repo.or.cz
/
git
/
debian.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
t7406: avoid using test_must_fail for commands other than git
2018-08-08
E
l
ijah Newre
n
t
7
406:
a
void u
s
ing test_mus
t
_fa
i
l for commands other
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newren
t7406: prefer test_* help
e
r
functions to test
-
[feds]
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-08-08
Eli
j
a
h Newr
e
n
t7406: avoid hav
i
ng
g
it com
m
ands u
p
stream of a pipe
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newren
t7406: simpli
f
y
b
y
u
sing diff --nam
e
-only instead of
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-08-08
E
l
i
j
ah
Newren
t7406: fix ca
l
l that
w
as failing for the wrong
r
eason
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-11
Elijah
N
ewren
t7405: verify 'merge --abort' wor
k
s aft
e
r submodule
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-11
Elij
a
h New
r
en
t7405:
a
dd a
d
irectory/subm
o
dule confli
c
t
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-11
Elijah N
e
wren
t7405:
a
dd a
file
/
submodule conf
l
ict
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-11
Elijah
N
ewren
mer
g
e
: fix misleading pre-m
e
rge check
d
ocumentation
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-11
Elij
a
h
N
e
wre
n
merge-
r
ecur
s
i
v
e:
e
nforce rule
t
hat index
ma
t
ches head
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-11
El
i
j
a
h Newren
t6044: add more testcases with staged changes before
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newr
e
n
merge-recursive: fix assumptio
n
that head t
r
ee being
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-11
E
lijah N
e
wren
merge-recur
s
iv
e
: make sure when we say we abor
t
that
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-11
E
lijah Newren
t6044: add a
t
e
s
tcase for ind
e
x
m
atch
i
ng head, whe
n
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-11
Elijah N
e
wre
n
t6036: add
a
fail
e
d conflict detection case: regular
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-06
Elijah
N
ewr
e
n
t603
6
:
add lots of detail for director
y
/fil
e
c
o
nflicts
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-03
Elija
h
Newre
n
t6042: add testcase co
v
eri
n
g long chains of rename
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t
6
042: add testc
a
se
co
v
e
r
ing rename/renam
e
(
2
to1)/delete
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newre
n
t6042: ad
d
testcase c
o
v
e
ring rename/add/delete conflict
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-03
El
i
jah Ne
w
ren
t6
0
36: add a f
a
il
e
d
c
o
n
flic
t
de
t
ec
t
ion
c
as
e
with co
n
flicting
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Ne
w
re
n
t6036
:
add a failed conflic
t
detection ca
s
e with submodule
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-03
E
lijah Newren
t6036: add a failed conflict detecti
o
n
case with submodule
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-03
E
l
i
j
a
h Newren
t603
6
:
add a failed conflict de
t
ec
t
ion case with
sym
l
ink
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-03
E
l
ijah Newren
t
6
0
36
:
add a failed conflict d
e
tection
c
ase
with symlink
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newre
n
t6044: v
e
rify
t
hat merges
expected
to
abort
actually
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
index_has_changes(): avoid assuming
o
p
erating on the_index
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-03
Elij
a
h
Newren
read-cache
.
c: move inde
x
_
has_chan
g
es() f
r
om merge
.
c
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-06-28
El
i
jah Newren
t5407: fix tes
t
to
c
over i
n
tended arg
u
ments
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-06-28
Elij
a
h
N
ew
r
en
apply: fix grammar er
r
o
r
in
c
omment
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-06-27
Elijah
Ne
w
re
n
git-r
e
base--merge: mod
e
rnize "
g
it
-
$cmd" to "git $cmd"
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
Fix use of strategy options wit
h
interactive rebase
s
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-06-27
El
i
jah Newren
t
3418: add testcase
showing prob
l
ems with
r
ebase -i
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-06-27
Elijah
N
ew
r
en
git-rebase: make --allow-empt
y
-message the default
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-06-27
E
l
ijah Newre
n
t340
1
: add
d
i
rectory rename testcas
e
s for
r
ebase
a
nd am
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-06-27
E
li
j
ah Newr
e
n
g
i
t
-
rebase
.
tx
t
: document b
e
havioral d
i
fferences
b
etween
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-06-27
Elija
h
N
ewre
n
di
r
ectory-
r
enam
e
-det
e
ct
i
on
.
txt: technical docs on abilities
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-06-27
Elijah N
e
wren
g
it-
r
ebase
.
t
xt: address conf
u
s
ion between --no-ff vs
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
git-rebase:
e
rror out when incom
p
a
t
ible optio
n
s passed
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-06-27
Eli
j
ah
N
ewren
t34
2
2: new testcases for chec
k
ing when
i
n
c
ompatible
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-06-26
Elijah Newren
git-reba
s
e
.
sh: update
h
elp messag
e
s
a bit
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-06-26
Elijah Newren
git-rebase
.
txt: do
c
u
ment i
n
compatible op
t
ions
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-06-13
Elijah
Ne
w
ren
RelNo
t
es
2
.
18
:
clarify wher
e
directory rename dete
c
tion
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-06-12
E
l
i
jah
N
ewren
me
r
ge-recursive: add pointer about u
n
duly c
o
mplex l
o
oking
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-06-12
Elija
h
Ne
w
ren
merge
-
re
c
u
r
s
ive: re
n
a
me conflict_rename_*() family
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-06-12
E
lijah Newren
merge-re
c
urs
i
ve:
cla
r
i
fy t
h
e rename_d
i
r
/
RENAME_D
I
R
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-06-12
Elij
a
h
Newr
e
n
mer
g
e-recursive: ali
g
n labels with the
i
r respecti
v
e
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-06-12
E
l
ijah Ne
w
ren
merge-recu
r
sive: fix numerous ar
g
ument
a
l
ignment issues
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-06-12
E
lijah
Newren
merge-rec
u
rsiv
e
: fix miscella
n
eous
g
r
a
mmar error in
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-06-01
Elijah Newren
RelNot
e
s
: remove duplicate rel
e
a
se note
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-28
Elijah Newren
t6036:
p
ref
e
r test_when_
f
inished to manual clea
n
up
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-28
Elijah Ne
w
ren
t6036, t
6
042
:
pr
e
fer test_c
m
p to sequences
of test
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-28
Elijah N
e
w
ren
t
603
6
, t6
0
42:
p
refer test_pat
h
_is
_
file, test_pat
h
_is_missing
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-28
Elijah Newren
t6036, t6042: use test_l
i
n
e
_count instead
o
f wc -l
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-28
Elijah Newren
t6036, t6042
:
use test_create_repo to
k
eep tests in
d
e
pendent
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-25
E
lijah Newre
n
rev-
p
arse:
c
heck
loo
k
u
p
'
e
d co
m
mit references for NULL
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-20
Elijah Newren
merge-recursive
:
provide pai
r
of `
u
npa
c
k_trees_{star
t
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recursive: fix check for skipa
b
ility of wor
k
ing
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recur
s
ive:
m
ake "A
u
to-merg
i
ng" c
o
mment s
h
ow f
o
r
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recursive:
f
ix remainder of was_
d
i
r
t
y() to
u
s
e
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-08
El
i
jah
Newren
merge-
r
ecursi
v
e
: fix w
a
s_tracked()
t
o
qui
t
lying with
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-08
Eli
j
ah Newren
t
6046: tes
t
case
s
c
hecking whet
h
er updates ca
n
be ski
p
ped
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
m
erge-
r
ecursive: avoid triggering add_cach
e
inf
o
error
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merg
e
-recurs
i
ve: move more is_dirty handling to
m
erge_content
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elij
a
h Newren
m
e
rg
e
-re
c
urs
i
v
e
:
improv
e
add_cache
i
nfo
error hand
l
ing
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge
-
r
e
cursi
v
e
: avoi
d
spurious
rename/rename conflict
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-08
El
i
j
a
h Newren
di
r
ectory rename detecti
o
n: ne
w
test
c
ases
s
howcasin
g
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
m
e
rge-recursive: fix remaining directory
renam
e
+
d
i
rty
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
Newren
merge-recursive: fix overwriting dirty files in
v
o
l
ved
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recursi
v
e: avoid clobberi
n
g unt
r
acked fil
e
s wit
h
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah New
r
en
me
r
ge-recursive: appl
y
neces
s
a
r
y modificat
i
ons for
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
New
r
en
merge-recursi
v
e: when co
m
p
a
r
ing f
i
l
e
s
,
d
o
n'
t
include
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recursive
:
check
f
or file level co
n
flicts then
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elij
a
h Newren
m
e
rge-recur
s
i
ve: add comp
u
tation o
f
collis
i
ons
d
ue
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-08
E
l
i
j
a
h Newren
merg
e
-recur
s
ive: check
for directo
r
y level
conflicts
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recursive: add get_directory_
r
e
names()
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-02
Elijah
N
ewr
e
n
unpack_tre
e
s: fix breaka
g
e when
o
->src_
i
n
d
ex != o-
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-25
Elijah Newren
Make running g
i
t under other debugger
-
like programs
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
merge-recursive: make
a
h
elper function for clean
u
p
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elija
h
N
e
wr
e
n
merge-recursive
:
split out code f
o
r
d
e
termining diff
_
file
p
air
s
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-20
Eli
j
ah Newren
merge-rec
u
rsive: make !o->detect_rename codepath more
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-20
E
l
i
jah Newren
mer
g
e-recursive: fix leaks o
f
a
llocated renames and
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
m
er
g
e-recursive: introduce new functi
o
ns to ha
n
dle
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elij
a
h Ne
w
ren
merge-r
e
cursiv
e
: move the get_renames() f
u
nctio
n
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-20
Eli
j
ah Newren
direct
o
r
y
ren
a
me detection: tests for handling overwri
t
ing
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elija
h
Newren
dir
e
ctory
r
ename detec
t
ion: te
s
t
s
for h
a
ndling over
w
riting
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-20
E
l
i
jah N
e
wren
d
i
rect
o
ry ren
a
me detection: miscellan
e
ous tes
t
cases
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elija
h
Newre
n
dire
c
tory rename detection: tes
t
case
s
expl
o
ring possibly
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah New
r
en
dire
c
tory rename det
e
c
t
ion: mor
e
invo
l
ved
e
dge/cor
n
er
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elij
a
h Newren
director
y
rename
d
e
tec
t
ion: tes
t
c
ases
checking
w
hich
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-20
E
l
i
j
ah Newren
di
r
ecto
r
y
r
ena
m
e detectio
n
:
f
i
les/directories in the
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-20
E
lijah Newren
d
ire
c
tor
y
r
e
n
a
m
e detection: pa
r
tial
l
y ren
a
med directory
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah New
r
en
director
y
rename
detection:
t
es
t
case
s
to a
v
oid taking
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
directory
r
en
a
me de
t
ection: directo
r
y split
t
ing testcases
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elij
a
h Ne
w
ren
directo
r
y
ren
a
me detection: basic t
e
stcases
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-09
Elijah Newren
Documentation: nor
m
alize spe
l
ling o
f
'normal
i
se
d
'
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-09
Elijah N
e
w
r
en
Documentation:
f
ix sever
a
l o
n
e
-charact
e
r
-off spel
l
ing
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newren
merge-recursi
v
e: e
n
sure we write updates
for
d
i
re
c
to
r
y
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-27
E
lija
h
Newren
mer
g
e
-
recu
r
siv
e
: avoid spurious rename/
r
ename confl
i
ct
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newren
d
i
rectory
r
ename detecti
o
n: new testcases
showcasing
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-27
Elijah N
e
w
ren
merge-recu
r
s
ive: fix remaining direct
o
ry rename + dirty
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
next