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
commit: add repository argument to parse_commit_buffer
2018-06-13
Elijah Newren
RelNotes
2
.
1
8: clarify
where directory rename
detectio
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-01
Elijah
Newren
RelNotes
:
remove duplicate
release
n
o
t
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah Newren
t6036: prefer test_
w
he
n
_finished to manual cleanup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
El
i
jah Newren
t6036, t
6
0
4
2: p
r
efer
test_cmp to sequences
of test
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Eli
j
a
h
N
e
w
ren
t6036, t6042: prefer test
_
path_is_file, test_pat
h
_is_missing
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
E
lijah Newre
n
t603
6
, t6042: use test_line_count instead of wc -l
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
E
l
ijah Ne
w
ren
t
6
036, t604
2
:
use test_create_repo to
k
e
e
p
t
ests independent
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-25
Elij
a
h
N
e
wren
rev-
p
arse:
check
l
ookup
'
e
d commi
t
references for NULL
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-20
Elijah
N
e
wren
merge-recur
s
ive: provide pair of `unpack_trees_{st
a
rt
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ijah Newren
merge-recursive:
f
i
x check for skipability of working
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah N
e
wren
mer
g
e-recursive: m
a
ke
"Auto
-
merging" comment show for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
Newren
merge-recu
r
sive:
fix remainder
of was_dirty
(
)
to use
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
Newren
merge
-
rec
u
rsiv
e
:
fix w
a
s
_
tracked
(
)
to quit
lying wi
t
h
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ijah
N
ewr
e
n
t6046: testcases check
i
n
g
whether updates can
b
e
skipp
e
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
N
ewr
e
n
merge-recur
s
iv
e
:
avoid tri
g
g
ering add_cach
e
inf
o
error
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah New
r
en
m
e
rge-recursive: move more is_dirty
h
and
l
ing to merge_content
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
El
i
jah Newren
merge-recursive: improve add_cacheinfo error
h
andl
i
n
g
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elij
a
h
New
r
e
n
merge-r
e
cursiv
e
: a
v
oid spur
i
o
us r
e
n
ame/rename conflic
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
N
e
w
ren
directory rename detection: new te
s
tca
s
e
s
showcas
i
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
Newren
merge-rec
u
rsive: fix remaini
n
g
director
y
rename +
dirty
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
m
e
rge
-
r
ecursive: fix over
w
riti
n
g d
i
rty files involve
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recursive: avoid clobbering untr
a
cked files
w
ith
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
N
e
w
ren
m
e
rge-re
c
ursive: apply
nece
s
s
a
ry modifications f
o
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
lijah Newren
merge-recursive: when co
m
paring
f
iles, don't incl
u
de
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ijah N
e
wren
merge-recursive: ch
e
ck
f
or file lev
e
l confl
i
ct
s
then
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recursive: add computa
t
io
n
of coll
i
sions du
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah New
r
e
n
merge-
r
e
cursi
v
e:
c
heck for
d
ire
c
t
ory l
e
v
e
l
c
o
n
f
licts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
El
i
ja
h
New
r
en
m
e
r
ge-recursive: add get
_
directo
r
y
_renam
e
s()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-02
Elijah Newren
unpack_
t
rees: fix breaka
g
e
when o->src_i
n
dex != o-
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-25
El
i
j
a
h Newren
Make r
u
nni
n
g git und
e
r o
t
he
r
debugger-
l
i
k
e pro
g
rams
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Ne
w
ren
merge-recursive:
make a helper function for
c
leanu
p
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elij
a
h
N
ewren
merge-recursi
v
e: split out
code
f
or d
e
t
ermi
n
ing diff_file
p
airs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Eli
j
ah
Newren
m
er
g
e-recursive: make !o->detect_rename code
p
ath more
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
El
i
j
a
h Newren
merg
e
-recurs
i
ve:
f
ix leaks
o
f
a
llo
c
ate
d
renames and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Eli
j
ah New
r
e
n
merg
e
-rec
u
rsive: introduce new func
t
ion
s
to handle
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Ne
w
ren
merge-recursive: m
o
ve the get_renames() functi
o
n
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah N
e
wren
directory rename detection: tests for handling overwriting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
lijah Newren
d
i
re
c
tory rename
detecti
o
n: test
s
for
h
a
n
dling
o
verw
r
iting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
directory rename detection:
m
iscellaneous tes
t
ca
s
es
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Eli
j
ah Newren
d
irectory re
n
a
me dete
c
tio
n
: testcases exp
l
orin
g
possibly
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elija
h
Newre
n
directory
r
ename detectio
n
: mor
e
i
nvolved edge/co
r
ner
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah
N
e
w
re
n
di
r
ecto
r
y rename detection:
testca
s
es
c
h
e
cking wh
i
ch
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
li
j
ah
N
ewren
direct
o
ry
r
enam
e
detection: fi
l
es/directori
e
s in the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elij
a
h
N
e
w
ren
directory rename detection: partial
l
y rena
m
ed di
r
ectory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elija
h
Newr
e
n
direc
t
ory rename detection: testcases to
avoid
t
a
king
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newre
n
d
i
re
c
tory rename detectio
n
: directory spl
i
tting testcases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah New
r
e
n
direct
o
r
y
r
ename detection: b
a
sic testcase
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-09
Elijah Newren
Documen
t
ati
o
n
: normalize spelling of 'normalised'
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-09
E
lijah Newren
Docum
e
ntation: fix several
o
ne-cha
r
acter-off sp
e
lling
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah
Ne
w
ren
m
erge-rec
u
rsive: ensu
r
e we write upda
t
es for d
i
rector
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Ne
w
ren
merge-recursive: avoid s
p
u
rious rename/ren
a
m
e
conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Ne
w
ren
directory
r
ename de
t
ection:
new testcases showcasing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elija
h
Newren
merge-recursi
v
e: fix remaining directo
r
y
rename + dirty
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newren
merge-recursive: fix
o
ver
w
riting dirty file
s
involved
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newren
merge-
r
ec
u
rsive: avoid clobbering untra
c
ke
d
f
i
les
with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newren
merge-rec
u
rsive: apply necessary modifications for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
Newren
merge-recu
r
s
ive: when compari
n
g files, d
o
n't include
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
merge-recursi
v
e: check for file leve
l
conflicts
t
hen
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
l
ijah Ne
w
r
e
n
merge-recursive: add computation of collisions due
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Eli
j
ah Newren
merge-recursi
v
e: check for directory level conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
Newren
merge-
r
e
c
ursive: add get_d
i
rectory
_
renames()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
El
i
jah N
e
w
ren
merge-recursive: make
a h
e
lper function for cleanup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
El
i
jah New
r
en
merg
e
-
r
e
c
ursive: spl
i
t out cod
e
for determining diff_filepairs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
N
ewren
m
e
rge-recursive:
m
ake !o
-
>
detect_rename codepath more
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
N
ewren
merg
e
-recursiv
e
: fix leaks of allocated rena
m
es and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
El
i
jah Newr
e
n
me
r
ge
-
recurs
i
v
e:
introduce new functions t
o
han
d
le
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah N
e
w
r
e
n
merg
e
-re
c
ursiv
e
: move t
h
e
g
e
t_renames() function
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Ne
w
ren
directory
rename
det
e
ction: tests
f
o
r
han
d
lin
g
overwriting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
l
i
j
a
h
Newren
d
irectory rename detection:
tests f
o
r handling ov
e
rwriting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
N
ewren
direc
t
ory rename detect
i
on:
misc
e
llan
e
o
u
s testcases
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Eli
j
ah
Newren
directo
r
y
r
ename
d
ete
c
ti
o
n: testcases
explorin
g
p
ossibly
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
director
y
rename detect
i
on: m
o
re involved edg
e
/corn
e
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
d
irecto
r
y rename detection: testcases checking wh
i
ch
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah N
e
w
r
en
direc
t
ory rename detec
t
ion: fil
e
s/direc
t
ories
i
n t
h
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
directory rename
d
e
t
ection:
p
arti
a
l
ly renamed directory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
N
ewren
direct
o
ry rename detectio
n
: tes
t
cas
e
s to avoid ta
k
ing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elija
h
Ne
w
ren
di
r
ectory rename det
e
cti
o
n
: directory splitting testcases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Eli
j
ah Newr
e
n
dir
e
ctory re
n
ame
d
e
t
ecti
o
n:
b
asic testcases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Elijah Newren
merge
-
recursi
v
e
:
a
dd exp
l
ana
t
ion for sr
c
_entr
y
an
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Eli
j
a
h
Newren
merge
-
re
c
urs
i
v
e: fix
l
ogic orderin
g
issue
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
E
l
ijah New
r
en
Tig
h
ten and cor
r
ec
t
a few testcases
f
or merging and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
Elijah N
e
wren
merge-recursive: avoid incorporating uncom
m
itted cha
n
ges
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
Eli
j
a
h Newren
move
i
ndex_has_ch
a
ng
e
s() fr
o
m
b
uiltin/am
.
c
to m
e
rge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
Elij
a
h Newren
t
6
0
4
4: recursive can silently incorporate dir
t
y ch
a
ng
e
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-05
Eli
j
ah New
r
en
st
r
buf: remo
v
e
u
n
u
sed stripspace f
u
n
c
tio
n
alias
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-27
Elij
a
h Newr
e
n
merge-
r
ecursive: ig
n
ore_case shouldn't
reject intentional
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Eli
j
ah Newren
sequence
r
: show
r
ename progress during cherry picks
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
E
lijah Newren
diff:
r
e
m
o
ve si
l
ent clamp of renameLimit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah Newren
prog
r
ess: fix progress me
t
ers when de
a
ling
w
ith lot
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah New
r
e
n
merg
e
-re
c
ur
s
ive: han
d
le addit
i
on of submodu
l
e on our
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-14
Elijah Newren
sequencer: warn
w
hen interna
l
m
e
rge
may be
s
u
b
optimal
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah
N
ewren
t6044:
n
ew merge test
c
ases for
w
hen index
d
oes
n
't match
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newr
e
n
m
erge-octopus: abort if in
d
ex does not matc
h
HEAD
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newr
e
n
b
u
ilt
i
n/merge
.
c
:
fix
a
bug with
t
rivial merges
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Ne
w
ren
t7605: a
d
d a testcase demonstrating a bug with
t
rivial
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newren
m
e
rge-recursive: do not check w
o
rking
copy wh
e
n creating
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah New
r
en
merge-recursive
:
r
e
move
d
upli
c
ate code
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
mer
g
e-recursive: Don'
t
re-so
r
t a list whose order we
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lija
h
Newren
merge-r
e
curs
i
ve
:
Fix virt
u
al merge base
f
o
r rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
en
t
6
036
:
cri
s
s-cross + rename/rename
(
1to2)/add-dest
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next