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
Adjust for 2.19.x series
2018-08-30
Elijah
N
e
wren
am: avoid dir
e
ctor
y
rename detection
w
hen calling recursive
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
Eli
j
ah Newren
m
e
r
g
e
-
recursive: add a
b
ility to turn off
d
irectory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
El
i
jah Newren
t340
1
: add ano
t
her di
r
e
c
tory rename
t
estcase for reb
a
s
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah
Newren
R
emove
f
orward declaration of an enum
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
E
lijah N
e
wren
co
m
pat/precompose_u
t
f8
.
h: use more common
incl
u
de guard
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Newren
url
m
atch
.
h
: fi
x
include gu
a
rd
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Newren
Move
d
e
finition of enum branch_
t
rack from cache
.
h to
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elij
a
h Newren
alloc: make alloca
t
e_a
l
lo
c
_state and clear_alloc
_
st
a
te
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Newre
n
Add mi
s
si
n
g includes and fo
r
ward d
e
clarati
o
n
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
E
lij
a
h Newren
g
it-u
p
d
a
te
-
index
.
t
x
t: rewor
d
possi
b
ly confusing example
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
E
l
ijah N
e
wren
t7406: avoid using
test
_
must_fail for commands other
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elij
a
h
N
e
wre
n
t74
0
6: pr
e
fer te
s
t_* helper functions to test -[fe
d
s]
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
E
lijah N
e
wren
t7406: avoid
having git comman
d
s
u
pstream of a
pipe
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
E
l
ijah Newren
t7
4
06: si
m
plify by using
dif
f
--n
a
me-only instea
d
of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
E
lijah Ne
w
ren
t7406:
fix call tha
t
was failing
f
or the wrong
re
a
s
o
n
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-06
Elijah
Newren
t3
0
3
1: up
d
a
t
e
test descri
p
tion
t
o men
t
i
o
n d
e
sired behavior
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-31
Elijah Newren
r
e
ad-c
a
che: fix directory/file
c
onflict handling in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-31
Eli
j
ah Newren
t1015: demonstrate directory/file
c
onflict
recovery
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-27
Elija
h
Newren
mer
g
e
-
re
c
ursive: preser
v
e skip_worktree bit
when n
e
cessary
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah
N
ewren
t7405: verify
'mer
g
e --abor
t
' works after submodule
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Eli
j
ah Newren
t
7
405: add a d
i
recto
r
y/submodule conflict
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah New
r
en
t74
0
5
:
add a
file/submodu
l
e co
n
f
l
ict
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elij
a
h Newr
e
n
merge: fix mi
s
le
a
ding pre-
m
erge check do
c
umentat
i
o
n
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah N
e
wre
n
merge-recursi
v
e:
e
nforce rule
t
hat i
n
d
ex matc
h
es h
e
ad
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
t6044: add
m
o
r
e testcases with staged changes befo
r
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Eli
j
ah Newren
m
erge-rec
u
rsiv
e
: fix
assumption th
a
t head t
r
ee bei
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
me
r
g
e
-recursive: make sur
e
w
h
e
n
we say we abort that
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
t6044: add a tes
t
case for i
n
dex m
a
t
c
hin
g
head, when
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
E
lijah
N
ewren
t6036: add a
failed con
f
lict det
e
c
t
ion case: regula
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-06
El
i
jah Newren
t6036: add lots of
detai
l
for di
r
ectory/
f
ile confli
c
ts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
El
i
jah Newren
t6042: ad
d
testcase covering
l
ong chains of rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Ne
w
ren
t6042
:
add testcase cove
r
ing rena
m
e
/rename(2
t
o
1)/delete
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
E
l
i
j
ah Newren
t6042:
add testca
s
e
c
overing
r
e
n
ame/add/delete c
o
nflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
El
i
ja
h
Ne
w
re
n
t6036: ad
d
a
f
ailed co
n
flict detec
t
i
on case wit
h
conflicting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
E
l
ijah Ne
w
ren
t60
3
6: add a
f
a
iled co
n
flict
d
et
e
c
tion ca
s
e with submodule
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elij
a
h Ne
w
r
e
n
t6036: add a failed conflict
detection case with submodule
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah New
r
en
t6036
:
add a
f
ailed conflict detect
i
on case with symlink
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
E
l
ijah
Newre
n
t6036: add
a
f
a
i
l
ed con
f
lict
d
e
t
e
c
t
io
n
case with
symlink
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Eli
j
ah Ne
w
ren
t6044
:
ve
r
ify th
a
t merges expected to a
b
o
rt actually
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
index_has_changes()
:
avoid assumi
n
g operating on
the
_
index
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Ne
w
ren
read-
c
a
che
.
c:
move index_has_
c
hanges() from merge
.
c
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-28
Elijah Newren
t5
4
07
:
fix test to cover intended arguments
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-28
Elijah Newren
appl
y
:
fix grammar er
r
or in com
m
ent
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
git-rebase--
m
erge:
m
odernize
"git-$cm
d
" to "git $cmd"
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
E
l
i
jah Newren
F
ix u
s
e of
strategy options
w
ith interac
t
ive reba
s
es
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah
N
ewren
t3418: add testcase show
i
ng pr
o
blems with rebase -i
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Ne
w
re
n
git-rebase: make --al
l
ow-empty
-
m
e
ss
a
ge the d
e
fault
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
E
l
ij
a
h Newr
e
n
t3401: a
d
d director
y
rena
m
e
t
estc
a
s
e
s f
o
r
r
e
base and am
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah
New
r
en
git-rebase
.
t
x
t:
d
oc
u
ment be
h
avioral differenc
e
s
between
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
director
y
-rename-detection
.
txt: t
e
chni
c
al docs on abil
i
ties
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
E
lijah Newre
n
git-
r
e
base
.
tx
t
: address conf
u
sion be
t
we
e
n
--no-ff v
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elij
a
h
N
ewren
git
-
r
ebase
:
er
r
or
o
ut w
h
en incompa
t
ible
o
pt
i
ons
p
assed
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
E
lija
h
Newren
t3422
:
ne
w
t
estca
s
es for
c
hecking when incompatibl
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-26
Elij
a
h Newren
g
i
t-rebase
.
sh: update help mes
s
age
s
a bit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-26
Elijah Newren
gi
t
-rebase
.
tx
t
: docu
m
ent incompatible options
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-13
Elijah
New
r
en
RelNotes 2
.
18:
clarify where dire
c
tory rename dete
c
tion
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Eli
j
ah
Newren
merge-recur
s
i
v
e:
a
dd pointer abo
u
t und
u
ly complex loo
k
ing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
E
lijah Newre
n
mer
g
e
-recu
r
si
v
e: rename conflict_rena
m
e_*() family
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
E
l
ijah Newren
merge-recursive: cl
a
r
ify t
h
e
rename_dir/RENAME_DIR
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elijah Newren
m
e
rge-re
c
ursive: align labels with their
r
e
s
pecti
v
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elij
a
h
N
e
wre
n
merge-recursive
:
fix n
u
m
erous argument
a
l
ignment
issu
e
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elijah Newren
merge-recursive: fix miscellan
e
o
u
s grammar erro
r
in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-01
Elij
a
h
Newren
RelNotes: remove
d
up
l
i
c
ate rele
a
se not
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
E
lija
h
Newre
n
t
6036: prefer test_when_finish
e
d to m
a
nual cleanup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elij
a
h Newren
t
6
036, t60
4
2: prefer test_cmp to se
q
u
enc
e
s
o
f test
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah N
e
wren
t6036, t6042: pr
e
fer test_path_is_file, test_path_is_missing
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah Ne
w
ren
t
6
036, t
6
0
42
:
use test
_
line_count
i
nstead of
w
c -l
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Eli
j
ah Newren
t6036,
t
6042: use test_create_repo to keep t
e
sts independent
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-25
Elija
h
New
r
en
re
v
-parse: ch
e
ck lookup
'
ed commit references
fo
r
NULL
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-20
El
i
jah N
e
wren
merge-recursive: pr
o
v
i
de pair o
f
`unpack_
t
rees_{start
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
m
e
rge
-
recursive:
f
ix check for skipability of
w
orking
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-rec
u
rsive: m
a
ke "Auto-merging" co
m
ment show for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recursive: fix remainde
r
of
w
as_dirty() to use
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
N
ewren
merge-re
c
u
r
sive: fix
w
as_track
e
d() to quit ly
i
ng with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
t
6
046: testcases c
h
ecking w
h
ether updat
e
s ca
n
be skipped
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Eli
j
ah N
e
wre
n
mer
g
e-recursi
v
e: a
v
oid trig
g
er
i
ng add_cacheinfo er
r
or
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
lijah Newren
merg
e
-recu
r
sive: move mo
r
e is_d
i
r
t
y
h
andling
to merge_content
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recursive: imp
r
ove a
d
d_cacheinfo erro
r
h
a
ndling
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
Newren
m
e
r
g
e
-recursiv
e
: avoid spurious rename/ren
a
me co
n
flict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
direc
t
ory rename dete
c
tion: new testcase
s
s
h
owcasing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Eli
j
ah N
e
wren
merge-rec
u
rsive: fix remaini
n
g director
y
r
e
name
+
di
r
ty
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
El
i
jah Ne
w
ren
merge-recur
s
ive:
f
ix ov
e
rw
r
iting
d
irty
file
s
in
v
olved
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newr
e
n
merge-recursive: avoid cl
o
bbe
r
i
ng u
n
tra
c
ked files with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge
-
recursiv
e
:
app
l
y necessar
y
modifications for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
N
ewre
n
merge-recursiv
e
: when com
p
aring files,
don't
in
c
lude
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merg
e
-recursive
:
c
heck
f
o
r file lev
e
l
c
onflicts then
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
N
ewren
m
e
rge-recursive: add comp
u
tation
o
f collisions due
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newre
n
merge-recursive: check for directory
leve
l
conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
m
erg
e
-recursive: add get
_
d
i
rector
y
_r
e
names()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-02
E
l
ijah Newren
unpa
c
k
_
t
rees: fix breakag
e
when o->src_index != o-
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-25
E
l
ijah Newren
M
a
ke runni
n
g git under other
d
ebugger-li
k
e programs
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Eli
j
ah Newren
merge-recursi
v
e: mak
e
a helper function for cleanup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elija
h
Newren
merge-
r
ecursive: split
o
ut code for dete
r
mining diff_filepairs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Eli
j
a
h Newr
e
n
merge-recursive
:
m
ake !o->detect_r
e
name c
o
depath more
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Eli
j
a
h
N
e
wren
merge-re
c
urs
i
v
e: fix leaks of allocated rena
m
es and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
l
ij
a
h
N
e
wren
mer
g
e-recu
r
s
iv
e
: i
n
tr
o
duce
n
ew functions to h
a
ndle
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newre
n
m
e
rge-r
e
cursi
v
e
:
mo
v
e the get_r
e
names()
f
unction
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
El
i
j
a
h
N
ewren
director
y
rename detection: tests for handling o
v
e
rw
r
itin
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newr
e
n
directory
rename detection: tests for handling overwr
i
ting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elij
a
h Newren
d
i
rectory rename detect
i
on: miscel
l
aneous testc
a
ses
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next