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
ref-filter: use oid_object_info() to get object
2018-06-13
Eli
j
ah Newren
R
e
lNotes 2
.
1
8
: cl
a
rif
y
where director
y
rename detection
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-01
Elijah Newr
e
n
RelNotes: remove d
u
p
l
icate
release
n
ote
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elij
a
h Ne
w
ren
t6036: prefer test_when_finish
e
d to manual clea
n
u
p
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
E
l
ijah New
r
en
t6036, t6042: prefer test_cmp to sequenc
e
s of te
s
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
E
lijah
N
ewren
t6
0
36, t6
0
42: pre
f
er test_
p
a
th_
i
s_file,
t
est_pat
h
_is_missing
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elij
a
h N
e
wren
t6036, t6
0
42: use test_line
_
cou
n
t instead of wc -l
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Eli
j
ah Newre
n
t60
3
6, t6042: use t
e
st_create_repo to k
e
ep tests independent
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-25
El
i
j
a
h Newren
rev-parse: ch
e
ck lookup'ed
c
o
mmit refe
r
ences for NULL
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-20
Elijah
N
ewren
merge-recursive: provi
d
e pai
r
of `unpack_tr
e
es_
{
start
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
Newren
merge-
r
ecursive:
fix check
f
or
skipab
i
lity of working
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
Newr
e
n
m
e
rge-re
c
ursive: make "Auto
-
merg
i
ng" comment show for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
Newren
merge-
r
e
cursive: fi
x
r
e
mai
n
der of was_dirty(
)
to
use
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newre
n
merge-recursive: fix was_tracked() to quit lying with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
li
j
ah
Newren
t6046: testcases checking wheth
e
r updates c
a
n be skipped
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
m
erge-recursive: avoid trig
g
eri
n
g add_ca
c
h
einf
o
error
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
lij
a
h N
e
wre
n
me
r
ge-r
e
cursive: move more is_dir
t
y
h
a
ndling to merge_cont
e
nt
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah New
r
en
merge-recursive: improve add
_
ca
c
heinfo
error
h
andli
n
g
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elij
a
h
Newr
e
n
merge-rec
u
r
s
ive
:
avoid s
p
urious re
n
a
m
e/rename conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
directory
r
e
name detec
t
ion: new testcase
s
showcasing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
li
j
ah Newren
merge-recursive: fix r
e
maining directory rename + dirty
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merg
e
-
r
ecu
r
sive: fix overwrit
i
ng
d
irty fil
e
s in
v
olved
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
m
erge-recurs
i
ve
:
avoid c
l
obbering un
t
rack
e
d files with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
Ne
w
r
en
mer
g
e-re
c
ursive: app
l
y necessary modi
f
ications
f
or
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newr
e
n
merge
-
recursive: when
com
p
ar
i
ng file
s
, don't inclu
d
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-r
e
cursive: che
c
k fo
r
file lev
e
l co
n
flicts
t
hen
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ijah Newr
e
n
m
e
rge-
r
ecursive: add computation of
collisio
n
s du
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
El
i
jah Newren
merge-recursive: check
for
dire
c
tory
l
evel
co
n
f
l
i
cts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Eli
j
ah Newren
merge-recursive
:
add get_di
r
ec
t
ory_
r
enames()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-02
Elijah Newre
n
unpack_t
r
ees: fix breakage when o
-
>src_index != o-
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-25
Elijah
Newren
Ma
k
e ru
n
ning git
u
nde
r
other debu
g
g
e
r-like programs
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
lijah
N
ewre
n
me
r
ge-rec
u
rsive: make a h
e
lper function for cleanu
p
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
merge-recursive: split out code for
de
t
ermi
n
i
ng diff_filepairs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elij
a
h Ne
w
ren
merge-
r
ecursive: make !o->detect_r
e
n
a
me code
p
ath
m
ore
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Eli
j
a
h Newren
merge
-
r
e
cursive: fix leaks of
allocate
d
ren
a
mes and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
El
i
jah N
e
wren
merge-r
e
cursive: introduce n
e
w fu
n
ctions to handle
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
m
e
rge-recursive:
m
ove the g
e
t_
r
en
a
mes() function
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
di
r
ectory
r
ename detection: tests for
handling overw
r
iting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
l
ijah Newren
d
i
re
c
tory rena
m
e
detec
t
ion: tests f
o
r handling ove
r
writ
i
ng
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
d
irectory rename
d
etection:
m
iscellaneo
u
s
t
estcases
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elij
a
h Newren
d
ir
e
ctory rename detec
t
ion:
t
estcas
e
s
e
xploring possibly
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elij
a
h
N
ewre
n
directory rename detection: more involv
e
d edge/corner
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
directory rename det
e
ction: testcases checking w
h
ich
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
l
ijah Newren
directory rename det
e
ction: files/directo
r
ies in
t
h
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
El
i
jah Newr
e
n
directory rena
m
e detect
i
on: p
a
rtially renamed directory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
direct
o
ry rename dete
c
t
ion: testcases to avoid ta
k
i
ng
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah
N
ewren
d
i
rect
o
ry rename detectio
n
: di
r
ectory splittin
g
t
e
stcases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah
N
ewren
directory
r
ename d
e
te
c
ti
o
n
: basic testcase
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-09
E
lijah N
e
wren
Documentation: normalize spelling of
'normali
s
ed'
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-09
Elija
h
Newren
Documentation: fix several
o
ne-character-off spelling
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Eli
j
ah N
e
wren
m
e
r
g
e-
r
ecursiv
e
:
e
nsure
w
e write updat
e
s for directory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newren
merg
e
-recursiv
e
:
avoid spurious rename
/
rename
co
n
flict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
El
i
jah N
e
wren
directory rename de
t
ection: new testcases show
c
asi
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
E
lija
h
Newren
m
er
g
e
-
recursive: fix rem
a
ining directory rena
m
e +
d
irty
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newren
merge-recurs
i
ve: fix overw
r
i
t
i
n
g dirty
files i
n
volved
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elij
a
h
Newren
me
r
ge-recursive: avoid clobbering untr
a
cked files with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newren
merge-recursive: apply
n
ecessary modifications for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah New
r
en
merge
-
rec
u
rsive: when comparing files, don't include
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah New
r
e
n
me
r
ge-
r
ecursi
v
e: c
h
eck for file leve
l
co
n
f
licts
t
he
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
El
i
jah Newren
merge-recursive: add
co
m
putation of collisions du
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
merge-rec
u
rsi
v
e: check for d
i
re
c
tor
y
le
v
el conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elija
h
N
e
wren
merge-recursive:
add get_directory_rename
s
()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah N
e
wren
m
e
rge
-
recursive: make a helpe
r
function
fo
r
clean
u
p
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elija
h
Ne
w
ren
merge
-
recursive: s
p
lit out code for dete
r
mining dif
f
_filepairs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
El
i
j
a
h Newre
n
mer
g
e-
r
e
cursive: mak
e
!o->de
t
ect_rename
codepath more
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newre
n
merge-
r
ecursive: fix
l
eaks of
a
llocated
r
enames and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
lijah
N
e
w
r
e
n
merge-recursi
v
e: intr
o
duce new
f
uncti
o
ns
t
o handle
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
l
ijah Newren
merge
-
recursive: mov
e
the get_renames() function
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elij
a
h Newr
e
n
directo
r
y
ren
a
me detection: tests fo
r
handling
o
v
e
rwri
t
i
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
Newren
di
r
ectory
rename de
t
ection:
test
s
for handlin
g
overwrit
i
ng
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elij
a
h Newren
dire
c
to
r
y
r
en
a
me d
e
t
ection: miscellaneous testcase
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
directory rename
d
etect
i
on: tes
t
cases
e
xplo
r
ing
p
o
ssi
b
l
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah N
e
wren
directo
r
y rename detection: more involv
e
d edge/corner
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Eli
j
ah New
r
e
n
directory re
n
ame detectio
n
: testca
s
es c
h
ecking which
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
El
i
j
ah Newren
d
i
r
ectory renam
e
de
t
e
ction: files/directories in the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
lijah
N
ewren
directory
r
en
a
me de
t
ection:
p
art
i
ally renamed d
i
re
c
tory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
Newren
d
irectory
rename de
t
ection: tes
t
cases
t
o avoid taking
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Ne
w
ren
directory re
n
ame
detec
t
ion: di
r
ectory
s
p
l
ittin
g
te
s
tcases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
l
ij
a
h Newren
directory re
n
ame
d
e
t
ect
i
on: basic test
c
a
s
e
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Elijah Newren
merge-r
e
cursive
:
add explanation for src_entry and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Elijah N
e
wren
merge-recursive:
f
ix logic
orde
r
ing issue
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Elijah New
r
en
Tig
h
ten
and correct a few testcas
e
s
for me
r
ging and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
Elijah New
r
en
merge-recur
s
ive
:
a
void incorporati
n
g uncommitted changes
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
Elijah Newren
move
i
nde
x
_has
_
chang
e
s() fro
m
builtin/am
.
c
to merge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
E
lijah Newren
t6044: recursive can
s
ilently incorpo
r
ate dirty
c
ha
n
ges
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-05
Eli
j
ah Newren
strbuf: r
e
move unused stripspace fu
n
ction alias
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-27
Elijah Newren
merge-recursive: ig
n
ore
_
case s
h
ou
l
dn't reject i
n
tentional
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah Newr
e
n
sequencer
:
s
h
o
w
r
e
n
ame progress durin
g
cherr
y
pi
c
ks
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
E
lijah Newren
diff: remo
v
e silent clamp
o
f
renam
e
Limit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah Newren
progres
s
: fix p
r
ogress meters
w
h
e
n
dealing
w
ith lots
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Eli
j
ah Newren
merge-recu
r
sive:
h
andl
e
a
d
dition of sub
m
odu
l
e on our
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-14
E
l
i
j
ah Ne
w
r
en
se
q
uen
c
er: warn when internal mer
g
e may
be subopti
m
al
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Ne
w
ren
t
6
0
44: new mer
g
e
t
estcases for when
ind
e
x doesn't
m
atch
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newren
merge
-
octopus: abort i
f
in
d
ex do
e
s not match HEAD
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
El
i
jah Newren
buil
t
i
n
/
merge
.
c: fix a bug with triv
i
a
l
m
e
rg
e
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah N
e
wren
t7605: add a
t
estcase demo
n
s
trating
a
bug with tr
i
via
l
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
E
l
i
j
ah Newren
me
r
ge-
r
ecursive: do
n
ot check working copy wh
e
n cr
e
ating
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elija
h
N
ewren
merge-recursive:
r
emo
v
e duplicate code
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Ne
w
ren
merg
e
-recursive: Don
'
t re
-
sort a list whose orde
r
w
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
me
r
ge-recu
r
s
i
ve: Fix virt
u
al me
r
ge base for re
n
ame
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6036:
c
ris
s
-cross + re
n
a
m
e/rename(1to2)/add-de
s
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next