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
t2000-t2999: fix broken &&-chains
2018-06-13
E
lijah
N
ew
r
en
RelNotes 2
.
1
8
:
clarify wh
e
r
e d
i
rectory rename
d
et
e
c
t
ion
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-01
E
lijah Newren
RelNotes: remove d
u
plicate r
e
lease
n
ote
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
E
lijah Newren
t6
0
36:
pref
e
r
t
est_when_
f
inished to m
a
nual cleanup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah Newre
n
t6036, t6042: prefe
r
test_cmp to s
e
quen
c
e
s of t
e
st
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah Newren
t6036, t60
4
2: prefer test_
p
at
h
_is_file
,
tes
t
_p
a
t
h
_is_missing
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah Newr
e
n
t
6036, t604
2
: use test_line_count instead of wc -l
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elij
a
h Newren
t6036, t6042: use t
e
st_create_re
p
o
t
o keep test
s
independent
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-25
Elij
a
h
N
e
wren
rev-parse: check lookup'ed commit re
f
ere
n
ce
s
for NULL
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-20
E
li
j
ah Newren
merge-recursive: p
r
ovide pair o
f
`unpack_trees_
{
start
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
Newren
merge-recursive: fix
c
heck for s
k
ipability of
work
i
ng
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
lijah
N
ew
r
en
merge-recursive: m
a
k
e
"
Auto-merging" comment show f
o
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newre
n
merge-rec
u
rsive: fix remainder of
was_d
i
rty() to use
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recursive: fix was_trac
k
ed() to qu
i
t lying with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
lijah Newr
e
n
t6046: testcas
e
s checking whether up
d
ates can be skipped
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elij
a
h
Newren
merge-recursive: avoi
d
trigg
e
ring add_cachei
n
f
o
e
rror
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-
r
ecurs
i
ve: move
m
ore is_dirty ha
n
dli
n
g to
mer
g
e_con
t
ent
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Eli
j
ah Newren
me
r
g
e
-
r
ecursive:
imp
r
ove add
_
c
a
cheinfo error
hand
l
ing
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Eli
j
ah Newren
merge-recur
s
ive: a
v
oid
spu
r
i
ous rename/rename conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Eli
j
a
h
Newren
d
i
r
ectory rename d
e
tec
t
io
n
:
new testcases showcasing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recursive: fix
r
ema
i
ning directory rename + dirt
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
lijah Newren
m
erge-r
e
cursive: fix o
v
e
rwri
t
ing di
r
ty files inv
o
lve
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
m
erge-recursive: avoid
c
lobbering untr
a
cked file
s
with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
lija
h
Newr
e
n
merge-recur
s
ive: apply necessary modifications f
o
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elij
a
h Newr
e
n
merge
-
recursive: when
c
omparing files, d
o
n't in
c
lude
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
El
i
jah Newr
e
n
merg
e
-recursive: ch
e
c
k
fo
r
file le
v
el conf
l
icts
t
he
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Eli
j
a
h
Newren
merge-recursive: add computation of col
l
i
s
ions due
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recursi
v
e: check fo
r
direct
o
ry lev
e
l conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
N
ewren
merge-recurs
i
ve: add get_di
r
ector
y
_renames()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-02
Elijah Newren
unpack_trees
:
fix b
r
e
a
k
age when o->src_index != o-
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-25
El
i
jah
N
e
w
ren
Make runnin
g
git under ot
h
er debugge
r
-like programs
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
El
i
j
a
h Newren
m
erge-rec
u
r
si
v
e
:
make a helper function for cleanup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
l
i
j
ah New
r
en
merge
-
recursive: sp
l
it out code for determining diff_filepairs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
merge-recursive: make !o->detect_rename co
d
epath more
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah N
e
wre
n
merge
-
r
e
curs
i
ve: fix
l
eaks of alloc
a
ted
r
enames an
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
El
i
jah Newren
merge-recu
r
s
i
ve: in
t
r
oduce new functio
n
s
t
o han
d
l
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Ne
w
ren
merge
-
recursive: move the get_re
n
ames() functio
n
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
El
i
jah Newren
directory rena
m
e de
t
ection: tests fo
r
h
andling
overwriting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Ne
w
ren
d
i
rectory
rename detectio
n
: tests for han
d
ling ove
r
writing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
d
i
rectory
r
e
name detection: miscellaneous te
s
tcas
e
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
directory r
e
n
a
me dete
c
tion: testc
a
s
es expl
o
ring po
s
sib
l
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
d
i
rectory re
n
ame detec
t
ion: more involved
e
dge/corner
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
l
ij
a
h Newren
d
ir
e
c
tory rename detection: testcases
c
h
ecking which
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
d
irectory rename detection: files
/
d
i
r
ectories in t
h
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newr
e
n
directory rename dete
c
tion: part
i
al
l
y renamed
directory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
d
i
r
ectory r
e
name
de
t
ection: testcases to avoid taki
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah
Newren
directory rena
m
e
d
e
tection
:
directory splittin
g
te
s
t
c
ases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
El
i
jah Newren
directory rename d
e
t
ection: basic
t
estca
s
es
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-09
Elijah Newre
n
Do
c
umen
t
at
i
on: normalize spelli
n
g of 'normal
i
sed'
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-09
Elija
h
Newren
Docume
n
t
ation: fix several on
e
-
c
haracter-off sp
e
lling
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Eli
j
ah
N
ewren
m
e
r
g
e-recu
r
sive: e
n
sure w
e
wr
i
te updates for dir
e
ctory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Eli
j
ah Ne
w
ren
merge-recu
r
sive: av
o
id
spuri
o
us rename/re
n
a
m
e c
o
nflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
E
l
ijah Newren
direct
o
ry rename
detect
i
o
n: new testcases showcasing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newren
merge
-
recursiv
e
: fix remai
n
ing direc
t
ory rename
+
dirty
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah
N
ewren
mer
g
e-
r
ecur
s
ive: fix o
v
er
w
riting dirty files inv
o
lved
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newren
m
e
r
ge-rec
u
rsive:
avoid clobbering
untracked fi
l
es with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
E
lijah Ne
w
ren
mer
g
e-recursive: apply necessary mo
d
ific
a
tions for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
m
e
r
g
e-recursi
v
e
:
when comparing files, d
o
n
'
t include
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Eli
j
ah Ne
w
ren
merge-recursive: check for f
i
le level conflicts then
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
m
e
r
ge-recursive: add
computa
t
io
n
of collisions
due
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
N
e
wren
merge-recursive:
check for dire
c
tory level conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
merge-rec
u
rsive: a
d
d
get
_
directory_renames()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elij
a
h
N
e
w
ren
merg
e
-rec
u
rsive: mak
e
a helper fun
c
ti
o
n for cleanup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
l
ijah Newre
n
m
e
rg
e
-recursive: sp
l
it
out code
f
o
r
deter
m
i
n
ing
d
iff_
f
ilepairs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
m
er
g
e
-recursive: make
!
o->detect
_
re
n
ame codepath more
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
Newre
n
merge-recursive:
fix lea
k
s of allo
c
ated re
n
am
e
s
a
nd
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Eli
j
ah
N
ewr
e
n
merge
-
recursi
v
e:
introdu
c
e new functions to handle
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Eli
j
ah Newren
merge-
r
ecu
r
sive:
move t
h
e get_renames(
)
f
u
nction
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
N
ewren
direct
o
ry
r
e
name detecti
o
n: tests for handling overwriting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newre
n
directory rename
dete
c
tion: tests for
handling overwriti
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
directory rename
detec
t
ion: miscell
a
neo
u
s
t
e
stcases
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newr
e
n
dir
e
ctory rename de
t
ection:
testcases
e
x
plo
r
i
n
g possibly
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
d
irectory renam
e
detection: more involve
d
e
d
ge/corner
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elija
h
New
r
e
n
dir
e
ctory rename det
e
ction: test
c
ases checkin
g
which
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
directory re
n
ame detectio
n
: fi
l
es
/
di
r
ectories in the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
lijah Newr
e
n
directory
rename detectio
n
: par
t
ially renamed directory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
dire
c
tory ren
a
me
detection
:
testcases to avoid t
a
k
i
ng
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Eli
j
a
h
Newren
dir
e
c
tory re
n
ame detection: directory splitting
t
es
t
cases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
lijah Newren
di
r
ectory rename detect
i
on:
basi
c
testca
s
es
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Elijah
Newren
merge-rec
u
rsive: add explan
a
tion for src
_
entry and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Elij
a
h New
r
e
n
m
e
rg
e
-recursi
v
e: fix logic o
r
dering issue
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Elijah Newren
Tighte
n
and
corre
c
t a few te
s
t
c
ases for mer
g
ing and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
Elijah Newren
merge-re
c
ursive: av
o
id incorporating uncommitt
e
d changes
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
E
l
ijah Newren
m
ove i
n
d
e
x_has_ch
a
nge
s
() from bui
l
tin/am
.
c to merge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
Elij
a
h New
r
en
t6044:
r
e
c
ursi
v
e c
a
n silently in
c
orporate dirty changes
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-05
Elijah Newren
strbuf: remove unused strip
s
pac
e
func
t
ion alias
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-27
Elijah Newren
merge-
r
ec
u
rsive: ign
o
re_
c
ase sho
u
ldn't r
e
j
e
ct intentional
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah Newr
e
n
seque
n
cer
:
s
ho
w
rename pr
o
gres
s
d
u
r
ing cherr
y
picks
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah
N
ewren
diff:
r
e
m
ove
silent cla
m
p
of re
n
ameLi
m
i
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah Newren
progre
s
s:
f
i
x
progress meters whe
n
dealing with lot
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah Newren
merge-recursive: ha
n
dle
addi
t
i
on of submodule o
n
our
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-14
Elijah Newren
sequencer: warn when inte
r
nal merg
e
may
be suboptimal
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newren
t6044:
n
e
w
merge testca
s
es for when index
doesn't match
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
E
l
ijah Ne
w
ren
merge-octopus: abort if index d
o
es not match HEAD
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah
New
r
en
builtin/merg
e
.
c:
f
ix a bu
g
w
ith triv
i
al me
r
ges
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elij
a
h Newren
t7
6
05: ad
d
a te
s
tcase demonstrating a bug wit
h
trivial
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newren
merge-recursive: do not check working copy when cre
a
ting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newr
e
n
merge-recursive: r
e
move dupl
i
c
ate
c
od
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-r
e
curs
i
v
e
: Do
n
't re-sor
t
a
list whose order we
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
j
ah Ne
w
r
e
n
merge-recursive: Fix
vir
t
ual merge base
for rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
j
a
h
Newren
t
6036:
c
riss-cr
o
s
s + rename/rena
m
e(1to2)/add-dest
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next