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
tree: add repository argument to lookup_tree
2018-06-13
Elijah
Newren
R
elNotes 2
.
18: clarify where directory rena
m
e de
t
ection
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-01
Elijah New
r
en
RelNote
s
:
remo
v
e duplicate releas
e
n
o
t
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah Newren
t6036: p
r
efer test_when_fin
i
shed to m
a
nual cleanup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah Newren
t603
6
, t604
2
: pref
e
r test_cmp to sequenc
e
s of test
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah Newren
t6036, t6042: prefer test_pa
t
h_is_file,
test_path
_
i
s
_mi
s
sing
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
E
l
i
jah
N
ewren
t6036, t6042: use test_
l
i
ne_cou
n
t inst
e
ad
of wc -l
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
E
l
ijah Newren
t6036, t6042: use
test_create_repo to keep tests
i
ndepende
n
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-25
E
l
ijah Newren
r
e
v
-p
a
rse: check look
u
p'ed commit r
e
fer
e
nces for NULL
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-20
Elija
h
Newren
merge
-
recursive
:
provide pair
o
f `unp
a
ck_trees_{
s
tart
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
Newren
merge-r
e
cursive: fix check for skipabili
t
y of working
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
mer
g
e-re
c
ursive: ma
k
e "Auto-mergin
g
"
c
o
mment sh
o
w
f
or
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-r
e
cursive
:
fix remainder of w
a
s_dirty() to use
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elij
a
h Newren
mer
g
e-re
c
ursive: f
i
x was
_
t
racked() to quit
lying wi
t
h
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
Newren
t6046:
testc
a
ses checking whether updat
e
s can be skipped
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
New
r
en
me
r
ge-recu
r
sive: avoid triggeri
n
g add
_
cache
i
nfo error
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recursive: move m
o
re is_dir
t
y handling to merge_c
o
nt
e
n
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
m
erge-recursive:
i
m
p
rove ad
d
_cacheinfo error han
d
ling
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Eli
j
ah Newren
merge-recursive:
a
void spurious
renam
e
/renam
e
conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
director
y
re
n
ame detecti
o
n:
new testc
a
ses
s
ho
w
cas
i
ng
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Eli
j
ah Newren
merge-recursive: fix re
m
aining director
y
rename + dirty
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newr
e
n
merge-r
e
curs
i
ve: f
i
x overwriting dirty files involved
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Eli
j
ah Newren
merge-rec
u
rsive: avoid clobber
i
ng unt
r
acked files with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Eli
j
ah
N
ewren
merge-recurs
i
ve: apply nece
s
sar
y
mo
d
ification
s
f
or
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ijah
Newre
n
me
r
g
e-re
c
ursi
v
e: w
h
en comparing f
i
l
es, don't i
n
clude
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge
-
recursive: ch
e
c
k
for f
i
l
e
level conflicts th
e
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newr
e
n
merge-recursive: add
compu
t
a
t
ion
of
c
o
l
lisions
due
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recursive:
check
f
or directory level conflict
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ija
h
Newre
n
merge-recursiv
e
: add ge
t
_
d
irectory_renam
e
s
(
)
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-02
Elijah Newren
unpack_trees: fix b
r
eakage when o->src
_
i
n
dex != o-
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-25
Eli
j
ah New
r
en
M
a
ke running
g
it unde
r
oth
e
r debugger-li
k
e programs
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
l
i
j
ah Newren
m
e
r
g
e-recursive:
m
ake a hel
p
e
r
func
t
io
n
for cleanu
p
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Eli
j
ah Newren
m
erge-r
e
cur
s
ive:
s
p
lit out code for determ
i
ning diff_filepair
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
merge
-
r
e
cursive: ma
k
e !o->detect_rename codepath mo
r
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
merge-recursive
:
f
ix leaks
o
f all
o
cated renames and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
merge-re
c
urs
i
ve: introdu
c
e
ne
w
functions to handle
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
merge
-
recur
s
ive:
m
o
ve th
e
g
e
t_renames
(
)
f
u
n
ction
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
di
r
ectory rename detection: tests
for han
d
li
n
g overwriting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
El
i
jah N
e
wren
directory re
n
a
m
e detection: tests for
handling o
v
erwriting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
d
i
rectory
rename detect
i
on:
m
isc
e
llane
o
us
t
e
stcases
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newre
n
directory rena
m
e detection: testcases exp
l
or
i
ng
possibly
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah
Newren
direc
t
ory rename
det
e
ction: m
o
r
e
involved edge/corn
e
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Eli
j
ah Newren
directory rename
d
etection: testc
a
ses
c
hecking w
h
i
c
h
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
directory rename
detect
i
o
n
: files/directories in the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
directory rename detection: partially
r
en
a
me
d
directory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elij
a
h
N
ewren
directory re
n
ame
d
e
t
e
ction: te
s
tcase
s
to avoid t
a
king
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newr
e
n
dir
e
ctory rename de
t
ec
t
ion: directory sp
l
itt
i
ng te
s
tcases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elij
a
h Newre
n
directo
r
y rename detectio
n
: basic
test
c
ases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-09
Elijah Newren
Document
a
tio
n
: norma
l
i
z
e spelling of '
n
or
m
alised'
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-09
Elij
a
h New
r
en
Documentation
:
fix several one-character-off
spelling
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
E
l
ija
h
N
ewren
merge-
r
ecursive: ensure we w
r
i
te updates for
dir
e
ctory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elij
a
h
N
e
wr
e
n
m
e
rg
e
-recursive: avoid spuriou
s
rena
m
e/
r
ename
conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Ne
w
ren
d
i
rectory re
n
ame detection: new testcases showcas
i
ng
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah
N
ewren
merge-r
e
cursive: fix
r
e
maining direc
t
ory rename + d
i
rty
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Eli
j
ah Ne
w
r
e
n
merge-recurs
i
ve: fix overwri
t
ing dirty files involved
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newren
merge-recursive: av
o
id clobberin
g
untr
a
cked files with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newren
merge-recursive: app
l
y necessary modification
s
for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
li
j
ah Newren
merge-rec
u
rsive: w
h
en co
m
paring fil
e
s, don't in
c
lude
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newre
n
me
r
ge-re
c
ursive: check for file
l
evel c
o
nflicts th
e
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
m
erge-recursive: add computat
i
on o
f
coll
i
sions due
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elij
a
h
Newren
merge-recursive: check for dire
c
tory level
c
onflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
merge-recursiv
e
: add
g
et_directory_renames(
)
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
merge-recursiv
e
: make a helper function for cle
a
nup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
l
ij
a
h Newren
m
erge-re
c
ur
s
ive:
s
plit ou
t
code for det
e
rmining dif
f
_fil
e
p
a
irs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elija
h
New
r
en
merge-recursive: m
a
ke !o->detect_rename codepa
t
h more
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
El
i
jah New
r
e
n
merge-
r
ecursive:
f
i
x
l
e
aks of allo
c
ated ren
a
mes and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
Newren
merg
e
-
r
ecursive: introd
u
ce
n
ew fun
c
ti
o
ns to hand
l
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elij
a
h
Newren
merge-recur
s
i
v
e: move t
h
e
g
et_r
e
n
am
e
s(
)
fu
n
ction
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
l
ijah Newren
directory rename det
e
c
tion: t
e
s
ts fo
r
h
a
n
d
ling overwriting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
d
i
rectory re
n
ame de
t
e
cti
o
n: tests fo
r
handli
n
g
overwriting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
dir
e
ctor
y
rename de
t
ection: misce
l
la
n
eou
s
t
e
s
tcase
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
d
irectory rena
m
e detection: testcas
e
s explorin
g
possibly
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
directory rename detection: m
o
re involved edge/
c
orner
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
El
i
j
a
h Ne
w
r
en
directory rename detection: testcases
chec
k
ing
which
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
l
i
j
ah Newren
director
y
renam
e
detectio
n
: files/
d
irectories in the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
director
y
r
e
name detection
:
partially renamed d
i
rect
o
r
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
directory rename dete
c
t
i
on: testcases to avoid tak
i
ng
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
directory rename detect
i
on
:
directory spli
t
ting t
e
s
tcase
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
N
ewren
direct
o
ry ren
a
m
e
dete
c
t
ion
:
ba
s
i
c testcases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Elijah Newre
n
m
e
rge-recu
r
s
i
ve: add expl
a
n
a
tion for src_entry and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Elija
h
Newren
m
erge-r
e
c
ursive: f
i
x log
i
c
ordering issue
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
E
l
i
jah Newren
Tig
h
ten and correct a few testcases fo
r
m
e
r
g
i
n
g
a
n
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
El
i
jah Newren
m
e
rge-r
e
cursive: a
v
oid inc
o
rporat
i
ng un
c
omm
i
tted changes
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
Elijah Newren
move index_has_changes()
fro
m
builti
n
/
a
m
.
c
t
o merge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
Elijah Newren
t
60
4
4: rec
u
r
s
ive can s
i
lently incorporate
dirty changes
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-05
E
l
ijah
N
ewren
strbuf: re
m
ove unuse
d
s
t
ripspace func
t
ion alias
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-27
Elij
a
h N
e
wren
merge-recur
s
iv
e
:
ignore_c
a
se shouldn't
reject
intentio
n
al
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
E
l
i
j
ah Ne
w
r
e
n
se
q
uencer: sho
w
rename progress during cherr
y
picks
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
E
l
ijah Ne
w
r
e
n
diff
:
remov
e
sil
e
n
t
clamp of renameLimit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Eli
j
ah Newren
p
r
o
gre
s
s: fix
p
rogress meters when deali
n
g
with lots
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah Newren
m
e
rge-rec
u
rsive: handle add
i
t
i
on of submodule on our
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-14
E
l
i
jah Newre
n
sequ
e
n
c
er: warn wh
e
n
internal merge may be subopti
m
al
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Eli
j
ah Newren
t
6044
:
new mer
g
e
testc
a
ses fo
r
when i
n
dex 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
not matc
h
HE
A
D
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newre
n
builtin/merge
.
c
: f
i
x a bug with tr
i
vial
m
erges
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
El
i
jah
N
e
wren
t7605:
add a testcase demonstrating a
b
u
g wit
h
trivial
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
E
lijah Newr
e
n
merge-re
c
ursive:
do
n
ot
che
c
k working copy when
crea
t
in
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newren
mer
g
e-
r
ecursive: remove duplicate code
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Newren
me
r
ge-recursive:
D
on't re-sort a list whose
ord
e
r we
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
li
j
ah New
r
en
m
e
r
ge-recursiv
e
: Fix vi
r
t
ual merge base for rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6036: cris
s
-cross + r
e
na
m
e/rename(1to2)/add
-
d
e
st
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next