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: refuse to create too cool a merge by default
2016-03-23
Jun
i
o C Hamano
m
erge: refuse to
crea
t
e too co
o
l
a merge by default
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-03-17
Junio C Hamano
G
it 2
.
7
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-03-17
J
u
n
i
o C Haman
o
Sync wi
t
h Git 2
.
6
.
6
commit
|
commitdiff
|
tree
2016-03-17
Junio C Hama
n
o
Git
2
.
6
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-03-17
Junio C Hamano
Merge
b
ran
c
h 'ma
i
nt-
2
.
5
'
into m
a
int-2
.
6
commit
|
commitdiff
|
tree
2016-03-17
J
u
ni
o
C Ham
a
n
o
Git 2
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-03-17
Junio
C
Ha
m
ano
Mer
g
e
b
ranch 'maint-2
.
4' in
t
o maint-2
.
5
commit
|
commitdiff
|
tree
2016-03-17
J
unio C Hamano
G
i
t
2
.
4
.
11
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-03-17
Jun
i
o C
H
a
m
ano
Merge bran
c
h 'jk/pat
h
-name-safety-2
.
4' into maint-2
.
4
commit
|
commitdiff
|
tree
2016-03-16
J
u
ni
o
C
H
a
mano
Merg
e
branch
'jk/path-name-saf
e
ty-2
.
7' int
o
maint
commit
|
commitdiff
|
tree
2016-03-16
Junio C Hamano
Merg
e
branch 'jk/path-
n
ame-safet
y
-
2
.
6' int
o
jk/pa
t
h
.
.
.
commit
|
commitdiff
|
tree
2016-03-16
Jun
i
o C Hamano
Me
r
ge branch 'jk/path-name-safety-2
.
5'
i
nto
j
k
/path
.
.
.
commit
|
commitdiff
|
tree
2016-03-16
J
un
i
o
C
Ham
a
no
Merg
e
bran
c
h
'jk/pat
h
-
name-saf
e
ty-
2
.
4'
i
nto jk/path
.
.
.
commit
|
commitdiff
|
tree
2016-03-16
Jeff King
list-o
b
jects:
p
a
ss full path
n
ame to callbacks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-03-16
Je
f
f
King
list-objects: drop name_path entirely
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-03-16
Jeff King
list-objects: convert name_
p
ath to a st
r
buf
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-03-16
Jeff Ki
n
g
show_object
_
with_name: simp
l
ify
by using path_name()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-03-16
Jeff Ki
n
g
h
ttp-
p
u
s
h: sto
p
using name_pat
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-03-16
Je
f
f King
tree-diff: catch i
n
t
e
ge
r
overflow
in com
b
ine_dif
f
_path
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-03-16
Jeff King
add
he
l
pers for
detecting size
_
t overflow
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-03-10
J
unio C Hamano
Git 2
.
7
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-03-10
Junio C Hamano
Merge branch '
m
a/update-hooks-s
a
mple-ty
p
ofix
'
i
n
to
.
.
.
commit
|
commitdiff
|
tree
2016-03-10
Junio
C
Hamano
Merge branch 'dt/
i
nitial-ref-xn-commit
-
doc' into maint
commit
|
commitdiff
|
tree
2016-03-10
Junio C Ham
a
no
Merge branch 'ps/plu
g
-xdl-mer
g
e-le
a
k' into
m
aint
commit
|
commitdiff
|
tree
2016-03-10
Junio
C
Hamano
Merge branch 'ak/git-
s
trip-extension
-
from-dashed-command
.
.
.
commit
|
commitdiff
|
tree
2016-03-10
Ju
n
io C
H
a
mano
Me
r
ge bra
n
ch 'ak/e
x
tract-argv0-last-dir-sep' into maint
commit
|
commitdiff
|
tree
2016-03-10
Jun
i
o C
H
ama
n
o
Merge branch 'jk/pa
c
k-idx
-
corr
u
ption-sa
f
ety' into
m
a
i
n
t
commit
|
commitdiff
|
tree
2016-03-10
J
unio C Hamano
Merge
b
r
a
n
ch 'js/config-se
t
-i
n
-
n
on-repos
i
tory'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2016-03-10
Juni
o
C Hamano
Merge
b
ranch 'sb/subm
o
dule-module-lis
t
-fix' into maint
commit
|
commitdiff
|
tree
2016-03-10
Junio C Hamano
Merg
e
branch 'jk/gre
p
-b
i
nary-workarou
n
d
-
i
n-
t
est' into
.
.
.
commit
|
commitdiff
|
tree
2016-03-10
Junio C Hamano
Merge branch
'mm/push-simpl
e
-doc
'
i
nto maint
commit
|
commitdiff
|
tree
2016-03-10
Ju
n
io C Hamano
Merge branch 'jk/tig
h
ten-alloc' into maint
commit
|
commitdiff
|
tree
2016-03-10
Junio
C
Ham
a
no
Merge branch 'jk/more-comment
s
-
on
-
te
x
t
conv'
i
nto mai
n
t
commit
|
commitdiff
|
tree
2016-03-10
Junio
C
Hamano
Mer
g
e
br
a
nch 'j
k
/no-di
f
f
-
emit-commo
n
' in
t
o ma
i
nt
commit
|
commitdiff
|
tree
2016-03-10
J
u
n
io C Hamano
Merge bra
n
c
h
'jc/am-i-v-fix' into mai
n
t
commit
|
commitdiff
|
tree
2016-03-10
Junio C Hamano
Merge branch 'nd/gi
t
-commo
n
-
dir
-
fix' i
n
to maint
commit
|
commitdiff
|
tree
2016-03-10
Junio C Ham
a
no
Merge branch '
n
d/dwim-w
i
ldcards-as-pa
t
hspecs' into
.
.
.
commit
|
commitdiff
|
tree
2016-03-10
Juni
o
C Haman
o
M
e
rge branch '
j
k/
e
pipe-in-async
'
int
o
mai
n
t
commit
|
commitdiff
|
tree
2016-03-10
Junio
C Hamano
Mer
g
e
bra
n
ch 'p
s
/config-error' into
main
t
commit
|
commitdiff
|
tree
2016-03-10
Juni
o
C Hamano
Me
r
ge
b
ranch 'mg
/
work-
t
ree-tests' into maint
commit
|
commitdiff
|
tree
2016-03-10
Junio C
H
amano
Merge branch 'sp
/
rem
o
te
-
cur
l
-s
s
l-s
t
rerror' into
ma
i
nt
commit
|
commitdiff
|
tree
2016-02-29
Jeff
K
i
ng
compat/mingw: brown paper bag fix for 50a
6
c8e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-02-27
Ng
u
yễn Thái
Ngọc Duy
sha
1
_file
.
c: mark s
t
r
i
ngs for translat
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-02-25
Jeff King
t
5504
:
h
andle expected o
u
tp
u
t
from S
I
GPIP
E
death
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-02-25
Jeff K
i
ng
tes
t
_m
u
st_f
a
il
:
rep
o
r
t number of unexpe
c
ted signal
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-02-25
Jeff King
fetch-pack: ign
o
re SIGPIPE in sideband d
e
mu
x
er
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-02-25
Je
f
f
King
wri
t
e_or_di
e
:
ha
n
dl
e
E
P
IPE in
async
t
hr
e
ads
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-02-25
David T
u
rner
ref
s
: document
t
r
ansaction semantic
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-02-25
J
e
f
f
King
use_pack:
handl
e
signed off_t overflow
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-02-25
J
e
f
f Kin
g
n
th_packed_object_offset
:
bounds-che
c
k e
x
tended offset
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-02-25
Je
f
f King
t5
3
1
3
: test bo
u
nds-checks of corrupted/malici
o
u
s pack
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-02-25
J
o
han
n
e
s
Schind
e
lin
git config
:
report when trying
to
m
odify a non-e
x
ist
i
ng
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-02-25
Martin Amdisen
te
m
pla
t
e
s/hooks: fix m
i
nor typo in
the samp
l
e update
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-02-24
Stef
a
n
Beller
submodule he
l
per list: respect correct path pref
i
x
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-02-23
John K
e
epin
g
t
9
200: avo
i
d grep on non-A
S
CII data
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-02-23
John Keeping
t8005: avoid
g
rep o
n
non-ASCII data
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-02-23
Matthie
u
Moy
Docume
n
t
a
ti
o
n
/git-
p
ush: d
o
cum
e
nt that
'simpl
e
' is
th
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-02-23
Patrick St
e
inhardt
xdiff/xmerge: fix
memory leak in xdl
_
me
r
ge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-02-23
J
eff
K
i
ng
xdiff: drop XDL_EMIT_CO
M
MON
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-02-23
Jeff King
merge-tree: drop generate
_
comm
o
n st
r
ate
g
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-02-23
Je
f
f King
merge
-
one-file
:
use empty blob for add/add ba
s
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-02-22
Jeff King
ewah
:
co
n
ve
r
t to R
E
ALLOC
_
ARRAY, e
t
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-02-22
Jeff Kin
g
conv
e
r
t
ewah/bit
m
ap code t
o
use xma
l
l
oc
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-02-22
Jeff
King
diff_pop
u
late_gitlink: use a strbuf
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-02-22
Jeff Kin
g
tra
n
sport_anonymize_url: use xstr
f
mt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-02-22
J
e
f
f King
git-compat-util:
dro
p
mempc
p
y
c
ompat co
d
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-02-22
Jeff King
se
q
uencer: simplify memory allocation of get_message
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-02-22
J
ef
f
King
test-path
-
utils: f
i
x
normalize_path_copy
o
u
tput buff
e
r
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-02-22
Jeff King
f
etch-pack: simplify
add_sou
g
ht
_
entry
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-02-22
Jeff King
fast-import: simplify allo
c
ation i
n
s
t
ar
t
_
pac
k
fi
l
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-02-22
J
e
ff King
w
r
ite_untr
a
cked_extension: use FLEX_
A
LLOC helper
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-02-22
J
e
ff Ki
n
g
prep
a
re_{git,shell}_cmd
:
use arg
v
_
a
r
r
a
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-02-22
Jeff K
i
n
g
use
s
t_add and st_mult for allo
c
a
t
ion s
i
ze computation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-02-22
Jeff King
c
o
nvert triv
i
al cases
to FLEX_ARRAY mac
r
o
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-02-22
Jeff K
i
ng
use xm
a
l
l
oc
z
to
a
void
s
iz
e
arithm
e
tic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-02-22
Jeff
King
convert trivial cases to ALLOC_ARR
A
Y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-02-22
J
eff
K
ing
convert m
a
nual al
l
ocations to ar
g
v_a
r
ray
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-02-22
Jeff King
argv
-
arra
y
: ad
d
det
a
c
h
function
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-02-22
J
e
ff King
ad
d
helpers for allocati
n
g
fl
e
x-
a
r
ray structs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-02-22
Jeff King
harden REALLOC_
A
RRAY and xcalloc against siz
e
_
t
o
verflow
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-02-22
Junio C Hamano
Git 2
.
7
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-02-22
Junio C H
a
mano
Merge branch 'nd/ita-cleanu
p
' into main
t
commit
|
commitdiff
|
tree
2016-02-22
Junio C Hama
n
o
Merge branch 'pw/completio
n
-sta
s
h' into
maint
commit
|
commitdiff
|
tree
2016-02-22
Junio C
H
amano
M
e
rge
b
ranch 'mm/clean-doc-fix' into
m
ai
n
t
commit
|
commitdiff
|
tree
2016-02-22
Junio C Hamano
M
erge branch 'dw/
m
erget
o
o
l
-vim
-
window-shuf
f
le' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2016-02-22
Junio C Hamano
M
e
rg
e
branch 'ah/stri
p
space-optstrin
g
'
into maint
commit
|
commitdiff
|
tree
2016-02-22
Jeff
K
in
g
diff: clarify te
x
tconv
interface
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-02-22
S
Z
EDER Gáb
o
r
com
p
letion: fix mis-
i
ndentation in _git_sta
s
h()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-02-22
Patrick Ste
i
nh
a
rdt
conf
i
g:
r
e
n
ame g
i
t_c
o
nfig_set_or_die
to git_
c
onfi
g
_s
e
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-02-22
Patr
i
ck Steinhardt
con
f
ig: rename g
i
t_config_set
t
o git_config_set_gently
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-02-22
Patr
i
c
k
Ste
i
nhardt
c
o
mpat: die w
h
en unable to set core
.
precomposeunicode
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-02-22
Patrick Stei
n
hardt
s
e
que
n
cer:
d
ie on config er
r
or
w
h
e
n
saving replay opts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-02-22
Patr
i
c
k
S
t
einhardt
init-db: die on config errors
when ini
t
ializing em
p
t
y
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-02-22
Patrick Steinhardt
clone: d
i
e
o
n
con
f
i
g
err
o
r in c
m
d_clon
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-02-22
P
atri
c
k Ste
i
nh
a
rdt
remote: die on co
n
fi
g
error when mani
p
ulating remotes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-02-22
Patrick S
t
einhardt
re
m
ote: die on config error whe
n
sett
i
ng
/
adding
branches
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-02-22
Patr
i
ck Stei
n
ha
r
dt
remote: di
e
o
n config e
r
ror wh
e
n sett
i
ng URL
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-02-22
Patri
c
k Steinhardt
sub
m
odule--helper
:
die o
n
confi
g
error
w
hen c
l
oning
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-02-22
P
at
r
ick Steinhardt
submod
u
le: d
i
e on config error when linking modules
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-02-22
Patrick Steinhar
d
t
branc
h
: die on c
o
nfig error w
h
en
editing branch description
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next