repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
t6042: add testcase covering long chains of rename conflicts
2018-07-03
Elij
a
h Newren
t
6
042:
a
dd
t
estc
a
se covering l
o
ng chains
of r
e
nam
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Eli
j
ah N
e
wren
t6042: add testcase
c
overing re
n
ame/renam
e
(2to1
)
/
d
elete
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
El
i
j
ah Newren
t6042:
add te
s
tcase co
v
ering rena
m
e/add/de
l
ete
c
onflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-13
Elijah Newren
RelNotes 2
.
18: clari
f
y where dire
c
t
o
r
y
rename detection
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-01
Elijah Newren
Rel
N
otes
:
remove duplicate release note
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah Newren
t6
0
36: prefer test
_
when_fini
s
hed to manual cleanup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
E
lijah Newren
t6036, t
6
042: prefer
t
est_cmp
to sequences
o
f
test
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah Newren
t60
3
6, t6042: prefer test_pat
h
_
is_f
i
le, test_pa
t
h
_is_mis
s
ing
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
E
l
ijah
Ne
w
ren
t6036, t
6
0
4
2:
u
se test_l
i
ne_count i
n
ste
a
d
o
f
wc -l
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
El
i
jah Newren
t6036, t6042: us
e
test_create_r
e
po
t
o k
e
e
p
t
ests in
d
ependent
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-25
Elijah Newr
e
n
rev-p
a
rse:
c
heck lookup'ed commit r
e
ferences for N
U
LL
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-20
Elijah Newren
merg
e
-recursive: provi
d
e p
a
ir o
f
`un
p
ack_tr
e
es_{start
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elij
a
h Newren
m
e
rge-recursive: fix check for skipability of workin
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ijah Ne
w
r
e
n
merge-recursive: make
"A
u
to
-
merging" comment sh
o
w f
o
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
m
e
r
g
e-recursive: fix remai
n
der of was_dirty() to use
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
El
i
jah
New
r
en
merge-r
e
cursive: f
i
x was
_
tracked() to quit lying with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
t604
6
: testcase
s
checking whe
t
her u
p
d
a
tes
c
a
n be
skipped
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Eli
j
ah Newr
e
n
merge-recursive: avoid tr
i
ggering add_cacheinfo
error
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
i
j
a
h
Newren
m
e
rge-recursiv
e
:
move more is_dir
t
y
h
a
ndl
i
ng to me
r
ge_cont
e
nt
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ij
a
h Newren
me
r
ge-
r
ecu
r
s
i
ve: impro
v
e
add_cac
h
einfo error
handlin
g
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Eli
j
a
h Newren
merge-r
e
cursive: a
v
oid sp
u
rious ren
a
me/renam
e
c
o
nfli
c
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
d
irectory renam
e
detect
i
on: ne
w
testcases showcasing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ija
h
Newren
merge-recursive: fix
r
emaining directory rename + dirty
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ijah Newren
merge-r
e
c
u
r
s
i
v
e: fix overwritin
g
d
i
r
ty files
involved
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
me
r
ge-r
e
cu
r
sive: avoid clobbering unt
r
acked f
i
l
es with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
lijah N
e
wre
n
merge
-
r
e
cursive: apply n
e
ce
s
sary modific
a
ti
o
n
s for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recursive:
when co
m
p
a
ring
f
i
l
es, don't include
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ijah Newren
m
e
rge-recursiv
e
:
ch
e
ck for
fi
l
e level confl
i
c
t
s then
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newre
n
merge-
r
ecursive: add
c
omputation of collisions due
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-r
e
cursive: check for di
r
ect
o
ry
l
evel conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
El
i
j
a
h Newren
m
e
r
g
e
-recursive:
ad
d
g
e
t_directory_
r
e
names(
)
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-02
Elijah New
r
en
unpac
k
_trees: fix
b
reakage
w
hen o->src_index != o-
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-25
Elij
a
h Newren
Make ru
n
ning git
u
nder other debug
g
er
-
like progra
m
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newr
e
n
merge-rec
u
rsi
v
e:
m
ake a
h
elper functio
n
for cleanup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
merge-recursi
v
e
:
spl
i
t out code for determin
i
ng d
i
ff_fi
l
epairs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elij
a
h Newren
merge-
r
ec
u
rsive:
m
a
ke !
o
->detect_rename
codepath more
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah New
r
e
n
merge-recursive: f
i
x le
a
ks of allo
c
ated renames a
n
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
lijah Newren
m
e
r
ge-r
e
c
ursiv
e
: i
n
troduce new
functions to h
a
ndle
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah New
r
en
m
erg
e
-
r
ecurs
i
ve: move th
e
get_renames() function
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
d
irec
t
ory
renam
e
detection: tests
for handl
i
ng overw
r
i
ting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
l
ijah Newren
directory rename detection: tests fo
r
han
d
l
i
ng ov
e
rwritin
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
direct
o
ry r
e
name dete
c
ti
o
n: mis
c
ellaneous testc
a
ses
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
l
ija
h
Ne
w
ren
di
r
ectory re
n
ame detec
t
i
o
n
:
t
estcases expl
o
ring p
o
ssibly
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elija
h
N
e
w
ren
directo
r
y r
e
name de
t
e
ct
i
on: more
i
n
v
olved edge/corner
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Eli
j
ah Ne
w
r
e
n
d
ire
c
tory renam
e
d
etectio
n
: test
c
ases checkin
g
w
hich
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
direct
o
ry rena
m
e detection: file
s
/
d
irectories in
t
h
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elija
h
Newren
directory rename
detection: partially
renamed
d
ire
c
tory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah
N
e
wren
directory re
n
a
m
e detection: testcases to avoid ta
k
ing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newr
e
n
dire
c
tory r
e
name
d
etection: dire
c
tory split
t
ing testcases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Eli
j
a
h Newren
directory rename detection: basic testcas
e
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-09
Elijah Newren
Documentation
:
normalize spelling
of
'
normalised'
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-09
Elijah Newren
Document
a
tion: f
i
x s
e
veral one-character-off s
p
ell
i
ng
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Eli
j
ah New
r
en
merge-r
e
cursive: ensure w
e
w
rite
updates for dir
e
ct
o
r
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elij
a
h Newren
merge-re
c
ursi
v
e: avoid
spurious renam
e
/rename conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah New
r
en
direct
o
r
y rename detection: new
t
estcases s
h
owcas
i
ng
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newren
merge-recursi
v
e: fi
x
r
emaining
d
i
r
ectory
r
ename + dirty
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
El
i
jah
Newren
m
e
rge-recur
s
ive: fi
x
overwriting
dirt
y
files involved
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah N
e
wren
merge
-
recursive: a
v
oid
c
lobbering untracked fi
l
es
w
i
th
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newren
merge-r
e
cursive: apply
necessary modifications for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
El
i
jah
Newren
merge-recursive
:
when comparing files
,
d
on't inclu
d
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah N
e
wren
merge-recursive: check for file level conflicts then
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
l
ijah New
r
en
m
erge-recursive
:
a
d
d c
o
mputat
i
on of
collisio
n
s due
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
m
e
rg
e
-recu
r
sive: che
c
k
f
or directory level conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
merge-rec
u
rsive
:
add ge
t
_direc
t
ory_renames()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
N
ewren
merge-recursive:
ma
k
e a helper function for cleanup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
merge-recur
s
i
ve: split out
c
ode for d
e
t
e
rmining d
i
ff_fil
e
pa
i
rs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
Newren
mer
g
e-recursive:
ma
k
e
!o->detect
_
rename codepath more
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elij
a
h Newren
merge-recursive: fix leaks of allocated renames and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Ne
w
ren
merge
-
rec
u
rsive: intro
d
u
ce new fun
c
tions
to handle
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newre
n
merge-r
e
cursive
:
move the get_renam
e
s
() fu
n
ction
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newr
e
n
directory rename detection: tests for
handling overwriting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Ne
w
ren
di
r
ec
t
o
r
y rename detec
t
ion: tests for handling
overwri
t
ing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
directory rename detection: miscellaneous t
e
stc
a
ses
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
director
y
r
e
name d
e
tectio
n
: testcases
exploring pos
s
i
b
ly
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elija
h
Newren
directory rename detection: more involved ed
g
e/corner
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
directory rename detectio
n
: testcases checking whic
h
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah New
r
en
directory
r
ename det
e
c
t
i
on: files/directories in
the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Eli
j
ah Newren
directory
r
e
n
ame detect
i
on:
partial
l
y renamed
di
r
ect
o
r
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
El
i
jah Newre
n
directory re
n
ame
detection: testcases to
a
v
oid taking
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newr
e
n
di
r
ectory rename detection:
d
irectory spli
t
ting tes
t
cases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
N
ewren
di
r
ec
t
ory rename detect
i
on: b
a
sic testc
a
ses
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
E
l
ijah N
e
wren
merge
-
recursive: add explanation for src_entry and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Elijah Newren
merge-recursive
:
fi
x
logic ordering
issu
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Eli
j
ah N
e
wren
Tighten and corre
c
t a
few testcases for
merging and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
Elijah Newr
e
n
mer
g
e-rec
u
rsiv
e
:
avoid incor
p
orating uncommitted chan
g
e
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
Elija
h
Newre
n
move index_h
a
s_ch
a
n
g
es() from builtin/am
.
c to m
e
rg
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
Elijah
N
e
wre
n
t6044: recursive can sile
n
tly inco
r
p
orate di
r
ty changes
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-05
Elijah
Newren
strb
u
f: r
e
move unused strip
s
pace fu
n
ction ali
a
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-27
Eli
j
a
h
Newren
merge-recur
s
i
ve: igno
r
e_c
a
se
sho
u
ldn't reject i
n
tenti
o
nal
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elij
a
h Newren
s
equencer: show rename progr
e
ss dur
i
ng cherry
p
icks
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah Newre
n
diff:
remove silent
c
l
amp o
f
renam
e
Limit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah Newren
progress:
f
ix prog
r
ess
m
e
ters
w
h
en
d
ealing
with l
o
ts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
E
l
ijah Newren
merge
-
recursive:
h
a
n
dle addition of submodule
on
our
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-14
Elijah Newren
sequencer: warn when intern
a
l merge may be suboptimal
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah
Newren
t6044: new m
e
rge testcases for when
i
ndex doesn't
m
a
t
ch
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
El
i
j
a
h
Newren
merge
-
octop
u
s: abort if index does not ma
t
ch HEAD
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah N
e
w
r
en
b
uiltin/merge
.
c: fix a bug with trivial
m
e
rges
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newren
t7605: a
d
d a testcase de
m
on
s
t
r
ating a bug with trivial
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah New
r
en
merge-recursive: do
n
ot check working copy whe
n
cre
a
ti
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Ne
w
ren
me
r
ge-recursive: re
m
ov
e
dupli
c
at
e
co
d
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next