repo.or.cz
/
git
/
mingw.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(): use a statically-allocated lock_file object
2014-10-01
M
i
chael
H
a
g
gerty
try_
m
e
r
ge_
s
tra
t
egy(): use a
s
t
atic
a
l
l
y-a
l
located lo
c
k_file
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
Michael Hagge
r
t
y
tr
y
_merge_s
t
rategy(): remove redu
n
d
ant lo
c
k_file all
o
ca
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
Michael Ha
g
g
e
rty
stru
c
t l
o
ck_file:
d
e
cla
r
e some fields volatile
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
Micha
e
l
H
a
ggerty
lockfil
e
: avoid transitory invalid states
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
Michael Ha
g
g
e
rty
g
i
t_con
f
ig_set_multivar_in_
f
ile(): avoid ca
l
l to rollback_lo
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
Michael Haggerty
dump
_
marks(): remove a redundant call
t
o rollback_l
o
c
k
_file()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
Mi
c
hael Haggert
y
api-lo
c
kfile: document e
d
ge cases
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
Michael H
a
ggerty
commit_lo
c
k_file(): rollback loc
k
f
ile on fa
i
lure to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
Michael Haggerty
close
_
l
ock_file():
i
f
c
lose fails, ro
l
l back
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
Michael Hag
g
erty
comm
i
t_lock_
f
ile(): die
(
)
i
f
called for
u
nlocke
d
l
o
ck
f
ile
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
Michael Ha
g
gerty
commit_lock_file(): inline t
e
mporary vari
a
ble
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
M
i
chael Haggerty
remove_lo
c
k_f
i
le(): call rollback_lock_file()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
Michael H
a
g
g
erty
lo
c
k_fi
l
e
(
)
: exit e
a
rly
i
f lo
c
k
fil
e
cannot be opened
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
Michael Ha
g
gerty
pre
p
are
_
i
ndex(): declare return v
a
lu
e
to be (const
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
Mich
a
el Ha
g
ger
t
y
delete_ref_loos
e
():
d
on't muck aro
u
nd
in the lock_fil
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
M
i
chae
l
Haggerty
cach
e
.
h
:
define cons
t
ants
L
OCK
_
SUF
F
IX and LOCK_SUFFIX_LEN
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
Michae
l
Hag
g
e
r
t
y
lockfile
.
c:
do
c
u
m
ent the various
state
s
of loc
k
_file
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
M
i
chael Ha
g
ge
r
t
y
lock_file(): al
w
ay
s
initia
l
i
z
e and register l
o
ck_file
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
Mic
h
ael Hag
g
erty
hold_
l
ock_f
i
le_for_app
e
nd(): rele
a
se lock on erro
r
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
Michael Haggerty
lockfile
:
unlock file if lockf
i
l
e
permissi
o
ns
c
annot
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
M
ichael H
a
ggerty
rollback_lock_fi
l
e
(
): set f
d
to
-
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
Mi
c
hael Haggerty
rollb
a
ck_
l
o
ck_file(): ex
i
t early if lo
c
k is not
a
ctive
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
M
ichael
H
aggerty
rollb
a
ck_lock_file(): do not clea
r
fi
l
en
a
me
r
edun
d
antly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
Michae
l
H
aggerty
close
_
lo
c
k_f
i
le():
exit
(
successfully)
i
f file i
s
already
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
Michael Haggerty
api-lockfile:
r
evise an
d
expan
d
t
h
e d
o
c
u
mentation
Helped-by: Junio Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-01
Michael Hagger
t
y
unable_
t
o_lock_d
i
e(): rename func
t
ion from unable_to_lock_in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-09-30
Junio C Ham
a
n
o
Sync wi
t
h 2
.
1
.
2
commit
|
commitdiff
|
tree
2014-09-30
Junio C Hamano
M
erge branch 'jt/iti
m
er-autocon
f
'
commit
|
commitdiff
|
tree
2014-09-30
Junio C Ham
a
n
o
M
e
rge branch
'
jc/
t
e
s
t
-l
a
zy-pr
e
r
eq
'
commit
|
commitdiff
|
tree
2014-09-30
Junio C Hamano
Merge b
r
anch 'sb/merge-rec
u
rsive-cop
y
-paste
-
fix'
commit
|
commitdiff
|
tree
2014-09-30
Junio C
H
amano
M
e
rge
branch 'pr/use-
d
efault-s
i
g
pipe-setting
'
commit
|
commitdiff
|
tree
2014-09-30
Juni
o
C Ham
a
n
o
Git
2
.
1
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-09-30
J
u
nio
C Hamano
Me
r
g
e b
r
an
c
h
'jk/fsck-exit-code-f
i
x' into mai
n
t
commit
|
commitdiff
|
tree
2014-09-30
J
u
nio C Hamano
M
erge branc
h
't
a
/
c
onfig-add-to
-
empty-or-true-fix
'
into
.
.
.
commit
|
commitdiff
|
tree
2014-09-30
Ju
n
io C
H
a
mano
Merge
branch
'
mk/re
a
chable-
p
rotec
t
-detached-head' into
.
.
.
commit
|
commitdiff
|
tree
2014-09-30
Junio C Hamano
Merge
b
ranch 'mb/fast-
i
mport-de
l
et
e
-root' in
t
o maint
commit
|
commitdiff
|
tree
2014-09-30
Jun
i
o C Hamano
Merg
e
branch '
j
k/
i
n
de
x
-pac
k
-
t
hreading-races'
i
nto m
a
int
commit
|
commitdiff
|
tree
2014-09-30
J
u
nio C
H
amano
Merg
e
b
ra
n
ch 'jk/send-pac
k
-
m
any-refs
p
ecs' int
o
maint
commit
|
commitdiff
|
tree
2014-09-30
Junio
C
Hamano
Merge
b
ranch
'
so/rebase-
d
o
c' into
m
aint
commit
|
commitdiff
|
tree
2014-09-29
Junio C Hamano
Update
d
r
a
ft r
e
lease notes to 2
.
2
commit
|
commitdiff
|
tree
2014-09-29
Junio C Hamano
Merge branch 'jk/mb
o
x
-fr
o
m-lin
e
'
commit
|
commitdiff
|
tree
2014-09-29
Ju
n
io C
H
am
a
no
Merge branc
h
'sb/t6031-typofix'
commit
|
commitdiff
|
tree
2014-09-29
J
u
nio
C
Hamano
Merge
b
r
anc
h
'sb/t930
0
-typofix'
commit
|
commitdiff
|
tree
2014-09-29
Jun
i
o
C Hamano
Merge branch 'rs
/
remote-simplif
y
'
commit
|
commitdiff
|
tree
2014-09-29
Junio C Hamano
Merge branch 'rs/graph-simpli
f
y
'
commit
|
commitdiff
|
tree
2014-09-29
Junio C Hamano
Merge branch 'da
/
rev-pars
e
-verify-
q
uiet'
commit
|
commitdiff
|
tree
2014-09-29
Jun
i
o C Hamano
Merge branc
h
'h
j
/pretty-naked-decoration'
commit
|
commitdiff
|
tree
2014-09-28
Junio C H
a
mano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2014-09-28
J
u
nio C H
a
mano
Merge branch 'm
a
int'
o
f
gi
t
://github
.
com/git-l10n/git
.
.
.
commit
|
commitdiff
|
tree
2014-09-26
Junio C
H
amano
Update draft rele
a
se notes to 2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-09-26
Jun
i
o
C Hama
n
o
Merge
bran
c
h 'sb/help-u
n
known-command-sort-fix'
commit
|
commitdiff
|
tree
2014-09-26
Juni
o
C
Hamano
M
e
rge
bran
c
h '
j
k/branch
-
verbose-merged'
commit
|
commitdiff
|
tree
2014-09-26
Jun
i
o C Hamano
Merge
b
ranch
'
rs/realloc-array
'
commit
|
commitdiff
|
tree
2014-09-26
Ju
n
io C Hamano
Merge branc
h
'jk/clo
s
e
-stder
r
-of-credent
i
al-cache-deamon'
commit
|
commitdiff
|
tree
2014-09-26
Junio C Ham
a
n
o
Merge br
a
nch 'jc/igno
r
e-sigpipe
-
while-runni
n
g
-
hooks'
commit
|
commitdiff
|
tree
2014-09-26
Junio C Hamano
Merge bra
n
ch
'
jk/prune-packed-server-info'
commit
|
commitdiff
|
tree
2014-09-26
Junio C
H
aman
o
Merge
b
ranch
'jc/hash-obje
c
t-fsck-tag'
commit
|
commitdiff
|
tree
2014-09-26
Junio C Ham
a
n
o
Merg
e
branch 'jc/has
h
-ob
j
ect'
commit
|
commitdiff
|
tree
2014-09-26
Junio C
Hamano
Merge branch 'js/fsck-
t
ag-validat
i
on'
commit
|
commitdiff
|
tree
2014-09-26
Junio
C Ham
a
no
Merge bra
n
c
h
'
j
k/faster-n
a
m
e
-conflicts
'
commit
|
commitdiff
|
tree
2014-09-26
J
u
ni
o
C Ha
m
ano
Mer
g
e
br
a
nch 'jk/writ
e
-
p
acked-ref
s
-via-stdio
'
commit
|
commitdiff
|
tree
2014-09-23
Stefan Bel
l
e
r
merge-
r
e
c
ursi
v
e: remove
stale commented debug
g
ing code
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-09-23
S
t
efan
Bel
l
er
merge-recursive: fi
x
cop
y
-paste m
i
stake
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-09-22
Eric Su
n
shine
m
a
ilinfo: work around -Wstring-plus-in
t
warning
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-09-22
J
o
hannes
S
ixt
ming
w
.
h: add dummy fu
n
c
t
ions fo
r
si
g
set_t ope
r
ations
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-09-22
S
t
e
fan Beller
t
6
0
31-t
e
s
t-merg
e
-recursiv
e
:
do
n
ot f
o
rget to add f
i
le
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-09-22
Stefan Beller
t9300-fast
-
i
m
port: fix t
y
po in t
e
st description
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-09-22
René Scharf
e
remote: simplify m
a
tch_nam
e
_with_patt
e
rn() u
s
in
g
strbuf
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-09-22
René Sc
h
arfe
graph:
s
impli
f
y graph_padding_line()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-09-19
Junio C
Hamano
Update draft re
l
ease no
t
e
s
to 2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-09-19
Junio C Hamano
Sync with G
i
t 2
.
1
.
1
commit
|
commitdiff
|
tree
2014-09-19
Junio C Hamano
Git 2
.
1
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-09-19
J
unio C Hamano
Merge branch
'
e
t/spell-poll-in
f
ini
t
e-with-minus-one
.
.
.
commit
|
commitdiff
|
tree
2014-09-19
Junio C H
a
man
o
Merg
e
b
r
anch 'nd/fetch-p
a
ss-quiet-to-gc-child-process
.
.
.
commit
|
commitdiff
|
tree
2014-09-19
J
unio C Ham
a
n
o
Merge b
r
anch 'jk/prun
e
-top-level-re
f
s
-
a
f
ter-packing
.
.
.
commit
|
commitdiff
|
tree
2014-09-19
Jun
i
o C Hamano
Merge b
r
anch
'
jk/fast-import-fixe
s
'
into m
a
int
commit
|
commitdiff
|
tree
2014-09-19
Ju
n
io
C
Hamano
Merg
e
bra
n
ch
'j
n
/unpack
-
trees-
c
hecko
u
t-m-
c
a
r
r
y-de
l
etion
.
.
.
commit
|
commitdiff
|
tree
2014-09-19
J
u
nio
C
Hama
n
o
M
erge branch 'sp/p
a
ck-protocol-
d
oc
-
on-sha
l
low
'
into
.
.
.
commit
|
commitdiff
|
tree
2014-09-19
Junio
C
Haman
o
M
e
rge
branch 'jk/pr
o
mpt-st
a
sh-co
u
ld-
b
e-packed' into
.
.
.
commit
|
commitdiff
|
tree
2014-09-19
Junio C Hamano
Merge branch
'r
s
/refresh-b
e
y
o
nd-symlink'
into
m
aint
commit
|
commitdiff
|
tree
2014-09-19
Junio
C
H
a
mano
Merge bran
c
h
'
l
f/bun
d
le-exclusion' into maint
commit
|
commitdiff
|
tree
2014-09-19
Junio C
Ha
m
ano
Me
r
g
e
br
a
n
c
h 'jc
/
a
pply-ws-prefix'
i
n
t
o
maint
commit
|
commitdiff
|
tree
2014-09-19
J
u
nio C Hama
n
o
Merg
e
branch 'jk/comman
d
-li
n
e-c
o
nfig-empt
y
-strin
g
'
.
.
.
commit
|
commitdiff
|
tree
2014-09-19
Junio C Hamano
Merge bra
n
ch 'j
k
/pret
t
y-empty-for
m
at' into maint
commit
|
commitdiff
|
tree
2014-09-19
Junio
C H
a
m
a
no
Merge branc
h
'jk
/
fsck
-
exit
-
c
ode-fix'
commit
|
commitdiff
|
tree
2014-09-19
Junio
C
Haman
o
Merge branch
'
so/rebase-
d
o
c'
commit
|
commitdiff
|
tree
2014-09-19
Junio C Hamano
M
erge
br
a
nch 'ir/makefi
l
e-typofix'
commit
|
commitdiff
|
tree
2014-09-19
Jun
i
o C Hamano
Mer
g
e
bran
c
h 'wk/pre-push-sample-ho
o
k'
commit
|
commitdiff
|
tree
2014-09-19
Junio C Ha
m
ano
Merge branc
h
'ss
/
co
m
pat-default-
s
ource-for-newer-gn
u
'
commit
|
commitdiff
|
tree
2014-09-19
Junio C Hamano
M
e
r
g
e branch
'
mr/mar
k
-i18n-l
o
g-r
e
rere'
commit
|
commitdiff
|
tree
2014-09-19
Junio C H
a
mano
Merge branch 'js/no-test
-
cmp
-
f
o
r-binaries'
commit
|
commitdiff
|
tree
2014-09-19
Juni
o
C
H
a
m
ano
Merge branch 'ta/c
o
n
f
i
g
-add-to-em
p
ty-or-true-
f
ix'
commit
|
commitdiff
|
tree
2014-09-19
J
unio C Hamano
Mer
g
e
branc
h
'sp/doc-
u
p
d
a
te-index-cacheinfo'
commit
|
commitdiff
|
tree
2014-09-19
Junio
C
Hamano
Mer
g
e
b
ranch 'rs/export-s
t
rbuf-add
c
hars'
commit
|
commitdiff
|
tree
2014-09-19
Junio C Ham
a
no
M
e
rge
b
r
a
nch 'k
b
/
perf
-
tr
a
ce'
commit
|
commitdiff
|
tree
2014-09-19
Junio C Hamano
Merge
b
ranch '
j
c/parseopt-ve
r
if
y
-
short-na
m
e'
commit
|
commitdiff
|
tree
2014-09-19
J
u
n
i
o
C
H
amano
M
e
rge bran
c
h 'mk/reachable
-
protect-detached-head
'
commit
|
commitdiff
|
tree
2014-09-19
J
un
i
o
C
Hamano
Merge branch 'tb/comple
t
e-diff-ignore-blank-lin
e
s'
commit
|
commitdiff
|
tree
2014-09-19
J
unio C
H
am
a
no
Merge b
r
anch 'as/calloc-t
a
kes-nmemb-then-s
i
z
e
'
commit
|
commitdiff
|
tree
2014-09-19
Junio C Hamano
Merge branch '
t
b
/
crlf-te
s
ts'
commit
|
commitdiff
|
tree
next