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
apply: learn to use a different index file
2016-09-07
Christian
Couder
apply: l
e
a
r
n to use a different index file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-09-07
Chr
i
stian Couder
apply: pass apply state to build_fake
_
ancestor()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-09-07
Christian Couder
ap
p
ly: refactor `git apply` option parsing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-09-07
Chris
t
ian C
o
uder
apply: ch
a
nge
error_r
o
u
t
ine when
silent
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-09-07
Christ
i
an Couder
u
s
a
ge:
add get_error
_
routine() a
n
d
g
e
t
_warn_routi
n
e()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-09-07
C
hristian Coud
e
r
usage: ad
d
set_warn_rou
t
ine()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-09-07
Christian Coud
e
r
apply: don't
pri
n
t o
n
stdout in verbosi
t
y_s
i
lent mode
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-09-07
Ch
r
ist
i
an Couder
apply: make i
t
poss
i
b
le to sil
e
ntly appl
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-09-07
Chr
i
stian
Couder
apply: u
s
e e
r
ror_errno(
)
wh
e
r
e possible
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-09-07
Chris
t
ian Couder
ap
p
ly: make some par
s
ing functions sta
t
ic again
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-09-07
Chris
t
ian
Couder
apply
:
move libi
f
ied c
o
d
e
fr
o
m
b
u
ilt
i
n/apply
.
c
to apply
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-09-07
Chri
s
t
ian Couder
apply: renam
e
and move opt consta
n
ts to apply
.
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-09-07
Christ
i
an Couder
bu
i
lt
i
n/a
p
ply: r
e
n
a
me op
t
ion parsin
g
funct
i
ons
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-09-07
Christian Couder
bui
l
tin/a
p
ply: make create_one_file()
r
e
turn -1 o
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-09-07
Christian Couder
builtin/ap
p
ly: make try
_
create_file() ret
u
rn
-1 on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-11
Ch
r
istian Co
u
der
builti
n
/apply: make w
r
it
e
_o
u
t_result
s
(
) r
e
turn -1 on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-11
Christian Couder
builtin/ap
p
ly: make
write_out_
o
ne_
r
esu
l
t() return
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-11
C
hristian Couder
b
u
i
l
t
in/ap
p
ly: mak
e
create_f
i
le()
retu
r
n -1
o
n
error
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-11
Christi
a
n Coud
e
r
bu
i
ltin/apply: make add_index_file
(
) re
t
urn
-
1 on error
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-11
C
hr
i
stian Couder
built
i
n/ap
p
ly:
make
add_conflicte
d
_stages_file() return
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-11
C
h
ristian
C
ou
d
er
buil
t
i
n/apply: make
re
m
ov
e
_file() return -
1
on erro
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-11
C
h
rist
i
an Couder
bui
l
tin/apply: m
a
ke build
_
fake_an
c
estor()
return
-
1
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-11
Chris
t
ian
C
o
uder
b
u
i
lti
n
/apply: cha
n
ge die_on_unsafe
_
path(
)
to chec
k
_unsafe_p
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-11
Christian Couder
b
u
ilti
n
/apply
:
ma
k
e
g
itdiff_*() retu
r
n -1
o
n error
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-11
Christi
a
n
Cou
d
er
builtin
/
apply: mak
e
gi
t
diff
_
*() return
1 at e
n
d of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-11
Christia
n
Couder
builtin/app
l
y: make parse_
t
r
a
d
i
tional_patch() return
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-11
Chri
s
tian Couder
builtin/apply: make apply_a
l
l_patches() r
e
tu
r
n 128
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-11
Christian
C
oude
r
b
uiltin/ap
p
ly: mo
v
e
c
heck_
a
pply_state
(
) to apply
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-11
C
h
r
i
stian
C
ouder
b
uiltin/apply: make check_
a
pply_state()
ret
u
rn -1 instead
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-11
C
hristian Couder
ap
p
ly: make
i
nit_apply_
s
tate(
)
return -1 instead o
f
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-11
Christian Couder
b
uiltin/apply: move init_a
p
ply_state() to apply
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-11
Chris
t
ian
Couder
builtin/apply: make pars
e
_ignorewhi
t
es
p
ace_opti
o
n(
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-11
Chri
s
tian C
o
ud
e
r
builtin/apply: mak
e
parse
_
whitespace_
o
p
t
ion() return
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-11
Chr
i
stian Co
u
de
r
builtin/apply: make
parse_single_
p
atch() return -1
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-11
Christian Couder
builtin/apply: make parse_chunk() return a negat
i
ve
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-11
Christian Coude
r
bui
l
t
i
n/apply
:
m
a
ke
f
i
n
d_heade
r
() return -128 instead
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-11
Christian
Couder
b
uiltin/a
p
ply: read_patch_f
i
le() return -1 in
s
t
e
a
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-11
Christian Couder
built
i
n
/apply:
make
appl
y
_pat
c
h() retur
n
-1 or
-
128
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-11
Chri
s
tian Cou
d
er
a
p
ply: move 'struct apply_s
t
at
e
' to ap
p
ly
.
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-11
Christian C
o
uder
a
pply: make som
e
na
m
es
m
or
e
specifi
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-07-28
Ju
n
io C Hamano
Sync with mai
n
t
commit
|
commitdiff
|
tree
2016-07-28
Junio C Hamano
Eighth batch
of
topics for 2
.
10
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-07-28
Juni
o
C
H
am
a
no
t9100:
p
ortabil
i
ty fix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-07-28
J
uni
o
C Hamano
Merg
e
branch 'mas
t
er'
of
git://git
.
b
ogomips
.
org/git-
s
vn
commit
|
commitdiff
|
tree
2016-07-28
Juni
o
C Hama
n
o
Some f
i
xe
s
for 2
.
9
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-07-28
Jun
i
o C Hama
n
o
M
e
rge branch 'ak/lazy-prereq-mkte
m
p
' into maint
commit
|
commitdiff
|
tree
2016-07-28
J
u
nio C Hamano
Merge branch 'nd/i
c
a
se' into maint
commit
|
commitdiff
|
tree
2016-07-28
Jun
i
o
C
Hamano
M
e
rge branch 'sb/sub
m
od
u
le-para
l
lel-fe
t
ch' into maint
commit
|
commitdiff
|
tree
2016-07-28
Junio C Hamano
Merge branch 'dk/b
l
ame-move-no-reaso
n
-for-1-line-context
.
.
.
commit
|
commitdiff
|
tree
2016-07-28
Junio C Hama
n
o
Merge branch 'jk/te
s
t-
m
atch-s
i
gna
l
' into maint
commit
|
commitdiff
|
tree
2016-07-28
Jun
i
o C Hamano
Merge br
a
nch 'js
/
am-call-theirs-th
e
irs-in-fallback
.
.
.
commit
|
commitdiff
|
tree
2016-07-28
Junio C Hama
n
o
Merge bra
n
ch 'js/
t
3
404-
g
r
amm
o
-fix' i
n
to
maint
commit
|
commitdiff
|
tree
2016-07-28
Ju
n
io C Ha
m
ano
M
erge b
r
anc
h
'
nd
/
doc
-
new-command' into maint
commit
|
commitdiff
|
tree
2016-07-28
Ju
n
io C
H
amano
Mer
g
e branch 'ew
/
gc-auto-pack-limi
t
-
f
ix'
into ma
i
nt
commit
|
commitdiff
|
tree
2016-07-28
Junio C
H
amano
Merg
e
bra
n
c
h
'j
s
/color
-
on
-
windows-comm
e
nt' into maint
commit
|
commitdiff
|
tree
2016-07-28
Junio C
H
a
m
a
no
Merge
b
ranch 'mm/doc-t
t
' into maint
commit
|
commitdiff
|
tree
2016-07-28
Jun
i
o C
H
ama
n
o
Merge br
a
nch 'js/
s
i
g
n-empty-commit-fix' i
n
to mai
n
t
commit
|
commitdiff
|
tree
2016-07-28
J
unio C Hamano
Merge branch 'ps/rebase-i-au
t
o-unstash-upon-abort'
.
.
.
commit
|
commitdiff
|
tree
2016-07-28
Jun
i
o C H
a
mano
Merge bra
n
ch
'
nd/ita-
c
lean
u
p' into main
t
commit
|
commitdiff
|
tree
2016-07-28
Junio
C
Ham
a
no
Merge b
r
anch '
j
s/find-commit-subject-ignore-l
e
ading
.
.
.
commit
|
commitdiff
|
tree
2016-07-28
Junio C Haman
o
Merge branch 'dg
/
subtree-rebase-test'
i
nto main
t
commit
|
commitdiff
|
tree
2016-07-28
Juni
o
C Hamano
Merge branch
'sb/submo
d
ule-deinit-all'
commit
|
commitdiff
|
tree
2016-07-28
J
un
i
o
C
Hamano
Merge
b
ranch 'e
w
/
find-perl-o
n
-freebsd-in-
l
ocal'
commit
|
commitdiff
|
tree
2016-07-28
J
u
nio
C Haman
o
M
e
rge branch
'ew/dae
m
on-socket-keepali
v
e'
commit
|
commitdiff
|
tree
2016-07-28
Junio C Hamano
Mer
g
e branch 'nd/pack-ofs-4gb-l
i
m
i
t'
commit
|
commitdiff
|
tree
2016-07-28
Junio C
Hamano
M
e
rge b
r
anch 'nd/worktree-lock'
commit
|
commitdiff
|
tree
2016-07-28
Junio C
H
amano
Me
r
ge branc
h
'r
s
/notes-merge-no
-
to
c
tou'
commit
|
commitdiff
|
tree
2016-07-28
Ju
n
i
o
C Haman
o
Merge branch
'
js/rebase
-
i-tests'
commit
|
commitdiff
|
tree
2016-07-26
Stefan Beller
sub
m
odule de
i
nit:
r
e
move ou
t
dated comment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-07-26
Nguyễ
n
Thái Ngọc Duy
config
.
m
a
k
.
uname: c
o
rr
e
ct perl pa
t
h on FreeB
S
D
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-07-25
J
unio C Haman
o
Seventh ba
t
ch o
f
topic
s
for 2
.
10
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-07-25
Jun
i
o C Hamano
Merg
e
br
a
nch 'rs/use
-
strbuf-a
d
dbuf'
commit
|
commitdiff
|
tree
2016-07-25
Junio C Hamano
M
e
rge branch 'ew/autoconf-pthread
'
commit
|
commitdiff
|
tree
2016-07-25
J
unio C Hamano
Me
r
ge
branch 'mh/blame-worktree'
commit
|
commitdiff
|
tree
2016-07-25
Junio C Hamano
Merge branch 'js/
f
sck
-
name-object
'
commit
|
commitdiff
|
tree
2016-07-25
J
u
n
i
o C Hamano
M
e
rge
b
r
a
nch 'nd/cache-tree-ita'
commit
|
commitdiff
|
tree
2016-07-25
J
u
n
io
C
H
a
mano
Merge branc
h
'jk/push-scrub-url
'
commit
|
commitdiff
|
tree
2016-07-25
Juni
o
C H
a
mano
Merge branch
'
nd/t
e
st-helpers'
commit
|
commitdiff
|
tree
2016-07-25
Junio C Hamano
Merge branc
h
'jc/d
o
c-diff-fi
l
t
e
r-exclude'
commit
|
commitdiff
|
tree
2016-07-25
Junio C Hamano
Merge branch '
l
s/travis-en
a
ble-htt
p
d-tests'
commit
|
commitdiff
|
tree
2016-07-25
Junio C H
a
mano
Merg
e
branc
h
'jc/ren
o
rmalize-mer
g
e-ki
l
l-s
a
fer-cr
l
f'
commit
|
commitdiff
|
tree
2016-07-25
Junio C
Haman
o
Merge branch
'
rs/worktree-use-s
t
rbu
f
-
a
bs
o
lute-
p
ath'
commit
|
commitdiff
|
tree
2016-07-25
Junio C Hamano
Merge branch
'rs
/
rm-strbuf-optim'
commit
|
commitdiff
|
tree
2016-07-25
Junio C Hamano
Merge branch
'rw/make-ne
e
ds-librt
'
commit
|
commitdiff
|
tree
2016-07-25
Junio C Ham
a
no
Merge branch 'js/ignore-space-
a
t-eo
l
'
commit
|
commitdiff
|
tree
2016-07-25
Juni
o
C H
a
mano
Merge
branch 'mh/ref-iterators'
commit
|
commitdiff
|
tree
2016-07-25
Ju
n
io C
H
amano
Mer
g
e branch '
m
h/update
-
ref-er
r
ors'
commit
|
commitdiff
|
tree
2016-07-25
Junio C Hama
n
o
M
erge
branch 'mh/spl
i
t
-
u
n
de
r
-lock
'
commit
|
commitdiff
|
tree
2016-07-22
Johan
n
es Sixt
Windows: add missing definition of ENO
T
SOCK
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-07-22
Ren
é
Scharf
e
strb
u
f: avoid call
i
ng strbuf
_
grow() twice in strbuf_add
b
uf()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-07-20
Jeff King
t5
5
4
1
:
fix
u
rl
scrubbi
n
g test w
h
en GP
G
is
n
ot set
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-07-19
Junio C Hamano
Sixth batch
o
f top
i
cs fo
r
2
.
10
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-07-19
J
unio C Hamano
Merge branch
'ls/p4-tmp-r
e
fs'
commit
|
commitdiff
|
tree
2016-07-19
J
unio C Hamano
Merge branch 'js/am-cal
l
-th
e
irs-theirs-i
n
-
f
all
b
ack
.
.
.
commit
|
commitdiff
|
tree
2016-07-19
Junio
C
Hamano
Merge branch 'jk/write-
f
ile'
commit
|
commitdiff
|
tree
2016-07-19
Junio C Hamano
Merge branch 'jk/print
f
-fo
r
mat'
commit
|
commitdiff
|
tree
2016-07-19
Junio C
H
amano
Merge branch 'rs/help-c-source-with-gitatt
r
ibutes'
commit
|
commitdiff
|
tree
2016-07-19
Jun
i
o C Ha
m
ano
M
erge
branc
h
'nd/fetch-ref-summar
y
'
commit
|
commitdiff
|
tree
2016-07-19
J
u
nio C Hamano
Merge branch 'jk/te
s
t-match
-
signal'
commit
|
commitdiff
|
tree
2016-07-19
Jun
i
o C Hamano
Merge bran
c
h 'jk/c
o
mmon-ma
i
n'
commit
|
commitdiff
|
tree
next