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
Merge branch 'ma/lockfile-cleanup'
2018-05-08
Elijah Newren
m
erge
-
recurs
i
v
e
: fix check for skipa
b
ilit
y
of working
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merg
e
-recur
s
ive: make "Au
t
o
-mer
g
ing" comm
e
nt show for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
i
j
a
h
N
ewren
merge-recursive: fix re
m
a
i
nder
of was_d
i
r
ty() to us
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Eli
j
ah Newren
merge-recursive: fix w
a
s_tr
a
c
k
ed() to quit
l
ying with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newr
e
n
t6046: tes
t
c
a
ses checking
w
hether updates can be skipped
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
El
i
jah New
r
en
merge-recursive: avoid t
r
iggerin
g
add_cach
e
info error
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
me
r
ge-
r
ecursive: move
m
ore is_dirty handling t
o
merge_con
t
ent
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elij
a
h
Newren
merge-recur
s
ive: i
m
p
rove
add_cache
i
n
f
o
e
rror han
d
ling
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elij
a
h Newren
m
e
rge-r
e
cursive: av
o
id spurious rename/rename conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
El
i
jah Newren
d
i
rectory r
e
name
d
e
tection: new testcases showca
s
in
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
N
e
wren
merge-
r
ecursive: fix remaining directory rename + dirt
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
m
e
r
ge-recu
r
sive: fix overwrit
i
ng dirty fi
l
es involved
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Eli
j
ah N
e
wr
e
n
merge-
r
ecursive
:
avoid
c
lob
b
e
ring untracked files w
i
th
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ijah Newr
e
n
m
erge-recursive: apply necessary mo
d
ifications for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ijah Ne
w
re
n
merge-recursiv
e
: when
c
omparing files,
d
on'
t
include
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elij
a
h Newre
n
m
erge-recur
s
ive:
c
heck for
f
il
e
level
con
f
l
icts then
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
lija
h
Newren
merge-r
e
cursive: a
d
d computation of collisions due
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
lijah
N
ewren
m
e
rge-recu
r
sive: check
fo
r
directo
r
y level conf
l
icts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merg
e
-recursive: add
g
et_directory_ren
a
mes
(
)
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-02
E
l
ij
a
h
Newren
unp
a
ck_trees: fix
break
a
ge when o->src_i
n
dex
!
= o-
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-25
Elijah Newren
Make ru
n
ning
g
it under other deb
u
gg
e
r-like p
r
ogr
a
m
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah
N
ewren
merge-r
e
c
u
rsive: make a helper
f
unc
t
ion for clea
n
up
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newr
e
n
m
e
rge-recursive: split
o
u
t
c
o
de for determi
n
ing
di
f
f_filepairs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elij
a
h
N
e
wre
n
merge-r
e
cursive:
m
ake !o->dete
c
t_rename codepath mor
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
merge-recursive: fix leaks o
f
allocated ren
a
mes and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
El
i
jah Newr
e
n
merge-recursive:
intro
d
uce n
e
w function
s
to ha
n
d
l
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
l
ijah Newren
m
e
r
g
e-recursive: move the
get_rename
s
(
)
function
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elij
a
h Newren
d
irect
o
ry rename detection: tests for han
d
ling overwriting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
l
ijah Newren
direct
o
ry rename detection: tests for h
a
ndl
i
ng
o
v
e
rwriting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
direct
o
ry rename
detection: miscellan
e
ous tes
t
cases
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
l
ijah New
r
e
n
directory rename detect
i
on: t
e
stcase
s
exploring pos
s
i
bly
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
directory rename dete
c
ti
o
n: more involved edge/corner
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah
Newren
direct
o
ry rename detection: testcases checking wh
i
ch
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Eli
j
ah Ne
w
re
n
directory
rename detection: files/directories in the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah
N
ewren
directory re
n
ame detection: par
t
ially ren
a
med dir
e
ctory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elija
h
N
e
wren
directory
r
ename
d
etect
i
on: testcases to avoid
taking
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah New
r
en
directory ren
a
me detection: directory splitting
testcas
e
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah N
e
wre
n
d
irec
t
ory rename
det
e
c
tion:
basic tes
t
cases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-09
E
lijah Newren
Documentation: no
r
malize spelling of 'norm
a
lised'
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-09
El
i
jah Newren
Docu
m
e
ntation: fix s
e
veral one-chara
c
t
e
r
-of
f
spellin
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
E
l
ijah Ne
w
r
e
n
m
e
rge-rec
u
rsive: en
s
ure we write updates for directory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newren
merge-re
c
u
r
si
v
e: avoid spuriou
s
rename/ren
a
me conflic
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Ne
w
r
en
directory rename detec
t
ion: n
e
w testca
s
es showcasing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elija
h
Newren
m
e
rge-recursive: fix remaini
n
g directory rename
+ d
i
r
t
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elija
h
New
r
en
mer
g
e-r
e
cursive: fi
x
over
w
riting dirty
f
i
l
e
s
invo
l
ved
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
El
i
jah Newren
merge-recursive: avoid clobber
i
ng untracked files wit
h
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah
N
ew
r
en
merge-
r
ecursive
:
apply nece
s
s
a
ry modificati
o
ns for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Ne
w
ren
me
r
ge-
r
ec
u
rsive: w
h
en c
o
mp
a
ring files,
don't include
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
lijah Newren
mer
g
e
-
recurs
i
ve: check
f
or fil
e
level
c
onflicts then
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Ne
w
ren
merge-recursive: add computati
o
n o
f
collisions du
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
El
i
j
a
h Newren
mer
g
e-recursive: check for dir
e
ctory le
v
el co
n
flicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
Newren
merge-recursi
v
e: add ge
t
_dire
c
t
ory
_
renam
e
s()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
merge-recu
r
sive:
make a helper function for cleanup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
li
j
a
h
Newren
merge-recursi
v
e: split out
code for deter
m
i
ning
diff_filepairs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
mer
g
e-recursive: make !o->detect_rename codepa
t
h more
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
l
i
j
ah Newren
merge-recursive:
f
ix leaks of alloca
t
ed renam
e
s a
n
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elij
a
h Ne
w
r
e
n
merge
-
recur
s
ive: i
n
troduce new functi
o
ns to
handle
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newr
e
n
m
e
r
g
e-
r
ecu
r
sive: mov
e
the get_renames() fu
n
c
t
ion
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
direct
o
ry r
e
name d
e
tection: tests for handling
ove
r
writing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
El
i
jah Newr
e
n
d
irec
t
ory re
n
ame detection:
test
s
fo
r
h
a
n
d
li
n
g overwri
t
i
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
El
i
jah Newren
directory rena
m
e detection: misce
l
laneous testcases
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
dire
c
tory rename detection: testcases
exploring
possibl
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elij
a
h Newren
direct
o
ry rename
d
e
tection: more
i
nvol
v
ed edge/corner
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
directory rename detection:
testcases
c
hec
k
ing
which
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
directory renam
e
detection:
f
i
les/directori
e
s in t
h
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newre
n
dire
c
tory rena
m
e detecti
o
n: partial
l
y renamed direct
o
ry
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
El
i
jah
N
e
wren
directory rename detection: testcases t
o
avoid taking
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
El
i
jah Newren
directory rename d
e
t
ection
:
directory sp
l
i
t
ting tes
t
c
ases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Eli
j
ah Newre
n
d
i
rectory ren
a
me detec
t
i
on:
b
asic t
e
stc
a
s
e
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
E
l
ijah Newren
m
erg
e
-r
e
curs
i
ve
:
add
e
x
planation for src_entry and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Elijah Newren
m
e
r
g
e-recursive: fix
l
o
g
i
c
ordering is
s
u
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Elija
h
Newren
Tighten and cor
r
ec
t
a few t
e
stcas
e
s for merg
i
ng and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
Elij
a
h New
r
en
m
e
r
g
e
-
re
c
ursive: avoid i
n
corporati
n
g uncommitted changes
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
Elijah
N
e
wren
move inde
x
_has_changes()
from builtin/am
.
c to merge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
Elijah Newren
t604
4
:
r
ecursive
c
an
s
i
l
e
n
tly
i
ncorporate dirty
changes
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-05
Elijah Newren
strbuf: remove unuse
d
stripspace function ali
a
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-27
Elij
a
h Ne
w
ren
merge-r
e
curs
i
ve: i
g
nor
e
_case shouldn't reject intentional
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah Ne
w
ren
se
q
uen
c
er: show
rename pro
g
ress d
u
r
in
g
che
r
ry picks
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
E
l
ijah N
e
wren
diff: r
e
move silen
t
clam
p
o
f
renameLimit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah New
r
en
progre
s
s: fix progress meters w
h
en dealin
g
with lots
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
E
l
ijah Newren
merge-recursive: handle additio
n
of su
b
module on our
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-14
Elijah
N
e
wren
sequencer: wa
r
n when
internal merge
may b
e
suboptim
a
l
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
El
i
jah Newren
t6044: new
m
erge testcases f
o
r when index d
o
esn't mat
c
h
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
E
l
ijah Newren
merge-octo
p
u
s: abor
t
if index does
not match HE
A
D
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newren
b
uil
t
in/merge
.
c: fix a bug
w
i
th tr
i
vi
a
l merge
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
El
i
jah Newren
t7605: add a testca
s
e
demonstrating a bug
with trivial
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
E
l
ijah
N
ew
r
e
n
merge-recursive: do not che
c
k
w
or
k
ing copy when creating
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newren
merge-r
e
cursive: remove duplicat
e
code
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
ren
m
erge-
r
ecu
r
sive: Don
'
t re-
s
or
t
a lis
t
whose order we
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newren
merge-recursive: Fi
x
v
i
rtual merge base for rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah New
r
en
t6036: criss-cross + rename/r
e
name(1to
2
)/add-dest
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newr
e
n
merge-recurs
i
ve: Avoid unnecessary fil
e
r
e
writes
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
t6022: Additional tests checking for
unnecessary updates
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
merg
e
-recurs
i
ve: Fix spurious
'refus
i
ng to lose u
n
t
r
acke
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewren
t60
2
2: Add
t
est
c
ase for spurio
u
s
"
r
efusing
to lose
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newr
e
n
merge-recursive: Fix working co
p
y hand
l
ing for rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
wren
m
e
rge-r
e
cursive: add handl
i
ng fo
r
rename/r
e
name/add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
wren
me
r
ge
-
rec
u
rsive:
H
a
ve co
n
flict_renam
e
_
d
elete reuse
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h
Newren
m
erge-r
e
cursi
v
e: Make modify/delete
h
andl
i
ng code
reusa
b
le
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Ne
w
ren
m
e
r
ge-
r
e
c
ursive: Conside
r
modifications
i
n rename/re
n
ame
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next