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 'bp/read-cache-parallel'
2018-09-27
Elijah Newren
commi
t
:
fix erron
e
o
u
s BUG,
'
multiple rename
s
on th
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
Elijah Newren
merge-recur
s
ive: rename merge_file_1
(
) and
merge_content
(
)
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
Elijah Newren
m
e
rge-rec
u
rsiv
e
:
re
m
ove f
i
nal remaining caller of merge_file
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
Elijah Newren
merge-recursive: avoid
wrap
p
er functi
o
n whe
n
unnece
s
sary
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
Elijah Newren
m
e
rge-recursive: set p
a
ths correct
l
y w
h
en three-way
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-13
E
lijah Newren
seque
n
cer: fix --allow-empty-message behavior, make
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-12
Elij
a
h N
e
wren
upd
a
te-ref: allow --no-deref wit
h
--stdin
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-12
Elij
a
h Newren
u
pdate-ref:
fix type o
f
update
_
flags variable to ma
t
ch
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-11
Eli
j
ah New
r
en
rer
e
re:
avoi
d
bu
f
fer overrun
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-11
Elijah Newr
e
n
t4200: demonstrate rerere segf
a
ult on specially crafted
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-05
Eli
j
ah Newre
n
Remove superfluou
s
trailing s
e
micolons
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
Elijah N
e
wre
n
am: avoid d
i
r
ector
y
rena
m
e
detection whe
n
c
alling recursive
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
Elijah
Newren
merge
-
recursive: ad
d
abili
t
y
t
o t
u
rn off directory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
Elijah Newren
t3401: add another
directory renam
e
testca
s
e
for rebase
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Newren
Remo
v
e forward
d
eclar
a
tion of an
en
u
m
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah
Newren
com
p
a
t
/precompo
s
e_utf8
.
h
:
u
s
e
more common include
guard
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Newren
urlmatch
.
h: fix inclu
d
e guard
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Newren
Move defi
n
ition of
e
n
u
m
b
ran
c
h_track fr
o
m
cache
.
h to
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Newren
a
l
l
oc: make allocat
e
_
a
lloc_state
a
n
d cl
e
ar_a
l
loc_
s
ta
t
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
E
lijah Newren
Add missing inclu
d
es and forward dec
l
a
r
ations
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
El
i
j
ah New
r
en
git-u
p
date-
i
ndex
.
t
xt: reword possibly confusing example
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elija
h
Newre
n
t74
0
6
: avoid using test
_
must_fail for comm
a
n
ds other
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newren
t7406: prefer test_* helper functions
to t
e
st -[feds]
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elija
h
Newren
t740
6
: avoid having git commands
upstr
e
am of
a
pipe
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah
N
ewren
t7406
:
simplify b
y
using diff
--n
a
me-only i
n
stead
o
f
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
El
i
jah New
r
en
t7406: fix call
t
hat was failing for the
w
rong reason
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-06
Elijah Ne
w
ren
t3031: update tes
t
description to mention desir
e
d be
h
a
vior
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-31
E
l
ijah
N
ewre
n
read-cache:
fi
x
directory/file
c
onf
l
ict hand
l
ing in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-31
Elijah Newr
e
n
t1015
:
dem
o
n
s
tr
a
te directory/
f
i
l
e confli
c
t re
c
overy
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-27
Elijah Ne
w
re
n
merge-recursi
v
e: preserve ski
p
_worktree
bi
t
when necessary
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Ne
w
ren
t740
5
: verify '
m
erg
e
--ab
o
r
t
' works af
t
er submo
d
u
l
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elij
a
h
Newr
e
n
t740
5
: add a
d
irectory/submodule conf
l
ict
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
t7
4
05: add
a
file/submodu
l
e co
n
flict
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah
N
ewren
merge: fix misleadin
g
p
re
-
m
erg
e
check
documentation
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
E
lijah
Newren
merge-recursiv
e
:
e
n
f
o
rce rule that ind
e
x mat
c
hes he
a
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
t
6
044: add more
te
s
t
cases with staged changes bef
o
re
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
E
l
ijah Newren
mer
g
e-recursive: fix
a
ssum
p
t
i
on th
a
t
head tree being
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah
N
ewren
merge-recur
s
ive: make sure whe
n
we say we abort
that
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
t60
4
4
:
add a
testcase
for
index
matching head, when
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newr
e
n
t
6
0
3
6
:
add a failed conflict detection case: reg
u
lar
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-06
Eli
j
ah Newren
t6036
:
add lots of detail for dire
c
to
r
y/file
con
f
li
c
ts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Eli
j
ah
New
r
en
t604
2
: ad
d
t
estcase covering long chains
o
f rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Eli
j
ah Newren
t6042:
add tes
t
c
a
se covering rename/rename(2to1)/del
e
te
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elij
a
h
New
r
en
t6042: ad
d
t
estcase
c
o
v
erin
g
re
n
ame/add/dele
t
e confli
c
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t
603
6
: a
d
d
a
f
ailed conflict detecti
o
n case with conflicting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Eli
j
ah Newre
n
t6036: a
d
d a failed con
f
lict
d
etection case
w
i
t
h submodul
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
E
l
ija
h
Ne
w
ren
t6
0
3
6
: add a failed conflict detec
t
ion ca
s
e with submodule
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Ne
w
ren
t6036:
a
d
d
a
failed c
o
nfl
i
ct detection case with s
y
m
l
ink
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah New
r
e
n
t6036: add a
failed conflict d
e
t
e
cti
o
n case with syml
i
nk
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elij
a
h Newren
t6044: verify
that merges exp
e
cted to
abort actu
a
lly
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah
N
ewren
i
ndex_ha
s
_changes(): avoid a
s
suming operating o
n
th
e
_index
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
E
l
ijah Newren
read-cac
h
e
.
c: move index_has_changes() from me
r
ge
.
c
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-28
Elijah
N
e
w
ren
t5407:
f
ix test to cover
i
n
t
ended a
r
guments
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-28
Elijah Newren
apply: fix grammar error i
n
com
m
ent
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah
N
ewren
git
-
rebas
e
--mer
g
e: mode
r
nize
"
gi
t
-$cmd" to "git $c
m
d"
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
Fix
u
se of strategy o
p
t
ion
s
with interactiv
e
reb
a
ses
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Eli
j
a
h
Newren
t34
1
8: add testcase showing
p
roblems with rebase -i
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elij
a
h
Newr
e
n
git-rebase: make --allow-e
m
p
t
y-message
t
h
e default
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
t
34
0
1: add directory rename test
c
ases for
r
ebase and am
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elij
a
h
N
e
w
ren
git
-
rebase
.
txt: document behavioral differe
n
ce
s
bet
w
een
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
E
l
i
j
ah N
e
wren
directory-
r
ena
m
e
-
detec
t
ion
.
txt
:
tec
h
nical do
c
s o
n
abilities
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
g
i
t-
r
ebase
.
txt: addr
e
ss confusion between --no-ff vs
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
g
it-rebase
:
erro
r
o
ut when incompatib
l
e options pass
e
d
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Eli
j
ah Newr
e
n
t
3422: new
testcases for c
h
ecking when
inco
m
p
at
i
b
l
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-26
Elijah Ne
w
ren
git-rebase
.
sh: up
d
ate help messages
a
b
it
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-26
Elijah
Newren
git-rebase
.
txt: document incomp
a
tible o
p
t
i
o
n
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-13
Elij
a
h Newre
n
RelNotes 2
.
18: clarify
w
here directory re
n
a
me detection
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elijah Ne
w
re
n
me
r
ge-recursiv
e
:
add
poi
n
ter about unduly
complex looking
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elijah N
e
wren
merge-re
c
ursiv
e
:
r
ena
m
e conflict
_
rename_*()
f
ami
l
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Eli
j
ah N
e
wren
merge-recursive: cl
a
rify the rename_dir/RENAME_DIR
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elijah Newre
n
mer
g
e-re
c
ursive: align l
a
b
e
ls
w
i
th their respect
i
v
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
E
lijah Newren
merge-recur
s
i
ve:
f
ix numerous argumen
t
alignme
n
t iss
u
es
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Eli
j
a
h
N
e
wren
merge-rec
u
rsive: fix miscellaneous
g
r
amma
r
error in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-01
Elijah Newren
RelNotes: rem
o
ve duplicate rele
a
se note
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
El
i
jah Newren
t6036: pref
e
r test_
w
hen_
f
i
nished to manu
a
l cleanu
p
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah N
e
wren
t6036, t604
2
:
prefer test_cmp to sequence
s
of tes
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
E
l
ij
a
h Newren
t6036, t
6
042: prefer test_path_is_file,
test_path_is_mis
s
ing
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elij
a
h
N
e
w
ren
t6036, t6042:
use test_line_count inste
a
d of wc
-
l
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah
N
ewren
t6036,
t6042: use
t
est_creat
e
_
repo to keep tests in
d
ependent
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-25
Eli
j
ah N
e
wren
rev-parse
:
check
l
ookup'ed commit reference
s
for NULL
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-20
Elijah Newren
m
e
rge-recursive:
p
rovide pair of `unpack_trees_{
s
tart
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah N
e
wren
merge
-
recursive: fix che
c
k
for skipability of working
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merg
e
-
r
ecur
s
ive: make "Auto-me
r
ging" co
m
ment show for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Ne
w
ren
merge-recur
s
ive: fix remainder of
was_dirty() to use
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-re
c
ursive: fix was_tracke
d
() to
q
uit lying with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
t60
4
6: testcase
s
checking whether updates can be skipped
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
me
r
ge-recursive: avoid
tri
g
gering add_cacheinfo error
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Ne
w
ren
m
e
rge-r
e
cu
r
sive
:
move
m
ore i
s
_dirty h
a
ndli
n
g
to merge_content
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elij
a
h
Newr
e
n
merge-recursi
v
e: impr
o
v
e add_cacheinfo err
o
r ha
n
dling
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-r
e
cur
s
ive:
a
voi
d
sp
u
r
ious rename/rename conflic
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Eli
j
a
h
N
e
wren
d
i
r
e
ctory r
e
name de
t
e
c
t
i
o
n: new t
e
stc
a
ses
showc
a
s
i
ng
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newr
e
n
merge-recursive: fix rema
i
ning director
y
re
n
ame + dirty
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recursive: fix o
v
erwriting
d
ir
t
y files involve
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
Newren
merge
-
recursive: avoid clobbering untrack
e
d fil
e
s with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Ne
w
ren
merge-
r
ecursive: appl
y
nece
s
sary modifications for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
New
r
en
merge-recursiv
e
: w
h
en
c
omparing fil
e
s, don
'
t i
n
clude
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elij
a
h Ne
w
r
en
merge-recur
s
ive: c
h
eck for file level c
o
n
flicts then
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
El
i
jah Newren
merge
-
recu
r
sive:
a
dd c
o
mputa
t
ion of co
l
l
i
s
ions due
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
El
i
jah Newren
m
erge-recu
r
sive: ch
e
ck
for directory level conf
l
i
c
ts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
N
e
w
ren
merge-rec
u
rsive: add get_d
i
recto
r
y_renames()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next