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
M
ichael Hag
g
erty
try_merge
_
strateg
y
(): remove redun
d
a
n
t
loc
k
_file allo
c
atio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
Michael Haggerty
s
truct lock_
f
ile: decl
a
re
some f
i
elds volatil
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
Michael Hag
g
e
r
ty
l
o
ckfile: avoid t
r
ansitory i
n
valid
states
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
Mic
h
ael Haggerty
git_config
_
set_
m
ultivar_in_file(): avoi
d
cal
l
to rollback
_
l
o
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
Mic
h
ael H
a
g
g
e
r
ty
dump_mar
k
s():
r
e
m
ove a redund
a
nt
call to rollback_lo
c
k_file()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
Michael Hagger
t
y
a
p
i-lock
f
ile: d
o
c
ument
e
dge cases
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
Michael
Haggerty
commit_lock_file():
r
ollback lock file on failure to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
Micha
e
l H
a
ggerty
close_l
o
ck_
f
ile(): if close
fail
s
, ro
l
l
b
ack
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
M
i
ch
a
el Haggerty
co
m
m
it_lock_file(
)
: d
i
e() if
c
alled for unlocked lockfile
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
Michael Ha
g
g
erty
c
ommit_lock_f
i
le(
)
: inline
t
emporary var
i
a
b
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
Michael Hagg
e
rty
remove_
l
ock_file(): c
a
ll r
o
llback_lock_f
i
l
e
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
Michael Haggerty
lock_file
(
): exit early if lockfile ca
n
n
o
t
b
e o
p
ene
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
Michael Haggert
y
prepare_index(): declare return
v
alue to b
e
(con
s
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
Michael
H
aggerty
delete_
r
ef_loose(): don
'
t muck around in the lock_file
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
Michael H
a
ggerty
cache
.
h: define co
n
st
a
nts
L
O
C
K
_
SUFFIX and LOCK_
S
UFFIX_LEN
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
Michae
l
Hagger
t
y
lockfi
l
e
.
c: do
c
ume
n
t the
vario
u
s states of lock_file
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
Michael Ha
g
gerty
l
ock_file():
a
lways
i
n
i
tializ
e
and
r
egister lock_fi
l
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
Michael Hagg
e
rty
hold
_
lock_file_
f
or_a
p
pend(): rel
e
ase lock on erro
r
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
Micha
e
l H
a
ggert
y
lo
c
kfile: un
l
o
ck file
i
f
lockfile
p
ermissio
n
s ca
n
n
ot
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
Mi
c
hael Haggerty
rollback_loc
k
_file(): set fd
to -1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
Michael
H
aggerty
rollbac
k
_
lock_
f
ile(): exit
ea
r
ly if
l
ock is
no
t
active
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
Michael Hagge
r
ty
rollback_lock_file(): do not clear filename redunda
n
tly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
Micha
e
l Haggerty
close_lock_f
i
l
e
(): exit (succe
s
sfull
y
) if
file is alr
e
ady
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
Michael Haggerty
a
pi-lockfile: revise and exp
a
nd the documentation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
M
i
c
h
ae
l
Haggerty
unab
l
e_
t
o_lock_die(): rename f
u
nction fro
m
unable_to_lock_in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-09-30
J
u
nio
C
Hamano
Sync wi
t
h
2
.
1
.
2
commit
|
commitdiff
|
tree
2014-09-30
Jun
i
o C Hamano
Merge branc
h
'jt/itimer
-
au
t
oco
n
f'
commit
|
commitdiff
|
tree
2014-09-30
Junio C
Hama
n
o
M
erge
bran
c
h 'jc/te
s
t-lazy-prereq'
commit
|
commitdiff
|
tree
2014-09-30
J
u
nio C H
a
mano
Mer
g
e branch 'sb/merge-re
c
urs
i
ve-copy-paste-
f
ix'
commit
|
commitdiff
|
tree
2014-09-30
Junio C Hamano
Merge bra
n
ch
'
p
r/us
e
-de
f
ault-sigp
i
pe
-
setting'
commit
|
commitdiff
|
tree
2014-09-30
Junio C
H
amano
Git 2
.
1
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-09-30
J
unio C Ham
a
no
Merg
e
bra
n
ch 'jk/fs
c
k-ex
i
t-code-fix'
i
nto ma
i
n
t
commit
|
commitdiff
|
tree
2014-09-30
Junio C Hamano
M
erge branch 'ta/conf
i
g-ad
d
-
t
o-empty-or-t
r
ue-fix'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2014-09-30
J
u
nio C
H
amano
Merge
b
ranc
h
'mk/reachable-pro
t
e
ct-detached-head' int
o
.
.
.
commit
|
commitdiff
|
tree
2014-09-30
J
u
nio C Hama
n
o
Merge
b
ranch
'
mb/fa
s
t-i
m
port-de
l
ete-
r
oot'
into maint
commit
|
commitdiff
|
tree
2014-09-30
Junio C
Hamano
Mer
g
e branch 'jk/index-pack-thread
i
ng-races
'
in
t
o maint
commit
|
commitdiff
|
tree
2014-09-30
Junio
C
Ha
m
a
no
Merge
b
ranch '
j
k/s
e
nd-pack-many
-
refspecs' i
n
to maint
commit
|
commitdiff
|
tree
2014-09-30
Jun
i
o C
Hamano
Mer
g
e
branch 'so/rebase
-
d
o
c
' into ma
i
nt
commit
|
commitdiff
|
tree
2014-09-29
J
unio C Hama
n
o
Update draf
t
rel
e
ase notes to 2
.
2
commit
|
commitdiff
|
tree
2014-09-29
J
unio C Hamano
Merge bran
c
h 'jk/mbox-from-line'
commit
|
commitdiff
|
tree
2014-09-29
Junio C Hamano
M
erge br
a
n
c
h
'sb/t
6
031-typo
f
ix'
commit
|
commitdiff
|
tree
2014-09-29
J
u
n
i
o
C Hamano
M
erge bra
n
ch 'sb
/
t
9
300
-
typofix'
commit
|
commitdiff
|
tree
2014-09-29
Junio C Ham
a
no
Mer
g
e bran
c
h 'r
s
/
remote-simplify'
commit
|
commitdiff
|
tree
2014-09-29
Junio C Hamano
Merge bran
c
h
'
rs/grap
h
-simplify
'
commit
|
commitdiff
|
tree
2014-09-29
J
unio
C
Ha
m
ano
Merge bra
n
c
h 'da/rev-pars
e
-veri
f
y-quiet'
commit
|
commitdiff
|
tree
2014-09-29
Junio
C
H
a
ma
n
o
Merge branch
'
hj/pretty
-
naked-decoration'
commit
|
commitdiff
|
tree
2014-09-28
Junio C Hamano
Merg
e
branch
'
maint
'
commit
|
commitdiff
|
tree
2014-09-28
Junio
C
H
amano
Merg
e
b
ranch 'maint' of
gi
t
:
//github
.
com/gi
t
-l10n/
g
it
.
.
.
commit
|
commitdiff
|
tree
2014-09-26
Junio 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
Juni
o
C
Hamano
Merge bra
n
ch 'sb/help-unknown-
c
ommand-sort-fix'
commit
|
commitdiff
|
tree
2014-09-26
Junio C Hamano
Mer
g
e branch 'jk/br
a
nch
-
verb
o
s
e
-merged'
commit
|
commitdiff
|
tree
2014-09-26
Junio C
Hamano
M
erge
b
ranch 'rs
/
r
e
alloc-array'
commit
|
commitdiff
|
tree
2014-09-26
Junio C Hamano
Merge branch 'jk/close-std
e
rr
-
of-credential-cach
e
-de
a
mon'
commit
|
commitdiff
|
tree
2014-09-26
Junio C Hamano
Merge br
a
nch 'j
c
/ignore-si
g
p
i
pe-
w
hile-runn
i
ng-hook
s
'
commit
|
commitdiff
|
tree
2014-09-26
Juni
o
C Hamano
M
e
rge branch 'jk/prune-packed-serve
r
-in
f
o'
commit
|
commitdiff
|
tree
2014-09-26
Junio C Hamano
Merge br
a
nch '
j
c/h
a
sh-obje
c
t-f
s
c
k
-tag'
commit
|
commitdiff
|
tree
2014-09-26
Ju
n
io
C Hamano
Merge branch 'jc/hash-object'
commit
|
commitdiff
|
tree
2014-09-26
Junio C
H
a
man
o
Merge b
r
anch 'js/f
s
ck-ta
g
-valida
t
ion'
commit
|
commitdiff
|
tree
2014-09-26
Junio C
Hamano
Merge
bran
c
h 'jk/faster-n
a
me
-
confl
i
cts'
commit
|
commitdiff
|
tree
2014-09-26
Junio C Hama
n
o
Merge branch
'jk/write-pack
e
d-refs-via-stdio'
commit
|
commitdiff
|
tree
2014-09-23
Stefan
B
eller
merge-re
c
ursive
:
r
e
move sta
l
e c
o
mmented debuggi
n
g code
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-09-23
Stefan Beller
mer
g
e-recursive: fi
x
copy-paste mistake
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-09-22
Eric Sunshi
n
e
m
a
i
lin
f
o: work around -Wst
r
ing
-
plus-int
warnin
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-09-22
J
ohann
e
s Sixt
ming
w
.
h: add
d
ummy
f
u
ncti
o
ns fo
r
s
igset_t oper
a
tions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-09-22
Ste
f
an B
e
ller
t6031
-
t
e
st-merge-recursive
:
do not forget to add file
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-09-22
St
e
fa
n
Beller
t
9
300-fa
s
t-impo
r
t: fix typo i
n
test d
e
sc
r
iption
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-09-22
R
e
né Scha
r
fe
remote: simp
l
ify match_name_wit
h
_pattern()
u
s
ing strb
u
f
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-09-22
René Scharfe
graph:
s
i
mplif
y
graph_pad
d
i
n
g_lin
e
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-09-19
J
unio C
H
a
m
a
n
o
Update draft release notes
t
o 2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-09-19
Junio C Hamano
Sync with Git 2
.
1
.
1
commit
|
commitdiff
|
tree
2014-09-19
Ju
n
io C
H
amano
Git 2
.
1
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-09-19
Jun
i
o
C Hamano
Mer
g
e bra
n
ch
'
et/sp
e
ll-poll-infinite-with
-
min
u
s-one
.
.
.
commit
|
commitdiff
|
tree
2014-09-19
Ju
n
io C
H
amano
Merg
e
branch 'nd/f
e
tch
-
pass-quiet-to-gc-child-proces
s
.
.
.
commit
|
commitdiff
|
tree
2014-09-19
J
u
n
io C
Hamano
Merge
branch 'jk/prune-top-
l
ev
e
l-
r
efs-after-pac
k
ing
.
.
.
commit
|
commitdiff
|
tree
2014-09-19
J
unio
C
H
amano
Merge
b
r
anch 'jk/fa
s
t
-
import-
f
ixes' into maint
commit
|
commitdiff
|
tree
2014-09-19
Junio
C Hamano
Merge branch 'jn/unpack
-
trees-checkout-m-c
a
rry-del
e
tion
.
.
.
commit
|
commitdiff
|
tree
2014-09-19
Junio C Hamano
M
e
rge branch '
s
p/p
a
c
k
-protocol-
d
o
c
-on-sha
l
l
o
w
'
into
.
.
.
commit
|
commitdiff
|
tree
2014-09-19
Junio C
Hama
n
o
M
er
g
e b
r
anch 'jk/prompt-stash-could-b
e
-packed' into
.
.
.
commit
|
commitdiff
|
tree
2014-09-19
J
unio
C Hama
n
o
Merge
branch '
r
s/ref
r
esh-
b
e
y
ond-symlin
k
' into
m
ai
n
t
commit
|
commitdiff
|
tree
2014-09-19
Junio C Haman
o
M
e
rge branch
'
lf/bundle-ex
c
lus
i
o
n'
i
nto m
a
i
n
t
commit
|
commitdiff
|
tree
2014-09-19
Junio C Ham
a
no
Merge branch 'jc/apply
-
ws-prefi
x
'
into maint
commit
|
commitdiff
|
tree
2014-09-19
Jun
i
o C
Hamano
Merge br
a
nch 'jk/command
-
l
i
ne-conf
i
g-empty
-
string'
.
.
.
commit
|
commitdiff
|
tree
2014-09-19
J
u
nio
C H
a
mano
Merge branch 'jk/prett
y
-empty-format' i
n
to maint
commit
|
commitdiff
|
tree
2014-09-19
Junio C H
a
ma
n
o
Merge branch
'jk/fsck-exi
t
-cod
e
-fi
x
'
commit
|
commitdiff
|
tree
2014-09-19
Junio C Hamano
Merge br
a
nch 'so
/
rebase
-
d
o
c'
commit
|
commitdiff
|
tree
2014-09-19
J
u
nio C Hamano
Me
r
ge branch '
i
r/makefile-typofix'
commit
|
commitdiff
|
tree
2014-09-19
Junio C Hamano
Merge
branch 'wk/pr
e
-pu
s
h-samp
l
e-hook'
commit
|
commitdiff
|
tree
2014-09-19
Junio C Hamano
Merge
b
ranch
'
ss/compat-de
f
ault-source
-
fo
r
-newer-gnu'
commit
|
commitdiff
|
tree
2014-09-19
Jun
i
o C Ham
a
no
M
e
rg
e
branch 'mr/mark-i18n-log-re
r
ere'
commit
|
commitdiff
|
tree
2014-09-19
J
u
n
i
o
C Hamano
Merge
branch 'js/no-test-cmp-for-binaries'
commit
|
commitdiff
|
tree
2014-09-19
Junio
C
Ham
a
no
M
e
rg
e
b
r
anch 'ta/config-add-to-emp
t
y-o
r
-true-fix'
commit
|
commitdiff
|
tree
2014-09-19
Ju
n
io C Hamano
Merge branch 'sp/doc-upda
t
e
-index-
c
a
cheinfo'
commit
|
commitdiff
|
tree
2014-09-19
Junio C Ha
m
ano
Merge bran
c
h 'rs/ex
p
ort-strbuf-addcha
r
s'
commit
|
commitdiff
|
tree
2014-09-19
J
u
nio C Hamano
Merge br
a
nch
'
kb/perf-trac
e
'
commit
|
commitdiff
|
tree
2014-09-19
Junio C
Hamano
Merge b
r
anch 'jc/par
s
eo
p
t-ver
i
fy-short-name'
commit
|
commitdiff
|
tree
2014-09-19
J
u
nio C Ham
a
no
Me
r
g
e
branch 'mk
/
reachable-pr
o
tect-det
a
ched-he
a
d'
commit
|
commitdiff
|
tree
2014-09-19
Junio C Haman
o
Mer
g
e b
r
anc
h
'tb/complet
e
-diff-ignore-blank-lines
'
commit
|
commitdiff
|
tree
2014-09-19
Jun
i
o
C
Ham
a
no
Mer
g
e bra
n
ch 'as/calloc-tak
e
s-
n
me
m
b-th
e
n-siz
e
'
commit
|
commitdiff
|
tree
2014-09-19
Juni
o
C Ha
m
a
n
o
Merge bra
n
ch 'tb/
c
rlf-tests'
commit
|
commitdiff
|
tree
2014-09-19
Junio C Hamano
Merge branc
h
'rs/simplify-http-walk
e
r'
commit
|
commitdiff
|
tree
next