repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'rs/remote-mv-leakfix'
2018-07-27
Elijah Newren
m
e
rge-recursiv
e
: preserve
s
kip_wo
r
k
t
ree b
i
t
w
h
en necessa
r
y
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
t
7
405: verify
'
me
r
ge -
-
abo
r
t
'
works after s
u
bmodule
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
t7405: add a
d
irectory/submodu
l
e conflict
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
t7405: add a file/submodu
l
e confli
c
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah
N
ew
r
en
merge:
f
ix mi
s
l
eading pre-me
r
ge c
h
eck d
o
c
umentation
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elij
a
h Newr
e
n
merge-rec
u
rsi
v
e: enforce
r
ule that index matches
h
ea
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah New
r
en
t60
4
4: add more tes
t
cases wit
h
s
taged cha
n
ges before
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
merge-
r
ecursive: fix assu
m
pti
o
n that he
a
d tre
e
being
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
El
i
j
a
h Newren
merge
-
recu
r
siv
e
: make su
r
e
w
h
en we say we abort that
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
t
6
044: add a
t
estcase for index mat
c
hing head, wh
e
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah New
r
en
t6036: add a failed confli
c
t detect
i
on case: regular
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-06
Elijah
New
r
en
t6036: add
l
ots
of detai
l
fo
r
di
r
ect
o
ry/f
i
le conflicts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t
6042:
a
dd testca
s
e cover
i
ng long chai
n
s of rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t
6042:
a
dd
t
estcase covering re
n
ame/r
e
name(2to1)
/
delete
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah
N
ewre
n
t6042: add testcase cover
i
ng r
e
name
/
add/
d
elete
c
onfl
i
ct
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t6036: add a failed conflict detection case
w
ith confl
i
c
ti
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newr
e
n
t603
6
: add a failed confl
i
ct detect
i
o
n cas
e
with
s
ubmodu
l
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah New
r
en
t6036: add a failed co
n
flict d
e
tectio
n
case with s
u
bmodul
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
E
lijah Newren
t6036: add a fai
l
ed con
f
lict detection
case wi
t
h
symlink
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t6
0
36: add a
f
a
i
led conflic
t
detection case with
symlink
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t6044
:
veri
f
y that
m
erges expected to a
b
ort actua
l
ly
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elij
a
h Ne
w
ren
index_ha
s
_chan
g
es():
avoi
d
a
ssuming
operating on the_index
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah
N
ewr
e
n
read-cache
.
c: move index_has_ch
a
nges() from mer
g
e
.
c
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-28
Elijah Newren
t54
0
7: fix test to cover
i
ntended arguments
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-28
Elijah Newren
apply: fix grammar error in comment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newre
n
git-
r
ebase--m
e
rge: moderniz
e
"gi
t
-$cmd" to
"g
i
t $cmd
"
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elija
h
Newr
e
n
Fi
x
use of
stra
t
egy options w
i
th interacti
v
e re
b
ases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
t3418: add
t
es
t
case showing proble
m
s with rebas
e
-i
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
g
it-rebase: ma
k
e --a
l
low-empty-message the default
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elija
h
Newren
t3401: add direct
o
ry ren
a
me
t
estcases for rebase
and am
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
git-reb
a
se
.
tx
t
:
docu
m
ent beh
a
vioral
differences betwe
e
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
di
r
ecto
r
y-r
e
n
a
m
e-dete
c
tion
.
txt: technical docs on ab
i
lities
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
E
l
i
jah Newren
git-re
b
ase
.
txt: address
confusion between --no-f
f
vs
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah N
e
wr
e
n
git-re
b
a
se: err
o
r out
w
h
en i
n
comp
a
tib
l
e opti
o
ns passed
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
E
l
ijah
N
ewren
t
3422: new testca
s
es for checking
w
hen inco
m
p
a
ti
b
le
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-26
El
i
jah Newren
git-rebase
.
sh: update
h
elp
mes
s
ages
a
bit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-26
Elijah Newren
git-rebase
.
tx
t
: do
c
ument i
n
compatible options
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-13
Eli
j
ah Newren
RelNo
t
es 2
.
18:
c
l
a
rify where
dire
c
tory rename detection
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
E
l
ija
h
Newren
merge-recursive:
add p
o
i
nter about unduly
complex looking
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elijah Newr
e
n
merge-recursive: re
n
am
e
co
n
fli
c
t
_rename_*() family
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elijah
N
ewren
merge-rec
u
r
s
i
ve: clarify the
rename_d
i
r/REN
A
ME_DIR
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Eli
j
ah Newren
m
erge
-
recursive: align labels with thei
r
resp
e
c
tive
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elijah Newren
merge-recursive: fix numerous
a
rgument alignmen
t
iss
u
es
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
E
lijah Newren
merge-recursive: fix miscellaneous gramma
r
error in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-01
El
i
jah Newren
RelNote
s
:
r
e
move dupli
c
ate release note
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
E
lij
a
h
N
e
w
ren
t6036: pre
f
er test_when_fi
n
ishe
d
to man
u
al
cleanup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Eli
j
ah Newren
t
6
036, t60
4
2: prefer test
_
cmp t
o
sequences of te
s
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah
N
ewren
t60
3
6
, t6042:
p
refer tes
t
_path_is_
f
ile, test_path_i
s
_missing
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah
Newren
t6
0
3
6, t
6
042
:
use
t
e
s
t
_line_cou
n
t i
n
s
te
a
d of wc -l
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
E
l
i
jah Newren
t6036, t6042:
u
se
test_crea
t
e
_rep
o
to
keep tes
t
s independent
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-25
Elijah Newren
rev-pars
e
:
chec
k
looku
p
'ed commit
refer
e
nces
for N
U
L
L
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-20
Elijah New
r
en
me
r
g
e
-
rec
u
r
sive
:
provide pair
o
f `
u
n
p
a
ck_trees_{start
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
mer
g
e-recursive
:
f
ix check
for skip
a
bility of working
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge
-
recursive: make "Auto-mer
g
i
n
g" comment show for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah New
r
en
merge-r
e
cursive: fix
r
emainder of
w
as_dirty() to use
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recursive: fix wa
s
_tracked() to
q
ui
t
lying w
i
th
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ij
a
h Newr
e
n
t60
4
6: testcases
c
hecking whethe
r
updates can be skipped
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
N
ewre
n
mer
g
e-recurs
i
ve: avoid tri
g
gering ad
d
_cac
h
einfo e
r
ror
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elij
a
h
Newren
m
erge
-
re
c
urs
i
v
e
: move more is_dirt
y
handling to merg
e
_content
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
Newr
e
n
m
e
rge-recursive: improve add_
c
acheinfo error ha
n
d
l
ing
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ijah Newren
merge-recu
r
sive: avo
i
d spurio
u
s
r
ename/rename conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elij
a
h Newren
directory rename d
e
tection: new tes
t
cases
s
howcasing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
mer
g
e-recursive: fix rema
i
nin
g
d
irect
o
ry ren
a
me + dirty
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ijah Newren
m
er
g
e
-
r
ecursive
:
fix overwriting dirty files
i
nvolved
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
El
i
jah
N
ewre
n
merge-recu
r
s
ive: avoid
clobb
e
ring untra
c
ked files with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah N
e
wren
mer
g
e-r
e
cursive
:
a
p
ply necessa
r
y
modifications for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recursive
:
w
h
en comparing files, d
o
n't incl
u
de
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
Newren
merge-recursive
:
check for
file le
v
e
l
c
onflict
s
then
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
lijah Newren
merg
e
-re
c
u
r
sive:
add computation of collisions due
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recursive
:
check for directory l
e
v
e
l conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
i
ja
h
N
ewren
merge-recursive: add get_dire
c
tory_r
e
names()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-02
Eli
j
ah Newren
un
p
ack_trees: f
i
x
b
reakage when o->src_index != o-
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-25
Elijah Newren
M
a
k
e
running g
i
t und
e
r other debugger-l
i
ke pr
o
g
r
ams
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
lijah Newren
merge
-
recursive: make
a
helper funct
i
on for
cleanup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
El
i
jah Newren
m
e
r
ge-recu
r
sive: split out
c
ode
f
or dete
r
mining dif
f
_
filepairs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
l
i
jah New
r
en
merge-recu
r
sive:
m
a
ke
!
o->detect_r
e
name codepath more
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah
Newr
e
n
merge-recursi
v
e: fi
x
leaks of
allocated renam
e
s and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newre
n
m
e
rg
e
-recursiv
e
: in
t
roduce
new functions
t
o
handle
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
merge-recursive: m
o
ve t
h
e g
e
t_ren
a
mes() function
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
dir
e
c
t
ory rena
m
e
detection: tests f
o
r handli
n
g ove
r
writing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah
N
e
w
ren
director
y
rename d
e
tect
i
on: tests for handling overwritin
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Eli
j
ah Newre
n
direc
t
o
ry rename detection: miscellaneou
s
testcases
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elij
a
h Newren
dir
e
ctory rename detection: testcases exp
l
orin
g
po
s
sibly
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
El
i
jah Newren
directory rename det
e
ction: m
o
re in
v
olved
edge/
c
orner
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
directory r
e
na
m
e
detectio
n
: testcases
c
hecking which
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
directory rename
d
etection: files/
d
irectori
e
s i
n
the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
direc
t
ory
r
ename det
e
ction: partial
l
y renamed
dire
c
tory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
l
ijah Newren
d
irectory renam
e
detection: testcases to
a
v
oid takin
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
d
i
rectory rename detection: di
r
e
c
tory
sp
l
i
t
ting testcases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
dir
e
ctory rename detec
t
ion:
basic
t
estcases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-09
Elijah Ne
w
ren
Do
c
umen
t
atio
n
: normal
i
ze
s
pelling of 'normal
i
sed'
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-09
Eli
j
ah Newren
D
o
cumentation: fix several on
e
-character-off spe
l
ling
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elija
h
Newren
merge-recurs
i
ve: ensure we
w
rite updat
e
s f
o
r directory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newren
merge-recurs
i
ve: avoid spur
i
ous rename/rename conflic
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah
Newre
n
directory rename detection:
n
ew tes
t
c
a
s
es s
h
owcas
i
ng
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
E
l
ijah Newren
merge-rec
u
rsive: fix rema
i
ning directory
r
ena
m
e + dirty
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah N
e
wren
merg
e
-recu
r
si
v
e
:
fix overwriting dirty f
i
le
s
involved
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
E
l
ijah
N
ewren
merge-recursive: avoid clobbering untracked
f
i
l
e
s with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elija
h
Newren
merge-recursive: apply neces
s
ar
y
modifications for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
l
ijah Newren
merge-recursive
:
when comparin
g
fil
e
s, don't
i
nc
l
u
d
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next