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
rerere: wrap paths in output in sq
2018-06-13
E
lijah
Newren
RelNotes
2
.
18: clarify where
d
i
rectory rename detection
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-01
Elijah
N
e
w
ren
RelNote
s
: remo
v
e dupl
i
c
a
te
r
elease
no
t
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
E
l
ijah Newren
t6
0
3
6: prefer tes
t
_when_finis
h
ed to manual
c
leanup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elij
a
h Newren
t6036, t6042:
p
ref
e
r test_cm
p
to sequences of test
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elija
h
Newre
n
t6036,
t
6042:
p
refer test_pat
h
_
is
_
file, test_pa
t
h
_is
_
missing
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah
N
ewre
n
t603
6
,
t60
4
2: use t
e
st_line_c
o
unt in
s
tead of wc -l
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
El
i
jah Newren
t6036,
t
6042: u
s
e test_create_repo to ke
e
p
t
ests
ind
e
penden
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-25
Elijah Newren
rev-parse: check
lookup'ed commit referen
c
es for NULL
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-20
Elija
h
Newren
merge-recursive: provide pair of `unpack_trees_{s
t
art
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recu
r
sive:
f
ix che
c
k for skip
a
bility of wor
k
ing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
N
ewren
merge-rec
u
rsive: make "Auto-merging" comment
show for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recurs
i
v
e
: fix remainder of was_dirty() to use
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
El
i
jah
N
ewren
m
erge-recursive: fix
was_
t
racked() to
q
ui
t
lying with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah N
e
wren
t6046: tes
t
cases che
c
king wh
e
t
he
r
updates can be skippe
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
El
i
jah
N
ewr
e
n
merge-recursive:
a
v
o
i
d triggering ad
d
_
cache
i
nf
o
error
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
Newren
merge-
r
ecurs
i
ve: move
m
o
r
e is_dirty handling
t
o merge_c
o
nten
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ijah Newren
me
r
ge-
r
ecursive
:
improve add_
c
a
c
he
i
n
f
o error hand
l
i
ng
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ijah Newren
merge-re
c
ursive: avoid s
p
urious rename/ren
a
m
e con
f
lic
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah New
r
en
di
r
e
ctory
r
ename detection: new testcase
s
showcasing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
N
ewren
mer
g
e-recurs
i
ve: fix remaining direct
o
ry re
n
ame + dirty
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
mer
g
e-recu
r
sive: fix overwriti
n
g d
i
r
t
y file
s
i
nvolved
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
lijah Newren
m
e
rge-recursive: avoid clobbering untrac
k
ed file
s
with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
Newr
e
n
merg
e
-recu
r
sive: apply necessary
m
o
d
ifications f
o
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Ne
w
ren
m
e
rge
-
recursi
v
e
:
when comp
a
ring fi
l
e
s
, don't
i
nclude
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Eli
j
ah Ne
w
ren
merge
-
recursive: c
h
eck for fil
e
le
v
el conflicts the
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah New
r
en
mer
g
e
-
recursive: ad
d
c
o
mput
a
t
i
on of collis
i
ons due
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
N
e
wren
merge-recursive:
check
f
o
r direc
t
or
y
level
con
f
licts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
i
jah Newren
m
e
rg
e
-recursive: add
get_director
y
_renames()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-02
Elijah
Newren
unpack_tree
s
:
f
ix breakage
wh
e
n o->src_index != o-
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-25
Eli
j
ah Newren
Make running git under other
debugge
r
-li
k
e
p
rograms
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Eli
j
ah
Newren
merge-recursive: make a helper fun
c
tion for cle
a
nup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah N
e
wren
merg
e
-recursive: split
o
ut c
o
d
e for
determining
diff_filepairs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
me
r
g
e-recursive: make !
o
->detec
t
_rename c
o
depath more
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newre
n
merge-recursive:
f
ix leaks
of
a
llocated r
e
n
ames and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elija
h
Newren
merge-recu
r
si
v
e
: introduce new fun
c
tions to ha
n
dle
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
El
i
jah Ne
w
ren
merge
-
r
e
cursive: move the get_re
n
ames() fun
c
tion
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newr
e
n
dire
c
tory
rename
d
et
e
ct
i
on: t
e
sts for handlin
g
overwriting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
El
i
jah Newren
director
y
rename detection: tests
f
o
r handl
i
ng overwriting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah New
r
en
dire
c
tory rename detection
:
m
i
scella
n
eous testcases
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
lijah
Newre
n
direct
o
ry r
e
name
d
e
tectio
n
: testcases explo
r
ing possibly
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
l
ijah N
e
wren
d
i
rectory rename detection: more involved edge/
c
orner
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Eli
j
ah N
e
wr
e
n
directory rename detection: t
e
stcases checki
n
g
which
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
lijah Newren
directory rename de
t
ect
i
on: files/
d
irectori
e
s
in
t
he
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
direct
o
r
y rename dete
c
tion: partiall
y
renamed dire
c
tory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah
Newren
d
i
r
ectory rena
m
e detection: testcases to
a
v
oid tak
i
ng
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Ne
w
ren
d
i
rectory rename de
t
ectio
n
: directory
s
plitting testcases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
d
ir
e
ctory r
e
name
detection: basi
c
testcases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-09
Elijah
N
e
w
ren
Do
c
umentati
o
n: n
o
rmalize spe
l
ling
of 'nor
m
ali
s
e
d
'
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-09
Elijah Newren
Documentation:
fix
several one
-
c
haracte
r
-
off spellin
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newr
e
n
me
r
g
e-recursive: ensure w
e
w
r
ite upda
t
es
for directory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newren
merge-rec
u
rsive:
avoid sp
u
rious rena
m
e/re
n
ame conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
E
lijah Newren
directory rename detection:
new testcases showcasing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newren
merge-rec
u
rsive:
fix remai
n
i
n
g dire
c
tory rename + di
r
ty
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
El
i
j
a
h Newren
merge-
r
ec
u
rsive: fix overwriting dirty files inv
o
lved
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
El
i
jah
N
ewren
merge-re
c
u
r
sive: avo
i
d clobbering untracked
f
iles
w
ith
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah New
r
en
merge-recursive: app
l
y necessar
y
mo
d
ifications for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
l
ijah
Newren
me
r
ge-recurs
i
ve: when comparing
files, don't include
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elij
a
h
N
ewren
merge-recurs
i
ve: check for fi
l
e lev
e
l conflicts then
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
N
ewren
me
r
ge-recursive: add
c
o
mputa
t
ion of collisions
due
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Eli
j
ah Newren
merge-
r
ecursi
v
e: check
for direc
t
o
ry level conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah N
e
wren
mer
g
e-
r
ecursive: add get_
d
irectory_ren
a
mes()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
merge-re
c
ursiv
e
:
make a helper fun
c
t
io
n
fo
r
cl
e
anup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
l
ijah Newren
merge-recursi
v
e:
split out
c
ode for det
e
r
m
in
i
ng diff_fil
e
pairs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
m
e
rge-recursive: make
!o->detect_rena
m
e codepa
t
h more
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
l
i
j
a
h
New
r
e
n
merge-recurs
i
v
e
:
f
ix leaks of
allocated r
e
name
s
and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
lij
a
h Newr
e
n
merge-recu
r
sive: introduce n
e
w fun
c
tions to handle
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
lijah Newren
merge-re
c
ursive: move
t
he get
_
renam
e
s
(
) function
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Eli
j
ah Ne
w
ren
d
i
rec
t
ory ren
a
me detection: tests for handling overwriting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
N
ewren
direct
o
ry ren
a
me dete
c
tion
:
tests for handli
n
g over
w
riting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
directory rename detection: miscellaneous testcase
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
lijah Newren
directory
rename detection: testcases exploring possibly
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
Newren
d
i
recto
r
y
r
ename detecti
o
n: m
o
re inv
o
lved edge
/
corner
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elij
a
h Newren
directory rename detection: testcases chec
k
i
ng wh
i
c
h
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Eli
j
ah
Newren
direct
o
ry ren
a
m
e
d
etection: files/directories i
n
the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
lijah Newr
e
n
dir
e
ctory rename detection: par
t
iall
y
renamed directory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Eli
j
ah
N
e
wr
e
n
directory rename detectio
n
:
t
estcases to avoid
takin
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
di
r
ectory
r
ename detectio
n
: direct
o
ry splitting testcases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
directory r
e
n
a
me detec
t
ion: basic testcases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Elijah Newren
merge-recursive: add
e
x
planat
i
on for src_entry an
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Elijah Newren
merge-recursive: fix logic
orde
r
ing
i
ssue
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Elijah Ne
w
ren
Ti
g
h
t
en and c
o
rrect a few testcases for merging and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
Elijah Newren
merge-re
c
ursive
:
a
v
oid inco
r
p
orating u
n
committed changes
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
Elija
h
N
e
wren
mo
v
e index_has
_
change
s
() fr
o
m
b
u
iltin/
a
m
.
c
to
m
erge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
E
li
j
ah Newr
e
n
t6044: recursive can silent
l
y incorporate dirty
c
h
ang
e
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-05
Elijah N
e
w
ren
strbuf:
re
m
o
v
e
u
n
used stripsp
a
ce func
t
ion ali
a
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-27
Elijah Newre
n
m
e
rge-recursive: ignore_case s
h
o
ul
d
n't rejec
t
i
ntentional
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elij
a
h
N
e
wren
sequencer: show rename progress during cherry p
i
cks
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah Newren
diff
:
remove sile
n
t clamp of renameLimi
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah
Newren
progre
s
s:
fix pr
o
gress meters when dea
l
ing with lo
t
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
E
lijah
N
ewren
merge
-
recur
s
ive: handle addit
i
on of submodule on our
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-14
Elijah Newren
sequ
e
nc
e
r
:
warn
w
hen
i
n
t
ernal merge ma
y
be suboptim
a
l
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elija
h
Newr
e
n
t6
0
4
4
: new me
r
ge testcases for when i
n
d
e
x
doesn
'
t m
a
tch
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
E
l
i
jah
N
e
wre
n
merge-octopus: ab
o
r
t if index does not mat
c
h HEAD
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elij
a
h
N
ewren
b
uiltin/mer
g
e
.
c: fix a b
u
g with
trivial
merges
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
El
i
j
a
h Newre
n
t7605
:
a
d
d a test
c
ase demonstrating a bug with tr
i
vial
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah N
e
wren
m
erge-recursive: do no
t
check
working cop
y
when c
r
e
a
ting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
El
i
ja
h
Ne
w
ren
merge
-
r
ecursive:
r
e
move duplicate code
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
merge-
r
e
cursive: Don'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
l
ijah Newren
merge-recursiv
e
: Fix virtual m
e
rge base
for rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h
Newren
t6036: c
r
iss-cross + rename/rename(1to2)/add
-
dest
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next