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
try_merge_strategy(): remove redundant lock_file allocation
2014-10-01
Michael Hagg
e
rty
t
r
y_merg
e
_s
t
rategy(): remo
v
e redundan
t
lock_fi
l
e allocat
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
M
ichael Haggerty
str
u
ct lock_file: declare som
e
fields volati
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
M
ichael Haggerty
lockfile: avoid
t
ransitory
i
nva
l
id
states
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
Michael Haggerty
git_
c
onfig_set_mul
t
ivar_in_file(): avoid
c
a
ll
t
o
rollback_lo
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
Mic
h
ael Haggerty
dump_marks(): r
e
move a
r
e
dundant call
t
o rollback_lock_fil
e
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
Mic
h
a
e
l Hag
g
erty
a
p
i
-lockfile:
d
ocumen
t
edge ca
s
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
Michael Haggerty
commit_lock_file
(
): rollback l
o
ck
f
i
l
e
o
n
f
a
i
lure
t
o
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
Mic
h
ael Hagge
r
ty
close_lock_file(): if
c
lose fails, roll
b
ack
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
Mic
h
ae
l
Haggerty
commit_
l
ock_file()
:
d
ie() if called for
unl
o
cked loc
k
file
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
Michael Haggerty
commit_
l
ock_file(): inline temporary vari
a
b
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
Michael Haggerty
remove_lo
c
k_file
(
)
:
call rol
l
back_lock_file()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
M
i
chael Haggerty
lock
_
f
i
le(
)
: exi
t
ea
r
ly if lockfi
l
e ca
n
not be
o
pened
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
Mi
c
hael Haggerty
p
r
epare_index(): declar
e
ret
u
rn value to be (cons
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
M
ichael
Ha
g
ger
t
y
delete_re
f
_loo
s
e(): don't muck ar
o
und i
n
the lock_file
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
Michael Hagg
e
rty
cac
h
e
.
h: define constan
t
s
L
O
CK_SUFFIX a
n
d
LOCK_SUFF
I
X_L
E
N
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
M
i
chael Ha
g
gerty
lockfile
.
c: do
c
ument the various
states of loc
k
_file
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
Michael Ha
g
gerty
lock_f
i
le()
:
alway
s
initialize and register l
o
c
k
_f
i
le
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
M
i
c
h
a
el Hagge
r
ty
h
old_
l
ock_file_for_a
p
p
e
nd(): rele
a
se lock
o
n errors
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
M
i
chael Haggerty
l
ockfile: unloc
k
file if lock
f
ile per
m
i
s
sions cannot
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
Michael Hagg
e
r
ty
rollback
_
lock_file()
:
set
f
d to -1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
Michael
H
aggerty
r
o
llback_lock_file(): exit ea
r
ly if
l
o
ck i
s
not active
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
Michael Haggerty
r
o
llbac
k
_l
o
ck_file
(
): do
n
ot clear filena
m
e red
u
ndantly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
Michael Haggerty
close_lock
_
fil
e
(): exit (
s
uc
c
essfully) if file is a
l
r
eady
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
Michael Hagg
e
r
ty
a
pi-l
o
ck
f
i
l
e: revise and
e
x
pand the documentatio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
Michael
H
aggerty
unable
_
to_lock_die(): re
n
ame funct
i
on
from unable_
t
o_l
o
c
k_in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-09-30
Junio C H
a
mano
Sync
w
i
t
h 2
.
1
.
2
commit
|
commitdiff
|
tree
2014-09-30
Junio C Hamano
M
e
r
ge branch 'jt/itimer-
a
utoconf'
commit
|
commitdiff
|
tree
2014-09-30
J
u
ni
o
C
H
a
man
o
Merge branch
'jc/test-lazy
-
p
r
ere
q
'
commit
|
commitdiff
|
tree
2014-09-30
Junio C Ha
m
ano
M
erge b
r
anch '
s
b/merg
e
-re
c
ursive-c
o
py-paste-
f
ix'
commit
|
commitdiff
|
tree
2014-09-30
J
unio C Hamano
Merge branc
h
'
pr
/
use
-
default-s
i
gpipe-setting'
commit
|
commitdiff
|
tree
2014-09-30
J
u
nio
C Hamano
Git 2
.
1
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-09-30
Junio C Haman
o
Merg
e
br
a
nch
'j
k
/fsck-exit-co
d
e-fix' into m
a
in
t
commit
|
commitdiff
|
tree
2014-09-30
Junio C
H
ama
n
o
Merge branch 'ta/conf
i
g-ad
d
-to-empty-or-true-f
i
x' into
.
.
.
commit
|
commitdiff
|
tree
2014-09-30
Junio
C
Hamano
Merge b
r
a
n
ch
'
m
k/reachabl
e
-
p
rotec
t
-
d
etached-head' into
.
.
.
commit
|
commitdiff
|
tree
2014-09-30
Ju
n
io
C Hamano
Me
r
ge br
a
nch 'mb/fast
-
impor
t
-
d
e
lete-root' i
n
to
maint
commit
|
commitdiff
|
tree
2014-09-30
Juni
o
C Ham
a
no
Merge branch
'
jk/index-pack-th
r
e
a
d
ing-r
a
c
e
s'
into main
t
commit
|
commitdiff
|
tree
2014-09-30
Ju
n
io C Ham
a
n
o
Merge branch 'jk/send-pack-many-refspecs'
i
n
t
o
maint
commit
|
commitdiff
|
tree
2014-09-30
Junio
C Hama
n
o
Merge
bra
n
ch '
s
o/re
b
ase
-
d
o
c' into maint
commit
|
commitdiff
|
tree
2014-09-29
Junio C Hamano
Updat
e
draft release notes to 2
.
2
commit
|
commitdiff
|
tree
2014-09-29
Junio C Ham
a
no
Merge
b
ra
n
c
h 'jk/mbox-from-line'
commit
|
commitdiff
|
tree
2014-09-29
Junio C Hamano
Merge bra
n
ch 'sb/t6031-typofix'
commit
|
commitdiff
|
tree
2014-09-29
Ju
n
io C Hamano
Merg
e
b
r
anch
'
sb/t9300-
t
ypofix'
commit
|
commitdiff
|
tree
2014-09-29
Junio C
Hamano
Mer
g
e branc
h
'rs/re
m
ot
e
-s
i
mplif
y
'
commit
|
commitdiff
|
tree
2014-09-29
Junio C H
a
mano
Merge branch
'
rs/graph-simplify
'
commit
|
commitdiff
|
tree
2014-09-29
Ju
n
io C Hamano
M
e
rge
b
ranc
h
'da/
r
e
v
-parse-verify-quiet'
commit
|
commitdiff
|
tree
2014-09-29
Jun
i
o C
Hamano
Merge
branch 'hj/prett
y
-naked-decoration'
commit
|
commitdiff
|
tree
2014-09-28
Ju
n
io C H
a
mano
Merge branc
h
'
m
aint'
commit
|
commitdiff
|
tree
2014-09-28
Juni
o
C
H
amano
Merge branch 'maint
'
of git://github
.
com/git
-
l
1
0n/gi
t
.
.
.
commit
|
commitdiff
|
tree
2014-09-26
Juni
o
C Hamano
Update draft release no
t
es to 2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-09-26
Junio C
H
ama
n
o
Merg
e
branch 'sb/h
e
lp-
u
nknown-command-sort
-
fix
'
commit
|
commitdiff
|
tree
2014-09-26
Junio C
H
amano
Merge bra
n
ch 'jk/branc
h
-verbose-merged
'
commit
|
commitdiff
|
tree
2014-09-26
Junio C Hamano
Merge branch 'rs/realloc-arra
y
'
commit
|
commitdiff
|
tree
2014-09-26
Junio C Hamano
Merge br
a
nch 'jk
/
close-stde
r
r-of-crede
n
tial-cache-deamon'
commit
|
commitdiff
|
tree
2014-09-26
Junio C Hamano
Merge bran
c
h 'jc/i
g
nore-sigpipe-while-running-
h
ooks'
commit
|
commitdiff
|
tree
2014-09-26
Junio C Hamano
Merge b
r
anch '
j
k/prun
e
-
p
acked-server-info'
commit
|
commitdiff
|
tree
2014-09-26
Juni
o
C
H
am
a
no
Me
r
ge
b
r
a
n
c
h 'jc/hash-objec
t
-fsc
k
-tag'
commit
|
commitdiff
|
tree
2014-09-26
Junio C Hamano
Merge branch 'jc/has
h
-
o
bje
c
t'
commit
|
commitdiff
|
tree
2014-09-26
Junio C Hamano
Merge branch 'js/fsck-tag-vali
d
ation'
commit
|
commitdiff
|
tree
2014-09-26
J
u
nio C Hamano
M
e
r
ge branch 'j
k
/faster-name-co
n
flicts'
commit
|
commitdiff
|
tree
2014-09-26
Junio C Hamano
M
erge branch
'j
k
/write-packed-refs-via-stdio'
commit
|
commitdiff
|
tree
2014-09-23
Stefan Beller
m
erg
e
-r
e
cursive: remov
e
stale c
o
mmen
t
ed
d
ebug
g
ing code
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-09-23
St
e
fan
Beller
m
erge-recurs
i
ve: fix copy-pa
s
te mistake
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-09-22
Eric Sunshine
ma
i
linfo: work
around
-
Wstr
i
ng-plus-int warning
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-09-22
Johannes S
i
xt
mingw
.
h:
a
dd dummy fun
c
tions for sigset_t operatio
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-09-22
Stefan
B
e
l
l
e
r
t
6031-test-merg
e
-
rec
u
rsive: do
n
ot forget to add file
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-09-22
Stefan Beller
t9
3
00-fast-
i
mport: fix typo
in tes
t
des
c
ription
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-09-22
René Scharfe
remote: simplify match_na
m
e_
w
ith_pat
t
e
r
n
()
using strbuf
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-09-22
René
Sc
h
ar
f
e
graph: si
m
plif
y
graph_paddi
n
g_line()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-09-19
Junio
C Hamano
Upd
a
te dr
a
ft release
n
otes
t
o 2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-09-19
Juni
o
C H
a
mano
Sy
n
c with Git 2
.
1
.
1
commit
|
commitdiff
|
tree
2014-09-19
Junio C
H
am
a
no
Git 2
.
1
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-09-19
Junio C H
a
m
a
no
Merge branch 'et/spell-poll
-
i
n
f
inite-with-min
u
s-one
.
.
.
commit
|
commitdiff
|
tree
2014-09-19
Junio
C
H
amano
Merg
e
branch 'nd/fetch-pass-quiet-to-g
c
-chi
l
d
-
process
.
.
.
commit
|
commitdiff
|
tree
2014-09-19
J
unio C Hamano
Merge branch 'jk/pru
n
e-t
o
p-
l
evel-r
e
f
s-afte
r
-
p
acki
n
g
.
.
.
commit
|
commitdiff
|
tree
2014-09-19
Junio C Hamano
Me
r
ge bran
c
h 'j
k
/fast-import-
f
ix
e
s' into
m
ain
t
commit
|
commitdiff
|
tree
2014-09-19
Jun
i
o
C Ha
m
a
n
o
Merge branch 'jn/unpack-
t
re
e
s-checkout-m-carr
y
-deletion
.
.
.
commit
|
commitdiff
|
tree
2014-09-19
Ju
n
io
C Haman
o
M
e
rg
e
br
a
nch
'
sp/pack-protocol-doc-on
-
shallow' into
.
.
.
commit
|
commitdiff
|
tree
2014-09-19
Junio C Hamano
M
e
rge
b
r
an
c
h
'jk/prompt
-
s
tash
-
c
oul
d
-b
e
-packed'
i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2014-09-19
Junio C
H
ama
n
o
Merge branch 'rs/refr
e
sh-beyond-symlink' i
n
t
o
maint
commit
|
commitdiff
|
tree
2014-09-19
Ju
n
io C Hama
n
o
Merge bra
n
ch
'
lf/bundle-
e
x
c
l
u
sion' into maint
commit
|
commitdiff
|
tree
2014-09-19
Ju
n
io
C
H
a
mano
Mer
g
e
b
ranch 'jc/apply-ws-pr
e
fix'
into ma
i
nt
commit
|
commitdiff
|
tree
2014-09-19
Junio C Hamano
Merge branch 'jk
/
co
m
mand-line
-
config
-
empty-
s
t
r
ing
'
.
.
.
commit
|
commitdiff
|
tree
2014-09-19
Junio C
Hama
n
o
Mer
g
e branch 'jk/pretty-e
m
pty-
f
ormat' into maint
commit
|
commitdiff
|
tree
2014-09-19
J
u
ni
o
C Hamano
Merge bran
c
h 'jk/fsck-
e
x
i
t-code-fix'
commit
|
commitdiff
|
tree
2014-09-19
J
unio C Hamano
Merge branch 'so
/
r
e
base-do
c
'
commit
|
commitdiff
|
tree
2014-09-19
Junio C Hama
n
o
Merge
b
ranch 'ir/makefile-typof
i
x
'
commit
|
commitdiff
|
tree
2014-09-19
J
unio C H
a
man
o
Merg
e
br
a
n
c
h 'w
k
/pre-push-sample-hook'
commit
|
commitdiff
|
tree
2014-09-19
J
u
nio C Hamano
Merg
e
branc
h
's
s
/compat-de
f
a
ult-source-f
o
r-
n
ewer
-
gnu'
commit
|
commitdiff
|
tree
2014-09-19
Jun
i
o C Hamano
Merge branch 'mr/mark-i18
n
-log-r
e
rere'
commit
|
commitdiff
|
tree
2014-09-19
Juni
o
C Ha
m
ano
Merge bra
n
ch 'js
/
n
o
-
test-cmp
-
for-bina
r
i
es'
commit
|
commitdiff
|
tree
2014-09-19
Junio C Haman
o
M
e
rge branc
h
'ta/config
-
ad
d
-to-empty-or-true-
f
ix'
commit
|
commitdiff
|
tree
2014-09-19
Juni
o
C Hamano
Merge branch 'sp/doc-update-inde
x
-c
a
c
heinfo'
commit
|
commitdiff
|
tree
2014-09-19
Junio
C Hamano
Merge bran
c
h 'rs/e
x
p
or
t
-strbuf-addch
a
rs'
commit
|
commitdiff
|
tree
2014-09-19
Jun
i
o C Hama
n
o
Merg
e
bran
c
h
'kb
/
perf-
t
r
ac
e
'
commit
|
commitdiff
|
tree
2014-09-19
J
u
nio C
H
a
m
ano
Merge
b
ranch 'jc/parseopt-verify-sho
r
t-name'
commit
|
commitdiff
|
tree
2014-09-19
J
u
ni
o
C Hamano
Merge branch 'mk/reachable-protect-detached-head'
commit
|
commitdiff
|
tree
2014-09-19
J
un
i
o C Ham
a
no
Me
r
ge bra
n
c
h
'
tb/complete-
d
iff-ig
n
ore-blank
-
lines'
commit
|
commitdiff
|
tree
2014-09-19
Ju
n
io C Haman
o
Merge branch 'as/calloc-ta
k
e
s-
n
memb-then-size'
commit
|
commitdiff
|
tree
2014-09-19
Juni
o
C Hamano
Merg
e
branch 'tb/crlf-tests'
commit
|
commitdiff
|
tree
2014-09-19
Junio C Hamano
Merge branch
'
rs/si
m
plify-htt
p
-
w
alker'
commit
|
commitdiff
|
tree
next