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
object: allow object_as_type to handle arbitrary repositories
2018-06-13
Elijah Newren
R
e
l
Notes 2
.
18: cl
a
rify w
h
ere dire
c
tory rename
d
ete
c
tion
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-01
E
lija
h
Newren
R
e
lNot
e
s: re
m
ove
d
u
p
licate
rele
a
se
note
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah Newren
t603
6
:
p
re
f
e
r test_when_finishe
d
to manual c
l
eanup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah Newren
t6036
,
t6042: p
r
e
fer test_cmp to se
q
uences of test
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah Newre
n
t6036, t6
0
42: prefer
te
s
t_p
a
th_is_file, t
e
s
t_
p
ath_i
s
_mis
s
i
ng
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elij
a
h
Newren
t603
6
,
t6042:
use
t
est_line_count i
n
stead of wc -l
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah Newren
t6036,
t604
2
:
u
se test_create_repo to keep test
s
independent
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-25
Elijah Newr
e
n
rev-parse: check lookup'ed
c
omm
i
t references for NUL
L
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-20
E
l
ijah Newren
merge-recursive: provide pair o
f
`unpack
_
trees_{s
t
art
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ijah Newren
merge
-
r
ecursive:
f
ix check f
o
r
s
kip
a
b
ility of working
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah N
e
wren
merge-recursive: make "A
u
t
o
-m
e
rging" commen
t
show for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
Newren
m
erge-recursi
v
e: fix remainder of w
a
s_dirty() to use
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Eli
j
ah
N
ewren
me
r
ge-re
c
ursive: fix was_tracked() to qui
t
lyin
g
with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
t6
0
46: t
e
s
tcases checking whet
h
e
r updates c
a
n
be ski
p
ped
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elij
a
h
Newren
merge-recursive
:
avoid triggering a
d
d_cacheinfo erro
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ij
a
h Newr
e
n
merg
e
-recursive: move mo
r
e is_di
r
ty ha
n
dling to merge_content
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah N
e
wren
merge-recursive:
improve add
_
cacheinfo error handling
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Eli
j
ah N
e
wren
merge-recursive: avoi
d
spurious rename/rename co
n
flict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
lijah Newren
director
y
rename de
t
ection: n
e
w
t
e
stcases showca
s
ing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
N
ew
r
en
merge-rec
u
rsive:
f
ix remainin
g
directory rename +
dirty
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah New
r
e
n
merge-recursive: fi
x
o
v
e
r
wr
i
ting
d
irty files involved
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
N
ewren
merge-recursive: avoi
d
clobbering untracked file
s
wi
t
h
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recursive: apply ne
c
essary mod
i
f
i
cations f
o
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ijah Newr
e
n
merge-r
e
cursi
v
e:
w
hen
c
omparing
f
il
e
s, don't include
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
El
i
jah Newren
merge-
r
ecursi
v
e
:
c
heck
for file le
v
el
c
onflicts then
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
El
i
jah Newren
m
e
rge-r
e
cursive: add computation of collision
s
d
ue
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elij
a
h Newren
merge-recursive: check fo
r
directory
l
e
v
el con
f
l
icts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newre
n
m
e
rge-rec
u
rsive: ad
d
get_directory
_
renames()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-02
Elijah Newren
u
n
pack_trees: fix breakage when o->src_i
n
dex != o
-
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-25
Elijah Ne
w
ren
Make
running git under
o
ther
d
ebugger-
l
ike programs
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newre
n
m
e
rge-rec
u
rsive: make a helpe
r
funct
i
on for cle
a
nup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah N
e
wre
n
mer
g
e-recursive: s
p
lit
o
ut
c
od
e
for dete
r
mining diff
_
filep
a
irs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
El
i
jah
Newr
e
n
m
erge-recursi
v
e: make !o->d
e
te
c
t_r
e
name codepath more
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
mer
g
e-recursive:
f
i
x
l
eaks of allo
c
ated rena
m
es
a
nd
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elij
a
h Newr
e
n
merge-recursive: introduce new fun
c
tions to
handl
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
lijah Newren
merge-
r
ecursive: mov
e
th
e
get_re
n
ames() function
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah
N
ewre
n
directory
r
e
n
a
me detection
:
tests for hand
l
ing overwriting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elij
a
h Newr
e
n
directo
r
y renam
e
d
e
te
c
tio
n
: tests f
o
r ha
n
dling overwr
i
ting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newre
n
dir
e
ctory
r
ename
detec
t
ion: miscellan
e
o
u
s testcases
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
lij
a
h
Newren
directory r
e
n
ame
d
etection: testcases exp
l
oring poss
i
bly
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
El
i
jah
N
ewre
n
directory rename
detec
t
i
o
n: more involved edge/corner
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
lijah Newren
directory rename
d
etection: test
c
ases
checkin
g
which
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
l
i
j
ah N
e
wren
directo
r
y r
e
name dete
c
tion:
fil
e
s/direc
t
ories in the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah
N
ewren
directory r
e
name
d
etectio
n
: pa
r
tiall
y
renamed directory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
directory rename
d
etection: testc
a
ses to avoid taking
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
directory rename detection: di
r
ectory splitting
t
e
s
tca
s
es
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elij
a
h Newren
directory
r
ename
d
etection: basic te
s
t
cases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-09
Elijah Newren
Documentation:
normalize spelli
n
g of
'nor
m
alis
e
d'
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-09
E
l
ijah Newren
D
o
c
umentation: fix se
v
eral one
-
charact
e
r-off spelling
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
E
l
ijah Newren
m
e
rge-re
c
ursive: ensure w
e
write updates for directory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah
Newre
n
merge-recursive: avoid spurious re
n
am
e
/rena
m
e
co
n
fl
i
ct
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newren
directory
rename detection
:
new testca
s
es show
c
asing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah
Newre
n
merge-recursive: fix remainin
g
dir
e
ctory r
e
name
+
dirty
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newren
merge-rec
u
rsive: fi
x
o
verwri
t
ing dirty
f
i
l
es involv
e
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elija
h
N
e
w
ren
m
erge
-
re
c
ursi
v
e: avoid clobbering u
n
t
r
acked files with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
E
l
ijah Ne
w
r
e
n
merge-re
c
ur
s
ive: apply
n
ecessary modificat
i
ons for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
l
ijah Newren
merge-recursiv
e
: whe
n
c
o
m
p
aring files, d
o
n't
inclu
d
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elij
a
h Newren
merge
-
recursive: check for file
level co
n
fl
i
cts t
h
en
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
merg
e
-recursive: a
d
d computation o
f
col
l
isions due
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newr
e
n
merge-recursive: check for director
y
level conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
lija
h
N
e
w
ren
merge
-
r
e
c
ursive
:
add
get_direc
t
o
r
y_renames()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
Newren
merge-recursive:
make a
h
el
p
er
f
unction for cleanup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Ne
w
ren
merge-recursive: s
p
lit
o
ut code for de
t
ermini
n
g diff_filepa
i
rs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
me
r
ge-recursive:
m
ak
e
!o->detect_rename codepath
m
ore
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newr
e
n
m
erge-r
e
cursi
v
e: fix leak
s
of alloc
a
ted renames
an
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
merge
-
rec
u
rs
i
ve:
int
r
oduce new functions
to handle
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
m
erge-recursive: move the get_ren
a
mes
(
)
function
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
direct
o
ry rename detect
i
on: tests for handli
n
g over
w
r
iting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
Newre
n
directory
r
ename de
t
ection:
tests for handling overwriting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
directory rename dete
c
tion
:
m
iscellaneo
u
s testcases
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah N
e
wr
e
n
directo
r
y r
e
na
m
e d
e
te
c
tion: testca
s
es expl
o
r
ing possibly
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
El
i
j
ah Newren
dir
e
c
t
or
y
rename
detection: mo
r
e invo
l
ved edge/corner
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elij
a
h
Ne
w
ren
dir
e
ctory rename
detection: testcases ch
e
cking wh
i
ch
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Eli
j
ah Newren
directory rena
m
e detection:
f
iles/directories in
t
he
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newre
n
d
irector
y
rename detection: partially re
n
amed directory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elija
h
Newre
n
directory renam
e
detecti
o
n: te
s
tcases to avoid taking
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah N
e
wren
direct
o
r
y rename detect
i
on: directo
r
y
s
p
litti
n
g te
s
tca
s
es
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
l
i
j
a
h
Newren
directory rename
detection: basic
testcase
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Elijah Newren
m
erge-recursive: add
explan
a
ti
o
n for src_entry an
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
E
lijah Ne
w
r
e
n
merge
-
re
c
ur
s
ive: f
i
x
l
o
gic ordering iss
u
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Elijah Newren
Tighten and correct
a
fe
w
testcases fo
r
merging and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
Elij
a
h Newren
merge-recu
r
sive
:
av
o
i
d i
n
corporat
i
ng u
n
committed changes
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
Elijah Newren
move index_
h
as_chan
g
es() from bu
i
l
tin/am
.
c to merge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
El
i
jah Newren
t6044: rec
u
rsi
v
e can silen
t
ly i
n
co
r
porate dirty ch
a
nges
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-05
E
l
ijah Newren
strbu
f
: re
m
ove unused strip
s
pace function a
l
ias
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-27
Elijah Newren
merge
-
r
ecu
r
sive: ignore
_
ca
s
e shouldn't reject
intentio
n
al
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
E
li
j
ah New
r
en
sequencer:
s
how rename
prog
r
ess durin
g
cherr
y
picks
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah Newr
e
n
dif
f
:
rem
o
ve silent clamp of renameLimit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah Newren
progress: f
i
x progr
e
ss mete
r
s whe
n
dealing
w
ith lots
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah Newren
me
r
ge
-
recursive:
handle addition o
f
submodule o
n
our
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-14
Elijah
Newren
sequencer: warn when
in
t
erna
l
merg
e
may b
e
sub
o
p
t
i
mal
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newren
t604
4
: new mer
g
e testcases f
o
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
op
u
s: abo
r
t if index
does not ma
t
ch H
E
A
D
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah
Newre
n
builtin/merge
.
c: fix a bug wi
t
h triv
i
al
m
e
r
ges
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah
N
e
wren
t76
0
5
:
a
dd
a
testcase demonstrating
a bug with trivial
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Eli
j
a
h
N
e
wren
merge-recur
s
ive: do no
t
check wo
r
ki
n
g copy when creatin
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah
Ne
w
ren
merge-recursive: r
e
mo
v
e du
p
lic
a
te
cod
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
mer
g
e-
r
ecurs
i
v
e: Don't re-sort a list
w
h
os
e
order we
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
i
jah Newren
m
erge-
r
ecursive: Fix virtua
l
merge base for re
n
ame
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h
New
r
en
t
6
0
36: criss-cross
+ rename/rename(1to2)/add-dest
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next