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
unpack_trees_options: free messages when done
2018-05-22
Martin Ågren
unpack_tree
s
_opti
o
n
s
: free
m
e
ssages whe
n
done
Helped-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-22
Junio C Hamano
argv-arra
y
: return the
pushed string
fr
o
m argv_push*
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-20
Elijah Newren
merge-r
e
cursive: prov
i
de pair
of `unpack_tree
s
_{start
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-20
Mar
t
i
n
Åg
r
e
n
merge: setup `opts` later in
`checko
u
t_fast_forwa
r
d()`
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
Ben Peart
m
e
rge: pass
a
ggressi
v
e when
r
e
name dete
c
t
io
n
is turn
e
d off
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
B
e
n
Peart
m
e
r
ge: add merge
.
rena
m
es config setting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
Ben Peart
merge: update d
o
cumen
t
ation for {
m
er
g
e,diff}
.
r
en
a
m
e
Limit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
El
i
jah
N
e
w
r
e
n
merge-recursive: fix
check for sk
i
pab
i
lity of working
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah N
e
wren
merge-r
e
cursive:
m
ake "Auto
-
mergin
g
" co
m
me
n
t show for
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
N
e
w
ren
m
erge-rec
u
r
s
ive: fix remainder of was
_
d
irty()
t
o use
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ijah Newren
me
r
g
e-rec
u
rsive: fix
was_tracked() to quit lyin
g
wit
h
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
t6046: tes
t
case
s
chec
k
i
n
g whether updates can be sk
i
pped
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
Eli
j
ah Newren
merge-recursive: avoid
trig
g
ering add_c
a
cheinfo error
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
mer
g
e-recursive:
move more i
s
_dirty han
d
ling to merge_
c
onten
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
Eli
j
ah N
e
wren
merge-re
c
ursive:
i
mp
r
ove add_cach
e
info error
h
andling
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-
r
ecursive: avo
i
d spurious r
e
name
/
r
e
name
c
onfli
c
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
dir
e
ctory renam
e
detection: new tes
t
c
ases showcasi
n
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ijah Newren
mer
g
e
-
recursive: fix
rema
i
ning dir
e
ctory rename +
d
i
r
ty
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
El
i
jah Newren
me
r
ge-r
e
cursive:
fix overwri
t
ing dirty
f
iles
i
nvolved
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah N
e
wren
merge
-
recursi
v
e: avoid c
l
o
b
b
e
ring untr
a
cked files wit
h
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
N
ewren
merge-recursive: apply necessar
y
m
o
difications
for
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ijah Newren
mer
g
e-recu
r
siv
e
: wh
e
n comparing files,
d
on't incl
u
de
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge
-
re
c
u
rsive: check for file level conflicts th
e
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
E
l
i
j
ah Newr
e
n
merge-recursive: add computation of collisions
due
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elij
a
h
N
ewren
merg
e
-recursive
:
check for d
i
r
ectory level conflicts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
N
ewren
merge-recursive:
a
dd get_d
i
rectory
_
re
n
ame
s
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
El
i
j
a
h Newren
merge-recur
s
ive
:
m
a
ke a helper fu
n
ction fo
r
cl
e
anup
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elij
a
h New
r
en
merge-recu
r
siv
e
: spli
t
o
ut code for d
e
termining
diff_
f
ilepairs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
E
l
ijah Newren
m
erge-recu
r
siv
e
:
make !o-
>
detect_rename cod
e
path mor
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Ne
w
re
n
m
e
r
g
e-recursive: fi
x
lea
k
s o
f
allocated re
n
ames and
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
E
lija
h
Newren
merge-recursive
:
i
ntroduce
new function
s
to h
a
ndle
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
mer
g
e-recursiv
e
: move the get_renames() function
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
El
i
jah Newren
di
r
ectory r
e
na
m
e detectio
n
: tests for hand
l
in
g
overwriting
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
director
y
rename detection: tests for hand
l
i
n
g ove
r
w
r
i
tin
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah
N
ewren
di
r
ectory
r
e
name detection: miscel
l
aneous te
s
tcases
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Ne
w
ren
directory
r
ename detection
:
testc
a
ses exploring possibly
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
d
i
re
c
tory rename detection:
more involved e
d
ge/corn
e
r
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
El
i
jah Newren
directory rename detection: test
c
ases check
i
ng which
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Ne
w
r
e
n
direct
o
ry renam
e
d
etection: files/directories in the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah
Newren
directory
rename detecti
o
n: partiall
y
rename
d
direc
t
o
r
y
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
E
l
ijah New
r
en
d
i
re
c
t
or
y
rename
d
etection:
testcas
e
s to avoid takin
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newre
n
d
i
rectory rename
d
etection: directory splitting testcases
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elija
h
Newren
directory
rename de
t
ecti
o
n
:
b
asic test
c
a
s
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-11
J
u
ni
o
C
H
a
mano
Merg
e
br
a
nch 'svn/aut
h
ors-prog-2' of gi
t
://
b
ogomips
.
.
.
commit
|
commitdiff
|
tree
2018-04-11
Junio C Hamano
R
evert "M
e
rg
e
branch
'en/r
e
name
-
direct
o
r
y
-detection'"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-11
Ju
n
io C Hamano
The third batch for
2
.
18
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-11
Junio C Hamano
Merge branch 'e
b
/cred-helper
-
ignore-sigpipe'
commit
|
commitdiff
|
tree
2018-04-11
Junio C H
a
mano
Merge bra
n
ch 'lv/tls-1
.
3'
commit
|
commitdiff
|
tree
2018-04-11
Ju
n
io
C
Hamano
Merge branc
h
'pk/t
e
st-avoid-p
i
pe-hiding-exi
t
-sta
t
us'
commit
|
commitdiff
|
tree
2018-04-11
Junio C Ham
a
no
Merge branch 'rs/
s
tatus-with
-
removed
-
s
u
b
mod
u
le'
commit
|
commitdiff
|
tree
2018-04-11
J
u
n
io
C
Hamano
M
erge
b
ranc
h
'nd/combined-test-he
l
per'
commit
|
commitdiff
|
tree
2018-04-11
Junio C Hamano
Merge branch
'sb/packfiles-
i
n-r
e
pository'
commit
|
commitdiff
|
tree
2018-04-11
Junio C H
a
mano
Mer
g
e
b
ra
n
ch 'sb
/
obj
e
c
t
-stor
e
'
commit
|
commitdiff
|
tree
2018-04-11
Junio
C
Hamano
Merge bra
n
c
h
'
j
c
/test-mu
s
t-be
-
emp
t
y'
commit
|
commitdiff
|
tree
2018-04-11
J
u
nio C Haman
o
Merge bra
n
ch
'
cc/perf-aggreg
a
te-sort'
commit
|
commitdiff
|
tree
2018-04-11
Junio C Hamano
Me
r
ge branch 'ab/doc-hash-brokenness'
commit
|
commitdiff
|
tree
2018-04-11
Junio C
Hamano
Mer
g
e branch '
b
c/
h
ash
-
ind
e
pendent-t
e
sts'
commit
|
commitdiff
|
tree
2018-04-11
J
u
nio C Hamano
Merg
e
branch 'ab/d
r
op-con
t
rib-ex
a
mples'
commit
|
commitdiff
|
tree
2018-04-10
Junio C
H
amano
The se
c
ond batch for 2
.
18
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-10
Junio C Hamano
Merg
e
branch 'ys/bisect-object-id
-
miss
i
ng
-
conversion
.
.
.
commit
|
commitdiff
|
tree
2018-04-10
Jun
i
o C
H
amano
Me
r
ge br
a
nch 'yk/filte
r
-branch-non-comm
i
tti
s
h-re
f
s'
commit
|
commitdiff
|
tree
2018-04-10
Junio
C Ha
m
ano
Mer
g
e
branc
h
'nd/trace-with-env'
commit
|
commitdiff
|
tree
2018-04-10
Jun
i
o
C Hamano
M
erge bran
c
h 'nd/
p
arse
o
p
t
-
completi
o
n-more
'
commit
|
commitdiff
|
tree
2018-04-10
J
unio C Hamano
Mer
g
e branch
'ds/bsearch-hash'
commit
|
commitdiff
|
tree
2018-04-10
Jun
i
o C Haman
o
Merge
br
a
nch 'ws/rebase-p'
commit
|
commitdiff
|
tree
2018-04-10
Junio C Hamano
Merge branch 'jk/di
f
f
-
highlight-graph-fix'
commit
|
commitdiff
|
tree
2018-04-10
Junio C Ham
a
no
Me
r
ge branch '
n
d/remove-
i
g
n
o
re-en
v
-fie
l
d'
commit
|
commitdiff
|
tree
2018-04-10
Jun
i
o C
H
amano
M
e
rge branch 'ps/contains-id
-
err
o
r-mes
s
age'
commit
|
commitdiff
|
tree
2018-04-09
Junio C Hamano
The first b
a
tch
f
or 2
.
18 cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-09
Junio C Hamano
M
erge branch 'tg/stash-untrac
k
ed-wi
t
h-pathspec-fix'
commit
|
commitdiff
|
tree
2018-04-09
Ju
n
io C Ha
m
ano
Merge branch 'nd/worktree-prune'
commit
|
commitdiff
|
tree
2018-04-09
Junio C
Hamano
Merge
b
ranch 'bc/object-id'
commit
|
commitdiff
|
tree
2018-04-09
Junio C
Ha
m
ano
Merge
branch '
m
a
/shor
t
l
og-revpars
e
'
commit
|
commitdiff
|
tree
2018-04-09
Junio C Hamano
M
erge
b
ranch 'ab/ins
t
all-s
y
mlinks'
commit
|
commitdiff
|
tree
2018-04-09
Junio C Ha
m
ano
Merge branch
'ml/filt
e
r-
b
r
a
nch-no-op-error'
commit
|
commitdiff
|
tree
2018-04-09
Junio C
H
aman
o
Merge
branch 'ab/pcre-v2'
commit
|
commitdiff
|
tree
2018-04-09
Junio C Hamano
Merge branch '
t
i/fetch-everything
-
local-optim'
commit
|
commitdiff
|
tree
2018-04-09
Junio
C Hamano
Me
r
ge branch 'en/rename-d
i
rectory-detection'
commit
|
commitdiff
|
tree
2018-04-02
Jun
i
o
C
Hamano
G
i
t 2
.
17
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-02
Junio
C Hamano
M
e
r
g
e tag 'l10n-2
.
17
.
0-rnd1' of git
:
//github
.
com/git
.
.
.
commit
|
commitdiff
|
tree
2018-04-02
Ju
n
i
o
C
Haman
o
Merge branch 'pw/add-p-singl
e
'
commit
|
commitdiff
|
tree
2018-04-01
Ævar Arnfjörð Bjarmason
add -p
:
f
i
x 2
.
17
.
0-r
c
*
regression due to m
o
ved c
o
de
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-29
Junio C Haman
o
Me
r
ge branch 'jh
/
p
artia
l
-clone'
commit
|
commitdiff
|
tree
2018-03-29
Jonathan
N
ieder
u
pload-pack:
d
isable obj
e
ct filtering
w
hen disa
b
led
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-29
Erik E Br
a
dy
cre
d
ential: i
g
nor
e
S
I
GPIPE when writi
n
g to credential
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-29
L
o
g
anaden
Velvindron
h
t
t
p
:
allow
use of TLS 1
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-28
René Scharfe
submodu
l
e: check for NULL return of get_submodul
e
_ref_store()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-28
J
unio
C Hamano
Git
2
.
1
7-
r
c2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-28
Junio C Hamano
Merge bran
c
h
'
tg/s
t
ash-doc-typofix'
commit
|
commitdiff
|
tree
2018-03-28
J
u
nio C Hamano
Mer
g
e
b
r
a
nc
h
'pc/su
b
module-helper'
commit
|
commitdiff
|
tree
2018-03-28
J
unio C Hamano
Merge branch 'nd/pars
e
opt
-
comple
t
ion'
commit
|
commitdiff
|
tree
2018-03-28
Pr
a
tik Ka
r
ki
t
es
t
: avoid pipes in git
r
e
l
ated commands for t
e
st
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-28
Stefan Beller
submodule deinit: han
d
le
n
on existin
g
pathspecs grac
e
fully
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-28
Thomas Gu
m
merer
git-stash
.
txt: re
m
ove extra square bracket
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-28
Ævar Arnfj
ö
r
ð
Bjarmason
do
c
h
a
sh-functi
o
n-transitio
n
: c
l
arify what SHAtte
r
ed
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-28
Ævar Ar
n
fjörð
Bjarmason
doc hash-function-transition:
c
lar
i
fy how
old
e
r git
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-28
SZEDER
G
ábor
t
e
st_must_be_empty: s
i
m
p
l
ify file existence check
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-28
Chri
s
tian Couder
perf/aggreg
a
t
e: add --sort-by=regressio
n
option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-28
C
hr
i
st
i
an Couder
perf/agg
r
egate
:
add dis
p
lay_dir()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-27
Nguyễ
n
Thái Ngọc Duy
t/helpe
r
: merge
t
es
t
-writ
e
-cache into test
-
to
o
l
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next