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
read-cache.c: optimize reading index format v4
2018-09-13
Elijah
N
ew
r
e
n
sequencer: fix --a
l
l
o
w-empty-message behavior, ma
k
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-12
Elijah N
e
wren
update-ref: allow --no-deref with -
-
stdi
n
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-12
Elij
a
h
Newren
update-ref
:
fi
x
typ
e
of update_
f
lags va
r
i
a
ble to matc
h
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-11
Elijah Ne
w
ren
rere
r
e
:
av
o
id bu
f
f
er overrun
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-11
E
lijah Newren
t4200:
d
e
monst
r
ate rerere
s
e
g
f
ault on s
p
ecially crafted
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-05
Elijah Newren
Rem
o
ve su
p
erfluous
traili
n
g semico
l
ons
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
Elijah
Newren
a
m
:
avoid dir
e
ctory
r
ename detection when
c
alling recurs
i
ve
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
Elijah Newren
m
erge
-
recursive: add abilit
y
t
o
turn off directo
r
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
E
l
ij
a
h Newren
t34
0
1
:
a
d
d another di
r
ecto
r
y r
e
name testca
s
e fo
r
r
e
base
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
E
l
ijah Newr
e
n
Remov
e
for
w
ard
d
eclaration of an enum
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Eli
j
ah
Newren
compat/precompose_utf8
.
h: use
more co
m
mon include guard
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah
N
ewren
urlmatch
.
h:
f
i
x include guard
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Ne
w
ren
Move defin
i
tion
of enum
b
ranc
h
_track
from
cac
h
e
.
h to
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
E
l
ija
h
Ne
w
ren
alloc: m
a
ke allocate_alloc
_
state
a
nd clear_alloc
_
state
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Newren
Add mi
s
sing inclu
d
es and
f
o
rward de
c
laratio
n
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newr
e
n
git-update
-
index
.
txt: reword possibly confusing
example
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newren
t
7
4
06: avoid using test
_
must_fa
i
l f
o
r
commands oth
e
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah
Newren
t740
6
: prefer test_*
h
elper functions to test -[
f
e
d
s]
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah
Newren
t7406:
a
void having
git com
m
ands up
s
tream of a
p
ipe
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah
Newren
t7406: simplify by us
i
ng
d
iff
--name-
o
nly ins
t
ead of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elija
h
Newren
t7406: fix cal
l
t
h
at
was fai
l
in
g
for the wrong rea
s
on
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-06
Elijah Newren
t3031: up
d
a
te test descri
p
t
i
on to me
n
tion de
s
ired beh
a
v
ior
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-31
Elijah
N
ewren
read-c
a
che: fix dire
c
tory/file conflict handling in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-31
E
l
ijah Newren
t1015: demonstrat
e
dir
e
ctory/file conflict recovery
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-27
Elij
a
h
Newren
merge-recursive:
p
reserve
s
kip_work
t
ree
b
it
w
hen
n
ecess
a
ry
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
t7405: verify 'merge --a
b
o
r
t'
works after
submodule
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah
Newren
t7405:
add a di
r
ecto
r
y/submodu
l
e
conflict
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah N
e
wre
n
t7405: ad
d
a
file/submodule
c
onflict
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah N
e
w
ren
merge: fix mis
l
eading pre-merge chec
k
documentation
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
E
l
ijah
Newren
merge-recursive:
e
nforce rule that
index matche
s
head
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
E
l
ijah Newren
t6044:
add m
o
re testcases
w
it
h
st
a
ged changes before
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elija
h
N
ewren
merge-recursive:
f
ix assumption
t
hat head tree being
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah
N
ewre
n
merge-rec
u
rs
i
v
e:
mak
e
s
ure wh
e
n we s
a
y w
e
ab
o
rt
that
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
E
l
ijah
N
ewren
t6044: add a testcase
f
or index matching head, w
h
en
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
E
lijah Ne
w
r
e
n
t
6036:
add a failed conflict detecti
o
n ca
s
e: r
e
gular
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-06
Elijah Newren
t6
0
36: add lot
s
of detail for direct
o
r
y/file
conflicts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
E
l
ijah N
e
wren
t6042: a
d
d testcase co
v
ering lon
g
chains of re
n
ame
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t6042: ad
d
t
estcase covering rename/rename(2
t
o1)/delete
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Ne
w
r
e
n
t6
0
42: add testcase covering rename
/
add/delete con
f
l
i
ct
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah
Newren
t6
0
3
6: add a fail
e
d
c
o
n
flict de
t
ecti
o
n case with co
n
flicting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elij
a
h Newren
t6
0
3
6: add
a
fail
e
d conflic
t
detectio
n
case with submodule
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
El
i
jah Newren
t6036
:
add a failed con
f
l
ict detection case with
s
ub
m
odule
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah
N
ewren
t60
3
6: add a f
a
iled conflict
detection case with symlink
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t6036
:
add a
failed confl
i
ct detect
i
on ca
s
e
with symlink
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
E
lijah New
r
en
t6
0
44: v
e
rify that
m
erges expected to abort actually
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
index_
h
as_changes(): avo
i
d assum
i
ng
ope
r
a
t
in
g
on t
h
e_i
n
dex
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
read-cache
.
c: mov
e
index_
h
as_changes() from m
e
r
g
e
.
c
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-28
E
lijah Ne
w
r
e
n
t5407: fix test to cover intended argu
m
e
nt
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-28
Elijah Newre
n
apply: fi
x
grammar error in c
o
mment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newre
n
git-reb
a
se--merge: modernize "git-$cmd" to "
g
it $cmd"
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Eli
j
ah Newre
n
Fix use of st
r
ategy
o
ptions with interac
t
ive rebases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
t3418: add testcase showing problem
s
with rebase -i
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah N
e
wren
git-rebase:
m
ake --allow-empty-message t
h
e default
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newre
n
t3401
:
add directory re
n
am
e
testcases for rebase and am
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
El
i
jah Newren
g
i
t-rebase
.
txt: document
b
e
havi
o
ral d
i
fferences betwee
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Eli
j
a
h
Newre
n
director
y
-rena
m
e-
d
etection
.
txt: technic
a
l docs on abilities
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
git-rebase
.
txt: ad
d
ress confusion b
e
tween --no-f
f
vs
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newr
e
n
git-rebase: erro
r
o
u
t when incompatible
o
ptions
p
assed
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah New
r
e
n
t
3
4
22: new testcase
s
for chec
k
i
n
g
when inc
o
mpa
t
i
b
le
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-26
Elijah Newren
git-reba
s
e
.
sh: update h
e
lp messages a bit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-26
Elijah
Newren
git-rebase
.
txt: document i
n
c
o
mpat
i
ble options
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-13
Elija
h
Newren
Rel
N
otes
2
.
18:
c
larify w
h
ere
d
i
rector
y
rename
dete
c
ti
o
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
E
l
ijah Ne
w
ren
me
r
ge-recursive:
a
dd pointer abou
t
unduly complex lo
o
k
i
ng
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
E
lijah Newren
merge-recursive: rename conflic
t
_
rena
m
e_
*
(
) family
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
El
i
jah Newren
m
e
rge-r
e
cursive: clarify the
r
en
a
me_d
i
r/RENAME_DIR
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
El
i
jah Newr
e
n
merge-recursiv
e
:
a
li
g
n labels
with thei
r
resp
e
ctive
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elijah N
e
wren
merge-re
c
u
r
si
v
e: fix numerous argument alignment
i
ssues
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elijah Newren
mer
g
e-recu
r
sive: fix miscellaneous grammar error i
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-01
E
lijah Newre
n
RelNotes:
remov
e
d
u
plicate release note
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah Newre
n
t6
0
36: prefer t
e
s
t
_w
h
en_finishe
d
to manual
cleanup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elij
a
h Newr
e
n
t
6
036, t
6
042
:
prefer
test_cmp to
seq
u
ences of test
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elija
h
Newr
e
n
t6036, t6042: pref
e
r test_pat
h
_is_f
i
le, test_p
a
th_is_missi
n
g
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah Newr
e
n
t6036,
t
6042: use tes
t
_lin
e
_
count inst
e
ad
o
f
w
c -l
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Eli
j
ah Ne
w
ren
t6
0
36,
t6042: use test_creat
e
_
r
epo to keep test
s
inde
p
endent
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-25
El
i
jah Newr
e
n
rev-parse: check lookup'ed com
m
i
t
references for
N
ULL
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-20
El
i
jah
Newren
merge-re
c
ursive: provide
p
air of `unpack_trees_{start
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
lijah Newren
merge-r
e
cur
s
ive: fix ch
e
ck for sk
i
pability of working
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ijah New
r
en
m
er
g
e
-
r
e
cursive: make "
A
uto-merging" c
o
mment show for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
N
ewr
e
n
m
erg
e
-recursive
:
f
i
x
r
emainder of was_dirty(
)
to use
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah N
e
wren
m
erge-
r
e
cursive: fix w
a
s_tr
a
c
k
ed()
to quit lyi
n
g with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
N
ewren
t6
0
4
6
: testcases che
c
king
whet
h
er
u
pdates
can be sk
i
pped
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Ne
w
ren
merge-recur
s
ive:
a
v
o
i
d
trigge
r
ing
add_cach
e
info error
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elij
a
h Newren
merge-re
c
u
r
sive: move more i
s
_
d
i
r
ty handling to merge_content
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
me
r
ge-recu
r
siv
e
: improve add_cacheinfo e
r
ror handling
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
El
i
jah N
e
wren
merge-
r
e
cursive: avoid spurious rename/rename conf
l
ict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ijah Newren
directory rena
m
e
d
etection: ne
w
t
est
c
a
s
e
s
show
c
asing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah N
e
w
ren
mer
g
e-recu
r
sive
:
fi
x
remain
i
ng
d
i
rectory rename + dirty
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
mer
g
e-recursive: fix
o
ve
r
writing dirty files
i
n
volved
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elij
a
h Newren
merge-recursive: avoid clobbering untracked files with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newr
e
n
merge-recursiv
e
: apply ne
c
essary modifi
c
ations for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah N
e
wre
n
mer
g
e-r
e
cursiv
e
: when comparing
f
i
l
es, d
o
n't include
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah New
r
en
merge-re
c
ursi
v
e: ch
e
ck for
f
i
l
e l
e
ve
l
c
onflicts then
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah N
e
wr
e
n
m
e
rge-recursive: add computation
of collisio
n
s due
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-r
e
cursive: check fo
r
directory
le
v
el conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-
r
ec
u
rsive
:
a
d
d
get_d
i
r
e
ctory
_
renames()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-02
Elijah New
r
en
unpack_trees: fix breakage when o
-
>src_index
!= o-
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-25
Elijah Newren
Make runnin
g
git
under other de
b
ugger-like pr
o
gra
m
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Eli
j
ah Newren
merg
e
-recursive: m
a
ke
a
helper function
f
or clea
n
up
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
l
i
jah
Newren
merge-
r
e
c
urs
i
ve: s
p
lit o
u
t code f
o
r dete
r
mining diff_filepairs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah
N
ewren
merge-recursive
:
m
a
ke !o->dete
c
t_rename codepath more
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next