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 'ot/ref-filter-object-info'
2018-05-28
Elijah Newren
t6036, t6042: prefer t
e
s
t
_
path_is_
f
ile, test_path
_
is_missing
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah Newre
n
t6036,
t
6042:
u
s
e t
e
st_line_count inst
e
a
d of wc -l
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elija
h
New
r
e
n
t60
3
6, t6
0
42: use t
e
st_create_rep
o
to keep tests independ
e
nt
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-25
E
lijah Newren
rev-pa
r
se: ch
e
ck lo
o
kup'ed c
o
mmit refe
r
ences fo
r
N
ULL
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-20
Elijah N
e
wren
merg
e
-recursive:
p
rovid
e
pair
of `un
p
ack_
t
r
e
es_{start
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
El
i
j
a
h
N
ewren
merge-recurs
i
ve:
f
ix check for skipability of working
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-r
e
cursive: make "Aut
o
-merging" comm
e
n
t show for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recursive: fix remainder of
was_dirty() to use
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
lijah
Newren
merge-rec
u
r
s
ive: fix w
a
s_
t
racked() to quit lying with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elij
a
h
N
e
wren
t6046: testcases check
i
ng wh
e
ther updates can be skip
p
ed
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newr
e
n
merge-
r
ecursive: avoid trig
g
er
i
ng add
_
c
acheinfo error
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elij
a
h
N
e
wre
n
merge-recursive: mov
e
more
i
s_dirty
handl
i
ng
to merge_co
n
t
e
nt
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recursive: improve
add_
c
acheinfo error handling
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
lijah Newren
merge-
r
ecursive:
a
v
o
i
d spu
r
ious
r
e
na
m
e/renam
e
conflic
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
d
i
r
ec
t
or
y
re
n
ame
d
etection: new tes
t
cases sho
w
casing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-r
e
cursive: fix
remaining director
y
r
e
n
a
me + dirty
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
N
ewre
n
merge-recursive: fix
o
ver
w
riting
d
irty fi
l
es involved
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elij
a
h Newren
merge-re
c
u
rsive: avoi
d
clobbering untr
a
cked files
with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recursive:
a
p
p
l
y
n
e
cessary modification
s
fo
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
Newren
m
e
rge-recursive
:
when c
o
m
p
a
r
ing
files, don'
t
i
nc
l
ude
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
Newren
m
erge-recursive:
c
heck for file lev
e
l con
f
licts then
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-re
c
ursiv
e
: add computation of collisions d
u
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah New
r
en
m
erge-re
c
ursive: check for d
i
rectory lev
e
l conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah New
r
en
merge-recursive:
a
dd get_direct
o
ry_re
n
ames()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-02
Elijah Newr
e
n
unpack
_
trees: fix breakage when o->
s
rc_
i
ndex != o-
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-25
Elijah Newren
Make
run
n
ing git under othe
r
debugger-like programs
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newr
e
n
me
r
ge-recursive
:
make a helpe
r
functio
n
for cleanu
p
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
l
ijah Ne
w
ren
me
r
ge-recursive: split
out code for determining diff_filepairs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
El
i
j
ah Newren
merge-recu
r
s
i
ve:
m
a
k
e
!o->detect_rename
codepath
m
ore
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elij
a
h
Newren
m
e
rge-recursiv
e
:
fix lea
k
s of
a
llocat
e
d
renames and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elija
h
Newren
m
e
r
ge-
r
ecursive: introduce n
e
w functions to ha
n
dle
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
merge-re
c
urs
i
ve:
m
ove the
g
e
t_
r
e
n
ame
s
() function
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
directory rename d
e
t
e
ction: tests for handling
o
v
er
w
riting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
El
i
ja
h
N
ewren
director
y
rename d
e
tec
t
ion: tests for handli
n
g
overwr
i
t
i
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
El
i
jah Ne
w
ren
direc
t
o
r
y re
n
ame detection: miscellaneous t
e
st
c
a
ses
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elij
a
h
Ne
w
ren
d
irecto
r
y r
e
name
d
etection: testcases explo
r
ing po
s
sibly
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
l
ijah Newren
direc
t
ory re
n
ame detectio
n
: mor
e
i
n
vo
l
ved edg
e
/corner
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah
Newren
direc
t
ory rename detection: testcases check
i
ng wh
i
ch
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
El
i
jah Newren
directory re
n
a
m
e
detect
i
on: file
s
/directories in the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
El
i
jah
Newre
n
dir
e
ctory re
n
ame d
e
tection
:
partially renamed directo
r
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
dir
e
c
t
ory
rename
d
e
tect
i
on: testcases to avoid taking
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
di
r
ectory rename detecti
o
n:
directory splitting testc
a
ses
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
d
irectory rena
m
e detection: basic
t
estcases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-09
Elij
a
h Newren
D
ocumentation:
n
or
m
alize spelling of '
n
ormalised'
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-09
E
l
ijah Newren
Docum
e
ntation: fix several one-ch
a
racter-off s
p
elling
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
E
lijah
N
e
wren
merge-recursive: ensure
we
wr
i
te updates for di
r
ectory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newren
merge-rec
u
rsi
v
e: avoid sp
u
ri
o
u
s r
e
name/
r
ename
c
on
f
lict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elij
a
h Newren
directory rename detection: new test
c
a
s
es showcasing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Eli
j
ah Newren
merge
-
recursi
v
e: fix remain
i
ng direct
o
ry r
e
name + d
i
rty
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Ne
w
ren
m
erg
e
-rec
u
r
s
ive
:
fix overwriting dirty file
s
involved
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Ne
w
r
en
merg
e
-recurs
i
ve: av
o
i
d clobbering un
t
racked files wit
h
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Ne
w
ren
merge-
r
ecursive: a
p
ply n
e
cessary modifications for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
merge-recursive:
when comparing
file
s
,
don't include
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
lijah Newren
merge-recurs
i
ve:
c
heck for file level conflicts then
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
m
e
rge
-
r
e
cursi
v
e: add c
o
mputation of collisions due
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
merge-recu
r
sive: check for directory l
e
v
e
l conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
me
r
ge-recursi
v
e:
add get_dire
c
tory_re
n
ames()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
merge-recursive: make a helper fu
n
ction for c
l
eanup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Eli
j
ah N
e
wre
n
merge-
r
e
c
u
rsive: spl
i
t o
u
t
code for determini
n
g di
f
f_filepairs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah New
r
en
merge-recu
r
sive
:
m
ake !o->detect_rename
c
odepath more
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
merg
e
-recursive: fix le
a
ks of allocat
e
d ren
a
m
e
s and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
merge-r
e
c
ursive:
introduce new
functi
o
ns to handle
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elija
h
Newren
me
r
ge-rec
u
rs
i
ve: move the get_re
n
am
e
s() fun
c
tion
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
directory rename detection:
te
s
ts for handl
i
n
g overwriting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
lijah
N
e
w
ren
dir
e
ct
o
ry rename detecti
o
n: te
s
ts
for handli
n
g
ov
e
rwriting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
N
e
w
ren
directory re
n
ame detection: m
i
sce
l
laneous testcases
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elij
a
h Newren
d
i
rectory rename
d
ete
c
tion:
t
estcase
s
explo
r
i
n
g
possibly
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
directory ren
a
me de
t
ection: mor
e
involved edge/corner
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
directory
r
en
a
me detectio
n
: testcas
e
s
c
heck
i
ng
w
h
i
c
h
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newr
e
n
directory r
e
name detection: fi
l
es/directories in
t
he
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elij
a
h Newren
dire
c
t
o
ry rename detect
i
on: part
i
ally
renamed
d
irectory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
d
irectory ren
a
me
detection: testcases to
avoid taking
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
directory
rename detection: d
i
r
ectory sp
l
itting
te
s
tcas
e
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
N
ewre
n
d
i
rectory rena
m
e detection
:
b
a
si
c
t
e
s
tcases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Elijah Newren
merge-rec
u
rsiv
e
:
ad
d
e
x
pl
a
nation for sr
c
_en
t
ry and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Elijah Newre
n
mer
g
e-rec
u
rsive: fix lo
g
ic ordering issue
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Elijah Newren
Tighten and corre
c
t a few tes
t
cases for me
r
ging and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
Elijah Newren
m
er
g
e-recurs
i
ve: av
o
id incorporating
u
n
co
m
m
it
t
ed changes
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
Elijah Newren
move i
n
d
e
x_has_changes() from
builtin/am
.
c
to
m
e
rge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
Elijah Newren
t6
0
44: recursive c
a
n si
l
ently inc
o
rporate dirty changes
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-05
Elijah Newren
s
trbuf:
remov
e
unuse
d
stripspace fun
c
tion
a
lias
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-27
E
lijah
Newren
me
r
ge-recursive
:
ignor
e
_
case
shouldn't
reject i
n
tentional
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah Newr
e
n
sequenc
e
r
: show rename progress dur
i
ng
c
h
e
rr
y
pick
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah Newren
diff:
r
emove silent clamp of r
e
n
a
meLi
m
it
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Eli
j
ah
N
ewren
progr
e
ss: fix progress mete
r
s when
d
ealing with
l
ot
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elija
h
Ne
w
ren
m
e
rge-recursive: handle
ad
d
ition of submodule on our
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-14
Elijah Newren
s
equencer: warn w
h
e
n internal m
e
rge ma
y
be subopti
m
al
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newren
t
6044: new merge testcases for wh
e
n
index doesn't match
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newren
merge-
o
c
t
opus: abort if
index does n
o
t match HEAD
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah N
e
wr
e
n
builtin/merge
.
c: fix
a b
u
g with trivial
m
er
g
e
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newren
t7605: add a testca
s
e demo
n
strating a bug with
t
rivial
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
El
i
j
ah Ne
w
ren
merge-
r
ecursive:
do n
o
t check wo
r
king copy whe
n
crea
t
ing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah
Newren
merge-re
c
ursive: remove duplic
a
t
e code
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
N
e
wren
m
e
rg
e
-
r
ecursive:
D
o
n't
r
e-s
o
rt a list whose order we
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newren
merge-recu
r
sive:
F
i
x
virtual merg
e
base for
r
ename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newr
e
n
t6036: criss-c
r
oss + rename/rename(1
t
o2)/add-dest
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
en
merge-re
c
ursive: A
v
o
id unn
e
cessary
file rewrites
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Ne
w
ren
t6022: Additi
o
nal tests checking for unnece
s
sary
u
p
d
a
tes
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah
N
ewren
merge-recursive: Fix spurious 'refusing to lo
s
e untrack
e
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newr
e
n
t6022
:
Add testcase
f
or spu
r
i
ous "refusing to
lose
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next