repo.or.cz
/
git
/
gitster.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
apply: fix grammar error in comment
2018-06-28
Elij
a
h Newr
e
n
apply: fix grammar error in comment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-13
Eli
j
a
h
Newre
n
Rel
N
otes
2
.
1
8
:
clarify where directory renam
e
detection
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-01
El
i
jah Newren
R
el
N
otes:
r
emove dup
l
ica
t
e release
note
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elij
a
h Newren
t6
0
36: pref
e
r
test_whe
n
_fin
i
shed t
o
m
anual cleanup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah
N
ew
r
en
t6036,
t6
0
42:
p
re
f
er
te
s
t_cmp
t
o se
q
ue
n
ces o
f
test
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah Newren
t6036, t
6
042: pr
e
fer test_path_is_fi
l
e, te
s
t_path_is_missing
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah Ne
w
ren
t6036, t6042: use test_line_count ins
t
e
a
d of wc -l
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah Newren
t6036, t
6
042: use test_create_r
e
po
to keep tests
i
ndepen
d
ent
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-25
Elijah Newren
rev-parse: check lookup'ed comm
i
t ref
e
re
n
c
es for NU
L
L
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-20
Elijah Newren
mer
g
e-recursive:
provide pair of `un
p
ack_trees
_
{start
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Eli
j
a
h
Newre
n
me
r
ge-recu
r
sive
:
f
ix check for
s
k
i
p
a
b
i
l
i
t
y
of
w
orkin
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elij
a
h Newren
merge-recursive: mak
e
"
A
uto
-
merging
"
comment
s
h
o
w for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
Newre
n
me
r
ge
-
r
ecursive: fix
rema
i
nder
of was_dir
t
y
() to use
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
Newren
merge-recur
s
iv
e
: fix was_tracked()
t
o quit
lying with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newre
n
t
6
0
46:
testcases checking
whether updates ca
n
be skipped
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
Newre
n
merge-r
e
cu
r
s
i
v
e: a
v
oid t
r
iggering add_cac
h
einfo error
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ijah New
r
en
merge-r
e
cu
r
s
ive: move more i
s
_dirty handling to me
r
g
e_content
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ijah Ne
w
ren
merg
e
-recursive: i
m
p
rove add_cacheinfo error
h
a
n
dl
i
ng
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
Newren
merge-recursive
:
avoid spurious
rename/rename confl
i
ct
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elij
a
h Newren
directo
r
y renam
e
detection: n
e
w
t
estcas
e
s showca
s
ing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
lij
a
h Newr
e
n
merge-rec
u
r
s
ive: fix remaining d
i
rectory
r
e
name + dirty
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ijah New
r
en
m
erge-recursive: fix over
w
riting dirty files involved
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
N
ewren
merge-recu
r
sive: avoid cl
o
bberi
n
g
u
n
t
r
acked file
s
with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Eli
j
ah Newren
m
e
rge-recursive: appl
y
neces
s
ary
m
o
difi
c
ations
for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
me
r
ge-recursive: when
compar
i
ng files, don't include
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
i
j
a
h Newren
merge-recursive
:
check
for fil
e
level conflicts then
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Ne
w
ren
merge-recu
r
sive: add computati
o
n of col
l
isions
d
u
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
N
ewren
merge-recursive: check for directory lev
e
l
conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Eli
j
ah Newre
n
m
erge-recur
s
i
v
e:
add
g
et_directory
_
renam
e
s()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-02
Elij
a
h
N
ewren
unpac
k
_tre
e
s:
f
ix
breakage
w
hen o->src_index != o-
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-25
Elij
a
h New
r
en
M
ake run
n
ing git
und
e
r
o
ther de
b
ugger-like
p
rogra
m
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
El
i
jah Newren
me
r
ge-recursive: make a helper func
t
ion for
c
le
a
nup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
merge-recu
r
sive: split out code for dete
r
m
ining diff_fil
e
pairs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
El
i
jah N
e
wr
e
n
m
erge-recursive: m
a
k
e
!o->detect_renam
e
codep
a
th more
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah
Newre
n
merge-recursive: fix
l
eaks
of
a
l
located rena
m
es and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
l
ij
a
h Ne
w
r
e
n
merge-recursive: i
n
troduc
e
new functi
o
ns to handle
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Ne
w
ren
merge-recursive: move the g
e
t_renames
(
) function
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
l
i
j
ah Newre
n
d
ire
c
tory
rename
de
t
ection: tests for
handli
n
g
overw
r
iting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
l
i
jah Newren
direc
t
or
y
r
ename detection: tests for handling overwrit
i
ng
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah N
e
wren
d
i
rectory rename
detection
:
misc
e
llaneo
u
s test
c
ases
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
El
i
jah
Newren
directory rename detection: t
e
s
tcases exploring possibly
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
directory renam
e
detection: m
o
r
e involved edge/corner
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
directory renam
e
detectio
n
: testcases
c
hecking
w
h
i
ch
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
El
i
j
ah Newren
directory r
e
name dete
c
ti
o
n: files/dire
c
tories in the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
El
i
jah N
e
wren
directory ren
a
me
d
etec
t
ion: partially
renamed directory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elij
a
h
New
r
en
directory rena
m
e detecti
o
n
: te
s
t
case
s
to avo
i
d takin
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
lijah Newren
directory re
n
ame detection:
d
ir
e
ct
o
ry split
t
ing testcases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
l
i
jah Newren
direct
o
ry re
n
ame detection
:
basi
c
testca
s
es
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-09
Elijah Newren
Documentation: normalize spelling of
'
normalised'
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-09
Elijah
N
ewr
e
n
Documentation: fix several one-characte
r
-
o
ff spelling
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah
N
ewr
e
n
mer
g
e-recursiv
e
:
ensure we w
r
i
t
e updates for directo
r
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
El
i
ja
h
Newren
merge
-
recursi
v
e
:
avoid
s
p
urious rename/
r
ename conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah
Newren
director
y
rename
d
e
t
e
ction: new tes
t
cases
showca
s
ing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah
Newren
m
erge-recursi
v
e: fix
r
emaining dir
e
c
t
ory rename
+
di
r
t
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Ne
w
re
n
merge-recursive: fix overwriting d
i
rty
f
il
e
s involved
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elij
a
h
New
r
en
mer
g
e-recursive:
a
void clo
b
be
r
ing untracked
f
ile
s
with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah N
e
wren
merge-recursive: appl
y
necessary modifica
t
ions for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Ne
w
ren
me
r
ge-re
c
ursive: when comparing files, d
o
n't i
n
clude
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
lijah Ne
w
r
e
n
merg
e
-
r
ec
u
r
s
i
v
e
:
check for fi
l
e level conflicts then
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
N
ewren
m
e
rg
e
-recursive:
a
dd computati
o
n of collisions due
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah New
r
en
merge-recursive: chec
k
f
or directory level conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
mer
g
e-r
e
cursive: add get_dire
c
t
ory_r
e
n
a
mes()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
El
i
jah Newre
n
merge-recursi
v
e: m
a
ke a helper
f
unction for
c
leanu
p
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
m
e
rge-re
c
ursive: sp
l
it out code
for determining diff_filepairs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
merg
e
-recursive: make !o->detect_rename
cod
e
path more
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elija
h
N
e
wre
n
m
erge-recursive: fi
x
leaks
o
f alloc
a
t
e
d ren
a
mes
and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Eli
j
ah N
e
wren
m
erge
-
re
c
urs
i
v
e
: in
t
rod
u
ce new func
t
ion
s
to
handle
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
mer
g
e-rec
u
rsive:
m
ove
the get_renam
e
s() function
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
d
irectory ren
a
me detection: tests for handling overwrit
i
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
directory
rename detection: tests for ha
n
dling overw
r
it
i
ng
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
Newren
d
irectory rename
d
etection: miscella
n
e
ous
t
e
stcases
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
directo
r
y ren
a
me
detection: testcases expl
o
ring possibly
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah N
e
w
re
n
directory rename detection: mo
r
e involved edge
/
corne
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
lijah Newren
directory rename detection: tes
t
cas
e
s checking which
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
l
ijah Newren
direc
t
ory rename detection: files/directories in the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
di
r
ector
y
rename
d
etectio
n
: part
i
al
l
y re
n
a
m
ed d
i
re
c
tory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
d
i
rectory rename
de
t
ection:
t
estcas
e
s
to
av
o
i
d
taki
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newre
n
directory
rename detectio
n
: directo
r
y sp
l
itt
i
ng
testcases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
El
i
jah Newren
directory re
n
ame dete
c
tio
n
: basic testcases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Elijah Newren
merge
-
recursi
v
e: add explanation for
s
rc_entry
and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Elijah Newren
merge-recursiv
e
: fix logic ordering issue
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Elijah New
r
en
Tighte
n
and
cor
r
ect a few testcases for m
e
rging and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
E
lijah Newren
merg
e
-recursive
:
a
void incorp
o
rating uncommitted changes
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
Eli
j
ah Newren
move index_has_changes(
)
fr
o
m
builtin/am
.
c to
m
erge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
Elijah Newren
t6
0
44: recursive can sile
n
tly incorporate dir
t
y cha
n
ges
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-05
El
i
jah Newren
st
r
buf: re
m
ove unused
s
tripspac
e
function alias
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-27
Elijah Newren
merge-rec
u
r
sive: i
g
nore_case shouldn't reject intentional
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah Newren
sequencer:
s
how rename progress
d
urin
g
cherr
y
picks
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah Newr
e
n
diff: remove
s
i
lent clamp of ren
a
meLimi
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elija
h
N
e
w
ren
pro
g
ress: fix progress meter
s
w
h
en dealing
with lots
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah Newren
merge-recursive: h
a
ndle addition o
f
submodul
e
on our
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-14
Elija
h
Ne
w
ren
s
equ
e
nc
e
r: w
a
r
n when i
n
tern
a
l
m
erge may be
s
uboptimal
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
E
l
ijah Newren
t6044: new merge testcases for when index do
e
sn
'
t match
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
E
lijah Newren
mer
g
e-oc
t
opus: abo
r
t if i
n
d
e
x
does n
o
t matc
h
HEAD
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Eli
j
ah New
r
e
n
built
i
n/
m
erge
.
c: fix
a
bug
with trivi
a
l merg
e
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah N
e
wren
t7605: add a
testcase demonstra
t
ing a bug with tr
i
vial
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
E
l
ijah Newre
n
merg
e
-
rec
u
rsive:
d
o
n
ot check workin
g
c
opy when c
r
eating
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah
N
ewren
m
e
rge-
r
ecur
s
ive: remove duplicate co
d
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursive: Don't re
-
s
ort a list wh
o
se
order we
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
i
j
ah Newr
e
n
mer
g
e-recursive:
F
ix virtual merge base for rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next