repo.or.cz
/
git
/
git-svn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'js/pack-objects-mutex-init-fix' into maint
2018-09-27
Elija
h
Newren
commit: fi
x
erroneou
s
BUG, '
m
ultiple renames on t
h
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-13
Elijah Newren
seq
u
encer: fix
-
-all
o
w-empty-message be
h
avior, make
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-12
E
l
ijah Newren
u
pdate-re
f
:
a
l
low
-
-no-deref wit
h
-
-stdin
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-12
Elijah Newren
update-ref: fix t
y
pe of
updat
e
_flags
v
ariable to ma
t
ch
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-11
Elij
a
h Ne
w
ren
rerere: avoid
buffer overr
u
n
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-11
Elijah Newren
t4200: demonstrate
r
erere
segfa
u
lt on s
p
ecially crafted
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
Elijah
N
e
w
ren
a
m
: avoid
d
irectory rename detecti
o
n when calling recursive
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
Eli
j
a
h
Newren
merge-recur
s
ive: a
d
d ability to turn of
f
di
r
e
c
t
ory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
E
l
ijah Newren
t
3401
:
add another d
i
rectory rena
m
e testcase fo
r
rebase
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
E
l
ijah Newren
R
emove forward
d
eclarat
i
on of an enum
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Ne
w
ren
co
m
p
at/preco
m
pose_ut
f
8
.
h: use more
c
ommon
i
ncl
u
de gu
a
rd
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elija
h
Newren
urlmat
c
h
.
h:
f
ix
i
nclude
g
uard
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Newren
Move
definition
o
f enum
branch_tra
c
k
f
rom
c
ache
.
h to
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Newren
all
o
c: make all
o
ca
t
e_alloc_st
a
te and
clear_al
l
oc
_
stat
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Newren
Add m
i
ssing in
c
ludes and forward de
c
larations
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah
N
ewre
n
git-update-index
.
txt: reword po
s
sibly confusing example
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah N
e
wren
t7406: avoid
using test_must_f
a
il fo
r
command
s
other
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newre
n
t7406:
prefer test_* help
e
r functions t
o
test -[feds]
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newren
t7
4
06: avoid havi
n
g g
i
t comman
d
s upstream of a pipe
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newren
t7406: simplify b
y
using diff --na
m
e
-only
i
nst
e
ad of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah N
e
wren
t
7406: fix ca
l
l
that
w
a
s
f
a
iling
for the wrong reason
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-06
Elijah Newren
t3031: update t
e
st descriptio
n
to me
n
tion
d
esire
d
behavior
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-31
El
i
jah New
r
e
n
read-cac
h
e: fix dir
e
ctor
y
/
f
ile conflict h
a
ndling in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-31
Elijah
New
r
en
t101
5
:
demonstrate
d
irect
o
r
y
/file con
f
l
i
c
t r
e
cove
r
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-27
Elijah Newren
mer
g
e-recursive: preserve skip_work
t
ree bit when neces
s
a
r
y
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
t74
0
5: verify 'merge --abort'
w
orks a
f
te
r
submodu
l
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
t7405: add a directory/submodule
c
onflict
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah New
r
en
t740
5
: add
a
file/s
u
b
m
odule
c
onflict
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
merge:
f
i
x
m
i
sleading
pre-merge
c
heck
documentation
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
m
erge-
r
ecursi
v
e:
enforce rule that index mat
c
h
e
s
head
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
E
l
ijah Newren
t6
0
4
4
:
add more
t
est
c
ases wit
h
staged
c
hanges before
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
merge-re
c
urs
i
ve
:
fi
x
assumption that
h
ead tre
e
being
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
merge-recu
r
sive
:
m
a
ke
s
ure when
we say we abort that
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
t6044: a
d
d
a t
e
stcase for index matching h
e
ad, when
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Eli
j
ah N
e
wren
t
6036: add a failed confl
i
ct detect
i
on case: regular
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-06
Eli
j
a
h Newren
t6036: add
l
ots of detail for directory/file confl
i
cts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t6042: add
testcase covering lon
g
ch
a
ins
o
f rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Ne
w
ren
t
6042: add t
e
s
t
c
ase cov
e
rin
g
r
e
n
ame/
r
e
name(2to1)/delete
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t6
0
42: add test
c
ase covering
rename/add
/
d
e
l
ete co
n
flict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Ne
w
ren
t603
6
: add a
f
a
iled conflict detection
ca
s
e with
c
o
n
flicti
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t6036: add a failed c
o
nflict detection case with sub
m
od
u
le
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elij
a
h N
e
wren
t6036
:
ad
d
a
f
ail
e
d conflict detection
cas
e
with submodule
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elij
a
h
N
e
wren
t
6
036: add
a
faile
d
conflict detection case with syml
i
nk
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Eli
j
ah Newr
e
n
t
6036:
add
a
failed conflict detection case with symlink
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t6044: verify that m
e
r
ges expected to a
b
ort a
c
tually
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
El
i
j
a
h Newren
i
n
dex_h
a
s
_changes(): avoid ass
u
m
ing
o
pera
t
ing on th
e
_index
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elija
h
Newren
read-cache
.
c: m
o
ve index_has_changes() f
r
om merg
e
.
c
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-28
Eli
j
ah
N
ewren
t5407: fix test to cov
e
r intended arguments
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-28
E
lijah Newre
n
app
l
y: fix gramma
r
error i
n
comment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
gi
t
-
rebase--
m
erge:
m
o
d
e
rnize "git-$cmd" to "gi
t
$cmd"
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
El
i
jah N
e
wren
Fix use of strategy opti
o
ns with interactive rebases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Ne
w
r
e
n
t3418: add te
s
tcase showing p
r
oblems
w
ith rebase -i
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
E
l
ijah Newren
git
-
rebase: m
a
ke --allow
-
empty-mess
a
g
e
the de
f
ault
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elij
a
h
Newren
t3401: add directory re
n
ame t
e
s
tcases for rebase and am
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
git-reba
s
e
.
t
x
t: docume
n
t beha
v
ioral
d
iff
e
rences b
e
t
w
een
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newr
e
n
directory
-
r
ename-detection
.
txt: technical docs
on abil
i
ti
e
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
E
l
ija
h
Newren
g
i
t-rebase
.
txt: ad
d
r
ess
c
onfusi
o
n be
t
ween --no-ff vs
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elij
a
h Newr
e
n
g
it-rebase: error out when
i
nc
o
m
pati
b
le opt
i
ons passed
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah New
r
en
t34
2
2: new testcase
s
for c
h
ecki
n
g
when incompa
t
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
:
updat
e
h
e
lp mess
a
ge
s
a bit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-26
Eli
j
ah Newren
git-reb
a
s
e
.
txt: document incompatible options
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-13
Elijah N
e
wren
R
elNotes
2
.
18: cl
a
r
ify w
h
ere directory rename detectio
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
El
i
jah Newren
merge
-
recursive: a
d
d pointe
r
about unduly complex look
i
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elijah New
r
en
merg
e
-
r
ecu
r
sive: rename conflict_rename_
*
() family
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
E
lija
h
Newren
merg
e
-rec
u
r
siv
e
: clarify the rename_dir/RE
N
AME
_
DIR
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elijah Newren
m
e
rge-recursive
:
align labels with their respective
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elijah N
e
wren
m
erge-recursi
v
e: fix n
u
merous argum
e
nt alignment issues
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elija
h
Newren
merge-recursive: fi
x
misce
l
la
n
eous g
r
amma
r
error in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-01
Elijah Ne
w
r
en
RelNot
e
s
:
re
m
o
ve duplicate release note
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah Ne
w
ren
t6036:
pref
e
r tes
t
_when_finished to ma
n
ual cleanup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
E
lijah Newren
t
60
3
6
, t60
4
2: pr
e
fer test_
c
mp to sequences of test
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah Newren
t6036, t6042: prefer test_path_is_file, tes
t
_path_is_mis
s
ing
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah
N
ewren
t6036, t604
2
: use tes
t
_l
i
ne_count instead of wc -
l
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah Newren
t6036
,
t604
2
:
u
s
e
t
est_
c
r
e
ate_repo to keep tests independent
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-25
Eli
j
ah Newren
r
ev-parse: check lookup'
e
d co
m
m
it reference
s
for NU
L
L
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-20
Elijah Newr
e
n
merge-r
e
cu
r
sive: provi
d
e
p
air
of `unpack_trees_{start
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Eli
j
ah Newren
merge
-
recursive: fix check
for skipabil
i
ty o
f
working
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
Ne
w
ren
merge-recursive: make "Auto-merging"
comment
s
h
ow for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge
-
recursive: fix remainder of was_dirty
(
) to use
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Ne
w
ren
merge-recursive: fix
w
as_track
e
d() to quit lying with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
t6046: testcas
e
s ch
e
cking whether updates can be sk
i
pped
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
Ne
w
r
e
n
m
e
r
ge-
r
ecursive: av
o
id
t
rigger
i
ng add_cachein
f
o error
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newr
e
n
merge-recursi
v
e: mov
e
m
o
re is_dirty h
a
ndling to mer
g
e
_
c
o
nten
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elij
a
h Newr
e
n
mer
g
e-recursive: improve add
_
cacheinfo error handling
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
N
ewren
mer
g
e-recursive: avoid spurious
re
n
ame/rename conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
direc
t
ory renam
e
detection: n
e
w t
e
stcases sh
o
wcasi
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
El
i
j
a
h
Newren
merge-recursive
:
fi
x
remainin
g
d
irect
o
ry rena
m
e + dirty
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newr
e
n
m
e
rge-rec
u
rsive: fi
x
overwri
t
i
n
g dirty
files
i
nvolved
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
m
e
rg
e
-
r
ecursive: avoid clob
b
ering unt
r
a
ck
e
d files w
i
th
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
i
jah
Newre
n
merg
e
-re
c
u
rsive: apply necessary modifications for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
Newre
n
mer
g
e-r
e
cursive: when
compar
i
ng files, don't include
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
lij
a
h Newr
e
n
m
erge-
r
e
c
u
rs
i
ve: check for file l
e
vel co
n
fli
c
ts the
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
N
ewren
m
e
r
g
e-
r
ec
u
rsive: add comput
a
ti
o
n of colli
s
ions due
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recu
r
sive:
chec
k
f
o
r direc
t
or
y
level conf
l
icts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Eli
j
ah Ne
w
ren
mer
g
e
-
r
ecursive: add get_directory
_
renam
e
s()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-02
Elijah Newren
unp
a
c
k
_trees: fi
x
br
e
akage
w
hen
o
->src_i
n
de
x
!
=
o-
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-25
Eli
j
ah Newren
Mak
e
running git under
other debugger-like programs
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah
N
ewren
merge-recursive: make a he
l
per
f
unction for
cleanup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
merge-
r
ecurs
i
ve
:
split out code for
determining diff_f
i
l
epa
i
rs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
lij
a
h Newren
m
e
rge-recurs
i
ve:
m
ake !o->detect_
r
ename codepath m
o
re
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next