repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Documentation: document pitfalls with 3-way merge
2013-10-30
J
eff King
subtree: add make
f
ile
t
arget for html d
o
cs
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-10-15
Jeff
King
split_ident: parse
t
i
m
est
a
m
p from end of li
n
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-10-15
Jeff K
i
ng
remote-curl: r
e
write bas
e
u
r
l
f
rom
i
nfo/
r
efs redire
c
ts
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-10-15
J
eff K
i
ng
remote-cur
l
: store url
a
s a strbuf
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-10-14
Jeff
K
ing
re
m
ot
e
-curl: make refs_url a s
t
rbu
f
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-10-14
Jef
f
King
h
t
tp: update
base
UR
L
s wh
e
n we
see redirec
t
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-10-14
Jeff
K
ing
http:
p
rovide
e
ffective url
t
o
call
e
rs
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-10-14
Jeff
K
ing
http: hois
t
c
r
e
dentia
l
r
e
quest out
o
f ha
n
dle_curl_result
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-10-01
Jeff King
http: refactor optio
n
s to http
_
g
et_*
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-09-30
J
eff King
http_r
e
quest
:
fac
t
or ou
t
curlin
f
o_st
r
buf
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-09-30
Jeff King
http_get_file: styl
e
fixes
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-09-20
Jeff
K
i
ng
f
ormat
-
patc
h
: prin
t
in
-
b
o
dy "From
"
o
n
ly
w
hen needed
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-09-18
Jeff
K
ing
shortlog
:
ignore commi
t
s with missing auth
o
rs
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-09-18
Je
f
f King
c
l
one: alwa
y
s set transport
o
ptions
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-09-18
Jeff Kin
g
clon
e
: treat "checking connect
i
vity" like other progress
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-09-18
J
e
ff King
clone: send diagnost
i
c mes
s
ages
t
o
s
td
e
rr
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-09-09
Jeff King
u
p
l
o
a
d
-p
a
ck: bump keepalive default to 5 seconds
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-09-09
Jeff K
i
ng
u
pload-pack: send keepal
i
ve packets during pack c
o
mp
u
tation
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-08-30
J
e
ff K
i
ng
ha
s
_sha1_file: re-check pack dire
c
tory before giving up
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-08-28
Jeff
King
mailmap: handle mailmap blob
s
without trai
l
i
n
g
n
ewlines
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-08-27
J
e
ff King
config: do not use C function names as struct members
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-07-29
Jeff King
commit: tweak empt
y
cherry
p
ick advice for sequencer
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-07-25
J
e
ff King
commit
.
h: d
r
o
p redundant
c
ommen
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-07-24
Jeff King
d
o
cument 'quiet' receive-pack capabili
t
y
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-07-24
Jeff
K
i
ng
do
c
u
ment 'agent' proto
c
ol capability
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-07-24
Jeff King
do
c
s:
note that receive-pac
k
k
nows
s
ide-band-6
4
k capabi
l
ity
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-07-24
Jeff King
docs: fix
'
report
-
st
a
t
u
s' protocol capability thi
n
ko
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-07-12
Jeff King
sha1_object_info_e
x
tended: pass ob
j
ect
_
in
f
o to helpers
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-07-12
Jeff King
sha1_object_info_
e
xt
e
nded: make type calculation optional
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-07-12
Jeff King
packed_object_info: make
type lookup optional
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-07-12
Jeff King
packed
_
object_
i
nf
o
: hois
t
delta type
r
es
o
lut
i
on to
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-07-12
Jeff
King
sha1_l
o
ose_o
b
ject_info: make t
y
pe lookup opti
o
nal
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-07-12
Jeff King
sha1_o
b
j
ect_info_exten
d
e
d
: rename "status" to "typ
e
"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-07-12
J
eff King
ca
t
-file: disable object/
r
efname ambiguity
check for
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-07-12
Jeff Ki
n
g
t0008: avo
i
d SIGP
I
PE race condition on
f
ifo
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-07-12
J
eff
K
ing
p
a
ck
-
revindex: radix-s
o
rt
t
he revindex
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-07-12
Jeff King
pack-revindex: use u
n
sign
e
d to store
num
b
er
of o
b
jects
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-07-12
Je
f
f King
cat-file: spli
t
--batch inpu
t
li
n
e
s on whitespa
c
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-07-12
Jef
f
King
cat
-
file: add %(obj
e
cts
i
ze:disk) format a
t
om
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-07-12
Jeff Kin
g
cat-file: a
d
d --
b
atch-check
=
<format>
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-07-11
J
e
f
f
King
c
a
t
-file: refactor
--b
a
tch optio
n
pars
i
n
g
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-07-11
Jeff King
cat-f
i
le: teach --bat
c
h to st
r
e
a
m blo
b
o
b
j
ects
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-07-11
Jeff King
t1
0
06: moderni
z
e output compar
i
sons
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-07-10
Jeff
K
ing
wt-status: use
"
f
ormat" functi
o
n
attribute for status_pri
n
tf
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-07-10
Jeff King
use "sentinel" function attribute for variadic li
s
t
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-07-10
Jeff
King
add missing "forma
t
"
functi
o
n attributes
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-07-08
Jeff King
clone: drop conn
e
ctivity check for local clone
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-07-07
J
e
ff King
teach sh
a
1_object_inf
o
_ex
t
ended
a "disk_siz
e
" quer
y
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-07-07
Jeff
K
ing
z
e
r
o
-initialize object_info structs
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-07-03
Je
f
f King
t
each format-patch to pl
a
ce other authors into in-body
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-07-03
Jeff King
pre
t
t
y
.
c: drop
c
onst-nes
s
f
r
om p
r
ett
y
_pr
i
nt_context
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-07-02
Jeff King
fet
c
h-pack: avoid qu
a
dratic behavior in rev_list_push
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-07-02
Jeff
King
commit
.
c
:
m
a
ke compa
r
e_c
o
mmits_by_comm
i
t_dat
e
global
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-07-02
Jeff King
fetch-pack: avoid quadratic li
s
t insertio
n
in mark_complete
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-06-21
Jeff King
l
i
b-http
d
/
apa
c
he
.
c
onf: check version only af
t
er mod_version
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-06-21
Jeff King
tran
s
p
o
rt-h
e
lper: b
e
quiet on read err
o
rs from helpers
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-06-20
Jeff King
p
u
ll: update unborn
branch tip
a
fter index
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-06-20
J
eff Kin
g
for_eac
h
_ref: load
a
ll lo
o
se refs befor
e
packed refs
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-06-20
Jeff
King
get_
p
acked_ref_cache:
r
e
loa
d
p
acked
-
refs file when
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-06-14
Jeff
King
unpa
c
k
_
ent
r
y:
do not die when
we fail
t
o
apply a
d
elta
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-06-14
Jeff Kin
g
t5303: drop "c
o
unt=1" from corrupti
o
n
dd
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-06-14
Jef
f
K
i
ng
t/lib-httpd/
a
p
ache
.
conf: c
o
n
f
igure an M
P
M module for
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-06-14
Jeff
K
ing
t
/
lib
-
httpd/apache
.
c
on
f
: loa
d
c
om
p
at acces
s
mo
d
ule
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-06-14
J
eff King
t/lib-h
t
tpd/apa
c
he
.
conf:
load extra auth modules in
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-06-14
Jeff
King
t/li
b
-httpd/a
p
ache
.
conf: do not
u
se
Lock
F
ile in apache
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-06-12
J
e
ff King
contrib:
d
r
op blameview
/
dire
c
tor
y
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-06-02
Je
f
f Ki
n
g
t
0
0
05: test
g
it exit code from signal death
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-05-12
J
eff
King
fe
t
c
h
:
opportunistica
l
l
y update
tracking refs
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-05-12
Jeff King
refactor "r
e
f->
m
e
r
g
e" f
l
ag
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-05-12
J
e
f
f
King
t5510: star
t
tracking-ref tests from a known state
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-05-02
Jef
f
Kin
g
l
ookup_objec
t
: prioritize re
c
e
nt
l
y found objects
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-04-19
Jef
f
K
i
ng
receive-pack: cl
o
se s
i
deba
n
d
f
d on early pack errors
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-04-17
Jeff King
c
at-fil
e
: print tags r
a
w
fo
r
"c
a
t-file -p"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-04-16
Jeff King
run-com
m
and: use thread-aware die_is_
r
e
c
urs
i
ng routine
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-04-16
Jeff King
usage:
a
llow p
l
uggable die-recursion check
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-04-16
Je
f
f King
http: se
t
cu
r
l F
A
I
LONER
R
OR each time we select a
hand
l
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-04-15
J
e
ff King
t/test-l
i
b
.
sh: drop "$test" varia
b
le
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-04-14
Jeff King
d
o
c/http-
b
acke
n
d: ma
t
c
h query-string in apache half
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-04-14
Jeff Ki
n
g
c
o
m
mit: allow associating a
u
xiliary
i
nfo on-de
m
and
commit
|
commitdiff
|
tree
2013-04-11
Jeff Ki
n
g
transport-helper: ment
i
on helper name when it
d
ies
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-04-11
J
eff
K
ing
d
o
c/http-backend: give so
m
e lighttpd c
o
nfig e
x
amples
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-04-11
Jeff K
i
ng
doc/http
-
backend: clarify "h
a
lf-
a
u
th" repo confi
g
uration
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-04-07
Jeff Ki
n
g
show-
b
ranch: use strbuf i
n
stead of static buffer
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-04-07
Jeff
King
http:
d
r
o
p
http_error function
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-04-07
Jeff King
r
e
mote-curl: die direct
l
y with http er
r
o
r
messag
e
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-04-07
J
eff Ki
n
g
http: r
e
-wor
d
http err
o
r message
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-04-07
J
eff King
http: simplify http_erro
r
h
elper fu
n
ction
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-04-07
Jeff K
i
ng
remote-c
u
rl:
consiste
n
tly report
r
epo url
f
or
h
ttp
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-04-07
Jeff
K
ing
re
m
o
te-c
u
r
l: alw
a
ys sho
w
fri
e
ndlier 404 message
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-04-07
J
e
ff K
i
ng
remote-curl: let ser
v
ers
ove
r
ride http 4
0
4 advice
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-04-07
Jeff King
remote-curl: show server content
o
n
http errors
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-04-07
Jeff King
h
ttp: add HT
T
P_K
E
EP_ERROR option
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-04-05
Jeff King
diffcore-p
i
ckaxe
:
u
nify code
f
or log -S/-G
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-04-05
Jef
f
King
t3
6
00:
document
failure of rm across symbol
i
c lin
k
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-04-05
Jeff
Kin
g
diffco
r
e-
p
ickaxe: r
e
mo
v
e fill_one()
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-04-04
Jeff King
t3600: t
e
st be
h
av
i
or of reve
r
se-d/f confli
c
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-04-04
J
e
ff Kin
g
rm: d
o
not complain about d/f conflict
s
during deletion
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-04-02
J
eff King
b
ra
n
ch
:
give a
d
vice whe
n
tracking start-poi
n
t is
m
iss
i
ng
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-04-02
Jeff King
b
r
a
n
ch: mention start_
n
ame
in set
-
ups
t
ream error
m
e
ssages
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2013-04-02
Jeff Kin
g
branch: impr
o
ve
e
rror mess
a
ge for
missi
n
g
--set-upstream
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
next