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
Elij
a
h Newren
merge-recur
s
i
v
e: fix
check for sk
i
pability
o
f w
o
rking
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Eli
j
ah Newr
e
n
merge-recursive: ma
k
e "Auto-m
e
rging" c
o
m
ment show for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
Ne
w
ren
merge-
r
ecu
r
sive:
f
ix 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 Newren
m
e
rge-recursive:
f
ix was_tracked() to quit lying
with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Ne
w
ren
t6046:
testcases c
h
ecking whether
u
pdate
s
can
be skipped
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
me
r
ge-
r
ecursi
v
e: avoid t
r
iggering add_cac
h
ei
n
f
o
er
r
or
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah N
e
wren
merge-recursive: move more
i
s_d
i
rty handling
t
o merge_con
t
ent
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Eli
j
a
h Newren
m
erge-recursive
:
improve add_cac
h
einfo error handling
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
El
i
jah Newr
e
n
merge-recursive: avoid spurious re
n
a
m
e/rename con
f
lict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
directory
r
ename
detection:
new testcases
showcasing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
Ne
w
ren
mer
g
e-recurs
i
ve
:
fix rema
i
nin
g
d
irectory rename +
d
irty
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recur
s
ive: fix overwriting dirty files involved
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
El
i
jah Ne
w
ren
merge-recur
s
i
v
e
:
avoid clobbering untr
a
cked fi
l
es with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ij
a
h Newren
merge-
r
ecursive: ap
p
ly ne
c
essa
r
y modifications for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
El
i
jah
N
ewren
merge-recursive:
when
comparing fi
l
es, d
o
n
'
t include
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
m
erge-recursive: check for file level
c
onflicts then
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
m
e
rge
-
rec
u
rsive: ad
d
computati
o
n of collisio
n
s due
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newr
e
n
merge-recursiv
e
: c
h
eck for d
i
r
e
ct
o
ry level conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
mer
g
e
-
recurs
i
ve: add g
e
t_directory
_
renames()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-02
E
lijah Newren
unpack_trees: fix b
r
e
akage when
o
-
>src_index !
=
o-
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-25
E
lijah Newren
M
a
ke runnin
g
git un
d
er other debugg
e
r
-like programs
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
merge
-
recursive
:
make a helper f
u
nction for
cleanup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
l
i
j
a
h
Newren
m
e
rge-recursive: split o
u
t
c
od
e
fo
r
determining diff_fi
l
epairs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah
Newren
m
erge-recurs
i
ve: ma
k
e !o->detec
t
_rena
m
e codepath more
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
merge-recursive: fix leaks of alloc
a
t
ed
renames
and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
l
i
j
ah Newren
merge-recursiv
e
:
introduce new fun
c
tions to handle
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newre
n
merge
-
recursive: move the get_renames() function
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah N
e
wren
dire
c
tory rename de
t
ection: t
e
st
s
f
o
r handling overwr
i
ti
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elija
h
Ne
w
ren
d
i
re
c
tory renam
e
detection: tests
for handling overwriting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elija
h
N
ew
r
e
n
directo
r
y
r
enam
e
de
t
ection:
m
iscella
n
e
ou
s
te
s
tcases
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
li
j
ah Newren
direc
t
ory rename d
e
tection: te
s
tcases exploring possibly
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elija
h
N
e
wren
dir
e
ctory re
n
ame de
t
ectio
n
: more
i
nvolve
d
edge/corner
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
directory rename
d
etection: tes
t
cases checking
which
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newre
n
directory rename detection: files/directories in
t
he
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
directory rename detecti
o
n
: partially renamed directory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Ne
w
ren
d
i
r
ectory re
n
ame detection: testcas
e
s
t
o
avoid
t
a
k
ing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Eli
j
ah Newren
di
r
ectory renam
e
detection: dire
c
to
r
y s
p
l
i
tting te
s
tc
a
ses
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newr
e
n
d
i
rec
t
ory rename detection:
basic
t
estcases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-09
E
lija
h
New
r
en
D
o
c
umentatio
n
: normalize s
p
ell
i
ng of 'no
r
mal
i
s
ed'
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-09
Elija
h
Newren
Docu
m
entation: fix several one-char
a
c
t
er-o
f
f
spelling
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newren
merge-r
e
cursive: ens
u
re we write up
d
at
e
s for directory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Ne
w
ren
merge-recursive: avoid spurious rename/rename confl
i
ct
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newren
directory r
e
name detecti
o
n: ne
w
testcases showcasing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elija
h
N
ewren
merge
-
recursive: fix rema
i
ning directory rename + dirty
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newren
merge-recu
r
sive: fix overwriting dirty f
i
l
e
s involved
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newren
m
erge-recursive: avoid clobberin
g
untracked fil
e
s
with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newren
merge-recursive: apply necess
a
r
y mo
d
i
ficati
o
ns for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elij
a
h Newren
merge-recu
r
sive:
when
c
ompar
i
ng files, don't incl
u
de
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elija
h
Newren
merge-recursive:
c
h
eck for file level con
f
li
c
ts th
e
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Ne
w
ren
merg
e
-recursive: add co
m
pu
t
a
t
ion of co
l
lisions due
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Eli
j
ah
Newr
e
n
m
e
r
ge-recursive
:
check for direc
t
o
r
y l
e
vel conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
l
i
j
a
h
Newren
mer
g
e-recurs
i
v
e
: add get_direc
t
ory_renames()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
l
ijah Newren
merge-rec
u
rsi
v
e: make a h
e
lpe
r
func
t
ion for cleanup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
merge
-
recu
r
sive: split out code for
determini
n
g dif
f
_filepai
r
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
merge-recursive:
make
!o->de
t
ect_
r
e
n
ame codepath more
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah N
e
w
r
en
merg
e
-recursive: fix
l
eaks of allocated ren
a
mes
a
nd
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
El
i
jah Newren
merge-r
e
cursive: intro
d
uce new functions to handle
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Eli
j
ah Newren
merge-recu
r
s
ive: mov
e
t
he get_renames
(
) function
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah N
e
wren
directory rename d
e
tection
:
tests
for handling overwriting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah New
r
e
n
directory rename dete
c
t
ion: tests
f
or ha
n
d
ling overw
r
i
t
ing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
directory renam
e
det
e
ction
:
mis
c
ell
a
ne
o
us testca
s
e
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elija
h
Newren
d
i
re
c
tor
y
rename detecti
o
n: testca
s
es exploring pos
s
i
b
l
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
l
ijah Newren
directory rena
m
e detection: mo
r
e inv
o
lve
d
ed
g
e
/
corner
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Eli
j
ah
N
ewr
e
n
d
i
rectory rename detec
t
ion: testc
a
ses checking
w
h
i
c
h
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
directory rename det
e
ction: files/directories in the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
l
i
jah New
r
en
directory r
e
n
a
m
e
detection:
p
a
rtially renamed d
i
rectory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newre
n
dir
e
ctory r
e
name detection: te
s
tcases to avoid taking
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
l
ijah
N
ewren
directory rename d
e
te
c
tion: directory splitti
n
g testcases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Eli
j
ah Newren
directory rena
m
e
de
t
ecti
o
n
:
basic testcas
e
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Elijah Newren
merge-recursi
v
e: add ex
p
l
anat
i
on for src_ent
r
y
and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
E
lijah
N
ew
r
en
merge-recursive: fix log
i
c or
d
eri
n
g issue
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
El
i
jah
N
ewren
Tig
h
ten and
correct a
f
e
w
testcases for
m
erging and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
Elijah Newren
merge-
r
ecu
r
sive:
avoid incorpo
r
ating uncomm
i
tted changes
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
El
i
j
a
h
Newren
m
o
ve index_has_changes() from
builtin/
a
m
.
c
to merge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
Elijah Newren
t6044: recur
s
ive can
s
ilently
i
ncorp
o
rate d
i
rty
cha
n
ges
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-05
E
l
i
ja
h
Ne
w
re
n
s
trb
u
f: remove unused stripspace function ali
a
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-27
El
i
jah
Newre
n
merge-rec
u
rsiv
e
: ignore_cas
e
s
h
o
u
ld
n
'
t reject in
t
entio
n
al
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
E
lijah Newren
s
equencer: show rename pr
o
gress during cherry picks
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elij
a
h Newren
dif
f
: re
m
ove silent clamp of
renameLi
m
i
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
E
l
i
jah
N
ewren
progres
s
: fi
x
progress meters when dealing wi
t
h lots
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah Newren
m
e
rge-recursi
v
e
:
handl
e
addition of s
u
bmodule on
o
ur
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-14
Elijah Newren
sequencer: warn
w
hen i
n
ternal merge m
a
y be suboptim
a
l
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elij
a
h New
r
en
t6
0
44: new merge testcases for when index
d
oesn't match
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newren
mer
g
e-octopus: abort if inde
x
d
oes n
o
t ma
t
ch HE
A
D
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newren
builti
n
/merg
e
.
c: fix a bu
g
with triv
i
al merges
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah N
e
wren
t
7
605: add a
t
est
c
a
se demonstrating a bug w
i
th trivial
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
E
lijah
N
ewren
merge-recursive
:
do n
o
t chec
k
working copy when
c
reating
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah
New
r
en
m
e
rge-re
c
ursive: remove duplica
t
e
c
o
d
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
merge-recurs
i
ve: Don't re-sort a list whose ord
e
r
w
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
a
h
Newre
n
merge-
r
ecu
r
sive: Fix virtual merge
b
ase for
r
enam
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6036: criss-cros
s
+ r
e
n
a
me/rename(1to2)/add-dest
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
r
en
m
e
rge-
r
ecursive: Avoid unnece
s
sary file
rewrites
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newren
t60
2
2
:
A
dditional tes
t
s checki
n
g fo
r
unnecessary updates
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Newren
m
erge-
r
ecursive
:
Fix spurious 'refus
i
n
g to lo
s
e untracked
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
t6022:
A
dd testcase
f
o
r s
p
urious "r
e
f
u
sing
to lose
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
wre
n
merge-recu
r
sive: Fi
x
wo
r
king cop
y
h
a
ndling
f
or
r
ename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursiv
e
: add handlin
g
f
or rename/rename/add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
i
j
ah
Newren
merge-recu
r
sive
:
Have
c
onflict_rename
_
delete
reuse
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewren
merge
-
recursi
v
e: Make modify/delet
e
handl
i
ng
code reusab
l
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
merge-rec
u
rsiv
e
: Consider modifications in r
e
n
a
me/rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next