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
t: drop unnecessary terminating semicolon in subshell
2018-06-13
Elijah Ne
w
ren
Re
l
Notes
2
.
18: clarify where direc
t
ory rename d
e
tection
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-01
El
i
jah
N
ewren
RelNotes:
r
emove
duplicate release note
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Eli
j
ah Newren
t6036: pre
f
e
r test
_
w
h
en
_
finished to
manual clean
u
p
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah Newren
t6
0
36,
t
6042: prefer test_cmp
to sequences o
f
te
s
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah
N
ewren
t6
0
3
6
,
t
6042: pre
f
er test_path_is_file, test_path_is
_
mis
s
in
g
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah Newren
t6036, t6042: use t
e
st_l
i
ne_cou
n
t instead of wc -l
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
El
i
jah Ne
w
ren
t603
6
, t604
2
: use test_create_re
p
o to keep tests
i
ndependen
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-25
Elijah N
e
wren
rev-par
s
e
:
check lookup'ed commi
t
r
eferen
c
es for
NULL
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-20
Elijah N
e
wren
merge-recursi
v
e: provide pair of
`
u
n
pack_trees_{start
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elij
a
h Ne
w
ren
merge-
r
ecursive: f
i
x check for sk
i
pabil
i
t
y
of working
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
lij
a
h Newren
merge-
r
ecursive: make "Auto-mer
g
ing" comment
s
h
o
w for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newr
e
n
m
e
rge-recursive: fix r
e
m
a
inder o
f
w
as_dir
t
y() t
o
use
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah New
r
en
m
e
rge-recursive
:
fix wa
s
_t
r
acked() to quit lying with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
Newren
t6046
:
te
s
tcases checking whether updates
c
an be
skipped
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elij
a
h Newren
me
r
ge-r
e
cursive: avoid triggering add_cacheinfo error
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recurs
i
ve: m
o
ve more is
_
d
i
rty ha
n
dl
i
ng to merge_con
t
ent
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recursiv
e
: improve add_cach
e
info erro
r
han
d
ling
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
Newr
e
n
mer
g
e-r
e
cursi
v
e: avoid spurious rename/rename
conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
di
r
ect
o
ry re
n
a
m
e
detection: ne
w
te
s
tcas
e
s showcasing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah New
r
en
merge-recur
s
ive:
f
ix re
m
ain
i
ng directory rename + dirty
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah New
r
en
me
r
ge-recurs
i
ve: fix over
w
riting
dir
t
y files involved
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elij
a
h
N
ewren
merge-recursive: avoid clobbering
u
ntracked files
with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newr
e
n
m
erge-recursive: apply neces
s
ary
m
odifications for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
New
r
en
merge-recursive: when comp
a
ring files, don't include
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elij
a
h Newr
e
n
merge
-
recursi
v
e: check for
f
ile level conflicts then
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah N
e
wren
merg
e
-recursive: a
d
d compu
t
ation of
collisions due
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
Newr
e
n
merge-recursive: check for dire
c
tory level
co
n
flic
t
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
El
i
jah Newren
m
e
rge
-
recur
s
ive:
add get_directory_
r
e
n
a
m
e
s()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-02
Eli
j
ah Newren
unpa
c
k_t
r
ees: fix breakage when
o
->src
_
i
nde
x
!=
o
-
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-25
E
lijah Newren
Mak
e
running git
u
nder oth
e
r
d
ebugger-like pro
g
rams
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah
N
ewren
m
e
rge-re
c
ur
s
ive: mak
e
a
helper function fo
r
clean
u
p
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
El
i
jah Newr
e
n
merge-recursive: split out code for
d
etermin
i
ng diff_file
p
airs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elija
h
Newren
merge-recu
r
sive
:
make !o->detec
t
_rename codepath more
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Eli
j
ah
N
ewren
merge-recur
s
ive:
fix leaks of
a
llocated renames and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Eli
j
ah Newren
mer
g
e-
r
ecursive:
i
ntroduce new functi
o
ns
to handle
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elij
a
h Newre
n
mer
g
e-
r
ecu
r
si
v
e
:
m
ove the g
e
t_renames() function
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elij
a
h N
e
wren
directory ren
a
me d
e
tection: tests f
o
r
handling o
v
erwriting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah N
e
wren
directory r
e
name detection: tests for han
d
ling overwr
i
t
i
ng
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
d
irec
t
o
r
y rename detec
t
ion: miscella
n
e
o
us testcase
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newr
e
n
directo
r
y rename de
t
e
c
tion: testcas
e
s
e
xploring p
o
ssibly
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
El
i
ja
h
Ne
w
ren
d
i
recto
r
y r
e
name dete
c
t
i
o
n: mor
e
involved edg
e
/corner
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elij
a
h Newr
e
n
dir
e
ct
o
ry rename dete
c
tion:
t
estcases
checking which
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
dir
e
ctory rename det
e
ction: files/directories in the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
directory r
e
name d
e
tecti
o
n: part
i
ally
r
enamed
directory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
El
i
jah Newre
n
directory rename de
t
ection: testcases
to avoid taking
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
El
i
jah Newren
dire
c
t
ory
rename
detecti
o
n: directory
splitting test
c
ases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah
Newren
dir
e
c
tory rename detectio
n
: basic test
c
a
s
es
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-09
E
li
j
ah Newre
n
Do
c
umentation:
nor
m
alize
s
pelling of 'normalised'
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-09
Elijah Newren
Docum
e
ntation: fix several
o
ne-c
h
ar
a
cter-off
spel
l
i
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newr
e
n
m
erg
e
-r
e
c
ursive: ensure we write updates for
d
irectory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elij
a
h Newren
merge-re
c
ursive:
a
void
spurious rename/rename
c
onflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
E
l
ijah New
r
en
directory
renam
e
d
etection: new testc
a
ses showc
a
sing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah
Newren
merge-recursive: fi
x
remaining direct
o
ry rename + d
i
r
ty
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newren
m
e
r
ge-recursive:
f
i
x overwritin
g
dir
t
y
f
iles involved
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
E
lijah
N
ew
r
en
merge-recursive
:
avoid clobbering untrac
k
ed f
i
les with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah New
r
e
n
merge-recursive: appl
y
necessary modifications for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
merge-recursive: when com
p
ar
i
n
g
files
,
don
'
t
inc
l
ude
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
l
ijah Newren
merge
-
recursive: check for file level
conflict
s
then
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
N
ewren
m
erge-r
e
cu
r
s
ive: add c
o
mputation of coll
i
sions due
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
merge-recursive: check for dire
c
tory level
c
onfl
i
cts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elija
h
N
e
wr
e
n
m
erge-
r
ec
u
rsive: add
get_
d
irectory_
r
e
n
ames()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Eli
j
ah Newren
merge-recurs
i
ve:
m
ake
a
help
e
r f
u
nction
f
or cleanup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
m
erge-recu
r
sive:
spli
t
out code fo
r
determining diff_filepairs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
me
r
ge-recursive: m
a
ke !o->detect
_
r
e
name co
d
e
p
ath more
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Eli
j
ah Newren
me
r
g
e-recursive: fix le
a
k
s
o
f
allocated
r
e
names and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Eli
j
ah Newren
merge
-
r
ec
u
rsive: introdu
c
e
new func
t
ions to handle
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elija
h
N
e
wren
merge-recu
r
sive: move the get
_
ren
a
mes() f
u
nction
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
d
irectory
rename detection: tests
f
or handling ov
e
rwriting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah New
r
en
d
i
rectory rename detection:
t
e
s
ts for handling overwr
i
t
i
ng
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
di
r
ectory re
n
ame dete
c
tion: miscell
a
neou
s
testcases
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
directory
r
e
na
m
e detect
i
on: testcases exploring p
o
ssibly
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elij
a
h N
e
wr
e
n
directory rename detecti
o
n: more invol
v
e
d
edge/corner
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
d
i
r
ect
o
ry
r
e
name
d
e
tection:
t
est
c
ases c
h
ecking which
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah New
r
en
d
irec
t
ory
r
ename detection: files/dire
c
tori
e
s
in the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
d
i
rectory
r
enam
e
d
e
tecti
o
n: partially renamed directory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
El
i
jah
Newren
directory renam
e
detection: t
e
stcases t
o
avo
i
d taking
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
dir
e
ctory rename d
e
tection: dir
e
ctory split
t
ing testcases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Eli
j
ah Newre
n
di
r
ectory
r
ename d
e
t
ect
i
on: basic testcas
e
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Elijah Newr
e
n
me
r
ge-recursive: add
e
xp
l
an
a
tion for src_entry and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
E
lijah Newren
merge-recursive: fi
x
logic
ordering issue
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Eli
j
ah N
e
wren
Tighten and correct a few testcases
f
or merging and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
Elij
a
h N
e
wren
merge-rec
u
rsive: avoid incorpora
t
ing
u
ncommitted c
h
ang
e
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
Elijah Newren
m
o
ve index_has_changes() from builti
n
/am
.
c to
merge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
El
i
jah Newren
t
6
044
:
recursive can
s
i
l
ent
l
y inco
r
pora
t
e dirty changes
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-05
Elijah Newren
s
t
rbuf: remove un
u
sed stripspace function
alias
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-27
Elijah
N
ewren
merge-recursive: ign
o
re_case shouldn'
t
reject in
t
e
n
tional
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah N
e
wren
sequ
e
nce
r
: sh
o
w rename progress during cherr
y
pic
k
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
E
l
i
jah
N
ewren
d
i
ff: remov
e
silent clam
p
of renameLimit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Eli
j
ah Newren
progress: fix progres
s
met
e
rs when d
e
aling with l
o
t
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah
N
ew
r
en
me
r
ge-recursive
:
h
a
ndle
add
i
t
i
o
n of submodule on
o
ur
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-14
E
lijah Newren
sequ
e
ncer: warn when inte
r
nal merge may be subopt
i
mal
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
E
lijah New
r
en
t6044
:
n
ew merge
t
es
t
c
a
ses for when ind
e
x doesn't ma
t
ch
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
E
lijah
Newren
merge-o
c
topus: a
b
ort if ind
e
x
d
oes no
t
match
H
EAD
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Eli
j
ah Ne
w
ren
builtin/merge
.
c:
f
i
x
a b
u
g with tr
i
vial merges
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newren
t
7
605: add a te
s
tcase demo
n
strating a bug wit
h
trivial
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
E
l
ijah Newr
e
n
merg
e
-recurs
i
ve: do not ch
e
ck working copy when creating
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
E
l
i
jah Newren
merge-recursive: remove duplicate
code
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ij
a
h Newren
me
r
ge-recursive: Do
n
't re-sort a
l
i
st who
s
e order we
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
en
m
e
rge-re
c
ursive:
F
i
x
vir
t
u
a
l
merge base fo
r
rena
m
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah
Newren
t6036:
criss-cross + rename/rename
(
1to2)/add-d
e
st
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next