repo.or.cz
/
git
/
debian.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
directory rename detection: new testcases showcasing a pair of bugs
2018-05-08
Elijah Newren
direc
t
ory renam
e
detection:
new testcas
e
s showcasi
n
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge
-
recursive: fix
r
e
ma
i
nin
g
dire
c
tory rename + dirty
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newre
n
merge
-
recursive:
f
ix overwriting dirt
y
files involved
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
Eli
j
ah Ne
w
ren
merge
-
re
c
ursiv
e
: avoid
c
lobbering untracked files w
i
th
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
N
e
w
r
e
n
merge-recursive
:
a
p
p
l
y
necess
a
r
y modific
a
t
i
o
n
s f
o
r
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ijah New
r
en
m
erge-recursive: wh
e
n
c
o
m
paring fil
e
s, don't include
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
Eli
j
ah Newren
merge-recursive:
check for
f
ile l
e
v
e
l conflicts then
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recursive: add co
m
p
u
tation of collisions due
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ijah Newren
merge
-
recursive: che
c
k for di
r
ecto
r
y lev
e
l c
o
nflict
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
E
li
j
ah Newre
n
merg
e
-re
c
u
rsive:
a
d
d
get_directory_renames()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elija
h
Newren
merge-recursive: make a h
e
lp
e
r functio
n
for cleanup
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
E
l
i
jah Newren
m
erge-re
c
ursive: s
p
lit out code
f
o
r determi
n
ing diff_filepa
i
rs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
merge-
r
ecur
s
ive: make !o->dete
c
t_rename codepat
h
more
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah
N
ewre
n
m
e
rge-rec
u
rsive: fix leaks of alloc
a
ted rena
m
es an
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
merge-rec
u
rsiv
e
: int
r
oduce new functions to
h
a
n
dle
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
merge-re
c
ursi
v
e: move the ge
t
_
r
enames
(
) functi
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah N
e
w
ren
directo
r
y rename detec
t
ion: tests for handl
i
n
g overwr
i
ting
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
E
l
ija
h
Newren
directory
r
ename d
e
t
ection:
t
ests for
handling overwriting
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
E
l
ijah N
e
wren
d
i
rect
o
ry
r
ena
m
e
de
t
ection
:
miscellaneous
testcases
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
directory re
n
ame detect
i
on:
t
e
stcases exploring possib
l
y
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
El
i
jah
N
ewren
directory rename d
e
tection: more involve
d
edge/corner
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
E
lij
a
h
Newren
directory re
n
a
me detecti
o
n
:
testca
s
es ch
e
cki
n
g w
h
ich
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
El
i
jah New
r
en
directory rename d
e
te
c
tion:
f
iles/
d
irectories in the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah
Newren
directory rename dete
c
tion: partially renam
e
d directory
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Ne
w
ren
dir
e
ctory ren
a
m
e
det
e
ctio
n
: testcases to avoid taki
n
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Ne
w
re
n
directory re
n
ame d
e
t
e
ction: directory
s
p
litting testc
a
ses
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
directory
r
ename
detection: basic test
c
ases
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-11
J
u
nio C Hamano
Merge branc
h
'svn
/
a
u
thors-prog-2' of gi
t
://
b
o
g
o
mips
.
.
.
commit
|
commitdiff
|
tree
2018-04-11
Ju
n
io C Ha
m
ano
Revert "
M
erge branch 'en/rename-director
y
-detection'"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-11
Junio
C
Haman
o
T
he
third batch for 2
.
1
8
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-11
Junio C Ha
m
ano
Merge br
a
nch 'eb/cred-hel
p
er-ig
n
ore-sigpipe'
commit
|
commitdiff
|
tree
2018-04-11
Junio C Hamano
Merge bran
c
h 'lv
/
tls-1
.
3'
commit
|
commitdiff
|
tree
2018-04-11
J
unio
C
Hamano
Merge
branch 'pk/test-
a
v
o
id-pipe-
h
iding-exit-st
a
tu
s
'
commit
|
commitdiff
|
tree
2018-04-11
Junio C
Hamano
Merge branch 'rs/status-with-re
m
oved-
s
u
bmodule'
commit
|
commitdiff
|
tree
2018-04-11
Junio C Hamano
Me
r
ge branch 'nd/combin
e
d-test-helper'
commit
|
commitdiff
|
tree
2018-04-11
Jun
i
o C Hamano
Merg
e
branch 'sb
/
p
ackf
i
les-in-rep
o
sitory'
commit
|
commitdiff
|
tree
2018-04-11
Junio C Hamano
Mer
g
e b
r
anch 'sb
/
objec
t
-store'
commit
|
commitdiff
|
tree
2018-04-11
Junio
C
Ha
m
a
n
o
Mer
g
e
branch
'jc/t
e
st
-
must-be-empt
y
'
commit
|
commitdiff
|
tree
2018-04-11
Junio C Hamano
M
e
rge branch 'cc/pe
r
f-aggregate-sort'
commit
|
commitdiff
|
tree
2018-04-11
Juni
o
C
Ha
m
ano
Merge branc
h
'ab
/
doc-hash-brokenness'
commit
|
commitdiff
|
tree
2018-04-11
Junio C
H
amano
Merge branch 'bc/hash-independent-t
e
sts'
commit
|
commitdiff
|
tree
2018-04-11
Junio C
Haman
o
Me
r
ge branch
'
a
b/drop-contrib-exa
m
ples'
commit
|
commitdiff
|
tree
2018-04-10
Ju
n
io C
H
amano
The s
e
cond ba
t
ch for 2
.
18
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-10
Juni
o
C Hamano
Mer
g
e branch 'ys/bisec
t
-objec
t
-id-missing-convers
i
o
n
.
.
.
commit
|
commitdiff
|
tree
2018-04-10
Juni
o
C Hamano
Merge bra
n
ch 'yk/filter-bra
n
ch-non-committish-refs'
commit
|
commitdiff
|
tree
2018-04-10
Juni
o
C
Hamano
Merg
e
branch 'nd/trace-with-env
'
commit
|
commitdiff
|
tree
2018-04-10
J
unio C Hamano
Merge branch 'nd/parseopt-co
m
p
l
eti
o
n
-mor
e
'
commit
|
commitdiff
|
tree
2018-04-10
Junio C Hamano
Merge branch '
d
s/bse
a
rch-hash'
commit
|
commitdiff
|
tree
2018-04-10
Ju
n
io C Ha
m
ano
Merge
b
ranch 'ws/rebase-p'
commit
|
commitdiff
|
tree
2018-04-10
Junio C
H
a
m
ano
Merge br
a
n
c
h 'jk/diff-high
l
ight-graph-fix'
commit
|
commitdiff
|
tree
2018-04-10
Junio C Ham
a
no
Merge branch 'nd/r
e
mov
e
-ignore-env-fi
e
ld'
commit
|
commitdiff
|
tree
2018-04-10
Junio C Ha
m
ano
Merge branc
h
'ps/contains-id-er
r
or-message
'
commit
|
commitdiff
|
tree
2018-04-09
Junio
C
Hamano
The firs
t
batc
h
for 2
.
18 cycl
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-09
J
unio C Hamano
Me
r
ge branch 'tg
/
st
a
sh-untr
a
ck
e
d-with-pathsp
e
c-f
i
x'
commit
|
commitdiff
|
tree
2018-04-09
Junio C Hamano
M
e
rge bran
c
h 'nd/worktree-prune'
commit
|
commitdiff
|
tree
2018-04-09
Junio C Hamano
Merge
branch 'bc
/
o
b
j
e
c
t
-
id'
commit
|
commitdiff
|
tree
2018-04-09
Junio C
H
amano
M
e
rge branch 'ma/shortlog-revparse'
commit
|
commitdiff
|
tree
2018-04-09
Junio C Ham
a
no
Merg
e
branch 'ab/inst
a
ll-syml
i
nks'
commit
|
commitdiff
|
tree
2018-04-09
Junio C Hamano
M
e
rge
branch
'
ml/filt
e
r
-
b
ranch-no-op-error'
commit
|
commitdiff
|
tree
2018-04-09
Junio
C Hamano
Merge branch
'ab/pcre-v2'
commit
|
commitdiff
|
tree
2018-04-09
Junio C
H
amano
Merge branch 'ti/fetch-everythin
g
-lo
c
a
l
-optim'
commit
|
commitdiff
|
tree
2018-04-09
J
unio C Hamano
Merge branch 'en/renam
e
-
directory-detection'
commit
|
commitdiff
|
tree
2018-04-02
Jun
i
o C Hamano
Git 2
.
1
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-02
Junio C Hamano
Me
r
ge tag 'l10n-2
.
1
7
.
0-rnd1'
of git://git
h
u
b
.
c
o
m
/git
.
.
.
commit
|
commitdiff
|
tree
2018-04-02
Jun
i
o
C
Hamano
Merge branch 'pw/ad
d
-p-single'
commit
|
commitdiff
|
tree
2018-04-01
Ævar Arnfjörð Bjarm
a
so
n
add -p
:
fix 2
.
17
.
0-rc* regres
s
ion due to
moved
c
ode
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-29
Junio C
Hamano
Merge
branch 'jh/partial-clone'
commit
|
commitdiff
|
tree
2018-03-29
Jona
t
han
N
ieder
u
pload-pack:
disabl
e
object
f
iltering when disabled
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-29
Erik E Brady
c
r
edential:
ignore SIG
P
IPE
when
w
riting to cr
e
d
e
ntial
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-29
Log
a
naden Vel
v
in
d
ron
h
t
tp: al
l
ow use of T
L
S
1
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-28
Re
n
é
S
c
h
a
rfe
submodule: check fo
r
NU
L
L ret
u
rn
of get
_
submo
d
ule_
r
ef_store()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-28
Juni
o
C Ha
m
ano
Git 2
.
17-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-28
Junio C Ham
a
n
o
Merg
e
bran
c
h 'tg/stash-d
o
c
-
typofix'
commit
|
commitdiff
|
tree
2018-03-28
J
unio C Hamano
Merge branch 'pc/
s
ubmodule-helper'
commit
|
commitdiff
|
tree
2018-03-28
Junio C Hamano
M
e
rge
b
ran
c
h 'nd/parse
o
pt-comp
l
etion'
commit
|
commitdiff
|
tree
2018-03-28
Pr
a
tik Karki
test: avoid pipes in git
r
e
lated comma
n
ds for tes
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-28
S
t
efa
n
Beller
submodu
l
e
d
einit: h
a
ndle non existi
n
g pat
h
specs grace
f
ully
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-28
Thomas Gummerer
git-stash
.
tx
t
: rem
o
ve ex
t
ra squa
r
e bracket
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-28
Ævar Arnfjö
r
ð Bjarmason
doc
hash-
f
unction-transition:
c
larify w
h
a
t
SHAtte
r
e
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-28
Ævar Arnfjörð Bjarmason
doc hash-fun
c
tio
n
-transition
:
clarify how older
g
its
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-28
S
Z
EDER Gábor
test_must_be
_
empty: si
m
pl
i
fy file e
x
i
s
t
ence check
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-28
Chris
t
ian Couder
p
e
r
f
/aggregate: add --sor
t
-by
=
regres
s
ion
o
ptio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-28
Ch
r
i
s
t
i
a
n Couder
per
f
/agg
r
egate: add display_dir()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-27
N
guyễn Thá
i
Ngọ
c
Duy
t/helper
:
merge test-wri
t
e
-
c
a
che
i
nto t
e
st-tool
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-27
N
g
u
yễn Thái Ngọc Duy
t/hel
p
er: mer
g
e test-wildmatch
i
nto test-tool
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-27
Nguyễn Thái Ngọc Duy
t/helper: merg
e
te
s
t-urlmatch-norm
a
l
i
zatio
n
into test
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-27
Ngu
y
ễn Thái Ngọ
c
Duy
t/hel
p
er: merge test-su
b
proce
s
s int
o
test-
t
ool
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-27
Ngu
y
ễn Thái
N
gọc Duy
t/helper: merge test-sub
m
odule-config i
n
t
o
t
e
st-to
o
l
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-27
Nguyễn
Thái Ng
ọ
c Duy
t
/
helper
:
merge
test-string-l
i
st into tes
t
-tool
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-27
N
guyễn
T
h
ái Ngọc D
u
y
t/helper:
merg
e
test-
s
trcmp-offset in
t
o
test
-
t
ool
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-27
Nguyễn Thái Ngọc
D
u
y
t/helper: merge
t
est
-
s
igchain into t
e
st-tool
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-27
Nguyễn Thái Ngọc Duy
t/
h
el
p
er: m
e
rge test-sha1-array into test-tool
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-27
N
guyễn Thái Ngọc Duy
t/helper: m
e
rge tes
t
-scrap-cac
h
e-tre
e
in
t
o tes
t
-tool
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-27
Nguyễn Thái
N
g
ọc Duy
t/
h
elper
:
merge test-run
-
command
i
nto
t
e
st-tool
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-27
Nguyễn Thái Ngọc
D
uy
t/h
e
lpe
r
: me
r
ge test-re
v
i
s
io
n
-walking
i
n
to tes
t
-tool
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-27
Nguyễn Thái Ngọc Duy
t/helper: merge test-regex into test
-
tool
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-27
Nguy
ễ
n
T
h
á
i
Ng
ọ
c Duy
t/help
e
r: merge test-
r
ef-store
in
t
o
tes
t
-tool
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-27
Nguyễn Thái
N
gọc Duy
t/helpe
r
: merge test-read-cac
h
e
into test
-
tool
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-27
Nguyễn
Thái Ngọc Duy
t/help
e
r: merge tes
t
-prio
-
queue into tes
t
-tool
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-27
Nguyễ
n
Thái Ngọc Duy
t/hel
p
er: merge
test-path-utils
i
nto test-tool
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next