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
Merge branch 'jt/non-blob-lazy-fetch' into maint
2018-09-27
Elijah N
e
w
r
en
co
m
m
i
t: fix erroneous BU
G
, 'multi
p
le re
n
ames
on
th
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-13
El
i
jah Newren
s
eq
u
encer: fix --allow-
e
mp
t
y-messa
g
e
b
ehavior,
m
ake
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-12
Elijah Newren
updat
e
-ref: allow --no-
d
eref
w
ith --stdi
n
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-12
Elijah
Newr
e
n
update-re
f
: f
i
x typ
e
of update_fl
a
gs variable
t
o match
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-11
Elijah Newren
rerere: avoid b
u
ffe
r
ove
r
run
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-11
E
lijah Newr
e
n
t4
2
00: demonstra
t
e
r
e
rere
s
egfa
u
lt on
s
pe
c
ially
c
rafted
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
Elijah New
r
en
am:
a
void dir
e
ctory
r
ename
detection when ca
l
lin
g
recursive
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
El
i
jah Newren
merge-r
e
cu
r
sive: add ability t
o
t
urn o
f
f direct
o
ry
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
Elijah Newre
n
t
3401: add an
o
ther directory rename t
e
stcase
f
or
r
e
b
ase
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Newren
Remove forward de
c
l
a
ration of an enum
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah
N
e
wren
comp
a
t/preco
m
pose_u
t
f
8
.
h: us
e
more common i
n
clude guard
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Newren
u
r
l
match
.
h: f
i
x include guard
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Ne
w
ren
M
ove definition of en
u
m branch_t
r
a
ck from
ca
c
he
.
h to
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
El
i
jah Newre
n
all
o
c: ma
k
e
a
llocate_
a
l
l
oc_state and
clear
_
alloc_state
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Eli
j
ah Newren
Add
missing includ
e
s and fo
r
ward
d
ec
l
a
rations
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
El
i
jah Ne
w
ren
g
i
t-updat
e
-index
.
txt: rew
o
rd possibly
c
o
n
f
u
s
i
n
g
e
x
ample
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newren
t7406
:
avoid using t
e
s
t_mus
t
_fail
for commands other
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
E
l
ijah
N
ewren
t7406: prefer test_* help
e
r
functions to test
-
[feds]
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah
N
e
w
ren
t7
4
06: avoid
having
g
it c
o
mm
a
n
d
s upstr
e
am of a
pipe
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Eli
j
ah Newren
t
7
406: si
m
plify by usin
g
di
f
f --name-only
i
nstead
o
f
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
El
i
jah Newren
t
7
406:
fix cal
l
that
was failing for the wrong
r
e
ason
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-06
Elijah
N
ewren
t3031:
update test
d
esc
r
iption to mention desired beh
a
v
i
o
r
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-31
Elija
h
Newren
read-cache: fix d
i
rector
y
/
file
conflict
ha
n
dling
in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-31
Elijah Ne
w
ren
t
1015: d
e
mon
s
trat
e
d
irectory/file conflict recovery
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-27
Elijah Newren
merge-recu
r
si
v
e
:
p
r
eserve skip_worktree bit when necessa
r
y
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
E
lijah Ne
w
ren
t7405:
v
erif
y
'merge --abort' works after submodule
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
E
l
ij
a
h Newr
e
n
t7405: add a directory/
s
ubmodu
l
e confli
c
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
El
i
ja
h
Newren
t7405:
add a file/submodule
c
o
nf
l
ict
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah New
r
en
merge: fix
misleading pre-
m
erge check
do
c
um
e
ntat
i
on
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elij
a
h Newren
merge-recursive:
e
nforce
rule
tha
t
index
mat
c
hes head
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Eli
j
ah
N
ewren
t6044: a
d
d m
o
re testca
s
es with staged changes before
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
merg
e
-recu
r
sive:
f
ix assumption that head tree being
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
E
l
ijah
N
ewren
merge-recursive: make
sure when
we say we
abort that
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Eli
j
ah Newren
t6044: add
a tes
t
case for index
m
atc
h
ing he
a
d
,
whe
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
t
6
0
36: add a failed c
o
nflict detection case: regu
l
a
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-06
Elijah New
r
en
t6036: add lots o
f
d
e
tail for directory/fi
l
e confl
i
cts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah
Newr
e
n
t6042:
add testc
a
se coveri
n
g long chains
of rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
El
i
j
a
h
Newren
t6042: add testc
a
se coverin
g
rename/rename(2
t
o1)
/
d
e
l
e
t
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
El
i
jah
N
ewren
t6042: a
d
d testcase
c
overing rename/add/delete con
f
lict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t
60
3
6:
a
dd a f
a
iled con
f
lict detection case
w
ith conflicting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newr
e
n
t6036: add a
f
ail
e
d conflict
detection case with submodule
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah New
r
en
t6036:
a
dd a failed conflict detection cas
e
w
ith s
u
b
module
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t
6
036: add a failed confl
i
c
t
detectio
n
case with s
y
mlink
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah
Newren
t603
6
:
add a failed conflict
d
etection case
w
ith symlink
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t6044:
verify that me
r
ges expec
t
ed to abort act
u
ally
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
E
l
ijah Newr
e
n
i
n
de
x
_h
a
s
_
changes(): avoid as
s
uming operatin
g
on the_index
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Eli
j
ah
Newren
read-
c
ache
.
c: move index_has
_
cha
n
ges()
f
rom
merg
e
.
c
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-28
Elij
a
h Newren
t5407: fix test to co
v
e
r
inte
n
ded arguments
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-28
Elijah Newren
apply: fix grammar e
r
ror in
com
m
ent
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah N
e
w
r
e
n
git-reba
s
e--merg
e
: modernize "git-$cmd" to "g
i
t $cmd"
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
Fix use of s
t
rategy o
p
tions wit
h
i
n
t
eractive
re
b
ases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
E
l
ijah New
r
en
t341
8
:
add testcas
e
showing
p
roblems wit
h
rebase -i
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elij
a
h N
e
wren
g
it-rebase: m
a
k
e -
-
allow-emp
t
y
-
messa
g
e the de
f
ault
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
t34
0
1: add
directory rename t
e
stcases for rebase and am
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elija
h
New
r
en
git-rebase
.
txt: document behavioral d
i
ffer
e
nc
e
s between
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
dire
c
tor
y
-
renam
e
-de
t
ecti
o
n
.
txt:
t
echnical docs
on abili
t
ies
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
gi
t
-rebase
.
txt: add
r
ess
c
on
f
usion
b
etween --no-f
f
vs
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Eli
j
ah Newr
e
n
git-
r
ebase: error ou
t
when incompa
t
i
b
le options passed
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
E
lijah Newren
t3422: new testcases for che
c
king
when incompatibl
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-26
Elijah
Newren
git-r
e
base
.
s
h:
update h
e
l
p
messages
a
bit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-26
Elij
a
h Ne
w
ren
git
-
r
ebase
.
txt:
d
ocument incompatib
l
e options
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-13
Elijah N
e
wre
n
RelN
o
tes
2
.
18: clarify where
di
r
ec
t
ory re
n
a
me detection
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elija
h
Newren
me
r
ge-recur
s
ive: add pointer about u
n
duly compl
e
x looki
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elijah Newren
merg
e
-
r
ecursive: rename c
o
n
flict_rename_*()
famil
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
E
l
ijah Newren
merge-recursive:
c
larify the
r
e
nam
e
_dir/RE
N
AME_DIR
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
El
i
jah Newren
merge-
r
e
c
ursive:
align label
s
with their
respective
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
E
lijah Newren
m
erge-r
e
c
ursiv
e
: fix numerou
s
argument alignment iss
u
e
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elijah Newr
e
n
merge-recursi
v
e: fix misce
l
lan
e
ous grammar er
r
or i
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-01
Eli
j
ah Newre
n
RelNotes: remove duplicate
release note
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah New
r
e
n
t
6
036: prefer test_when_f
i
nished t
o
manual c
l
eanup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
El
i
jah Newren
t60
3
6,
t
6042: prefer test_
c
mp to sequenc
e
s of test
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah Newren
t6036, t60
4
2: pre
f
e
r
test_p
a
t
h
_is_file, t
e
st_path_is_missing
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah Newren
t6036, t60
4
2: use test
_
line_count instead
o
f wc
-
l
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah N
e
w
r
en
t60
3
6
,
t6042:
use test_
c
r
eate_repo to k
e
ep t
e
s
ts independent
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-25
Elija
h
Newren
r
ev-pa
r
se: check
l
ookup'ed commit references
f
or NULL
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-20
El
i
jah Newren
merge-recursive: provide p
a
i
r
of `unpack_trees_
{
start
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah N
e
wren
merg
e
-
recursive
:
fix
check for skipability of work
i
ng
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
m
erge
-
r
ecursive:
make "Aut
o
-merging" comm
e
nt show for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
Newren
merge-rec
u
rsive: fix rema
i
nder of wa
s
_d
i
rty() to us
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recursive
:
fix was_trac
k
ed() to q
u
it lying with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
N
e
wr
e
n
t6046: testcase
s
c
hec
k
ing whether updates ca
n
be skipped
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recursive: avoid trigger
i
ng
a
d
d
_cacheinfo error
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recursive: move mo
r
e is_dirty handling to me
r
ge_content
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ijah Newre
n
m
erge-recursive:
impro
v
e add_cacheinfo error
h
andling
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elij
a
h
N
e
w
ren
merge-recursive: avoid spurious r
e
name/
r
ename
conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
lij
a
h
Newren
d
irect
o
ry rename detection:
new t
e
stcases showcasing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
lijah N
e
wren
me
r
ge-recurs
i
ve: fix remai
n
in
g
directory
ren
a
me +
dirty
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
N
e
w
ren
merge-recu
r
sive: fi
x
overw
r
iting dirty files
i
nvol
v
ed
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Eli
j
ah Newren
merge-recursive: avoid clobbering untr
a
c
ked files w
i
th
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
Newren
merge
-
recurs
i
ve: apply necessar
y
m
odi
f
ications for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
lijah New
r
e
n
merg
e
-rec
u
r
s
i
ve:
w
hen comparing files, don't include
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merg
e
-re
c
ursive: check fo
r
file level conf
l
ict
s
then
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
El
i
jah Newr
e
n
merge-recursiv
e
: add c
o
mp
u
tation of
colli
s
ion
s
due
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
Newre
n
merge-recursive: chec
k
for directo
r
y level conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Eli
j
ah Newren
me
r
ge-recursive
:
add
g
e
t_
d
irectory_renames()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-02
E
lijah Newren
unpack_trees: fix bre
a
kage whe
n
o->
s
rc_inde
x
!= o-
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-25
Eli
j
ah Ne
w
ren
Make running
git
under other deb
u
gger-like programs
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah
Newren
merge-r
e
cursive: make a helper funct
i
o
n
for
c
lean
u
p
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
m
e
r
g
e
-re
c
u
rsive: split out
code for
d
ete
r
mining diff_filepairs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Eli
j
ah N
e
wren
merge-recursive: ma
k
e !o
-
>d
e
tect_rename codepath
m
or
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next