repo.or.cz
/
git
/
raj.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
builtin/apply: make add_index_file() return -1 on error
2016-08-11
C
h
ris
t
ian Co
u
der
builtin/apply: ma
k
e add_in
d
e
x
_f
i
le()
r
eturn -1 on error
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-11
Christian Coud
e
r
builtin/
a
p
p
l
y: make add_conflicted_s
t
ages_f
i
l
e
() re
t
urn
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-11
Chr
i
stia
n
Couder
builtin/apply: make re
m
o
v
e_file() retu
r
n -1 on
e
r
r
o
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-11
Christian Couder
builtin/apply:
make build
_
fak
e
_ancestor()
r
eturn -1
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-11
Christian Couder
builtin
/
a
pply:
change die_on
_
unsafe_path() to check_u
n
safe_p
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-11
C
hristian
Couder
buil
t
in
/
apply: make gitd
i
ff_*() return -1 on error
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-11
Christian Couder
builtin/appl
y
: ma
k
e
g
itdiff_
*
() return 1
at end
o
f
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-11
Christian
Couder
builtin/
a
pply:
make p
a
rse_traditiona
l
_patch() return
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-11
C
h
ristia
n
Couder
builtin/apply:
m
ake appl
y
_all_patches
(
) return 128
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-11
C
h
ristian Couder
buil
t
in/apply: mov
e
check_app
l
y_s
t
a
te() to apply
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-11
Chris
t
i
a
n Cou
d
er
bu
i
ltin/app
l
y:
mak
e
check_apply_state() return -1 i
n
stead
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-11
Chris
t
ian Couder
apply: make init_apply_stat
e
()
return -1 instead
of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-11
C
h
ristian Coud
e
r
bu
i
ltin/apply: move
init_apply
_
state()
t
o
a
pply
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-11
Christian
C
o
uder
builtin/apply: make par
s
e_ignor
e
whites
p
ace
_
option(
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-11
Christ
i
an Co
u
der
builtin/apply: make
parse_whites
p
a
c
e_option() return
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-11
Christian Couder
b
uiltin/apply
:
m
a
ke
p
ar
s
e_single
_
p
a
tch(
)
retur
n
-1
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-11
Christian C
o
ud
e
r
b
u
i
ltin/appl
y
: m
a
ke pa
r
se_chunk
(
)
ret
u
rn a
negative
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-11
Christian Couder
builti
n
/
apply
:
mak
e
fi
n
d
_h
e
ader() return -
1
28 instead
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-11
Christian Coud
e
r
builtin/
a
pply: read_p
a
tc
h
_file() retu
r
n
-1 instead
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-11
Christian Couder
b
uilt
i
n/ap
p
l
y
: make app
l
y_
p
atch()
return -1 or -128
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-11
Ch
r
istian Co
u
der
apply: move 'str
u
c
t
a
pply_state' to apply
.
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-08-11
Chr
i
stian Couder
ap
p
ly: make some names m
o
re spe
c
ific
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-07-28
J
u
n
io C Haman
o
Sync with maint
commit
|
commitdiff
|
tree
2016-07-28
Junio C Hamano
Eigh
t
h
b
at
c
h of
t
o
pics for 2
.
10
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-07-28
J
unio C Hama
n
o
t
9
100: portability fix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-07-28
Junio C Hamano
Merge branch 'master' of git:/
/
git
.
bogomips
.
org/g
i
t-svn
commit
|
commitdiff
|
tree
2016-07-28
Juni
o
C Haman
o
S
ome f
i
x
es for 2
.
9
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-07-28
Junio C Hamano
Mer
g
e branch 'ak/
l
azy-prere
q
-mktemp' into
maint
commit
|
commitdiff
|
tree
2016-07-28
J
unio C
Hamano
Merge branch 'nd/ic
a
se
'
into
maint
commit
|
commitdiff
|
tree
2016-07-28
Junio C Haman
o
Mer
g
e
bran
c
h 's
b
/submodule
-
p
a
r
allel-
f
etch'
into maint
commit
|
commitdiff
|
tree
2016-07-28
Jun
i
o C Hamano
Merge branch 'dk/
b
lame
-
m
o
ve-no
-
r
e
ason-for-1-line-context
.
.
.
commit
|
commitdiff
|
tree
2016-07-28
Jun
i
o C Hamano
Merge branch
'jk/test-ma
t
ch-signal' into maint
commit
|
commitdiff
|
tree
2016-07-28
Junio C Hamano
M
e
rge bra
n
ch 'js/a
m
-call-theirs
-
theirs-in-fallback
.
.
.
commit
|
commitdiff
|
tree
2016-07-28
J
unio C Hamano
Merge b
r
a
nch 'js/t3404-grammo-fix' into maint
commit
|
commitdiff
|
tree
2016-07-28
J
u
n
io C Hamano
Me
r
ge
b
ranch 'nd/d
o
c-new
-
c
o
mmand' into maint
commit
|
commitdiff
|
tree
2016-07-28
Junio C Hama
n
o
M
erge branch 'ew/gc-auto-pack-l
i
mit
-
fi
x
'
into maint
commit
|
commitdiff
|
tree
2016-07-28
Junio C
H
a
mano
Merge branch 'js/colo
r
-on-windows-com
m
ent'
i
nt
o
maint
commit
|
commitdiff
|
tree
2016-07-28
J
unio C Hamano
Merge bran
c
h 'm
m
/do
c
-tt'
i
nto maint
commit
|
commitdiff
|
tree
2016-07-28
Junio C Hamano
Merge bra
n
ch 'js/sign-empty-com
m
it-fix' i
n
to maint
commit
|
commitdiff
|
tree
2016-07-28
Junio
C
Ha
m
ano
Me
r
ge branch 'ps/reb
a
se-i-auto-
u
nstash-u
p
on-abort'
.
.
.
commit
|
commitdiff
|
tree
2016-07-28
Jun
i
o C Hamano
M
erge branch 'nd/it
a
-cleanup' into maint
commit
|
commitdiff
|
tree
2016-07-28
Junio C
H
amano
Merge branch 'js/fi
n
d-c
o
mmit-subje
c
t-ignore
-
lea
d
i
ng
.
.
.
commit
|
commitdiff
|
tree
2016-07-28
Junio C
H
am
a
n
o
M
e
r
ge branch 'dg/subtree-rebase-tes
t
'
i
nto maint
commit
|
commitdiff
|
tree
2016-07-28
J
u
ni
o
C Ha
m
ano
Merge branch 'sb/submod
u
le-deinit-all'
commit
|
commitdiff
|
tree
2016-07-28
Junio C Hamano
Me
r
ge
bra
n
ch 'ew/find-perl-on-f
r
eebs
d
-in-l
o
cal'
commit
|
commitdiff
|
tree
2016-07-28
J
u
nio C
H
amano
Merge branch 'ew/daemon-
s
ocket-keepali
v
e'
commit
|
commitdiff
|
tree
2016-07-28
Junio C Ha
m
ano
M
erg
e
branch
'
nd/pack-
o
fs-4
g
b
-limit'
commit
|
commitdiff
|
tree
2016-07-28
Junio C Hamano
Merge branch 'nd/work
t
ree-lock'
commit
|
commitdiff
|
tree
2016-07-28
Juni
o
C Hamano
M
erge branc
h
'rs/notes-merg
e
-
n
o-toctou'
commit
|
commitdiff
|
tree
2016-07-28
Junio C
H
amano
Merg
e
branch
'js/rebase-i-test
s
'
commit
|
commitdiff
|
tree
2016-07-26
Stefan B
e
ller
sub
m
o
d
ule de
i
ni
t
: remov
e
o
utdated commen
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-07-26
N
g
uyễn Th
á
i Ngọc
Duy
config
.
mak
.
uname: correct perl
p
ath on FreeBSD
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-07-25
Junio C Ha
m
ano
Seventh batch of t
o
pics f
o
r 2
.
1
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-07-25
Junio C Hamano
Merge branch 'r
s
/use-str
b
u
f-addbuf'
commit
|
commitdiff
|
tree
2016-07-25
Junio C Ha
m
ano
M
e
rge branch 'ew/au
t
o
conf-pt
h
read'
commit
|
commitdiff
|
tree
2016-07-25
Junio C
H
a
mano
Merge
branch
'mh/blame-
w
orktre
e
'
commit
|
commitdiff
|
tree
2016-07-25
Junio C Hamano
Merge b
r
anch 'js/fsck-na
m
e-objec
t
'
commit
|
commitdiff
|
tree
2016-07-25
J
u
n
i
o C
Ham
a
no
Me
r
g
e
b
r
anch 'nd/cache-tree-ita'
commit
|
commitdiff
|
tree
2016-07-25
Junio
C Ham
a
no
Merge branch
'
jk/push-scrub-url'
commit
|
commitdiff
|
tree
2016-07-25
Junio C Hama
n
o
M
erge bra
n
ch 'nd/
t
est-hel
p
e
rs
'
commit
|
commitdiff
|
tree
2016-07-25
Junio C Hamano
M
e
rge branch 'jc/doc-diff-filte
r
-exclude'
commit
|
commitdiff
|
tree
2016-07-25
Junio C
Hamano
Merge
branch 'ls/tra
v
is-e
n
a
b
l
e-httpd-t
e
sts'
commit
|
commitdiff
|
tree
2016-07-25
Junio C Hamano
Merge
branch 'jc/reno
r
malize-merge-kill-saf
e
r-crlf'
commit
|
commitdiff
|
tree
2016-07-25
Juni
o
C Hamano
Me
r
ge
branch 'rs/wo
r
k
t
ree-use-
s
trbuf
-
absolute-path'
commit
|
commitdiff
|
tree
2016-07-25
Junio C Hamano
Merge
b
ranch 'rs/rm-strbuf-optim'
commit
|
commitdiff
|
tree
2016-07-25
J
u
nio C Ham
a
no
Merge
b
r
a
nch 'r
w
/make-n
e
ed
s
-lib
r
t
'
commit
|
commitdiff
|
tree
2016-07-25
Junio
C H
a
mano
Merge bra
n
ch 'js/ig
n
ore-space-at-eol'
commit
|
commitdiff
|
tree
2016-07-25
Junio C Ham
a
no
Merg
e
bran
c
h 'mh/re
f
-iterators'
commit
|
commitdiff
|
tree
2016-07-25
Jun
i
o C Ham
a
no
Merg
e
branch 'mh/update-re
f
-errors'
commit
|
commitdiff
|
tree
2016-07-25
Junio C Hamano
Merge
bran
c
h 'mh/spl
i
t-
u
nd
e
r
-lock'
commit
|
commitdiff
|
tree
2016-07-22
Johannes Sixt
Windows: add missin
g
definit
i
on
o
f
ENOTS
O
CK
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-07-22
René Sch
a
rf
e
strbuf: avoid calling strbuf_grow() twice
in strb
u
f_add
b
uf()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-07-20
Jeff K
i
ng
t5
5
41: fix
url
s
cru
b
bi
n
g test wh
e
n
G
P
G
is
n
ot set
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-07-19
Jun
i
o C Hamano
Si
x
t
h
batc
h
of topi
c
s for 2
.
10
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-07-19
Junio C Hama
n
o
Me
r
ge branch 'ls/p4-tmp
-
refs'
commit
|
commitdiff
|
tree
2016-07-19
Junio C Hamano
Merge
b
ranch '
j
s
/am-c
a
ll-theirs-theirs-in-fallback
.
.
.
commit
|
commitdiff
|
tree
2016-07-19
Junio C Hamano
Merge branch 'jk/write-file'
commit
|
commitdiff
|
tree
2016-07-19
Junio C H
a
mano
Merge bran
c
h 'jk
/
printf-format'
commit
|
commitdiff
|
tree
2016-07-19
Junio C Haman
o
Merg
e
br
a
nch 'rs/help-c
-
s
ource-with
-
gita
t
tributes'
commit
|
commitdiff
|
tree
2016-07-19
Juni
o
C H
a
m
a
n
o
Merge branch '
n
d
/fetch-ref-summary'
commit
|
commitdiff
|
tree
2016-07-19
Ju
n
io C Hamano
Mer
g
e branch 'jk/test-match-signal'
commit
|
commitdiff
|
tree
2016-07-19
Junio C Hamano
Merge
b
ranch '
j
k/co
m
mon-main'
commit
|
commitdiff
|
tree
2016-07-19
Junio C Hamano
Merg
e
bra
n
ch 'ak
/
l
azy-pr
e
req-mkt
e
m
p
'
commit
|
commitdiff
|
tree
2016-07-19
Juni
o
C Hamano
Merge bra
n
ch 'nd
/
icase'
commit
|
commitdiff
|
tree
2016-07-19
Junio C Hamano
Merge branc
h
'bc/
c
occi'
commit
|
commitdiff
|
tree
2016-07-19
J
u
nio C Hamano
M
e
rge bra
n
ch 'js
/
log-to-diffo
p
t-file
'
commit
|
commitdiff
|
tree
2016-07-19
Junio C Hama
n
o
Merge b
r
anch 'sb/submodule
-
parallel-fetch'
commit
|
commitdiff
|
tree
2016-07-19
Junio C Hamano
Mer
g
e branch
'lf/
r
ecv-
s
ideband-cleanup'
commit
|
commitdiff
|
tree
2016-07-19
J
unio C Ham
a
no
Merge branch 'dk/bl
a
me-move-no-reaso
n
-for-1-line-conte
x
t'
commit
|
commitdiff
|
tree
2016-07-19
Junio C Hama
n
o
Merge branch 'nd/conne
c
t-ssh-
c
omm
a
nd-c
o
nfig'
commit
|
commitdiff
|
tree
2016-07-19
René Scharfe
us
e
st
r
b
u
f
_
addbuf() f
o
r ap
p
en
d
ing a
s
trbuf to another
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-07-18
Johannes Sc
h
i
nd
e
lin
fsck:
optionally show more hel
p
ful in
f
o for broken
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-07-18
M
i
ke Hommey
t/
t
800
3
-blame-corner-ca
s
es
.
sh:
U
se her
e
doc
u
ments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-07-18
Mike Hommey
b
lame: allow to blame paths freshl
y
a
dded to the index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-07-18
Nguyễn Thái
Ngọc D
u
y
c
ache-tree: do not genera
t
e empty trees as a
r
e
s
ult
.
.
.
Noticed-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-07-18
Nguy
ễ
n
T
hái Ng
ọ
c Du
y
cache-tree
.
c: f
i
x i-t-a e
n
tr
y
skipping directory up
d
ates
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-07-18
Ngu
y
ễ
n
T
h
ái Ngọc Du
y
tes
t
-
l
i
b
.
sh:
i
ntroduce and use $EMPTY_BLOB
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-07-18
Nguy
ễ
n
Thái Ngọc Duy
t
est-li
b
.
sh: introdu
c
e and use
$EMPTY_TREE
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-07-18
Jo
h
annes S
c
h
i
n
de
l
in
fsck: give the erro
r
functi
o
n a cha
n
ce to see the
f
sck_options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-07-18
J
o
han
n
e
s Schi
n
d
elin
fs
c
k_walk(): optio
n
ally name objects on th
e
go
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next