repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'fc/rerere-conflict-style' into maint
2014-06-04
Jeff King
update
-
index: fi
x
segfault with
m
issing --cac
h
einfo
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-05-30
J
e
ff
King
t5
5
3
7: re-drop
h
ttp tests
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-05-20
Jeff King
move "--follow ne
e
ds one
p
athspec" rule to diff_set
u
p_done
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-05-15
Jeff
K
ing
open_sha1_file:
r
eport "most
i
nterestin
g
" errno
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-05-15
Jeff K
i
ng
run_diff_files: do n
o
t look at
u
ninitialized stat
d
ata
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-05-12
Jeff Kin
g
ind
e
x
-pac
k
:
d
ist
i
nguish missing objects from ty
p
e errors
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-04-28
J
e
ff King
commit
:
do no
t
complain of e
m
p
t
y
mes
s
ages from
-C
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-04-21
Jeff King
run_
e
xternal_diff: use
a
n a
r
gv_array f
o
r the co
m
m
and
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-04-16
J
eff King
config
.
c: mark die_
b
ad_number as NORE
T
URN
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-04-04
Jeff King
pack
-
objects: do not reuse packfiles w
i
t
h
o
u
t --de
l
t
a
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-04-01
Jeff King
t4
2
1
2: lo
o
sen far-in-fu
t
ure test for AIX
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-04-01
J
e
ff Ki
n
g
date: recognize bogus F
r
e
e
BSD gmti
m
e
output
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-03-21
Jeff
K
ing
t0
0
0
1
: drop
subshells just f
o
r "cd"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-03-21
Je
f
f King
t0001: dro
p
u
s
eless subs
h
ells
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-03-21
Jeff Ki
n
g
t000
1
: use
test_must_fail
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-03-21
J
eff King
t
0
001: use te
s
t_config_glo
b
al
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-03-21
Jeff King
t
0
001
:
u
s
e te
s
t_path_is_*
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-03-21
J
e
ff King
t0001: make sym
l
i
nk
r
ei
n
i
t
test mo
r
e
careful
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-03-21
Jeff
K
i
n
g
t: prefer "git co
n
fig --file
"
to
GIT_CONFIG
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-03-21
J
e
ff King
t: prefer "git config
-
-file" to
G
IT_CONFIG with
t
est_m
u
st_fail
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-03-21
Je
f
f
King
t: stop using GIT_
C
ON
F
IG
to cross repo boundaries
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-03-21
Jeff Ki
n
g
t:
drop useless sa
n
e_unset GIT_* calls
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-03-21
J
ef
f
King
t/test-
l
i
b: drop redun
d
ant u
n
set
of GIT_CONFIG
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-03-21
Jeff King
t
/Makefile:
s
top se
t
ting GIT_CONFIG
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-03-17
Jeff
K
ing
subtre
e
: initialize "prefix" variable
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-03-17
Jeff King
shallow
:
verify sh
a
llow file after taking lock
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-03-17
Jeff King
pack-objects
:
turn off
b
i
t
maps wh
e
n skipping o
b
jec
t
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-03-17
Je
f
f Ki
n
g
pack-objects: show
r
eused pac
k
file objects in "Counting
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-03-17
J
eff King
pack-
o
bj
e
c
t
s: s
h
ow
p
rogre
s
s fo
r
reused packfiles
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-03-14
Jeff
King
t/lib-te
r
minal: mak
e
TTY
a lazy prerequisite
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-03-13
Jeff King
rev-list:
disabl
e
object/refname ambi
g
u
i
ty check
w
i
t
h
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-03-13
Je
f
f K
i
ng
cat
-
f
i
le: resto
r
e
warn_
o
n_object_refname_ambiguity
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-03-11
Jeff
K
ing
clean: simplify dir/not-dir
l
o
gic
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-03-11
Jeff King
clean: respect p
a
thspecs wi
t
h "-
d
"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-03-07
Jeff King
show_ident_date: fix tz ra
n
ge ch
e
ck
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-03-05
Je
f
f King
p
ush:
detect loc
a
l refspec errors e
a
rly
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-03-05
Jeff Ki
n
g
match_explicit_lhs
:
al
l
ow a "
v
eri
f
y
only" mode
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-03-05
Jeff K
i
ng
matc
h
_
e
xplicit
:
h
o
ist re
f
s
p
ec
l
h
s
chec
k
s into t
h
eir
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-03-05
Jeff King
do
c
s: mark info/grafts as outdated
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-03-03
J
ef
f
King
rep
a
c
k
:
a
dd `repack
.
p
a
ckKep
t
Objec
t
s`
c
onfig v
a
r
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-02-28
Jeff King
Codin
g
Guidelines
:
ment
i
on C whitespace r
u
les
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-02-28
J
eff
King
docs: clarify remote res
t
ri
c
tions
fo
r
git-upload-archive
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-02-27
Jeff Ki
n
g
shal
l
ow: au
t
omatically clean up s
h
allow t
e
mpfiles
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-02-27
Jeff King
s
h
al
l
ow:
use s
t
at
_
validity
to
c
heck
f
or up-to-date
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-02-24
Jeff King
remote:
h
andle pushrem
o
te c
o
nfig
in any order
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-02-24
Jeff
K
i
n
g
log: do
n
ot segfault
on gm
t
ime err
o
rs
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-02-24
Jeff King
l
og: h
a
ndle integer overflow
in
t
im
e
s
tamps
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-02-24
Jeff King
d
ate: check date
overflow against time_t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-02-24
Jeff King
fs
c
k: report intege
r
overflow
in author timest
a
mps
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-02-24
Jeff King
t4212: test
bogus tim
e
stamps with git-log
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-02-19
J
e
ff King
config: disal
l
ow relat
i
v
e include paths fr
o
m b
l
obs
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-02-18
J
eff King
http: never u
s
e curl
_
easy_perfor
m
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-02-14
J
e
ff King
te
s
ts: tur
n
on
network daemon tests by
d
e
faul
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-02-12
Jeff King
ewah: unconditi
o
n
ally n
t
ohll ewa
h
dat
a
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-02-10
Jeff King
tests: aut
o
-set git-daemon port
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-02-10
Jeff King
test
s
: auto-set LIB
_
HT
T
PD_PORT from test name
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-01-28
Jeff King
hand
l
e_path_in
c
lude: don't lo
o
k
at NULL value
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-01-28
Jeff K
i
ng
expand_use
r
_path:
do n
o
t lo
o
k at N
U
LL
p
ath
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-01-23
Jeff Kin
g
read-cache: use get_be32 instea
d
of ha
n
d-rolled
n
toh_
l
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-01-23
Jeff King
block-sha
1
: factor o
u
t get_be an
d
put_be w
r
a
p
pers
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-01-23
J
eff Ki
n
g
t7
7
0
0
:
d
o not use
"
t
o
uch" unnecess
a
rily
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-01-23
Jeff King
t7501
:
fix
"em
p
ty commit" te
s
t with NO_PERL
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-01-23
Je
f
f King
repack: pro
p
agate
pack-
o
bjects opti
o
ns as st
r
ings
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-01-23
Jeff King
repack: make pars
e
d
string options
const-
c
or
r
ect
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-01-23
Jeff King
repack:
f
i
x
typo in
m
ax-pa
c
k-size o
p
t
i
on
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-01-21
Jeff
K
ing
l
ist-ob
j
ects
:
only loo
k
at c
m
dline t
r
e
es with edge_hint
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-01-21
Jeff King
t/pe
r
f:
t
ime
r
ev-list with UNINT
E
RESTING commits
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-01-17
Je
f
f Ki
n
g
diff_filespec: use on
l
y 2
b
i
ts
f
or is_binary
f
la
g
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-01-17
Je
f
f King
d
iff_filespec: reo
r
der
is_binary
field
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-01-17
J
e
ff K
i
ng
diff_f
i
lesp
e
c
:
drop xfrm_fl
a
gs field
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-01-17
Jeff Ki
n
g
diff_files
p
ec: d
r
op funcname_pat
t
ern_ide
n
t fiel
d
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-01-17
J
eff King
dif
f
_fil
e
s
p
ec: reorder dirty_submod
u
le mac
r
o definitio
n
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-01-16
J
e
ff King
do
not d
i
scard re
v
inde
x
wh
e
n re-prepar
i
n
g packfiles
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-01-15
Jeff King
interpret_branch_name: find all possible @
-
marks
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-01-15
J
e
f
f
Kin
g
i
nterpret_branch_nam
e
: avoi
d
@{upstream}
p
ast colo
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-01-15
Jeff King
i
n
t
erpret_branch_name
:
alwa
y
s
respect "nam
e
len" parameter
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-01-15
Jeff
King
int
e
rpret_br
a
nch_name: re
n
ame "cp" variable to "at"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-01-15
Jeff K
i
ng
interpret
_
bran
c
h
_
n
a
me: fac
t
or
o
ut
u
pstream
h
a
ndling
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-01-15
J
e
ff King
fetch-pac
k
: do not filter ou
t
one
-
le
v
el refs
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-01-13
Jeff King
t5531: fu
r
ther
"ma
t
ching"
f
ixups
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-01-07
Jeff King
cat
-
file:
f
ix a minor m
e
mory leak in ba
t
c
h
_objects
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-01-07
J
eff King
cat-file:
refactor error h
a
ndl
i
n
g
of batch_obj
e
c
t
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-01-02
Je
f
f
K
ing
t0000: drop "known
breakage" test
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-01-02
Jef
f
King
t0000: si
m
plify HARNESS_ACTIVE hack
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-01-02
Je
f
f
K
in
g
t0000: set TEST_
O
U
T
PUT_
D
IRECTORY for sub-tests
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-01-02
Jef
f
King
use distinct username/pass
w
o
r
d
for
http
a
u
t
h
t
ests
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-01-02
Jeff King
Revert "prompt: clean up strbuf
u
sage"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-12-30
Jeff King
t
/pe
r
f
:
add test
s
for pack bitmaps
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-12-30
Je
f
f K
i
n
g
t: add
b
asi
c
bitmap function
a
lity tests
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-12-30
J
e
ff Kin
g
repack: handl
e
o
p
tion
a
l
files c
r
ea
t
e
d by pack-objects
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-12-30
Jeff
King
repack: t
u
rn exts
array into
array-of-struct
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-12-30
Jef
f
King
r
e
pack
:
stop us
i
ng magic number
f
o
r
ARRAY_SIZE(exts)
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-12-30
Jeff King
pa
c
k
-
o
bjects: spl
i
t
a
dd_object_entry
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-12-26
Jeff Ki
n
g
c
at-file: pro
v
ide %(deltabase
)
b
atch for
m
a
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-12-26
Je
f
f King
sha1_object_info
_
extended: provid
e
de
l
t
a base sha1s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-12-26
Jef
f
K
ing
do not pr
e
tend sha1w
r
i
t
e re
t
ur
n
s e
r
ror
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-12-18
J
e
ff King
builtin/prune
.
c:
u
se st
r
buf to a
v
oid
h
avin
g
to wor
r
y
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-12-16
Jeff King
diff
.
c: fix some
rece
n
t
w
hi
t
es
p
ace
style violations
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-12-16
Je
f
f
K
i
ng
pack-objects
doc: treat output filename
as opaqu
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-12-12
Je
f
f King
cat-file: handl
e
--batch format
w
it
h
missing t
y
pe/s
i
ze
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
next