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 'da/mergetool-meld'
2014-03-21
Jeff King
t: prefer
"git con
f
ig -
-
file" to
G
IT_CONFIG with
test
_
must_fa
i
l
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-03-21
Jeff K
i
n
g
t:
st
o
p
u
sing GI
T
_CONFIG to cross
repo bo
u
ndaries
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-03-21
Jeff Kin
g
t: drop
useless s
a
ne_un
s
et GIT_* c
a
lls
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-03-21
Jeff King
t/test-
l
ib: dro
p
re
d
undant
unset of
GIT_CONF
I
G
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-03-21
Jeff Kin
g
t/Makefi
l
e: stop sett
i
ng GIT
_
CONF
I
G
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-03-17
Jeff Kin
g
subtree: ini
t
ialize "pref
i
x" va
r
i
a
b
le
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-03-17
Jeff Kin
g
shal
l
ow
:
v
e
rify sh
a
llow file after t
a
ki
n
g lock
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-03-17
J
eff King
pack-objects: turn off b
i
tmaps when skipping objects
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-03-17
Jeff King
pa
c
k-objects
:
s
h
ow r
e
us
e
d packfile ob
j
e
c
ts
in "Cou
n
t
i
ng
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-03-17
Jeff King
p
ack-ob
j
e
ct
s
:
sho
w
progre
s
s f
o
r r
e
used
packfiles
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-03-14
Jeff King
t
/lib-terminal: make
T
TY a lazy prerequi
s
i
te
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-03-13
Jeff King
rev-list: d
i
sabl
e
o
bj
e
c
t
/re
f
name ambiguity check
wit
h
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-03-13
Jeff King
cat-file: resto
r
e warn_o
n
_objec
t
_
refname_ambiguity
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-03-11
J
e
ff Ki
n
g
cle
a
n:
s
impl
i
fy di
r
/
n
o
t
-dir logic
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-03-11
Jef
f
King
clean: respect pa
t
hspecs
w
ith "-d"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-03-07
Jeff Kin
g
show_i
d
ent_date: fi
x
tz range check
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-03-05
Je
f
f King
push: detec
t
l
o
cal r
e
fspec erro
r
s e
a
rly
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-03-05
J
e
ff K
i
ng
match
_
ex
p
licit_lhs:
allow
a "verify
o
nly
"
mode
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-03-05
Jeff King
match_
e
xplicit:
h
o
i
st refspec lhs checks
i
nto their
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-03-05
Jeff King
docs: mark info/grafts as outdated
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-03-03
Jeff
K
i
n
g
repack: add `repack
.
p
a
ckKe
p
tObjects` config var
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-02-28
Jeff King
Co
d
i
n
gG
u
id
e
lines: ment
i
on C whitespac
e
rules
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-02-28
Jef
f
King
docs: clarify
r
e
mo
t
e r
e
st
r
ictions for git-upload-arc
h
ive
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-02-27
Jeff K
i
ng
sh
a
llow: automatically
clean up shallow tempfiles
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-02-27
Jeff King
shallo
w
: use stat_va
l
idity to
c
heck for up-to-date
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-02-24
Jeff King
rem
o
te: handle pushremot
e
co
n
fi
g
in any order
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-02-24
J
eff King
log: do not
s
egfault
o
n g
m
t
im
e
erro
r
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-02-24
Jeff King
l
og:
handl
e
integ
e
r
overf
l
ow in t
i
mes
t
a
m
ps
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-02-24
Jeff King
date: check date o
v
e
r
flow against time_t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-02-24
Jef
f
King
fsck: report integer overf
l
ow in author timestamp
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-02-24
Jeff K
i
ng
t4212: test bogus ti
m
est
a
mps with g
i
t-lo
g
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-02-19
Je
f
f King
config: di
s
allow re
l
ative inc
l
ud
e
paths fr
o
m blobs
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-02-18
Jeff King
ht
t
p
:
never use
c
url_easy_perform
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-02-14
J
e
f
f King
tests
:
tu
r
n o
n
networ
k
da
e
mon tes
t
s by
defa
u
lt
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-02-12
J
eff Ki
n
g
ewah: unconditiona
l
ly ntohll ewah da
t
a
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-02-10
Jeff King
tests:
a
ut
o
-
set git-daemo
n
port
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-02-10
Jeff Ki
n
g
tests: auto-set LIB_HTTPD
_
PORT from test
n
ame
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-01-28
Jeff King
h
a
n
dle_path_include:
don
'
t lo
o
k at N
U
LL value
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-01-28
Jef
f
King
expand_user_path: do not lo
o
k at
NULL path
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-01-23
Je
f
f King
read
-
cache: use ge
t
_b
e
3
2
ins
t
ead
o
f h
a
n
d-rolled ntoh_l
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-01-23
Je
f
f K
i
ng
block-sha1
:
f
a
ctor o
u
t get_be and put
_
be wr
a
ppers
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-01-23
Jeff K
i
ng
t7700:
d
o not use "touch" unneces
s
aril
y
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-01-23
Jeff King
t75
0
1: f
i
x "empty c
o
mmi
t
" test with NO_PERL
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-01-23
Jeff King
r
e
pac
k
: propagat
e
pack-
o
bjects
optio
n
s as strings
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-01-23
J
e
f
f Kin
g
repack: make parsed string options co
n
st-correct
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-01-23
Jeff King
r
epack: fix typo in max-pa
c
k-size option
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-01-21
Jeff King
list-objects:
o
nly look at cmdline trees wit
h
edge
_
hint
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-01-21
Je
f
f King
t/perf: time
r
ev-
l
ist
with UNINTERE
S
TING comm
i
ts
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-01-17
Jeff King
diff_filespec: us
e
only 2
bits for i
s
_binary flag
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-01-17
Jef
f
King
diff_filesp
e
c:
r
e
or
d
er i
s
_bin
a
ry field
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-01-17
Je
f
f Kin
g
diff_filespec: dro
p
xfrm_f
l
ags field
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-01-17
Jeff King
diff_filespec: drop funcname_pat
t
e
rn_
i
den
t
field
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-01-17
Je
f
f King
diff
_
filespec:
r
eorde
r
di
r
ty_submodule macro definitions
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-01-16
Jeff King
do not discard revindex when re-
p
repar
i
ng packfiles
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-01-15
Jeff King
in
t
erpret_bra
n
c
h
_name: find all po
s
si
b
le @-m
a
rks
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-01-15
Jeff King
int
e
rpret_branch_nam
e
:
a
void @
{
upstream} past c
o
lon
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-01-15
Jeff King
interpr
e
t_branc
h
_name:
a
lways respect "namelen"
p
a
r
ame
t
er
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-01-15
Jeff
K
ing
inte
r
pret_branch
_
name: rename "cp"
v
ariab
l
e
to
"at"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-01-15
Jeff King
i
nt
e
rpret_br
a
nch_na
m
e: factor out upstream handling
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-01-15
J
e
ff King
fetch-pack: do not
f
ilter out
one-le
v
e
l
refs
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-01-13
Jeff
K
in
g
t5531: further "matching" fixups
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-01-07
J
eff Kin
g
c
a
t-file: fix a minor memory leak in batc
h
_o
b
jects
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-01-07
Je
f
f King
cat-file: r
e
f
a
c
t
or error hand
l
ing
of bat
c
h_objects
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-01-02
Jeff King
t
0
0
00
:
drop "known bre
a
k
a
g
e
" test
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-01-02
Jeff King
t000
0
: sim
p
lify
HARNESS_ACTIVE ha
c
k
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-01-02
Jeff King
t0000: set
T
EST_OUTPUT_DI
R
E
C
TORY for sub-tests
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-01-02
Jeff King
use distinct username
/
pa
s
s
word for http auth tests
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-01-02
J
ef
f
King
Revert "prompt:
clean
u
p strbuf usage"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-12-30
Je
f
f King
t/perf: add
tests for pack
bitmaps
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-12-30
Jeff
K
i
ng
t: add basic bitma
p
f
u
nctio
n
ality test
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-12-30
Jeff King
repack:
handle optional files created by pack-
o
bjects
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-12-30
Jeff King
repack
:
turn exts arr
a
y
into arra
y
-
of-
s
tru
c
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-12-30
Jeff
K
ing
r
epack
:
st
o
p usi
n
g ma
g
ic nu
m
be
r
fo
r
A
R
RAY_S
I
ZE(e
x
ts)
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-12-30
Jeff King
pa
c
k
-o
b
ject
s
: s
p
lit add_object_entry
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-12-26
Jef
f
King
cat-file:
p
rovide %(delt
a
base) batch
fo
r
m
at
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-12-26
Jeff K
i
ng
sh
a
1_ob
j
ect_in
f
o_exte
n
d
ed: provide delta base sha1s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-12-26
J
e
ff King
do
not pretend sha1write returns error
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-12-18
J
e
ff Ki
n
g
builtin/p
r
une
.
c: use st
r
buf to avoid
having to wo
r
ry
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-12-16
J
eff
K
in
g
diff
.
c:
f
ix some recent
w
h
i
te
s
pace sty
l
e violati
o
n
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-12-16
Jeff King
pack-o
b
jects doc: tr
e
a
t output fi
l
ename as o
p
a
que
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-12-12
Jeff King
c
at-fil
e
: handle --batch f
o
rmat wi
t
h missing type/size
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-12-12
Jef
f
K
i
ng
ca
t
-
file: pass expand_data
t
o print_objec
t
_or_d
i
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-12-09
Je
f
f
King
rev-parse
:
be more
careful with munging arguments
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-12-09
Jeff King
rev-parse: co
r
rec
t
ly
dia
g
n
o
s
e revision
e
r
rors before
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-12-05
Jef
f
King
pac
k
-objects: na
m
e pack
fil
e
s
a
f
t
e
r trailer ha
s
h
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-12-05
Jeff
King
t5000: simplify gzip prereq
u
isite checks
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-11-21
J
e
ff King
drop support for
"exp
e
rimental
"
lo
o
s
e objects
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-11-04
Jeff K
i
n
g
unpack-tre
e
s: fix "read-tree
-u
--reset A B" w
i
th
c
onflicted
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-10-31
Jeff Ki
n
g
r
emote-cu
r
l: pass
c
u
r
l
slot
_
results back through run_slot
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-10-31
Jeff King
ht
t
p: return curl's AUTHAVAIL via
sl
o
t_results
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-10-30
Jeff King
subtr
e
e: add makefile
target for html
docs
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-10-30
Jeff King
for-ea
c
h-
r
e
f
: a
v
oid loadi
n
g objects
t
o
print
%
(objectna
m
e)
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-10-29
Jeff King
t
:
use perl ins
t
ead of "
$
PERL_PATH
"
where ap
p
licable
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-10-29
Jeff King
t:
p
rovide a pe
r
l() function
w
hich
u
ses $PERL_P
A
TH
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-10-29
Jeff King
use @@PERL@@
i
n
built scripts
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-10-25
J
e
ff K
i
ng
howto:
a
dd ar
t
i
cle on
r
ecoverin
g
a corrupted
o
bject
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-10-25
Jeff King
res
e
t: pass
real rev n
a
me t
o
add--
i
nteractive
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-10-25
Jeff King
ad
d
-interacti
v
e: handl
e
unborn br
a
nch in p
a
tch
mode
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-10-24
Jef
f
King
sha1w
r
ite: make buffer co
n
st
-
correct
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-10-24
J
eff
King
checkout: do not
d
ie whe
n
l
e
aving
b
roken detached H
E
AD
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
next