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
rerere: return strbuf from handle path
2018-06-13
Elijah Newren
RelN
o
tes 2
.
18: cla
r
ify
w
h
e
re direct
o
ry rena
m
e de
t
ection
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-01
Elijah Newren
RelNotes
:
remov
e
duplicate release note
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah Newren
t6036:
p
refer t
e
st_
w
he
n
_finish
e
d
to manual c
l
eanup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elija
h
N
e
wren
t6036, t6042: prefer
test_cmp to s
e
qu
e
n
ces
of t
e
s
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah Newren
t
6
0
36
,
t6042:
p
refer test_pat
h
_
is_fil
e
,
test_path_is_missing
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elija
h
Ne
w
ren
t6036, t6042: us
e
test_line_count instead of wc -l
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah Newren
t603
6
, t6042:
u
se test_cr
e
a
t
e_rep
o
to
k
e
ep tests i
n
dependen
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-25
Elijah Newren
rev-pa
r
se:
check
l
ook
u
p'ed co
m
mit references for NULL
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-20
Elijah
N
ewren
merge
-
recurs
i
ve
:
provide pair of `unpack_
t
rees_
{
start
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
i
jah N
e
wren
m
e
r
g
e-recur
s
ive: fix check
for skipabi
l
ity of working
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
lij
a
h Newren
merg
e
-recursive: make "Auto-merging" comment show
f
o
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ijah Newren
me
r
ge-recursi
v
e: fix remainder of wa
s
_dirty()
t
o use
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ija
h
Newren
merge-
r
e
cur
s
iv
e
:
fi
x
was_tracked() t
o
q
uit lying with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ija
h
Newr
e
n
t6046: test
c
ases checking wh
e
ther up
d
a
t
es can be skipped
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
m
erge
-
recurs
i
v
e
: avoi
d
triggering
a
dd_cacheinfo error
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
Newren
merge-recursive:
m
ove more is_dirt
y
handlin
g
t
o
merge_conten
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newre
n
merg
e
-recursive: improve a
d
d_cacheinfo error handling
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
lijah
N
ewr
e
n
mer
g
e-recursive: avoid
s
pur
i
ous rename/rename
confli
c
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
N
ewren
direc
t
ory rename detection:
n
ew testcases showcasing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
lijah Ne
w
ren
merge-
r
e
curs
i
ve:
f
ix remaining
direc
t
o
r
y rename + dir
t
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
lijah
New
r
en
merge-recur
s
ive: fix
overwriting
dirty files involved
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
me
r
g
e
-recursive: avoid clobbering untra
c
ke
d
files w
i
th
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
li
j
ah Newren
merge-recursive: ap
p
ly ne
c
essary modifica
t
io
n
s for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
Newren
merge-recursiv
e
:
when
co
m
paring file
s
, don't inc
l
ude
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
Newren
merge-re
c
ursive:
c
h
e
c
k for file leve
l
conflicts then
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elij
a
h New
r
en
merge-recursiv
e
:
a
dd compu
t
at
i
on
o
f
collisions due
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
lijah Newren
merge-r
e
cu
r
si
v
e
: check for directory level conf
l
icts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merg
e
-recursiv
e
: add get_direc
t
ory_re
n
ames()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-02
Elijah
Newre
n
unpack
_
t
rees:
fix breakage whe
n
o
->s
r
c_
i
ndex !
=
o-
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-25
Elijah
N
ewren
Make running git under other deb
u
gger-like programs
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah N
e
wren
merge-
r
ecursive: make
a
h
e
lper function for cleanup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Eli
j
ah Newren
merge-recursive:
spli
t
ou
t
code for determini
n
g diff_fil
e
pairs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
m
e
r
g
e-recu
r
sive: make !o
-
>de
t
e
ct_rename codepath more
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
lijah Newren
mer
g
e-recurs
i
v
e
: fix leak
s
of alloca
t
ed re
n
ames a
n
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
lijah Newren
m
erge-recursive: int
r
oduce new fu
n
ctions to hand
l
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah
N
ewr
e
n
m
e
r
g
e-recur
s
iv
e
:
move the get_
r
enames() function
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newr
e
n
d
irectory r
e
name dete
c
tion: te
s
ts for h
a
ndling over
w
riting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
lijah Newren
directory rename detection: tests
for han
d
ling ov
e
rwrit
i
ng
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah
Newren
dire
c
tory rename detection: misce
l
lane
o
u
s
testcas
e
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah N
e
w
ren
directory rename
detecti
o
n: testcases explori
n
g possibly
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah New
r
en
directory rename detection
:
m
o
re i
n
volv
e
d
edge/corne
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah N
e
wren
directory
re
n
ame detection: te
s
tcases check
i
ng
whic
h
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah N
e
wren
directory r
e
name
d
et
e
c
tio
n
: files/directories
i
n the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah N
e
wren
directory
rename detection: partially r
e
named dir
e
ctory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
directory
r
ename detect
i
on:
testca
s
es to
a
void
ta
k
ing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
El
i
jah N
e
wren
d
i
re
c
tory ren
a
me detection: direct
o
ry s
p
l
i
tting
test
c
a
s
es
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
El
i
jah Newren
directory rename de
t
ectio
n
:
basic testc
a
ses
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-09
E
li
j
a
h
Newr
e
n
Documentation:
n
o
rmalize spell
i
ng of 'normalise
d
'
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-09
Elijah Newren
Documentation
:
fix
several one-characte
r
-off spelli
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
E
l
ijah N
e
wren
m
e
rge-recursive:
e
nsur
e
w
e
wri
t
e
updates fo
r
directory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
E
l
ijah Newren
merge-recu
r
sive
:
avoid spur
i
o
us
r
ename/rename con
f
lict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Eli
j
ah New
r
en
directory rename detectio
n
: new testcases showcasing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elij
a
h Newren
merge
-
recursive: fi
x
remaining directory rename + dirt
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newren
mer
g
e-
r
ec
u
rsive: fix
o
ve
r
writ
i
ng
d
i
r
t
y file
s
i
n
volved
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Eli
j
a
h Newren
m
erge-re
c
u
rsive: avoid
c
lobbering untracked fil
e
s with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
El
i
jah Ne
w
ren
m
e
rge-recursi
v
e:
a
pply necessary modif
i
ca
t
i
ons f
o
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
lija
h
Newr
e
n
m
erge-recurs
i
ve:
when comparing files, don't incl
u
d
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
m
er
g
e
-
recursi
v
e:
check for file level con
f
licts th
e
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
N
ewren
mer
g
e
-re
c
ursiv
e
:
a
d
d co
m
p
u
tati
o
n of colli
s
ions due
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Ne
w
r
en
merge-recursive: check for d
i
rectory
level confli
c
ts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elija
h
Newren
merge-re
c
ursive: add
get_
d
ire
c
tory_r
e
n
a
mes()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
merge-rec
u
rsive: make a
h
elp
e
r func
t
i
o
n f
o
r cleanup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
merge
-
r
ecursive: split
out code f
o
r determi
n
i
ng diff_filepair
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Eli
j
ah Newren
merge-recu
r
sive: mak
e
!o->detect_
r
e
n
ame codepat
h
more
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Ne
w
r
e
n
merge-recu
r
sive: fix lea
k
s of a
l
located renames and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
merge-recursi
v
e: introd
u
ce new func
t
ions to handle
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
El
i
jah Newr
e
n
merge-recursive
:
move the get_re
n
a
me
s
() fu
n
ct
i
on
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Eli
j
a
h
N
ewren
direct
o
r
y re
n
am
e
d
e
tection:
t
ests
f
or handling ov
e
rwri
t
ing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elij
a
h
N
ewr
e
n
direc
t
ory r
e
name
detection: te
s
ts for
han
d
l
ing overwriting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
directory rename detection: miscellaneous testcases
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elij
a
h Ne
w
ren
directory rename
dete
c
tio
n
: t
e
stcases e
x
ploring possibly
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
directory re
n
am
e
detection: more invo
l
ved edge/corner
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elij
a
h Newre
n
d
i
recto
r
y rename d
e
t
ection: te
s
tcases checking whic
h
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
Newren
directory rename
detection: files/di
r
ectories
i
n th
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
direc
t
or
y
rename detect
i
on: parti
a
l
ly renamed directory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newr
e
n
directory rename detection: te
s
tcases to avoid
taking
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
directo
r
y
rena
m
e d
e
tecti
o
n: directory splitting
t
e
s
tcases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah N
e
wren
directory rename
detection:
b
asic testcases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Elijah Newren
mer
g
e-r
e
cursive: ad
d
e
x
planati
o
n f
o
r src_entry and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Elija
h
N
ewren
merge-recursive: fix logic ordering is
s
ue
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Elijah Newre
n
Tighten an
d
correct a
f
ew testcases
f
or
mergin
g
and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
E
l
ijah Newren
merge-recursive: avoid incorporating un
c
o
mmitted changes
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
Elija
h
Newren
mo
v
e index_h
a
s_changes
(
) from
bui
l
t
i
n/a
m
.
c to merge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
Elijah Newre
n
t6044: re
c
u
rsive can silently
i
n
c
orpo
r
ate dirty
c
hanges
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-05
Elijah Newren
strbuf:
r
e
move un
u
sed stripspace function alias
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-27
Elijah New
r
e
n
merge-
r
ecursive
:
ignore_case sho
u
l
dn't reject
i
n
ten
t
i
on
a
l
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah Newren
sequenc
e
r: show rename progress during cherry pic
k
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah Newren
d
i
f
f: remove
s
ile
n
t clamp of r
e
na
m
e
Limit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah New
r
en
progr
e
ss:
f
ix pr
o
gress
meters when dealin
g
with lots
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah New
r
e
n
me
r
ge
-
recursive: hand
l
e
a
ddi
t
ion o
f
submo
d
ule
on o
u
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-14
Elija
h
Newren
s
e
q
uencer: wa
r
n w
h
en
in
t
ernal merge may
b
e suboptim
a
l
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah N
e
wre
n
t6044: new
m
erge te
s
tca
s
es for wh
e
n
index d
o
esn'
t
m
atch
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newren
m
e
rge-o
c
topus: abort if index does
n
o
t
match H
E
A
D
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
El
i
jah Newren
builtin/merge
.
c: fix
a bug
with triv
i
al merges
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
E
l
ijah Newren
t7605: add a testc
a
se demons
t
rating a
bug with trivial
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elij
a
h Newren
merge-recursive: do not check work
i
ng copy when creating
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah
N
e
wr
e
n
mer
g
e-recursive: remove duplicate code
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Newren
m
e
r
g
e
-recur
s
ive: D
o
n't re-sort a list whose order we
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lij
a
h Newren
merge-
r
ecursive:
F
ix virtua
l
merge base for rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
ren
t6
0
36: criss-cro
s
s
+
rename/ren
a
me(1to2)/add-dest
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next