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 'tq/refs-internal-comment-fix' into maint
2018-09-27
Elijah Newr
e
n
co
m
mit:
f
i
x
erroneous BUG, 'mul
t
iple rena
m
es on
the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-13
Elij
a
h Newre
n
seque
n
cer:
fix --all
o
w
-empty-mes
s
ag
e
be
h
avior, make
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-12
El
i
j
a
h
N
e
wren
upd
a
te-ref:
all
o
w
--no-
d
eref w
i
th --stdin
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-12
Elijah
N
ewren
update-ref: fix type of
u
pdate_flags variable t
o
match
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-11
Eli
j
ah Newre
n
rerere: avo
i
d buffer overrun
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-11
E
l
ija
h
Newren
t4200
:
demo
n
strate re
r
e
r
e segf
a
ul
t
on speci
a
l
l
y
c
r
afted
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-05
Elijah N
e
wren
Remove s
u
perfluous trailing semicol
o
ns
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
Elijah Ne
w
r
e
n
am:
avoid directory rename detection when calling r
e
cursive
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
Elijah Newren
merge-recursive: add a
b
ility to turn off dire
c
tory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
Elijah Ne
w
ren
t3401
:
add another directory
rename testcase for re
b
as
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Newre
n
Remove forward declaration of
a
n enum
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
E
l
ijah New
r
en
compat/precompose_utf8
.
h
:
use
m
ore com
m
on inc
l
ude guard
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Eli
j
ah Newren
urlmat
c
h
.
h: fi
x
include gua
r
d
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Newr
e
n
Move defin
i
tion of enum branch_t
r
ack from c
a
che
.
h to
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah New
r
en
a
l
loc: make allocate_alloc_state and clear_alloc_
s
t
a
te
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah
N
ewren
Add missing incl
u
des and forward d
e
cl
a
rati
o
ns
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newren
git-update-inde
x
.
txt: reword possibly confusing example
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newren
t
7406: avoid using tes
t
_mu
s
t_fa
i
l for
co
m
mands other
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
E
lijah Newren
t7406: prefer test
_
*
helper functions to te
s
t
-
[feds]
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
El
i
j
a
h
Newren
t7
4
06: avoid
h
av
i
ng git comm
a
nds upstream of a p
i
pe
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newren
t7406
:
simplify by using
diff --name-only instead of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
El
i
jah Newren
t74
0
6: fix call t
h
at wa
s
failing for t
h
e wron
g
r
easo
n
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-06
Elijah Newren
t3
0
3
1: up
d
ate test
d
escriptio
n
to
m
ention
d
esired behavior
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-31
Elijah Ne
w
ren
r
e
ad-cache:
fix
d
i
r
e
ctory/file conflic
t
hand
l
ing in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-31
Elijah New
r
e
n
t1015: demonstr
a
te directory/fil
e
conflict recovery
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-27
Elijah Newren
merge-
r
ecurs
i
ve
:
pre
s
erve skip_worktree bit when necessary
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Eli
j
ah
N
ew
r
en
t
7
405: veri
f
y 'mer
g
e
-
-abort' work
s
after subm
o
dule
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
t
7
405: add a
d
ir
e
cto
r
y
/
submodul
e
c
onfl
i
ct
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah
N
e
wren
t740
5
: add a fil
e
/
submodule confl
i
ct
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
merge:
fix misleadi
n
g
pr
e
-
merge ch
e
ck
documentat
i
on
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
El
i
jah
N
e
w
re
n
merge-recursive
:
en
f
o
r
c
e rul
e
that index matches
h
ead
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elija
h
N
ewren
t6044: add
m
or
e
testca
s
e
s
with stage
d
c
h
anges be
f
ore
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
merge-recur
s
iv
e
: fi
x
a
ssumption
t
hat head
t
ree being
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
merge-recursive: m
a
ke s
u
re when we say we abort that
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Eli
j
ah New
r
en
t
6
0
44: add a testcase for inde
x
matching head, when
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elij
a
h Newren
t6
0
36:
a
dd a fa
i
led c
o
n
flic
t
detection case:
regular
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-06
Elij
a
h Newren
t6
0
36: add lots o
f
detai
l
for directory/fi
l
e conflict
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t604
2
: add testcase c
o
vering long c
h
ains o
f
rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elij
a
h Newren
t6042: add t
e
stcase
coverin
g
rename
/
rename(2to1)/de
l
ete
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newr
e
n
t6042:
a
dd te
s
tcase covering r
e
name/add/del
e
te conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Eli
j
ah Newren
t603
6
: a
d
d a
f
ailed c
o
nflict detection cas
e
w
ith conflicting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah N
e
wren
t6
0
36: add a fai
l
ed conflict d
e
tect
i
o
n case
w
ith submodu
l
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah N
e
wren
t6036: add a
f
ailed conflict dete
c
tion case with submodule
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t6036:
add
a
faile
d
conflict de
t
ectio
n
case wi
t
h sym
l
i
n
k
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newre
n
t6036: add a failed conflict d
e
t
e
c
tion c
a
se
with
symlink
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah N
e
w
r
en
t6044: verify that merges e
x
pe
c
t
ed to
a
bort
actually
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
i
ndex_has_
c
hanges(): avoid
assum
i
ng opera
t
ing on the_index
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elij
a
h
N
ewre
n
read-ca
c
he
.
c: mo
v
e index_ha
s
_changes()
from
m
e
r
ge
.
c
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-28
Elijah Newren
t
54
0
7: fix test
to cover
i
n
tended arguments
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-28
Elijah
N
e
wren
apply: fix grammar error in co
m
ment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
El
i
jah Newren
git-re
b
ase--merge: mode
r
ni
z
e "git
-
$
c
md" to
"
git $cmd"
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
Fix use of strategy options
wit
h
interact
i
ve rebases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
El
i
ja
h
N
ewre
n
t3418: add testcase sho
w
ing proble
m
s with rebase -i
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Eli
j
ah
Newren
git-r
e
base
:
m
a
ke
--allow-em
p
ty-message the default
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
E
lijah Newren
t3401: a
d
d
di
r
ectory rename
t
e
stcases
f
or reb
a
se and
a
m
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newr
e
n
git-r
e
bas
e
.
txt: doc
u
m
e
nt behaviora
l
differe
n
ces betw
e
en
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah
Ne
w
ren
direct
o
ry-rename-detection
.
txt: technical
d
ocs on
abi
l
itie
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
git-reb
a
se
.
txt: a
d
dress confusion betwee
n
--no
-
f
f
vs
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
El
i
j
a
h
N
e
w
ren
g
i
t-rebase: error
o
ut when
inc
o
mpatible opt
i
o
n
s pa
s
sed
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
t3422:
new testcases f
o
r ch
e
ck
i
ng when i
n
compatible
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-26
E
l
i
jah
Newren
git-reba
s
e
.
s
h:
update help mes
s
ages a bit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-26
Elijah Newren
git-rebase
.
txt: document in
c
o
m
p
a
t
i
b
le op
t
ions
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-13
Elija
h
Newren
RelNotes 2
.
1
8
:
clarify
w
h
ere direc
t
o
r
y rena
m
e detection
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elijah
Newr
e
n
merge-recursive: ad
d
pointer
about unduly comp
l
ex
l
ooki
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elijah
Newr
e
n
merge-
r
ec
u
rsi
v
e:
r
e
n
ame co
n
f
l
ict_rename_*() fam
i
ly
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Eli
j
ah Newren
merge-r
e
cu
r
sive:
c
larify the
renam
e
_d
i
r/RENAME_DIR
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
E
l
ijah
Newren
me
r
g
e
-re
c
u
r
sive: align
labels with the
i
r r
e
s
pective
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
E
lijah Newren
merge-recursive: fix numerous argument alig
n
ment issues
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elijah N
e
wren
merge-
r
ecursive: fix miscel
l
aneous gram
m
ar er
r
or in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-01
Elij
a
h Newre
n
RelNotes: remove duplic
a
te rele
a
se note
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
El
i
jah Newr
e
n
t
6
036: prefe
r
test
_
when_finished
to manual
clea
n
u
p
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah Newren
t
6
036, t6042:
p
ref
e
r test
_
cmp to sequences of
te
s
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah
N
ewren
t
6
036, t6042:
p
ref
e
r
t
est_path_is_file, tes
t
_path_
i
s_m
i
ssing
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah Newren
t6036, t6042: use test_li
n
e_count ins
t
ead of wc -l
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah New
r
en
t
6
036, t60
4
2
: use test
_
c
reate_repo
to keep te
s
t
s
i
ndependent
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-25
Elijah Newren
rev-parse: che
c
k lookup'ed
commit r
e
fe
r
ences for NULL
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-20
Elijah Ne
w
ren
merge-rec
u
rsive: provid
e
pair o
f
`unpac
k
_tree
s
_
{
s
tart
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah N
e
wren
m
e
rge-recursive: f
i
x
c
heck fo
r
skipability of wo
r
kin
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
El
i
jah Newren
merge-recursive: make "Auto-merging" comment s
h
o
w
for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah New
r
en
merge-recursive:
f
ix remainder
o
f
w
a
s_dirty
(
)
to use
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
lijah
N
ewren
merge-rec
u
rsive: f
i
x
w
as_track
e
d() t
o
quit lying with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elij
a
h Newren
t6046: testcases
c
he
c
king whet
h
er upda
t
e
s
can b
e
skipped
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
li
j
ah
N
ewren
merge-rec
u
rsiv
e
: avoid
t
r
iggering add_cachei
n
fo error
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
Newren
merg
e
-recursive: move
m
ore is_di
r
t
y han
d
ling to merg
e
_con
t
ent
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
lija
h
N
e
wren
merge-
r
ecursiv
e
: improve ad
d
_
cacheinfo
error handling
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newre
n
mer
g
e
-
r
ecu
r
sive: avoid spurious rename/rename c
o
nflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
El
i
jah Newren
directory rename detect
i
o
n:
new testcas
e
s showcasing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elij
a
h N
e
wren
merge-recursiv
e
: fix remaining directory rename +
dirty
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
m
erge-recursive: fix o
v
erwriting dirty files involved
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
lij
a
h Newren
merge-
r
e
c
ursi
v
e: av
o
id
c
l
o
bber
i
ng unt
r
acked file
s
with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
Newren
merge-recursive: a
p
p
l
y
ne
c
e
s
sary modifications for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
me
r
ge-
r
ec
u
rsi
v
e: when comp
a
ring fil
e
s, don't incl
u
de
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah N
e
w
re
n
mer
g
e-recur
s
i
ve: check f
o
r file leve
l
conflicts then
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recursiv
e
: add
c
ompu
t
ati
o
n of collision
s
due
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elij
a
h
Newren
merge-recursive: check
for
directory leve
l
conf
l
icts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
Newr
e
n
merge-r
e
cursive: add get_directory
_
renames()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-02
El
i
jah Newre
n
unpack_tr
e
es: fix b
r
eak
a
ge when o->sr
c
_index != o-
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-25
Elijah Newren
Make
r
unning git under
o
t
her debugger-like progra
m
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elija
h
Ne
w
ren
m
e
rge-recu
r
s
ive: make a help
e
r function for cleanup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
m
erge
-
recursive: split out cod
e
for determining d
i
ff_
f
ile
p
a
i
r
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next