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
try_merge_strategy(): remove redundant lock_file allocation
2014-10-01
Mi
c
hael H
a
ggert
y
try_me
r
g
e
_strategy(): remove r
e
dund
a
nt
l
ock_
f
ile allo
c
ation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
Michael Hagger
t
y
struct lock
_
file: declare
some fields volatil
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
Michael Ha
g
gerty
lockfile: avoi
d
tra
n
s
itory invalid sta
t
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
M
i
chael Haggert
y
git_config_set_multiv
a
r_
i
n_
f
ile(
)
: avoid cal
l
to rollb
a
c
k_lo
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
M
ichael Haggerty
d
ump_ma
r
ks
(
):
r
e
move a redundant call to rollback_lock_file()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
Michael
Hagg
e
rty
api-
l
ockfil
e
: document edge cases
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
M
i
c
hael Hagger
t
y
commi
t
_lock_file():
rollback lock file on failure to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
Michael Hagg
e
rty
close_lock_file(): if
c
l
o
s
e fails, roll back
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
Michae
l
Ha
g
gerty
commit_lock_fil
e
(): die() if
called
for unlocke
d
loc
k
f
i
le
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
Mi
c
hael Haggerty
commit_lock_file():
i
n
l
ine
t
emporary vari
a
ble
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
Michael Haggerty
remove_lock_file()
:
call roll
b
ack_lock_f
i
le()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
M
icha
e
l Haggerty
loc
k
_
f
ile(): exit
e
a
rly if lockfi
l
e cann
o
t
be opened
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
M
i
chael H
a
ggerty
prepar
e
_
i
ndex():
d
eclare r
e
turn valu
e
to
be (const
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
Mic
h
ael Haggerty
d
e
lete_ref
_
loose():
d
on
'
t
muck around in the lock_fil
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
Micha
e
l H
a
ggerty
cache
.
h: define
c
onstants LOCK_SUFFIX a
n
d LOCK_SUFF
I
X_
L
EN
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
Mic
h
ae
l
Haggerty
loc
k
file
.
c: document
t
he various
s
t
ate
s
of lock_file
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
Michael Hag
g
e
rty
l
o
ck_file(): always in
i
t
i
alize and r
e
gist
e
r lock
_
file
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
Mic
h
ael Haggerty
hol
d
_lo
c
k_
f
i
le_f
o
r_append(): release lock on erro
r
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
Mi
c
hael Haggerty
lockfile: u
n
lock
f
ile if lockfile p
e
rmissions cannot
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
Michael Haggerty
r
o
l
lback_lock_fi
l
e
(
): se
t
fd to -1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
Mich
a
e
l
Haggert
y
rollback_lock_
f
i
l
e(): exit ear
l
y if lock is not active
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
M
ichael Haggerty
r
ollba
c
k
_lo
c
k_file(
)
: do
not clear filename
r
edu
n
d
antly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
Micha
e
l Haggerty
close
_
lock_fi
l
e(): exit (successfu
l
l
y) if file is alread
y
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
M
i
chael Ha
g
gerty
ap
i
-loc
k
file: r
e
vise and expan
d
the
d
ocumentation
Helped-by: Junio Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
Michael Haggerty
unable_to_lock_d
i
e():
r
enam
e
func
t
ion from u
n
able_
t
o_lock_in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-09-30
Ju
n
io C
Hamano
Sync
w
ith 2
.
1
.
2
commit
|
commitdiff
|
tree
2014-09-30
Junio C
Hamano
Merge branch
'jt/itimer-auto
c
onf'
commit
|
commitdiff
|
tree
2014-09-30
J
unio C Hamano
M
e
r
g
e branch '
j
c/test-l
a
zy-prereq'
commit
|
commitdiff
|
tree
2014-09-30
Junio
C
H
a
mano
Merge
b
r
anch 'sb/merge-recursive-copy-
p
aste-fix
'
commit
|
commitdiff
|
tree
2014-09-30
Junio C Hamano
Merge br
a
nch '
p
r/use-default
-
s
i
gpipe-s
e
tt
i
ng'
commit
|
commitdiff
|
tree
2014-09-30
Junio C
Haman
o
Git 2
.
1
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-09-30
Junio
C
Ha
m
a
no
Merge branch '
j
k/
f
sck-ex
i
t
-code-fix'
i
nto maint
commit
|
commitdiff
|
tree
2014-09-30
J
unio C Hama
n
o
M
e
rge branc
h
'ta/
c
o
n
f
ig-
a
dd-t
o
-empty-or-true-fix'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2014-09-30
Junio C Haman
o
Me
r
ge bran
c
h
'
mk/
r
eachable-protect-deta
c
hed-head' into
.
.
.
commit
|
commitdiff
|
tree
2014-09-30
Junio
C
Hama
n
o
Merge branch 'mb/fast-
i
mport
-
dele
t
e-root' into
m
aint
commit
|
commitdiff
|
tree
2014-09-30
Junio C Hamano
Merge
b
ranch 'jk
/
i
ndex
-
pack-t
h
reading-races' i
n
to maint
commit
|
commitdiff
|
tree
2014-09-30
Junio C
Hamano
Merge branch
'
jk/send-pa
c
k-ma
n
y-r
e
f
s
pecs' int
o
main
t
commit
|
commitdiff
|
tree
2014-09-30
Junio C Hamano
Merge
b
ranch
'
so/re
b
ase-do
c
' into main
t
commit
|
commitdiff
|
tree
2014-09-29
J
u
n
i
o C Hamano
U
p
date draft release notes to 2
.
2
commit
|
commitdiff
|
tree
2014-09-29
Jun
i
o C Hamano
Merge
branch 'jk/m
b
ox-from-
l
i
ne'
commit
|
commitdiff
|
tree
2014-09-29
Juni
o
C Hama
n
o
Merge branch 'sb/
t
6
031-typofix'
commit
|
commitdiff
|
tree
2014-09-29
J
u
nio C Hama
n
o
Mer
g
e
branch 'sb
/
t
9300-typofix'
commit
|
commitdiff
|
tree
2014-09-29
J
unio C
H
amano
Merg
e
branch 'rs/remo
t
e-simplif
y
'
commit
|
commitdiff
|
tree
2014-09-29
Junio C Hamano
Merge br
a
nch 'rs/graph-
s
implify'
commit
|
commitdiff
|
tree
2014-09-29
Jun
i
o C
Ha
m
ano
Merge br
a
nch 'da
/
rev-parse-
v
erify
-
quiet'
commit
|
commitdiff
|
tree
2014-09-29
Junio C Ha
m
ano
Merge
br
a
nch 'hj/pretty
-
n
ake
d
-d
e
cor
a
tion'
commit
|
commitdiff
|
tree
2014-09-28
Junio C Hamano
Mer
g
e
branch 'maint'
commit
|
commitdiff
|
tree
2014-09-28
J
unio
C H
a
mano
Merge branch 'maint' o
f
git://github
.
com/git-l10n/gi
t
.
.
.
commit
|
commitdiff
|
tree
2014-09-26
Jun
i
o C Hamano
Upda
t
e draft relea
s
e notes to 2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-09-26
Junio
C
H
amano
Merge b
r
anch
'
sb/he
l
p-unknown-comma
n
d-sort-fix'
commit
|
commitdiff
|
tree
2014-09-26
Junio C
Hamano
Merge bra
n
c
h
'
j
k/
b
r
a
nc
h
-ver
b
ose-merged'
commit
|
commitdiff
|
tree
2014-09-26
Juni
o
C Hama
n
o
Me
r
ge
b
r
anch 'rs/realloc-array'
commit
|
commitdiff
|
tree
2014-09-26
Junio C Hamano
Merge
b
ranch 'j
k
/close-stderr-of-
c
red
e
nt
i
al-cache-deamon'
commit
|
commitdiff
|
tree
2014-09-26
Ju
n
io C Hamano
Merge branch 'jc/ignore-sigpipe-whil
e
-running-h
o
oks'
commit
|
commitdiff
|
tree
2014-09-26
Jun
i
o C Hamano
Merge branch 'jk/
p
rune-
p
acked-server-info
'
commit
|
commitdiff
|
tree
2014-09-26
Junio C
H
a
m
ano
Merge branch 'jc/hash-object-fsck-tag'
commit
|
commitdiff
|
tree
2014-09-26
Junio C Hamano
M
e
rge b
r
anch 'jc/hash-object'
commit
|
commitdiff
|
tree
2014-09-26
Junio C Hamano
M
e
rge bran
c
h 'js/fsck-tag-v
a
lidation'
commit
|
commitdiff
|
tree
2014-09-26
Junio C Hamano
Merge bra
n
c
h
'jk/faster-name-co
n
flicts'
commit
|
commitdiff
|
tree
2014-09-26
Junio C Ham
a
no
M
erge br
a
nch 'jk/
w
rite
-
pack
e
d
-
refs-via-s
t
dio'
commit
|
commitdiff
|
tree
2014-09-23
Ste
f
an Beller
merg
e
-re
c
u
rsive:
remove sta
l
e commented debu
g
gi
n
g
cod
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-09-23
Stefan Bell
e
r
m
e
r
ge-recursive:
fix
c
opy
-
p
a
ste mi
s
take
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-09-22
E
ric
S
u
n
shin
e
m
a
ili
n
fo: work aroun
d
-Wstr
i
ng-plus-int warn
i
ng
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-09-22
Jo
h
a
nnes Si
x
t
mingw
.
h: add dummy fu
n
c
tio
n
s
for
s
i
gset
_
t operat
i
ons
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-09-22
Stefa
n
B
e
ller
t6031-test
-
merge-recursive: do not forge
t
to add file
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-09-22
Stefa
n
Beller
t
9
30
0
-fast-import:
f
ix typo in tes
t
d
e
scriptio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-09-22
René Scharfe
remot
e
: simplify match_name_wi
t
h_p
a
ttern() using strb
u
f
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-09-22
Re
n
é Scharfe
g
r
aph: simplify graph_p
a
d
d
ing
_
line()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-09-19
Juni
o
C Hamano
U
p
d
a
te
d
raft rel
e
ase notes to 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
Jun
i
o C H
a
mano
Git 2
.
1
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-09-19
Junio C Haman
o
Merge branch '
e
t/
s
pe
l
l-poll-infinite-with-minu
s
-one
.
.
.
commit
|
commitdiff
|
tree
2014-09-19
Junio C
Haman
o
Merge
branch 'n
d
/fetch-
p
ass-quiet-to
-
gc-child-process
.
.
.
commit
|
commitdiff
|
tree
2014-09-19
Junio C Ham
a
no
Merge branch '
j
k
/pru
n
e
-top
-
l
e
vel-refs-after-
p
ac
k
in
g
.
.
.
commit
|
commitdiff
|
tree
2014-09-19
Juni
o
C
H
a
m
a
n
o
Merge branch 'jk/fast-import-fixes
'
into maint
commit
|
commitdiff
|
tree
2014-09-19
J
u
n
i
o C H
a
mano
Merge branc
h
'
j
n/unp
a
ck-tr
e
es-ch
e
ckout-
m
-carry-
d
elet
i
on
.
.
.
commit
|
commitdiff
|
tree
2014-09-19
Junio C Hamano
M
erge branch 'sp/pa
c
k-proto
c
ol-doc-on-shallow' into
.
.
.
commit
|
commitdiff
|
tree
2014-09-19
J
unio C Ha
m
a
n
o
Merge branch 'j
k
/prom
p
t-stas
h
-could-be-packed' into
.
.
.
commit
|
commitdiff
|
tree
2014-09-19
Junio
C
Haman
o
Merge b
r
anch 'rs
/
refresh-b
e
yond-symlink' int
o
maint
commit
|
commitdiff
|
tree
2014-09-19
Ju
n
io C Hamano
Merg
e
branch 'lf/bund
l
e-exclusio
n
' int
o
maint
commit
|
commitdiff
|
tree
2014-09-19
Junio C Ha
m
ano
Merge branch 'jc/a
p
ply-ws-prefix' into ma
i
nt
commit
|
commitdiff
|
tree
2014-09-19
J
u
nio C Hamano
M
e
rge bra
n
ch 'jk/c
o
mmand-lin
e
-config
-
empty-string'
.
.
.
commit
|
commitdiff
|
tree
2014-09-19
J
u
nio C Ha
m
ano
M
erge branch 'jk/p
r
etty-emp
t
y-format' int
o
maint
commit
|
commitdiff
|
tree
2014-09-19
Junio C
Hama
n
o
Me
r
ge
branch 'jk/fsck-exit-code-fi
x
'
commit
|
commitdiff
|
tree
2014-09-19
Junio C H
a
mano
Merge bran
c
h
'
so/
r
e
ba
s
e-doc'
commit
|
commitdiff
|
tree
2014-09-19
Junio C Hamano
Merge branch
'
ir/makefile-typofix'
commit
|
commitdiff
|
tree
2014-09-19
J
u
nio C Hamano
Merge
b
ranch 'wk/pre-push
-
sample
-
hook
'
commit
|
commitdiff
|
tree
2014-09-19
Junio C Ham
a
no
Merge branc
h
'
s
s
/
compat-default-source-for-new
e
r
-g
n
u'
commit
|
commitdiff
|
tree
2014-09-19
Junio C
Hamano
Merge
b
ranch
'mr/mark-i18n-log-r
e
r
e
re'
commit
|
commitdiff
|
tree
2014-09-19
Ju
n
io C Ham
a
no
M
e
rge branch 'js/no-test-cmp-for
-
binarie
s
'
commit
|
commitdiff
|
tree
2014-09-19
Juni
o
C
H
a
ma
n
o
M
e
rge
branch
'ta/config-add-to-em
p
ty-or-t
r
ue-f
i
x'
commit
|
commitdiff
|
tree
2014-09-19
J
u
nio
C Hamano
Mer
g
e branch 'sp/doc-update-index-cacheinfo'
commit
|
commitdiff
|
tree
2014-09-19
Jun
i
o
C
H
a
m
ano
Me
r
ge b
r
anch 'r
s
/exp
o
r
t-s
t
r
b
uf-addch
a
rs'
commit
|
commitdiff
|
tree
2014-09-19
J
u
nio
C
Haman
o
Merge bra
n
c
h
'kb/p
e
rf
-
trace'
commit
|
commitdiff
|
tree
2014-09-19
Junio
C Hamano
Merge
branch 'jc/p
a
r
s
eopt-verif
y
-sho
r
t-name
'
commit
|
commitdiff
|
tree
2014-09-19
J
u
nio C
H
amano
Merge branch 'mk/reachab
l
e
-prot
e
ct-detached-he
a
d'
commit
|
commitdiff
|
tree
2014-09-19
Ju
n
i
o
C Hamano
Me
r
ge branch 'tb/
c
om
p
let
e
-diff-ignor
e
-
b
lan
k
-lines'
commit
|
commitdiff
|
tree
2014-09-19
Junio C
H
amano
Merge branch
'
as/callo
c
-t
a
kes-nmemb-
t
hen-size'
commit
|
commitdiff
|
tree
2014-09-19
Junio
C
H
a
mano
Merge branc
h
'tb/c
r
lf-tests'
commit
|
commitdiff
|
tree
2014-09-19
Juni
o
C
Ha
m
ano
Mer
g
e branch
'rs/simplify-http-walker'
commit
|
commitdiff
|
tree
next