repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'nd/diff-i-t-a'
2015-06-15
Jeff K
i
n
g
Revert "
s
tash:
r
e
q
uire a c
l
ean index to apply"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-06-09
Jeff King
index-pack: avoid
excessive r
e
-re
a
ding of pack direct
o
r
y
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-06-04
Jeff King
index-
p
ack: fix truncation of off_
t
in co
m
parison
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-06-03
Jeff King
ewah:
use l
e
ss gene
r
ic macro name
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-06-01
Jeff K
i
ng
suppress
e
rrors on
m
issing
U
N
I
NTERESTI
N
G lin
k
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-06-01
Jeff Ki
n
g
si
l
ence broken link warni
n
gs with r
e
vs-
>
i
gnore_missing_links
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-06-01
Jeff Ki
n
g
add quieter ver
s
ions of parse_{tree,commit
}
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-05-29
Je
f
f K
i
ng
s
etup
_
gi
t
_direct
o
ry: delay co
r
e
.
bare/core
.
worktree
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-05-29
J
e
ff King
Makef
i
le: s
i
lence
p
erl/PM
.
stamp
r
ecipe
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-05-29
Jeff King
Makef
i
l
e
: avoid timestamp updates to
GIT-BUILD
-
OPTIONS
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-05-29
Jeff King
Makefile: dr
o
p dependency
b
etween gi
t
-i
n
staweb and
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-05-28
Jeff King
c
onfi
g
.
c:
r
ewrite EN
O
DEV into EISD
I
R when mmap fa
i
ls
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-05-28
Jef
f
King
config
.
c: a
v
oid xmmap
e
rror messages
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-05-28
Jeff King
config
.
c: fix mmap leak w
h
en
w
riting
c
o
n
fig
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-05-28
J
e
ff King
read-cache
.
c: d
r
op PROT_WRITE fro
m
mmap of index
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-05-27
J
ef
f
K
ing
diff
.
h:
r
ename
D
I
FF_PLAIN color slot
t
o
D
IFF_CONTE
X
T
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-05-27
Jeff
K
i
ng
d
i
ff
:
accept color
.
diff
.
context as
a
s
y
nonym for
"
plai
n
"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-05-27
Jeff
King
t7
0
63: hide st
d
err from setup insid
e
prereq
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-05-27
Jeff King
clone: reorder
--dissocia
t
e and --reference
options
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-05-27
Jeff King
clone: use OPT_STRING_LIST
f
or --r
e
ferenc
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-05-26
Jeff K
i
ng
h
ttp-backend
:
spool ref negoti
a
ti
o
n r
e
ques
t
s to
b
uffer
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-05-22
Je
f
f King
f
o
r-each-
r
ef: accept "%(push
)
" format
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-05-22
Je
f
f
K
i
ng
f
or-each-ref:
use skip_p
r
efix inst
e
a
d
o
f
starts_wit
h
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-05-22
Jeff King
sha1_name
:
i
m
plement @{push} sh
o
rthand
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-05-22
J
e
f
f
Ki
n
g
sha1_n
a
me
:
refactor in
t
erpret_upstre
a
m_m
a
r
k
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-05-22
Jeff King
sha1_
n
ame: refacto
r
up
s
t
ream_mar
k
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-05-22
Jeff
K
ing
remot
e
.
c:
add b
r
anc
h
_ge
t
_push
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-05-22
J
eff Ki
n
g
remote
.
c: r
e
tu
r
n upst
r
eam name from stat_tracking_info
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-05-22
Jeff
Kin
g
remote
.
c: u
n
tangle er
r
o
r logic in branch_get_upstream
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-05-22
Jeff King
tes
t
_bit
m
ap_walk:
f
ree bitmap with bitmap_free
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-05-21
Jeff
King
r
e
mote
.
c: report specifi
c
errors
f
rom
b
ranch
_
get_up
s
tream
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-05-21
Jeff King
r
emote
.
c: intr
o
duce branch_get_upstream h
e
lper
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-05-21
Jeff
King
r
emote
.
c: hoist read_confi
g
into remote_get
_
1
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-05-21
Jeff Kin
g
remote
.
c: provide
p
e
r
-branch pushremote n
a
me
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-05-21
Jeff King
r
e
m
ote
.
c
:
hoist
b
r
a
n
ch
.
*
.
r
emote
l
o
o
kup out of
r
emote
_
get_1
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-05-21
Jeff Kin
g
remote
.
c: drop "re
m
ote" pointer
from "struct branch
"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-05-21
Jeff King
remote
.
c: re
f
actor setup of br
a
nch
-
>m
e
rge li
s
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-05-20
Jeff King
s
t
ash:
recognize "--
h
elp" for su
b
commands
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-05-20
Jeff Kin
g
stash: complain about unknown flags
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-05-20
Jeff King
t55
5
1: factor out tag cre
a
t
i
on
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-05-19
Jeff Ki
n
g
progress: treat "no
t
er
m
ina
l
"
as bei
n
g
in th
e
foregr
o
und
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-05-15
J
e
ff K
i
ng
http-
b
ackend: fix die recursion wit
h
custom handler
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-05-14
Jeff King
rerere: exi
t
silently on "forget" when rerere i
s
d
isab
l
ed
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-05-14
Je
f
f King
doc: convert AsciiDoc {?foo
}
to ifdef::fo
o
[]
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-05-13
Jeff
K
ing
doc: put exa
m
ple URLs a
n
d emails insi
d
e
l
iteral
backticks
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-05-13
Jeff King
doc: drop bac
k
slas
h
quo
t
in
g
of some
c
u
r
ly
b
r
a
c
e
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-05-13
Jef
f
King
d
oc: convert \--option to -
-
optio
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-05-13
Jeff King
doc/add: r
e
format `--edit` opti
o
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-05-13
Jeff King
doc: fix length of underl
i
ned sect
i
on-ti
t
le
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-05-13
Jeff King
doc: fix hanging "+"-cont
i
nuatio
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-05-13
Jeff King
d
o
c
:
f
ix
unquoted
us
e
of "
{
ty
p
e
}"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-05-13
Jeff King
doc: fix misrendering due to `sing
l
e quote'
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-05-13
J
e
ff King
doc:
f
ix unmat
c
hed code fen
c
es in git-strips
p
ace
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-05-13
J
eff King
a
d
d: check return v
a
lue of la
u
nch
_
editor
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-05-07
Jef
f
King
t/lib-httpd
.
sh: skip tests if NO_CURL is
d
efine
d
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-05-03
Jeff
King
remote
.
c: drop default_remote_name variable
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-04-29
J
ef
f
Ki
n
g
f
ilter-bran
c
h
:
a
void passing co
m
mit message through sed
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-04-28
Jef
f
Ki
n
g
test-
l
ib: turn on GIT_TE
S
T
_
CHAIN_LI
N
T by default
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-04-28
Jeff King
rebase: s
i
lence "
g
it che
c
kout"
for noo
p
rebas
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-04-22
Jeff Kin
g
s
top putting argv[
0
] dirna
m
e at front
of PATH
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-04-22
Jeff
K
ing
stash: require a
clean
i
ndex to apply
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-04-22
Jeff King
t390
3
: avo
i
d ap
p
l
y
i
ng
o
nto di
r
ty ind
e
x
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-04-22
Je
f
f K
i
ng
t3903: stop hard-codin
g
commit sha1s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-04-20
Jeff King
sha1_file: only fre
s
hen pa
c
ks
o
nce
per run
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-04-20
Jeff
K
i
ng
sha1_file: fre
s
h
e
n
pack objects be
f
ore loose
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-04-20
Jeff King
reachable:
o
nly m
a
rk
lo
c
a
l objects as re
c
ent
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-04-17
Jeff King
limit_l
i
st: avoid q
u
adratic behavior from still_interesti
n
g
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-04-17
J
e
f
f
K
i
ng
ty
p
e
_from_st
r
in
g
_gentl
y
:
make
sure
l
e
ngth matches
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-04-16
Jef
f
King
t1430: add anothe
r
refs-escape
test
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-04-16
Jeff Ki
n
g
rea
d
_packe
d
_refs: avoid double-checking sane refs
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-04-16
Jeff
King
strbuf_getwhole
l
i
ne: use
getde
l
im
if it
i
s availab
l
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-04-16
J
eff King
strbuf_getwholeline: avoid
cal
l
i
n
g strbuf_grow
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-04-16
Jeff King
strbuf_addch: avoid calli
n
g strbuf_grow
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-04-16
Jeff King
config: use getc_unlocked
when reading from file
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-04-16
Jeff
King
strb
u
f
_
g
e
twholeline: use getc_unlo
c
ked
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-04-16
Jeff Ki
n
g
git-compat-util: add fallbacks for unlocked s
t
di
o
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-04-16
Jef
f
Ki
n
g
strbuf_getwholeline: u
s
e
ge
t
c
m
acro
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-04-02
Jef
f
King
mer
g
e: pa
s
s verbosity fl
a
g down to
merge-recursive
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-04-02
Je
f
f King
init: d
o
n't set cor
e
.
worktree when initia
l
izi
n
g /
.
git
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-04-02
Jeff King
howto: document more
tools for rec
o
very corruption
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-03-31
Je
f
f King
che
r
ry-pick:
f
ix docs desc
r
ibing
h
andling of
empty
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-03-31
J
eff King
sh
a
1
_fil
e
:
s
quelch "packfile c
a
nnot be acce
s
s
e
d" warni
n
g
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-03-25
Jeff King
t9001: drop save_confi
r
m helper
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-03-25
Jeff King
t0020:
u
se
t
est_* helpers i
n
stea
d
of hand-rolled messages
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-03-25
Jef
f
Ki
n
g
t
: s
i
m
plify loop
ex
i
t
-
cod
e
status va
r
iab
l
es
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-03-25
Jeff King
t: fi
x
some tr
i
vi
a
l
c
as
e
s of
i
gnore
d
exit codes in
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-03-25
Jeff
K
ing
t770
1
: fix
ignored exit code inside
loop
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-03-25
J
eff King
t330
5
:
f
i
x
i
gnored ex
i
t
c
ode in
s
ide loop
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-03-25
Je
f
f King
t
00
2
0: fix ignored e
x
i
t
code
inside loo
p
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-03-25
Jeff King
perf-lib: fix ignored exi
t
code i
n
side loop
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-03-23
Jeff King
ru
n
-comm
a
nd: fo
r
bid using
r
un_
c
ommand with p
i
ped outpu
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-03-23
J
ef
f
K
ing
trailer:
u
s
e capture_comma
n
d
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-03-23
Jeff King
submodule: use ca
p
ture_command
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-03-23
J
e
ff K
i
ng
wt-st
a
tus:
use capture_command
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-03-23
Jeff King
run-
c
o
m
mand: introduce ca
p
ture
_
command h
e
l
p
er
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-03-22
Jeff Ki
n
g
w
t_statu
s
: fix
signed
n
e
s
s misma
t
c
h
i
n
strbuf_read
c
al
l
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-03-22
J
ef
f
Kin
g
wt
-
stat
u
s: don't flu
s
h
b
efo
r
e
running "submodule status"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-03-20
Jef
f
King
r
e
fs
.
c
: drop cura
t
e_packed_refs
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-03-20
J
e
ff King
repack: t
u
rn on "r
e
f
p
a
r
a
noia" when doing a destructive
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2015-03-20
J
eff
King
prune: turn on ref_
p
aranoia flag
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
next