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-10-08
Ju
n
io C Ha
m
ano
Upd
a
te draft rele
a
se notes t
o
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-08
J
u
n
io C Haman
o
Mer
g
e branch
'
sp/str
e
am-clean-filter'
commit
|
commitdiff
|
tree
2014-10-08
J
u
nio C H
a
mano
Merg
e
branch '
b
w/use-write-script-in-tests'
commit
|
commitdiff
|
tree
2014-10-08
Junio C Hamano
M
erge
b
ranch 'nd/arc
h
i
v
e-pathsp
e
c'
commit
|
commitdiff
|
tree
2014-10-08
Junio
C
H
amano
Me
r
ge branch 'jc/push-cer
t
'
commit
|
commitdiff
|
tree
2014-10-07
J
unio C
Hamano
S
y
nc w
i
th maint
commit
|
commitdiff
|
tree
2014-10-07
Junio C Hamano
Merge branch 'main
t
-2
.
0' into maint
commit
|
commitdiff
|
tree
2014-10-07
Junio
C
H
a
m
ano
Mer
g
e branch
'
m
ain
t
-1
.
9' into maint-2
.
0
commit
|
commitdiff
|
tree
2014-10-07
Junio
C
Hamano
Merge branch 'maint
-
1
.
8
.
5' in
t
o maint-1
.
9
commit
|
commitdiff
|
tree
2014-10-07
J
u
nio C Hamano
Mer
g
e branch 'jk/mbox-from-l
i
ne' into maint
commit
|
commitdiff
|
tree
2014-10-07
D
a
vid Aguilar
c
o
mpletion: add --
s
how-signatur
e
for l
o
g and sh
o
w
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-07
René Schar
f
e
use
s
kip_pre
f
ix
(
)
t
o
av
o
id more m
a
gi
c
numbers
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-07
Wieland Hoffma
n
n
g
i
t-t
a
g
.
txt: A
d
d
a
missing hyphe
n
t
o
`-s`
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-07
René Sc
h
a
rfe
mailsplit
:
remove
u
nnec
e
ssary unlink(2) call
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-07
René Scharfe
bundle:
p
l
ug minor
me
m
ory lea
k
in
i
s_tag_in
_
d
a
te_range()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
Mi
c
hael
H
a
g
ger
t
y
commit_packed_
r
efs
(
): reimplem
e
nt usi
n
g fdopen_lock_file()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
M
i
chael
Haggerty
d
ump_marks(): reimplement using fdopen_
l
ock_fi
l
e
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
Michael
Haggert
y
fdope
n
_l
o
ck_f
i
l
e(): access a
l
ockfile usin
g
stdio
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
M
ic
h
ael Ha
g
gerty
lo
c
kfile
.
h: ext
r
a
c
t new
h
eader file for the functions
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
Mi
c
hael Haggerty
hold_locked_ind
e
x
(
): move fro
m
lockfile
.
c to read-cach
e
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
Michael Hagge
r
t
y
hold_lock_file_f
o
r_append
(
): restore
errn
o
b
e
fo
r
e
r
etur
n
ing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
Michael H
a
g
g
ert
y
get_locked_file_path():
n
ew
f
u
nction
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
Michael Haggerty
lock
f
il
e
.
c: ren
a
m
e
static funct
i
on
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
Micha
e
l
Haggerty
lockfile: rename LOCK_NODEREF t
o
L
O
C
K_NO_DEREF
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
M
ichael Haggerty
com
m
it_lo
c
k_file_to(): refactor a helper out of
commit_
l
ock_
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
Michael Haggerty
trim_last_path_compon
e
nt
(
): re
p
lace last_path_elm()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
Mi
c
hael Hag
g
erty
resolve_s
y
mlink():
take a strbuf p
a
rameter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
Michael Haggerty
resol
v
e
_
symli
n
k(
)
:
u
s
e a
s
trbuf for
internal s
c
r
a
tch
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
Michael Hagg
e
rty
l
o
ckfile: change lock_fi
l
e::filename int
o
a strbuf
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
Michael Hagge
r
ty
commit_lock_file(): use a strbuf to manag
e
temporary
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
Mi
c
h
ael Haggerty
try_
m
e
r
ge_strateg
y
():
u
s
e
a stati
c
al
l
y
-
alloca
t
e
d
lock_f
i
le
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
Mich
a
el
H
a
g
gert
y
try_merge
_
s
t
rategy()
:
remove redun
d
a
nt l
o
ck_file
a
llocatio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
Michael Haggerty
struct lock_file: dec
l
are s
o
me fi
e
lds vol
a
til
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
M
i
ch
a
el
Hag
g
erty
lockfile: a
v
oid
t
r
ansitory inval
i
d states
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
Michael Hagge
r
ty
git_c
o
nfig_set_multivar
_
i
n
_
file(): avoid ca
l
l to ro
l
l
b
ack_lo
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
Mich
a
el
Haggerty
dump_mark
s
(
)
: remove a r
e
dund
a
nt call to
rollback_lock_file()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
Michae
l
Haggerty
api-lockfil
e
: documen
t
edge cases
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
Michael Hagger
t
y
c
o
mmit_lock_file():
roll
b
a
c
k lock file on failure to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
Michael Haggerty
close
_
lock_file(): if clo
s
e
fails, roll
b
ack
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
Michael Haggerty
commit_lock_file():
die() if called for unlocked loc
k
file
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
M
i
chael Hag
g
e
r
t
y
com
m
it_lock_file(): inline tempora
r
y v
a
riable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
Micha
e
l
H
a
g
g
erty
remov
e
_
lock_file
(
): call rol
l
back_lock
_
f
i
le()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
Michael Haggerty
lock_file(
)
: exit early if lo
c
kfile
cannot
b
e
opened
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
M
i
c
h
ael Hagge
r
ty
p
r
epare_ind
e
x(): declare return
value to
be (cons
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
M
ic
h
ael
H
a
gger
t
y
delete_ref_loos
e
():
d
on't muck
a
round in t
h
e lo
c
k
_
f
ile
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
Michael Hagger
t
y
cache
.
h: define constants
L
OCK_SUFFIX
and
L
O
C
K_
S
UFFIX_LEN
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
Michael Haggerty
l
o
ckfile
.
c: d
o
cument the
v
ariou
s
s
t
ates of
lock_file
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
Michael Ha
g
gert
y
lock_file(): always i
n
i
tiali
z
e and reg
i
ster lo
c
k_fi
l
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
Mich
a
el H
a
ggerty
h
old
_
lock_file_fo
r
_append(
)
: rele
a
se
l
ock on errors
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
Mi
c
hael Haggerty
l
o
ckf
i
le: un
l
ock file if
l
ockfil
e
permissions canno
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
M
i
c
hael Haggerty
ro
l
lback_lo
c
k_file():
s
et f
d
to -1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
Micha
e
l
H
a
ggerty
rollback_lock_file(): exit ear
l
y if
lock is no
t
ac
t
ive
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
Michael Haggerty
rollback_l
o
ck_file
(
): d
o
not clear filename redunda
n
tly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
Michae
l
Hagge
r
ty
close_lock_file(): ex
i
t
(succe
s
sfully) if file is
alr
e
ady
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
Michael Haggerty
api
-
lockfile: revise and expand the d
o
c
umentation
Helped-by: Junio Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
M
ichael
Hagge
r
ty
unable_to_loc
k
_die():
r
en
a
me functio
n
from
u
nable_to_l
o
c
k_in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
René
Scharfe
daemon: remove write-only
v
ariab
l
e
maxfd
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
René Scharfe
daemon: fix
e
r
r
or m
e
ssage after bind
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
René Schar
f
e
daemo
n
:
handle get
h
ostbyname()
error
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
René Scharf
e
sha
1
-lookup:
handle
duplicates in sha1
_
pos()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
René Scharfe
sha1-array: add t
e
st-sha1-
a
rray a
n
d basic tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-09-30
R
ené Sch
a
rfe
t
0
0
90
:
avoid pas
s
ing
e
mpt
y
str
i
ng to printf
%d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-09-30
Junio
C H
a
ma
n
o
Sync
w
ith 2
.
1
.
2
commit
|
commitdiff
|
tree
2014-09-30
Juni
o
C Hamano
Merge
branch
'jt/i
t
imer-autoconf
'
commit
|
commitdiff
|
tree
2014-09-30
Junio C Ha
m
ano
Merge br
a
nc
h
'jc
/
t
e
st-
l
azy-
p
rereq'
commit
|
commitdiff
|
tree
2014-09-30
Ju
n
io C Ha
m
ano
M
e
r
ge
bra
n
ch
'
sb/merge-recursive-copy-paste-fix'
commit
|
commitdiff
|
tree
2014-09-30
Ju
n
io
C
Hamano
M
erge
branc
h
'pr/use-defau
l
t
-
si
g
p
ipe-setting'
commit
|
commitdiff
|
tree
2014-09-30
Junio C
Hamano
G
it 2
.
1
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-09-30
Junio
C
H
aman
o
Merge branch
'
jk/fsck
-
e
x
it-code-fix' into mai
n
t
commit
|
commitdiff
|
tree
2014-09-30
Jun
i
o C Ham
a
no
Merge branc
h
'ta/c
o
nfig-ad
d
-to-emp
t
y-or-true-fix' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2014-09-30
Junio C Hamano
Mer
g
e branch 'mk/rea
c
hable-p
r
o
tect-detach
e
d-
h
ead
'
into
.
.
.
commit
|
commitdiff
|
tree
2014-09-30
J
unio C Hamano
Merge bra
n
ch '
m
b/fast-import-dele
t
e
-
root' into
ma
i
nt
commit
|
commitdiff
|
tree
2014-09-30
Junio C Hamano
Merge branch 'jk/
i
ndex
-
pa
c
k-t
h
reading-race
s
' in
t
o maint
commit
|
commitdiff
|
tree
2014-09-30
J
unio
C
H
amano
Merge
b
r
a
nch 'jk
/
send-pack-ma
n
y-ref
s
pecs' int
o
ma
i
nt
commit
|
commitdiff
|
tree
2014-09-30
Junio C Ham
a
n
o
Merge branc
h
'so
/
rebase-doc'
i
n
t
o m
a
int
commit
|
commitdiff
|
tree
2014-09-29
Ben W
a
lton
t
ra
c
e
.
c: do n
o
t
m
ark
g
etnanotime() as "inli
n
e"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-09-29
Junio C Hamano
Up
d
a
t
e draft
re
l
ease note
s
to 2
.
2
commit
|
commitdiff
|
tree
2014-09-29
Junio C Hama
n
o
Merge branch 'jk/mbox-from-line'
commit
|
commitdiff
|
tree
2014-09-29
J
unio C Hamano
Merge b
r
anch
'sb/t60
3
1-typofi
x
'
commit
|
commitdiff
|
tree
2014-09-29
Ju
n
io C Ham
a
no
Merge branch 's
b
/t9300-typofix'
commit
|
commitdiff
|
tree
2014-09-29
Junio C Hama
n
o
Me
r
g
e
bra
n
ch 'rs/remote-simplify'
commit
|
commitdiff
|
tree
2014-09-29
Juni
o
C Hama
n
o
Merge
b
ranc
h
'rs/graph
-
si
m
p
lify'
commit
|
commitdiff
|
tree
2014-09-29
Junio C
H
a
m
a
no
M
e
r
g
e
branch
'
da/r
e
v-parse-verify-qu
i
et'
commit
|
commitdiff
|
tree
2014-09-29
Junio C Hamano
Mer
g
e br
a
nch
'
hj/pretty-naked-dec
o
ration'
commit
|
commitdiff
|
tree
2014-09-29
Sergey
Organov
Docu
m
entatio
n
/
git-rebase
.
txt
:
d
o
c
u
ment when --for
k
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-09-29
B
e
n Walton
t/lib-credentia
l
: use write_
s
cript
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-09-28
Junio
C
Hamano
Me
r
ge branc
h
'mai
n
t
'
commit
|
commitdiff
|
tree
2014-09-28
Junio C
Haman
o
Merge
b
r
anch 'maint'
o
f git://g
i
thub
.
com
/
git-
l
10n/git
.
.
.
commit
|
commitdiff
|
tree
2014-09-26
J
u
n
i
o
C
Haman
o
Update
draft release notes to
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-09-26
J
un
i
o C Hamano
M
e
r
ge bran
c
h '
s
b
/
help-un
k
n
own-
c
ommand-sort-fix'
commit
|
commitdiff
|
tree
2014-09-26
Junio C Hamano
M
erge bra
n
c
h
'jk/b
r
anch-ver
b
ose-mer
g
e
d'
commit
|
commitdiff
|
tree
2014-09-26
Juni
o
C
H
amano
Merge
b
r
a
nc
h
'r
s
/reallo
c
-arra
y
'
commit
|
commitdiff
|
tree
2014-09-26
Juni
o
C Ham
a
no
Merge br
a
nch 'jk/close-stderr
-
of-
c
re
d
ential-cach
e
-deamon'
commit
|
commitdiff
|
tree
2014-09-26
Junio C
H
a
m
ano
Merge b
r
a
n
c
h '
j
c/ignore
-
si
g
pipe-while-run
n
ing
-
h
o
oks'
commit
|
commitdiff
|
tree
2014-09-26
Junio C Hamano
Merge branch 'jk/pr
u
n
e
-packed-s
e
r
v
er-info'
commit
|
commitdiff
|
tree
2014-09-26
Ju
n
io
C
H
a
mano
Merge
branch 'jc/hash-obje
c
t-fs
c
k-ta
g
'
commit
|
commitdiff
|
tree
2014-09-26
Jun
i
o C Hamano
Merge branch 'jc/
h
ash-o
b
j
e
ct'
commit
|
commitdiff
|
tree
2014-09-26
Ju
n
io C
H
amano
Merge br
a
n
c
h
'js/fsc
k
-tag-validation'
commit
|
commitdiff
|
tree
2014-09-26
J
u
nio C Hamano
Merge branch '
j
k/faster
-
na
m
e-conflicts'
commit
|
commitdiff
|
tree
2014-09-26
Junio
C Hamano
Merge branch 'j
k
/w
r
i
t
e
-
packed-
r
efs-via-stdio'
commit
|
commitdiff
|
tree
next