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
Sync with maint
2014-10-19
Jeff
King
pack-objects: double-ch
e
c
k
options
before
d
iscarding
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-19
Jeff King
repack: pack objects m
e
ntioned by
the index
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-19
Jef
f
King
pack-objects: use
ar
g
v_array
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-19
Jeff King
rea
c
hable: u
s
e r
e
v
i
s
i
on machinery's --inde
x
e
d
-obj
e
c
t
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-19
Jeff King
rev-li
s
t
: add --
i
ndexed-
o
bjects option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-19
Jeff
King
rev-lis
t
: docu
m
ent
--reflog option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-19
J
e
ff King
t
5516: tes
t
pushing
a tag o
f
an otherwise unreferenced
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-19
Jeff King
traverse_commit
_
l
ist: support pendi
n
g blobs/tree
s
with
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-16
Junio C Hamano
Merge br
a
nch
'jc/completion
-
no-c
h
dir'
commit
|
commitdiff
|
tree
2014-10-16
Ju
n
io C Hamano
M
e
r
ge branch '
b
w/tr
a
ce-no-inline-get
n
a
notime'
commit
|
commitdiff
|
tree
2014-10-16
Junio C Hamano
Merge
b
r
anch '
p
o/every
d
a
y
-
doc'
commit
|
commitdiff
|
tree
2014-10-16
Ro
l
and Mas
g
i
tweb: use star
t
_for
m
,
n
ot
startform that w
a
s re
m
oved
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
t7610-merget
o
ol
:
a
dd te
s
t cases for merge
t
ool
.
wri
t
eTo
T
e
m
p
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-16
Dav
i
d Agu
i
lar
m
e
rg
e
too
l
: add
a
n opti
o
n for writin
g
to a tem
p
orary
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-16
Da
v
id
Aguilar
me
r
getool:
u
se more con
s
erva
t
ive temporary filen
a
mes
Helped-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
test-l
i
b-f
u
nctions: adjust
style
to match C
o
di
n
g
G
uide
l
ines
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
t7610-mer
g
etool:
u
se te
s
t
_
c
onfig to isolate tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-16
David
Aguilar
m
e
rgetools
/
m
eld: make usage
o
f `--outp
u
t`
c
onf
i
g
urable
.
.
.
Helped-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-16
Jeff
King
ma
k
e
add
_
object_array_w
i
th_co
n
te
x
t interfac
e
mor
e
sane
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-16
Jeff King
write
_
sh
a
1_file: freshen e
x
i
st
i
ng o
b
jects
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-16
Jeff King
p
ack-objects: match pr
u
n
e
logic for discarding obje
c
ts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-16
Jef
f
K
i
n
g
pack-objects: ref
a
ctor unpack-unre
a
chable
expiration
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-16
Jeff
King
prune: keep objects reacha
b
le fr
o
m
recent obj
e
ct
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-16
Jeff King
s
h
a1
_
file: add for_ea
c
h iterators for l
o
ose and pack
e
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-16
Jeff King
count-objects:
use for_ea
c
h_loose_fil
e
_in_
o
bj
d
ir
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-16
Jef
f
King
count-objects: do not use xsiz
e
_t when counting object
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-16
Jeff K
i
ng
prune-packed:
u
se for_each_loose_file_in_objdir
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-16
Jeff King
r
e
achable
:
mark index blobs
a
s SEEN
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-16
Jeff King
prun
e
: factor ou
t
l
oose-object direct
o
ry travers
a
l
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-16
Jef
f
K
i
ng
r
eachabl
e
:
r
euse revisio
n
.
c
"
add all reflogs" code
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-16
Jeff King
reacha
b
le: use
t
r
ave
r
se_
c
ommit_
l
ist instead of
c
ust
o
m
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-16
Jef
f
King
clean
u
p name alloc
a
tion
i
n prepare_revision_walk
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-16
Jeff
King
object_array: add a "
c
lear"
function
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-16
Je
f
f King
o
bje
c
t_array:
f
acto
r
out
s
lop
b
uf-fr
e
e
i
ng logi
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-16
Jef
f
Kin
g
isxdigit:
c
ast inpu
t
to unsigned char
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-16
J
e
ff King
f
o
r
each_alt_odb:
p
ropagate return value from
c
allback
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Sebast
i
an
Schuberth
con
t
a
c
ts: ad
d
a Make
f
i
le to g
e
n
erate docs a
n
d inst
a
l
l
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Sebastian Schube
r
th
subtree: a
d
d
a
n i
n
stal
l
-html target
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Charles Bailey
difftool: don't assume that defaul
t
sh is
s
ane
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Charles
Bailey
merget
o
ol: don't
r
equire
a
w
o
rk tre
e
for --tool-help
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
David
A
guilar
gi
t
-sh-
s
etup: move GIT_DIR initia
l
ization into a fun
c
ti
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Dav
i
d
A
g
uilar
mergetool: use more co
n
serv
a
tive temporary file
n
ames
Helped-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Da
v
id Aguilar
test-lib
-
func
t
ions: adjust style to
m
atch CodingGuide
l
ines
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Dav
i
d
A
guilar
t7610-m
e
rgetool: prefer test_co
n
fig
o
v
er git config
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
t7610-mergetool: ad
d
missing && and remo
v
e comme
n
ted
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
David Aguila
r
t761
0
-mergetool:
use tabs instead of
a mix of tabs
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
brian m
.
c
arlson
Doc
u
menta
t
ion: i
m
pleme
n
t linkgit macro
f
or Asciidoctor
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
bria
n
m
.
carlson
Do
c
umentatio
n
:
move some AsciiDoc paramete
r
s
into variab
l
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Jonatha
n
Nieder
ref_transacti
o
n_commit: b
a
il out on failure to r
e
m
o
v
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Jonat
h
an Nie
d
er
lockfile: remove
unable_to_lock_error
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Jonathan Nieder
refs
.
c
:
do not permit err == NUL
L
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sah
l
ber
g
remote rm/prune: print a
m
essage whe
n
w
riting packed
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
R
o
nnie
S
ahlberg
f
o
r-eac
h
-
r
ef: skip and w
a
rn about b
r
oken ref names
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sah
l
berg
r
efs
.
c
: allow li
s
ting and deleting
badly named refs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahl
b
erg
test: put
t
ests for handlin
g
of bad ref nam
e
s in o
n
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Jonathan
Niede
r
packed-ref cache: forb
i
d dot-comp
o
nents in refn
a
mes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahlb
e
rg
branc
h
-d:
s
implify by usin
g
RESOLVE_REF_READING
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Jonathan Nieder
b
r
a
nch -d:
a
void repeated symr
e
f
resoluti
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Jun
i
o C Ha
m
a
n
o
r
e
fl
o
g
test: test in
t
eraction
w
it
h
detached HEAD
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ron
n
ie Sahl
b
erg
re
f
s
.
c: change res
o
lve_re
f
_un
s
afe r
e
ading argument
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ro
n
nie S
a
hlberg
refs
.
c: ma
k
e write_
r
ef_sha1 stat
i
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahlberg
f
e
tch
.
c: ch
a
nge
s_
u
pdate
_
ref to use
a
r
e
f transaction
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahlberg
r
efs
.
c:
ref_transaction
_
comm
i
t: distinguish name conflicts
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ronn
i
e Sahlbe
r
g
refs
.
c
:
p
a
s
s a l
i
s
t
of names to ski
p
to is_r
e
fname_av
a
i
l
able
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie S
a
h
l
berg
refs
.
c: c
a
ll l
o
c
k
_ref_sha1_bas
i
c directly fr
o
m
c
o
mmit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ronni
e
Sah
l
b
e
rg
refs
.
c: refuse to
lock
badly named refs in lock_ref_sha1_basic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie
S
ah
l
berg
rename_ref: don'
t
ask read_ref_f
u
l
l
where the
ref
c
ame
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ronn
i
e Sahlberg
r
efs
.
c
:
pass the ref log
m
es
s
age to _
c
r
e
ate/delete
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
R
o
n
nie Sahlberg
refs
.
c:
add
a
n e
r
r
a
rgu
m
e
nt to
d
e
l
ete_ref_l
o
os
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahlber
g
wrapper
.
c: ad
d
a n
e
w fun
c
tion
unlink_or_msg
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ronn
i
e Sahl
b
erg
refs
.
c: lock_
r
ef_sha1_basic is used for a
l
l refs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahlberg
wrap
p
e
r
.
c:
remove/unlink_or_warn: simp
l
i
f
y, trea
t
ENOENT
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Jona
t
h
a
n Nieder
mv test:
r
ecreate
m
o
d
/
d
ir
e
ctor
y
i
n
ste
a
d of
relyi
n
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-14
John Szak
m
e
i
ster
compl
e
tion: silence "fat
a
l: No
t
a
git r
e
pository" erro
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-14
Jeff King
color_par
s
e: do not mention
variable
n
a
m
e in err
o
r
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-14
Jonat
h
a
n
Ni
e
d
e
r
pass config slots
as po
i
nters instead of offsets
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-14
Junio C Hamano
Updat
e
draft
r
elease notes to 2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-14
Junio C Hamano
Mer
g
e branch 'bc
/
asciidoc-
p
retty-formats-fix
'
commit
|
commitdiff
|
tree
2014-10-14
J
unio C Ham
a
no
Merge b
r
anch 'rs/p
l
ug-
l
eak-in-
b
undle
'
commit
|
commitdiff
|
tree
2014-10-14
Jun
i
o C Hamano
Merge
branch 'rs/more-us
e
s-of-skip-prefix
'
commit
|
commitdiff
|
tree
2014-10-14
Junio C Hamano
Merge branch 'rs/mail
s
plit'
commit
|
commitdiff
|
tree
2014-10-14
Juni
o
C Hamano
Merge bra
n
ch 'rs/sha1-array
-
test'
commit
|
commitdiff
|
tree
2014-10-14
Juni
o
C Ham
a
no
Merge branc
h
'mh/loc
k
f
i
le-
s
tdio
'
commit
|
commitdiff
|
tree
2014-10-14
Junio C
Hamano
Merge branch 'mh/lockfile'
commit
|
commitdiff
|
tree
2014-10-14
Juni
o
C
H
amano
Mer
g
e branch 'sk/tag-cont
a
ins-wo-re
c
ur
s
ion'
commit
|
commitdiff
|
tree
2014-10-14
Ju
n
io C Hamano
Merge b
r
anch
'
d
a
/completion-show-signature'
commit
|
commitdiff
|
tree
2014-10-14
Junio C Hamano
Me
r
ge branch
'rs/daemon-fixes'
commit
|
commitdiff
|
tree
2014-10-14
Junio C Ham
a
no
Merge
branch 'd
t
/cache-tree-repair'
commit
|
commitdiff
|
tree
2014-10-14
Juni
o
C Hamano
Merge branch 'so/rebase-doc-
f
ork-point'
commit
|
commitdiff
|
tree
2014-10-14
Junio C H
a
mano
Merge bran
c
h 'da/inc
l
ude-compat-util-firs
t
-in-c'
commit
|
commitdiff
|
tree
2014-10-13
Jeff King
t
e
st-
l
ib
.
sh: support -x option for
s
hel
l
-trac
i
ng
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
Ju
n
io C Ha
m
ano
t1
3
08: fix br
o
ken he
r
e
document in
test scri
p
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
Chr
i
stian Couder
Document
a
t
i
on: add documen
t
ation
f
or
'
git i
n
t
erpret
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
C
hristian Cou
d
er
trailer: add tests
for c
o
mm
a
nds in
confi
g
f
i
le
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
Chri
s
t
i
a
n Coud
e
r
trailer: ex
e
cute command f
r
om
'
trailer
.
<name>
.
comm
a
nd'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
C
hris
t
i
an C
o
uder
trailer
:
add test
s
for
"git interpret-
t
r
a
ilers"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
Christian Co
u
der
t
railer:
a
dd interpret-trailers c
o
mmand
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
Christian Couder
trailer: put all
the proces
s
i
n
g
t
o
g
e
ther and print
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
Christian C
o
uder
trailer: pa
r
se trailer
s
f
r
om file
or stdin
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
C
hristi
a
n Coude
r
trailer: process com
m
and line
trailer
arguments
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next