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 'bc/tree-walk-oid'
2019-01-10
El
i
j
ah Newren
git-show-r
e
f
.
txt:
fix
order of flags
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-09
Elijah New
r
en
git-rebase
.
txt:
u
pd
a
te note about
directory ren
a
me
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newren
fast-export: a
d
d a --sho
w
-ori
g
inal-ids option t
o
sh
o
w
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Eli
j
ah Ne
w
ren
fast-import: remove unmain
t
ained d
u
p
l
icate doc
u
m
ent
a
tion
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah N
e
wren
f
ast-export: add --reference-excluded-parents opt
i
on
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah
N
ewren
fa
s
t-e
x
port: ensure w
e
export reques
t
e
d
refs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Eli
j
ah Newren
fast-export: when u
s
ing paths, a
v
oid
c
o
rrupt s
t
ream
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newren
f
a
st-
e
xpo
r
t: move commit rewrit
i
ng logi
c
i
nto a
funct
i
on
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Eli
j
ah Ne
w
ren
fast-export: avoid dying wh
e
n filtering by pa
t
hs and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newr
e
n
fast
-
e
xport: use value from corr
e
ct enum
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
El
i
jah Newren
git-fast-export
.
t
x
t: clarify misleadin
g
documentatio
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
El
i
ja
h
N
e
wr
e
n
git-fa
s
t-impor
t
.
txt: fix documen
t
ation for --
q
uiet
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah New
r
en
fast
-
ex
p
ort:
convert
s
h
a1 to oid
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
E
li
j
ah Newren
t603
6
, t6043: incre
a
se code cov
e
r
age for file
c
ollision
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah Newren
merge-recursive: improve rename/rename(1to2)/add[/add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elij
a
h
Newren
mer
g
e
-rec
u
rsi
v
e: u
s
e
h
and
l
e_file_collision fo
r
add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah Newren
m
e
rge-rec
u
r
s
ive
:
impro
v
e
handlin
g
for
r
ename/ren
a
me
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah
N
ewren
me
r
ge-recursive: fix
rename/add conflict ha
n
d
ling
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah
N
ewren
merge-recursive:
new function for better co
l
lid
i
ng
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah Newren
merge-recursive: increas
e
mar
k
er len
g
th w
i
th depth
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah
Newren
t6036,
t
6042:
t
estc
a
ses for rename collision of al
r
eady
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah Newren
t
6
0
42: add tests
for con
s
istency in file collision
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-10-22
Elijah Ne
w
ren
f
sck: mo
v
e fsck_h
e
ad_li
n
k(
)
to get
_
defaul
t
_heads()
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-10-18
Elij
a
h Newren
merge-r
e
cur
s
ive:
a
v
o
i
d
sho
w
ing conflicts with merge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-10-18
El
i
j
ah Newren
merge-recurs
i
ve:
i
mpro
v
e auto-merging
m
essages
w
ith
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-27
E
lijah Newren
commit: fi
x
erroneous
BUG, 'multip
l
e renames on the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
Elijah Newren
merge-
r
e
c
ursive: rename m
e
r
g
e_fil
e
_1
(
) a
n
d merge_content(
)
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
Elijah Newren
merge
-
re
c
ursi
v
e: remove f
i
nal remaining c
a
ller of merge_file
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
Elij
a
h Newren
mer
g
e-re
c
ursive
:
a
vo
i
d wrapper functio
n
w
hen un
n
ecessary
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
E
l
ij
a
h
N
ewre
n
merge-
r
ecursive: set p
a
ths correct
l
y when three-way
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-13
E
l
ijah N
e
wren
s
e
q
uencer: f
i
x
-
-
allow-empty-mes
s
age be
h
avio
r
, make
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-12
Elijah
Newren
upd
a
t
e
-
ref: allow
--no-de
r
ef with --
s
tdin
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-12
Eli
j
a
h
Newren
update-r
e
f: fix type of update_fl
a
g
s
variable to m
a
tch
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-11
Elij
a
h Newr
e
n
rerer
e
: avoid buffer ov
e
rrun
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-11
Elija
h
Newren
t420
0
: demonstrate rer
e
r
e s
e
gfaul
t
on specially crafted
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-05
Elijah Newren
Remove superfluous t
r
ailing sem
i
colons
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
Elijah N
e
wren
am: av
o
id
directory re
n
ame detection wh
e
n c
a
lli
n
g
recursive
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
Elij
a
h Newren
merge-recursive: add ab
i
l
ity
to turn
o
ff d
i
rectory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
El
i
jah Newren
t3
4
0
1: ad
d
a
nother dire
c
tory r
e
name testcase for rebase
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Newren
Remove forwa
r
d
dec
l
aratio
n
of
an enum
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah New
r
en
compat/precomp
o
s
e_utf8
.
h:
use more comm
o
n
include guard
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah
N
ewren
u
r
lmatch
.
h: fix include guard
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
E
lijah
Newren
Move
d
efi
n
i
t
ion of enu
m
b
ranch_track
fro
m
ca
c
he
.
h to
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
El
i
j
ah Newren
al
l
oc: m
a
ke alloc
a
te_all
o
c_sta
t
e and
clear_alloc_stat
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Eli
j
a
h Newren
Add missing include
s
and forwa
r
d declara
t
ions
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newren
git-update-index
.
txt: reword possibly co
n
fu
s
i
ng example
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newren
t7406: a
v
oid using test_must_fa
i
l f
o
r commands
o
ther
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newre
n
t7406: prefe
r
test_* helper functions to test -[
f
eds]
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elij
a
h New
r
e
n
t7406: avoid
hav
i
n
g
git commands u
p
s
tream of a pipe
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newren
t7406: s
i
mp
l
i
f
y by using
diff --name-o
n
ly
i
nste
a
d of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newren
t7406: f
i
x cal
l
that was failing fo
r
the wrong reason
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-06
Elijah
N
ewren
t3031: update
test descripti
o
n to mention des
i
red
b
ehavi
o
r
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-31
Elijah Newren
rea
d
-ca
c
he: fix directory/file conflict handling in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-31
Elijah Newren
t1
0
1
5: demonst
r
ate d
i
rectory/file conflic
t
re
c
ove
r
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-27
E
l
ijah Newre
n
mer
g
e
-
recursiv
e
: preserve skip_wo
r
k
t
re
e
b
it
w
hen
n
e
c
essary
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
El
i
jah New
r
en
t74
0
5: verify 'merge --abort
'
wo
r
ks after submodule
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newr
e
n
t7405: add a directory/submodule co
n
fl
i
c
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
E
l
ijah Newren
t7405: add a file
/
submodul
e
conflic
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah N
e
wren
merge: f
i
x
m
isle
a
ding pre-m
e
rg
e
check
d
o
cumen
t
ation
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
E
lijah Newr
e
n
mer
g
e-recursive:
e
nforce rule
t
h
a
t index
m
a
t
ches
head
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elija
h
Newren
t
6
044: a
d
d more testca
s
es with
s
taged
c
h
a
nges before
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Eli
j
ah Newren
merg
e
-recurs
i
ve:
f
ix assumption that h
e
ad t
r
ee being
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
merge-recurs
i
ve:
m
ake sure w
h
en
we say we abort that
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
E
l
ijah Newren
t
6
044: add a te
s
tcase for
inde
x
mat
c
hing head, wh
e
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah
Newren
t60
3
6: add a failed c
o
nf
l
ict detec
t
ion case: regular
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-06
Elijah N
e
wren
t6036:
a
d
d lots of detai
l
f
or
d
i
rectory/file co
n
f
l
i
cts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
E
l
ij
a
h
N
e
wren
t6042
:
ad
d
testcase c
o
v
e
ring long chains
of ren
a
me
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
E
lijah Newren
t604
2
:
a
dd test
c
ase cove
r
ing
ren
a
me/rename(2to1)/delete
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah
N
ewren
t6042:
add testcase covering
rena
m
e/add/delete conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
E
lijah
N
ewren
t6036: add a fa
i
led confl
i
ct detection case with c
o
nflicting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t6036:
a
dd
a failed confli
c
t detect
i
on case
w
ith submodule
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Eli
j
ah Ne
w
ren
t603
6
: add a failed conflict detection case
wit
h
submodu
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 de
t
e
c
tion case with symlink
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
E
l
ijah Newren
t6
0
3
6
:
a
d
d
a fail
e
d c
o
n
f
lict d
e
te
c
tion case with syml
i
nk
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
El
i
jah Ne
w
r
en
t
6044: verify that merges
expec
t
ed to abort act
u
al
l
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elija
h
Newren
i
n
dex_h
a
s_
c
ha
n
ge
s
()
:
avoid assu
m
ing operat
i
ng on the_index
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elija
h
Newren
read-cache
.
c
:
mov
e
i
n
dex_has_changes() from merg
e
.
c
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-28
Elijah Newren
t5407: fix t
e
st to cover int
e
n
ded arguments
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-28
Elijah Ne
w
r
en
apply: fix grammar error in comment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah
N
e
wren
git-rebase-
-
merge: modernize "git-$c
m
d" to "git $cmd"
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newr
e
n
Fi
x
u
se
of st
r
ateg
y
options with i
n
t
e
ractive reb
a
ses
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Eli
j
ah Newren
t3418: add
t
es
t
case showing p
r
oblems wit
h
r
e
b
ase -i
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Eli
j
ah
New
r
en
git-re
b
ase: ma
k
e --allow-empty-message the d
e
fa
u
lt
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
t3401: add directory rena
m
e testcases for rebase an
d
am
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newre
n
git-rebase
.
txt: document beha
v
iora
l
di
f
ferences between
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
directory-rename-detectio
n
.
txt: t
e
c
hnic
a
l docs
o
n
abilitie
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah N
e
w
ren
git-rebase
.
t
x
t
: addr
e
ss
con
f
usion
betwe
e
n --no-f
f
vs
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newr
e
n
git-rebase:
e
rror o
u
t when incompatible op
t
ions passed
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newr
e
n
t3422: new te
s
tcases for che
c
king when
i
ncomp
a
tible
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-26
Eli
j
ah
N
ewren
g
it
-
rebase
.
sh: update
help messages
a bit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-26
Elijah Ne
w
ren
git-reb
a
se
.
t
xt: documen
t
inco
m
p
a
tible
o
p
t
ions
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-13
Elijah Ne
w
ren
RelNotes 2
.
18:
c
larify
w
here direct
o
ry ren
a
me
de
t
ecti
o
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elijah N
e
w
r
en
merge-recursive: add po
i
nter about undul
y
co
m
plex
l
ookin
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
E
lijah Newre
n
merge-recursive: rename c
o
n
flict_rename
_
*
() f
a
mily
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elijah Newr
e
n
merge-
r
ecu
r
sive: clarify the
r
ename_dir/REN
A
ME_
D
IR
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elijah Newren
merge
-
recursive: align labels with their respective
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elij
a
h Newre
n
mer
g
e-recur
s
iv
e
:
f
ix numerous argum
e
n
t
alignment is
s
ues
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
E
l
ijah Newren
merge-recursive: fix mis
c
ell
a
neous gramma
r
erro
r
in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-01
Elija
h
Newren
R
e
lN
o
tes: remove duplicate release note
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
El
i
jah Ne
w
ren
t6036: pref
e
r
t
est_
w
hen_finished to
ma
n
ual cl
e
anup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next