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
t0028: fix wrong octal values for BOM in setup
2018-06-13
Elijah Newren
Rel
N
otes 2
.
18: clarify w
h
ere directory rename detecti
o
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-01
E
l
ijah Newren
R
elNo
t
es: re
m
ove dupli
c
ate release note
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-25
Elij
a
h
N
e
w
ren
r
e
v-p
a
rse
:
c
heck l
o
oku
p
'ed commit references for NULL
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-20
Eli
j
a
h
N
ewren
merge-r
e
cursive: provide pai
r
of `unpack_trees_{start
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recursive: fix
c
he
c
k f
o
r
s
kipability of
w
orking
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah New
r
en
merge-recu
r
sive: make "Auto-merg
i
ng" comment show for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
Newr
e
n
merge-r
e
cursive: fix remainder
o
f
was_dirty() to use
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ijah Newren
mer
g
e
-
recursiv
e
: fix w
a
s
_tracke
d
(
) to quit lying with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ijah Newren
t604
6
: tes
t
c
a
ses check
i
ng whethe
r
updates can be
s
ki
p
ped
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newr
e
n
merge-recursive
:
avoid trigger
i
n
g add_cac
h
einfo error
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah N
e
wren
me
r
ge-recursive:
m
o
v
e
more is_
d
i
rty handling to merge_cont
e
nt
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
lijah New
r
e
n
mer
g
e-
r
ecursive: i
m
prove add_ca
c
heinfo
error hand
l
ing
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recursi
v
e: avoid sp
u
rious rena
m
e/rename conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
directory rena
m
e detecti
o
n: new test
c
ases sh
o
wcasing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ijah
Newren
me
r
ge-recursive: fix remainin
g
d
irectory rename + dirty
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recursive: f
i
x overwriting dirty files involved
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merg
e
-recursive:
a
void clobberin
g
u
n
t
rack
e
d
files with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Eli
j
ah Newren
merge-rec
u
r
s
ive
:
apply
n
e
c
essary modificatio
n
s for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
Newren
me
r
ge
-
recursive: when comparing files, don't incl
u
de
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Ne
w
ren
merge-recursi
v
e:
c
heck for f
i
le level conflicts then
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
N
ewren
merge-recursive: add computation of co
l
lisions due
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newr
e
n
me
r
ge
-
recursive: check
for directory level conf
l
i
c
ts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ijah Newren
m
e
rge-rec
u
rsive
:
add get_dire
c
to
r
y
_
renames()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-02
Elij
a
h
N
ew
r
en
unpack_trees: fix
b
re
a
k
a
ge
when o->src_index !
=
o-
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-25
Elija
h
Newren
Make
r
un
n
ing g
i
t under other d
e
bugger-like programs
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
l
ijah Newren
merge-recursive: m
a
ke a help
e
r func
t
ion for clea
n
up
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Eli
j
a
h
New
r
en
mer
g
e
-recursive: spli
t
out code for det
e
rmining di
f
f_filepairs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elij
a
h Newren
merge
-
recursi
v
e:
make !o->
d
ete
c
t_rename codepath more
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
merge-recursive: fix leaks of allocated renam
e
s an
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
m
e
r
ge-recursive:
i
n
tr
o
duce new f
u
nctio
n
s
to
h
a
n
dle
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elija
h
Newr
e
n
merge-recursive: move the
get
_
renames() function
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Eli
j
ah New
r
en
d
i
rectory ren
a
me detec
t
io
n
: tests
f
or handling
o
ve
r
w
riting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Ne
w
ren
d
irectory rename det
e
ction: tests for handling overwriting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
lijah N
e
wren
direc
t
ory r
e
n
a
me detec
t
ion: m
i
scellan
e
ous test
c
as
e
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
direct
o
ry rename detection:
testcases exploring possibly
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
directory
r
en
a
m
e
de
t
e
c
tion: more i
n
v
olved edge/corner
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
directory rename detect
i
on:
t
e
s
tcases checking
which
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elij
a
h
N
e
w
ren
dir
e
c
tory r
e
name detection: files/directorie
s
in
the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
directory rename
d
etection: part
i
all
y
rename
d
di
r
ectory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
El
i
jah Newren
directory rename
d
etec
t
io
n
:
t
e
stc
a
ses to
a
void ta
k
ing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah N
e
w
r
en
directory
rena
m
e
d
etection: directory splitting testcases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
El
i
jah
Newren
dir
e
ctory rename
detect
i
on:
b
asic testcases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-09
Elijah Newren
Doc
u
mentatio
n
: normaliz
e
spelling o
f
'normalised'
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-09
E
l
ijah Newren
Do
c
u
m
entation: fix
s
eve
r
a
l
one-character-off
spelling
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
E
lijah
Newren
merge-rec
u
rsiv
e
:
ensure we wri
t
e updates for
d
i
r
e
ctory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
El
i
j
a
h Newre
n
merge-recursive: avoi
d
spurious rename/rename co
n
flict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Eli
j
ah Newr
e
n
directory
r
ename detection:
n
ew testcases
sh
o
wcasing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elij
a
h
N
e
wren
merge-rec
u
rsive: fix remaining d
i
rectory rena
m
e
+ dirty
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elija
h
Newren
merge-recursiv
e
: fi
x
overwriting dirty files i
n
volved
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah
N
ewren
merge-
r
ecursive:
a
v
o
id clobbering untrack
e
d files
with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah
Newren
me
r
ge-re
c
ursive
:
apply necessary modification
s
f
o
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah N
e
wren
m
e
r
g
e
-recursi
v
e: when c
o
mparing files, don
'
t incl
u
de
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
l
ijah
N
ewren
m
erge-recursive: ch
e
ck
f
or file level
c
onflicts then
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elij
a
h Ne
w
ren
merge-recursi
v
e:
add
comput
a
tion of collisions
d
u
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
N
ewren
merge-r
e
cu
r
sive: check for d
i
rectory level co
n
fl
i
c
ts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
merge-recursi
v
e: add g
e
t_directory
_
renames
(
)
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
m
e
rg
e
-
recursive: ma
k
e a helper functio
n
for c
l
eanup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Ne
w
r
e
n
merge
-
recur
s
ive: split out code for
d
etermining
dif
f
_
f
i
l
e
p
airs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
l
ijah Newren
m
e
rge-re
c
ursive: ma
k
e !o-
>
detec
t
_ren
a
m
e
codepath more
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elij
a
h Newr
e
n
m
e
rge-recursive
:
fix l
e
aks of allocat
e
d
renames an
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
m
erge-
r
ecursive: in
t
r
o
duc
e
new fu
n
ct
i
o
ns to
h
andle
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Ne
w
ren
merge-recurs
i
ve: move the get
_
renames() function
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
directory rename
detection: tests for handling over
w
riting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
lijah Newren
d
i
rec
t
or
y
rename detection
:
t
e
sts fo
r
handl
i
ng
overwriting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
El
i
jah Newr
e
n
directory re
n
am
e
detection: miscellan
e
ous te
s
tcases
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
directory rena
m
e detection:
t
estcases explorin
g
possibly
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newr
e
n
directory r
e
name
d
e
tecti
o
n
: more
involved edge/corne
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Eli
j
ah Newren
directory rename
dete
c
tion: testcases checking wh
i
ch
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
d
i
rectory rename dete
c
tio
n
:
fi
l
es/directo
r
ies
in the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
directo
r
y rename detectio
n
: part
i
all
y
r
enamed directory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elij
a
h Newren
directory rename d
e
tection: testca
s
es
to avoid
taki
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
directory
r
en
a
me detec
t
ion: d
i
rectory splitti
n
g testcases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
El
i
jah Newren
dire
c
t
ory rename detecti
o
n: basic
t
e
s
tcases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Elijah Ne
w
r
e
n
merge-recursive: add exp
l
anation for src_entry and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Elijah Newren
merge
-
recursive: fix logic ordering i
s
sue
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Elija
h
Newren
Tighten and corre
c
t
a few test
c
a
s
es for mergi
n
g and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
E
l
i
jah
Ne
w
ren
mer
g
e-
r
ecursive: avoid i
n
cor
p
orating uncommi
t
ted
c
hang
e
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
Elijah New
r
en
move index_has_changes()
from bui
l
tin/am
.
c to m
e
rge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
E
lijah New
r
en
t6044: recursi
v
e can silently incorpora
t
e dirty
c
ha
n
ges
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-05
Elij
a
h
Newren
strbuf: remove
unused strip
s
pace function a
l
ias
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-27
Elijah Newr
e
n
merg
e
-re
c
ursive: ignore_
c
ase
shouldn't reject
intentional
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah Newren
s
e
quencer:
show rename pr
o
g
r
e
s
s dur
i
ng
c
herry
p
icks
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah
N
ewren
diff: remove silent
c
lamp
of rena
m
eLimit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah
New
r
en
progress: fix progr
e
ss
meters when de
a
ling with
lots
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elij
a
h Ne
w
r
en
mer
g
e-recurs
i
v
e
:
handle addition of submodule
on our
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-14
Elijah Newren
seque
n
cer: war
n
when internal mer
g
e may be su
b
optimal
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newr
e
n
t6044:
n
e
w m
e
rge t
e
stcases
for when index
doesn't
matc
h
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
El
i
j
ah N
e
wren
merge-oc
t
opu
s
: abort if index does not match HEA
D
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elij
a
h Newre
n
b
ui
l
tin/merg
e
.
c: fi
x
a
bu
g
with tr
i
vial merges
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
El
i
j
ah Newren
t76
0
5
:
add a testcase dem
o
ns
t
rating a
b
ug with trivial
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
El
i
ja
h
N
ewren
m
e
rge-re
c
ursive: do not ch
e
ck working copy when
c
reating
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah New
r
en
merg
e
-rec
u
rs
i
ve: remove duplicate code
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
e
n
merge-recurs
i
ve: Don't re-so
r
t a list whose order we
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
e
n
merge-
r
e
c
u
rsive:
Fix
virtual me
r
ge ba
s
e for rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
i
j
ah
Newren
t6036: cris
s
-cros
s
+
r
en
a
me/rename
(
1to2)/add
-
dest
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
N
e
wren
merge-recursive
:
A
void unneces
s
ary fi
l
e rewrites
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
j
a
h Newren
t
6022:
A
d
d
itio
n
al tests checking for
u
nnec
e
ssary updates
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah N
e
wren
merge-recursive: Fix spurio
u
s 'refusing to lo
s
e
unt
r
acked
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newr
e
n
t6022: Add testcase for spu
r
i
ous "refusi
n
g to lose
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newr
e
n
merg
e
-r
e
cursive: Fi
x
working copy handlin
g
for
r
e
n
ame
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next