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
t5552: suppress upload-pack trace output
2018-06-13
Elijah Newren
RelNotes 2
.
18: clarify where dir
e
cto
r
y r
e
name detec
t
i
o
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-01
Elijah Newren
RelNo
t
e
s: remo
v
e duplicat
e
rele
a
se n
o
te
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-25
E
l
ijah Newren
rev
-
parse: che
c
k lookup'e
d
commit references for NULL
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-20
Elij
a
h Newre
n
merge
-
re
c
ursive: prov
i
d
e
pa
i
r of `unpack_
t
rees_{start
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
m
erge
-
recu
r
sive: fix check for
s
k
i
pability of working
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah New
r
en
m
erge-
r
e
cursive: make "Auto
-
mergi
n
g"
c
o
mment show f
o
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newre
n
m
e
rge-rec
u
rsiv
e
: fix remai
n
d
e
r of was_dirty(
)
to
u
se
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
lijah Newren
merge-recursive
:
fix w
a
s_tracked() t
o
q
u
it ly
i
ng with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
t6046:
t
es
t
cases checki
n
g whether updates ca
n
b
e
skip
p
ed
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah New
r
en
merg
e
-
recursive: avoid triggering add
_
cacheinfo error
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah New
r
en
merge-rec
u
rsive: move
more is_
d
irty hand
l
ing to merge
_
content
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
Newren
merge
-
recursive: i
m
prove add_cacheinfo error
handling
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Ne
w
ren
m
erge-recursive: avo
i
d spuriou
s
r
e
n
am
e
/re
n
ame conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
Ne
w
ren
di
r
ec
t
or
y
rena
m
e
d
etecti
o
n: new
t
e
s
tcases s
h
owcas
i
ng
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
m
erge-
r
ecursive: fix remaining directory rename
+
dirty
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
lija
h
Ne
w
r
e
n
merge-recursi
v
e: fix overwriting dirty files inv
o
lved
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
N
ewren
merge-recursive: avoid clobbering
untracked files wi
t
h
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
mer
g
e-recurs
i
ve: app
l
y necessary modif
i
ca
t
ions f
o
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Eli
j
ah Newren
merge-rec
u
rsiv
e
: when comparing
files, don't in
c
lude
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Eli
j
ah Newre
n
merge-recursiv
e
: check
f
or f
i
le level c
o
nflicts then
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recursive: add comput
a
t
ion of collision
s
d
ue
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recu
r
sive:
check for directory lev
e
l conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
El
i
jah Newren
mer
g
e-r
e
cursive: add get_directory_re
n
am
e
s()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-02
E
lijah
Newren
unpack_trees: f
i
x breaka
g
e w
h
en o->sr
c
_i
n
dex
!= o-
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-25
Elij
a
h
N
ewren
Make
r
unning
git und
e
r other debug
g
er-
l
ike pro
g
r
a
m
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
mer
g
e-recursive: make a helper
function for cleanup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Eli
j
ah Ne
w
re
n
m
erg
e
-recursive: split o
u
t code for deter
m
in
i
ng diff_filepairs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newre
n
merge-recursive
:
make
!o
-
>de
t
ect_rename c
o
d
e
path more
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
me
r
g
e
-recursive: f
i
x leaks of all
o
c
ated renames and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
lijah Newren
merge-r
e
cursive: introduce
new functions to handle
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah New
r
en
mer
g
e-recursive: move the get_renames
(
)
function
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah New
r
en
dire
c
to
r
y
r
e
n
am
e
detection
:
tests for han
d
lin
g
ov
e
rwrit
i
ng
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
l
i
j
ah
N
ewren
directory
r
ename de
t
ection: tes
t
s for handling overwriting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
d
i
r
ectory rename de
t
ection: misce
l
laneous test
c
ases
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newre
n
directory renam
e
detectio
n
: testcases ex
p
lori
n
g po
s
sibly
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
directory rename detection: mor
e
involved edge/c
o
rner
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
El
i
jah Newren
direc
t
ory re
n
am
e
detection: testcases check
i
ng which
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elij
a
h Newren
directory r
e
name de
t
ection: files/directories
in the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Eli
j
ah Newren
directory
r
ename
d
etection: partially renamed directory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
direct
o
ry r
e
n
ame detection: testcas
e
s to av
o
i
d taki
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
li
j
ah Newren
d
irectory
r
e
nam
e
detection: directory splitt
i
ng
t
e
stcases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah New
r
en
directory r
e
name detect
i
on: basic testcase
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-09
E
lij
a
h Newre
n
Documentation
:
normalize
s
pelling of 'normalised'
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-09
Elijah Newren
Documentation: fix
s
ev
e
ral one-cha
r
acter-off
s
pelling
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newren
merge-recursive: ensure we write
upda
t
es
for directory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah N
e
w
r
en
mer
g
e
-
recursive: avoid spuriou
s
rename/
r
e
na
m
e conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elija
h
Newre
n
directory ren
a
me de
t
ection: new t
e
stcases showcasing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newren
merge-re
c
ursive: fix remaining dir
e
c
t
o
ry re
n
ame + dirty
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newren
m
erge-
r
ecurs
i
ve: fix over
w
riting dirty files
i
nvol
v
ed
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elij
a
h Newren
m
erge
-
re
c
ursi
v
e: avoid clobbering untrack
e
d files
w
i
th
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
E
l
ijah Newren
m
e
r
ge-recu
r
s
ive: ap
p
ly necessar
y
modifications
for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
m
e
rge-recursi
v
e: when comparin
g
f
iles, don't includ
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
merge-recursive: che
c
k for f
i
le lev
e
l conflicts then
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
merg
e
-recurs
i
ve: a
d
d computation
of collisions due
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
merge-recursive: check for directory
level conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah N
e
wren
merge-recursi
v
e: ad
d
g
e
t_dir
e
ctory_
r
enames()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
merge-recurs
i
ve: make
a helper function for cleanup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
me
r
ge-recursive: split
o
ut code for determi
n
i
n
g
diff_filepairs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah New
r
en
mer
g
e-recur
s
ive: make !o->det
e
ct_rename codepath mor
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
El
i
jah Newren
mer
g
e-rec
u
rsive
:
f
ix leaks
o
f allocat
e
d
renames an
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elija
h
Newren
merge-recursive:
introduce
new functi
o
ns t
o
h
a
n
d
le
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
l
ija
h
Newren
merge-recursive: move
t
he get_ren
a
mes() function
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah N
e
wren
direct
o
ry r
e
nam
e
d
etecti
o
n: tests f
o
r handling overwr
i
t
i
ng
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah N
e
wren
directory
r
ename detection
:
te
s
ts
f
o
r
h
andling overwriting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah New
r
en
dir
e
ct
o
ry ren
a
me
d
etection:
m
iscellaneous t
e
stcas
e
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elija
h
Newren
d
i
re
c
to
r
y
r
e
n
ame
detection: testcases ex
p
lori
n
g possibl
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
dire
c
tory
r
ena
m
e detection: more involv
e
d e
d
g
e/corner
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Eli
j
ah Newren
direc
t
ory rename det
e
ction: testc
a
ses checking which
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
directory rename detection: files/d
i
rectories in
the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newr
e
n
d
irectory rename
d
etection
:
pa
r
tially ren
a
med directory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
directory rename detection:
testc
a
ses
to avoid tak
i
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
direc
t
ory
r
ename detection:
d
ire
c
t
ory sp
l
i
t
t
ing testcase
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
l
ijah Newren
directo
r
y ren
a
m
e
detection: basic test
c
a
s
es
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Elijah New
r
en
merge-recursive: add explanation for src_en
t
r
y
a
n
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Eli
j
ah Newren
merge-r
e
cursive: fi
x
logic ordering issue
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Elijah N
e
wren
Ti
g
hten an
d
c
orrect a few te
s
tc
a
s
e
s for
m
erging a
n
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
E
lijah Newren
merge-recursive: avoid
i
nc
o
rporating uncomm
i
tted
c
hanges
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
E
lijah Newren
m
o
v
e
index_has_c
h
anges
(
) from
builtin/am
.
c t
o
merge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
E
lijah Newren
t6
0
44: re
c
ur
s
ive can silently incorporate dirty ch
a
n
ges
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-05
Elija
h
N
e
wren
strbuf: remov
e
un
u
sed s
t
r
i
pspace
function alias
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-27
Elijah
Newren
mer
g
e-recursive: ign
o
re_case should
n
't rej
e
ct in
t
entiona
l
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah Newren
se
q
uencer: s
h
ow rename progres
s
during cherry
p
i
cks
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah Newren
di
f
f: remov
e
silent clamp
o
f renameLimit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah Newre
n
progress:
f
ix progress met
e
rs when dealing with lots
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
E
l
ijah Newre
n
merge-rec
u
rsive: handle ad
d
ition
o
f submodule on our
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-14
Elijah Ne
w
r
en
sequencer
:
warn when in
t
ernal
m
erge may be suboptimal
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Ne
w
ren
t6044: n
e
w m
e
r
g
e testcases for w
h
en index d
o
esn'
t
m
a
t
ch
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elija
h
Newren
merg
e
-octopus: ab
o
rt if index
d
oe
s
not match HEAD
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
E
l
ijah New
r
en
builtin/merg
e
.
c: fix a bu
g
with t
r
iv
i
al
m
erges
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newren
t7605
:
add a testcase demonstratin
g
a b
u
g
with tr
i
vial
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah New
r
en
merg
e
-
r
ecurs
i
v
e: do
not check wo
r
king copy when creatin
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elija
h
Newren
merge-recursive:
r
e
move duplicate code
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah N
e
w
r
e
n
merg
e
-
recursiv
e
: Don't re-sort a list whose
orde
r
we
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursive:
F
ix virtual merge
base for
r
ena
m
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
ja
h
Newren
t6
0
36: criss-cross +
r
ename/r
e
name(1to2)/add-
d
est
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newren
merge-
r
ecursive: Avoid unnecessary fil
e
re
w
rites
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
e
wren
t6022: A
d
ditio
n
a
l tes
t
s checking for unnecessary updates
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newren
merge-recursive
:
Fix
spurious 'ref
u
sing to lose
u
ntracked
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
t6022: Add tes
t
c
a
se for
s
pu
r
iou
s
"refus
i
ng to lose
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newren
mer
g
e
-
r
ecursive: Fix
working copy handling for
r
enam
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next