repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
t6042: add testcase covering rename/rename(2to1)/delete/delete conflict
2018-07-03
Elijah Newr
e
n
t
6
0
42: add
t
e
s
tcase
covering
r
ename
/
rename(2t
o
1)/delete
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newr
e
n
t6042:
a
dd testcase covering rena
m
e
/
ad
d
/
delete conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-13
E
li
j
ah Ne
w
ren
R
elNotes
2
.
1
8: clarify whe
r
e
directory
r
ename detectio
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-01
El
i
jah
N
ewren
RelNotes: remove
d
upli
c
ate rel
e
a
s
e note
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
El
i
jah
N
ewren
t60
3
6: pre
f
er test_when_finished
to manu
a
l cleanup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elij
a
h
N
ew
r
en
t6036,
t
6042
:
prefer t
e
s
t
_cmp
t
o se
q
u
e
nces
of test
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah N
e
wre
n
t6036
,
t604
2
: p
r
efer test_pat
h
_
is_file, test_path_is_miss
i
ng
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah Newre
n
t6036,
t
6042
:
use test_li
n
e_count inste
a
d
o
f
wc
-
l
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah Ne
w
ren
t6036, t6042: use test_cre
a
te_r
e
po
to
k
ee
p
test
s
i
ndepe
n
de
n
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-25
Eli
j
ah Newren
rev-parse:
check lookup'ed
co
m
mit references for NULL
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-20
Eli
j
ah Ne
w
r
en
m
erge
-
r
ecursive: pr
o
vide pair of
`unpack_trees_{
s
tar
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
N
ewren
m
e
rge-recursive: f
i
x chec
k
for
s
kipability of working
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
m
e
rge-recur
s
i
v
e: make "Auto-merging" comme
n
t
sho
w
f
or
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah New
r
en
merge-recursive
:
fix
remainder of was_dirty() to use
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ijah Newren
merge-recursive: fix was_tracked() to qu
i
t lying with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
lij
a
h Newren
t
6
046: testcases checking
w
he
t
her updat
e
s can be skipped
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Ne
w
ren
me
r
g
e-recursive: av
o
i
d trig
g
e
ring ad
d
_cacheinfo e
r
ror
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Ne
w
ren
merge-recursive: move more
i
s_dirty handling to m
e
rge_content
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recursive: im
p
rove add_cac
h
e
i
nfo error
handl
i
n
g
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
N
ewre
n
m
erge
-
recursive: avoid spurious rename/rename conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
El
i
jah Newren
director
y
rename detectio
n
: new testcases showcasin
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recursive: fix r
e
ma
i
ning directory renam
e
+ dirty
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merg
e
-recursive:
f
ix overwriti
n
g di
r
ty file
s
involved
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recursive: avoid
c
lobbering untr
a
cked file
s
with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newre
n
merge-rec
u
rs
i
ve
:
apply nece
s
sa
r
y
m
odific
a
tion
s
for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
me
r
ge-recursive: when comparing files, don't include
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
me
r
ge-recursive:
c
heck for file lev
e
l conflicts then
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
m
e
rge-
r
ecursive:
a
dd com
p
ut
a
tion of collisions due
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
lijah Newren
me
r
ge-recurs
i
ve: ch
e
ck for directory lev
e
l conflic
t
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
m
erge-recursiv
e
: add get_directory_renames()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-02
Elijah Newre
n
unpack_trees
:
fi
x
breakage
when o->src_in
d
ex != o
-
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-25
Elijah New
r
en
Make runnin
g
g
i
t under other debugger-like programs
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
mer
g
e-recursi
v
e:
m
ake a hel
p
e
r fun
c
tion f
o
r
c
leanu
p
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
merge-recursive: split o
u
t
code for de
t
ermining diff
_
file
p
airs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
El
i
jah Ne
w
ren
merge-r
e
cursive: m
a
ke !o->d
e
tect_
r
ename codepath more
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah N
e
wren
merge-r
e
cur
s
ive: fix
l
eak
s
of alloc
a
ted renam
e
s an
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Ne
w
ren
merge-
r
ecursive: introd
u
ce new functions to handle
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Ne
w
ren
me
r
ge-recursiv
e
: move the get_renames() function
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah New
r
en
d
i
rectory rename detection
:
tests for handl
i
ng ov
e
rwriting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Eli
j
ah New
r
en
directory
renam
e
detection: te
s
ts for h
a
ndling overwr
i
ting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah New
r
en
directory renam
e
detecti
o
n: miscel
l
aneous te
s
tcase
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
d
i
r
e
ctory rename detec
t
ion: testcases
exploring possibl
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
direc
t
ory re
n
ame de
t
ection: more involved
ed
g
e/cor
n
er
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
El
i
j
a
h
N
e
w
r
e
n
d
i
rectory rename
d
etection: testcases check
i
ng which
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
lijah Ne
w
ren
directory rename
detection
:
file
s
/directories in the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
l
ijah N
e
wren
directo
r
y rename detecti
o
n: pa
r
tially renamed direc
t
ory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah N
e
wren
director
y
rename detection: testcas
e
s to avoid tak
i
ng
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah New
r
en
director
y
rename d
e
tecti
o
n:
d
irectory
s
plitting testcases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elij
a
h Newren
directory rename detection: b
a
s
ic testc
a
ses
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-09
Elij
a
h New
r
en
D
ocumenta
t
ion:
n
o
r
malize spelling of '
n
o
r
m
a
lised'
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-09
Elijah New
r
en
Documentation: fix s
e
veral
o
ne-character-o
f
f spelling
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah N
e
wren
merge-recu
r
sive: e
n
sure
w
e w
r
ite
u
pdates for directory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newren
merge-rec
u
rsiv
e
: avoid
s
puriou
s
rena
m
e
/
rename confli
c
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah
N
ewren
d
i
rectory rename detectio
n
: new testcases showcasing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah
N
e
w
ren
merg
e
-recursive: fix remaining directory rename + d
i
r
ty
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newren
merge-recursive: fix
o
verwriting d
i
rty files in
v
olved
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newren
merge-recur
s
ive: avoid
c
lobbering un
t
rac
k
ed files w
i
th
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah New
r
en
m
e
rge
-
recu
r
s
ive: ap
p
ly nec
e
ssary
mo
d
i
f
i
cati
o
ns for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
merge-recurs
i
ve:
when comparing files, don't inclu
d
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
merge-r
e
cursiv
e
:
check for fil
e
lev
e
l conflicts then
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
l
i
jah Newren
merge-recursive: add compu
t
ation
o
f collisions due
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
l
ijah Newren
m
erge-r
e
curs
i
ve
:
check for direct
o
ry l
e
vel
confli
c
ts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Eli
j
ah
Newren
m
e
rge-recursive: a
d
d get
_
di
r
ectory
_
r
e
names
(
)
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Eli
j
ah Newren
merg
e
-re
c
ursive
:
make a helper functio
n
fo
r
cleanup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
N
ewr
e
n
me
r
ge-recursive: split
out code for determining diff_filepairs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah New
r
en
merge-recur
s
ive: make !o->det
e
ct_renam
e
codepath more
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Eli
j
ah Newren
merge-rec
u
rsive: fix leaks
of allocated re
n
ames and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
merge-re
c
ursive: intro
d
u
c
e new fu
n
ctions to handle
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
li
j
a
h Newren
merge
-
recursive: move the get_renames(
)
fun
c
tion
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newr
e
n
direct
o
r
y
re
n
ame detectio
n
: tests f
o
r
han
d
l
i
n
g ov
e
rwriting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
d
i
rector
y
rename det
e
ct
i
on: tests for handling o
v
erwrit
i
ng
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
l
ij
a
h Newren
direc
t
ory ren
a
m
e
detection
:
miscellaneou
s
testcases
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
Newren
dir
e
cto
r
y re
n
ame
detection: testcases explo
r
i
ng possibly
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
lijah Newren
direct
o
ry re
n
a
me dete
c
ti
o
n: more i
n
volved edge
/
c
o
rner
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
l
ija
h
Newre
n
di
r
ectory rena
m
e d
e
te
c
tion: tes
t
cases checking
which
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elija
h
Newren
director
y
re
n
am
e
de
t
ection: fi
l
es/directories
i
n the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
direc
t
ory rename d
e
tectio
n
: partially r
e
n
a
med dir
e
ctory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newre
n
direc
t
ory rename detection: testcases to avoid taking
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elija
h
Newren
directory rename dete
c
t
i
on: directory split
t
ing
testc
a
ses
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
l
ijah Newren
director
y
rename detection:
b
asic testc
a
s
e
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Elijah Newren
mer
g
e-recursi
v
e: add explana
t
ion for src_e
n
t
r
y
and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Elijah Newren
merge-r
e
cursive:
fi
x
logic ordering issue
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
E
l
ijah Newr
e
n
Tighten an
d
correct a few
testcases for merg
i
ng and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
Elijah
Newren
merge-recur
s
i
ve: avoid incorporating u
n
committed
c
h
anges
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
Elijah Newren
m
o
v
e in
d
ex_has_changes
(
)
from builtin/a
m
.
c
to me
r
ge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
E
l
ijah
N
e
w
ren
t604
4
: re
c
ur
s
ive can silentl
y
i
n
cor
p
orat
e
dirty
changes
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-05
Elijah Newren
str
b
u
f
: rem
o
ve unused stripspace functi
o
n
a
lias
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-27
Elijah Newren
merge-
r
ecu
r
sive:
i
gnore_
c
a
se shouldn't reject intention
a
l
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah
N
e
w
r
en
sequencer: show renam
e
progress during cherry picks
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
E
l
ijah New
r
en
dif
f
: re
m
ove
si
l
ent
clamp of renam
e
Limit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah Newren
p
ro
g
r
e
ss:
f
ix progress meters
w
h
e
n d
e
aling with lots
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elij
a
h Newr
e
n
merge
-
rec
u
r
s
ive:
h
andle addition
of submodule on our
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-14
Elijah New
r
en
sequencer: warn whe
n
internal merge may
b
e subopti
m
al
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newren
t604
4
:
new merge testcase
s
f
or when index d
o
esn'
t
match
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah New
r
en
mer
g
e-octopus: abort i
f
ind
e
x does
n
ot match
H
EAD
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
E
l
ijah Newre
n
b
uilt
i
n
/
me
r
ge
.
c: fix a bug
w
ith trivial merge
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elija
h
Newren
t7605
:
add a
t
es
t
cas
e
demons
t
rating a bug with trivial
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newre
n
merge-re
c
ursive:
do
not check
w
orking copy when creating
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newre
n
merge-r
e
cursive: r
e
m
ove
d
uplic
a
te
c
o
d
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lij
a
h
Newre
n
me
r
ge-
r
ecurs
i
ve
:
Don'
t
re-sort a lis
t
w
hose order we
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next