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
J
uni
o
C Hamano
U
pdate
draft
r
el
e
ase notes to 2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-08
Junio C
H
amano
Merge branch 'sp/stream
-
clean-filter'
commit
|
commitdiff
|
tree
2014-10-08
Junio C Hamano
Mer
g
e bra
n
ch 'bw/use-write-script-in-tes
t
s'
commit
|
commitdiff
|
tree
2014-10-08
Jun
i
o C Hamano
Merg
e
branch 'nd/archive-pathsp
e
c'
commit
|
commitdiff
|
tree
2014-10-08
Juni
o
C
H
amano
Merge branch 'jc/
p
ush-cer
t
'
commit
|
commitdiff
|
tree
2014-10-07
Juni
o
C H
a
man
o
Sync with maint
commit
|
commitdiff
|
tree
2014-10-07
Junio C Hamano
Merge
branch 'main
t
-2
.
0' into m
a
int
commit
|
commitdiff
|
tree
2014-10-07
Junio
C Ham
a
no
Me
r
ge branch 'maint-1
.
9' int
o
mai
n
t-2
.
0
commit
|
commitdiff
|
tree
2014-10-07
J
unio
C
Haman
o
Merge bra
n
ch 'maint-1
.
8
.
5' into maint-1
.
9
commit
|
commitdiff
|
tree
2014-10-07
Jun
i
o C Hamano
M
e
rge bra
n
ch 'jk/mbox-from-line' into maint
commit
|
commitdiff
|
tree
2014-10-07
D
a
vid Aguila
r
completion: add -
-
s
ho
w
-signat
u
re for
l
og and show
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-07
René Scharfe
u
s
e ski
p
_pref
i
x() to avoid more ma
g
ic numbe
r
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-07
Wieland Hoffmann
git-tag
.
txt: Add
a mis
s
ing hyphen
t
o `-s`
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-07
René
S
ch
a
rfe
m
ailspl
i
t:
remove unnecessary unlink(2) cal
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-07
R
e
n
é Scharfe
bund
l
e
:
p
l
u
g minor memory
leak i
n
is_t
a
g_
i
n_date_range(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
Mich
a
el Haggerty
comm
i
t_packed_
r
efs(): reimplement us
i
ng fd
o
pen_lock_file()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
Micha
e
l Haggerty
dump_marks():
r
eimplement using
f
dop
e
n_lock_
f
i
l
e
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
Michael Haggerty
fdop
e
n_lock_file(): access a lockfile using stdio
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
Mic
h
a
e
l
Hagger
t
y
lockf
i
le
.
h: extract new h
e
ader f
i
le
f
or the functio
n
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
M
ichael H
a
ggerty
hold_locked_index(): mo
v
e from loc
k
fil
e
.
c to read-c
a
che
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
Mic
h
ael H
a
gg
e
rty
h
o
l
d
_lock_file_for_append(): restore err
n
o befo
r
e return
i
ng
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
Michael Haggert
y
g
e
t_
l
ocked_file_path(): new func
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
Mi
c
h
a
el Haggerty
lockfile
.
c: rename sta
t
ic functio
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
Mich
a
el
H
aggerty
lockf
i
le: ren
a
me LOC
K
_NODE
R
EF to LOCK_NO_DERE
F
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
Michael
Haggerty
c
ommit_lock_file_to(): refactor a helper
out of com
m
i
t
_
lock_
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
M
i
chael
H
aggerty
tri
m
_las
t
_path_c
o
mponent(
)
: replace last_path_elm()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
Michael H
a
ggerty
resolve_syml
i
nk(
)
:
t
a
k
e a
s
trbuf paramet
e
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
Michael Haggerty
resolve_symlink(): use a str
b
uf for internal scratch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
Michael
H
a
gge
r
ty
lockfile: chan
g
e lock_file::fil
e
na
m
e in
t
o a s
t
rbuf
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
M
i
chael Haggerty
com
m
it
_
l
o
c
k
_
f
il
e
(): use
a strbuf to manage temporary
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
M
ic
h
ael Hag
g
erty
try
_
m
erge_
s
trate
g
y(): use a
s
tatically
-
all
o
cated lock_file
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
Mi
c
hael Ha
g
gerty
try_
m
e
rge_
s
trategy():
r
emove redu
n
da
n
t
l
ock_file al
l
ocat
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
Mi
c
hael H
a
g
g
erty
st
r
uct lock_f
i
le: declare
some f
i
eld
s
volatile
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
Michael H
a
ggerty
lo
c
kfi
l
e: avo
i
d tra
n
si
t
ory inva
l
id states
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
M
i
ch
a
el Hagg
e
rty
git_conf
i
g_set_
m
ultivar_in
_
file(): avoid call to rol
l
back_lo
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
M
i
cha
e
l Hagge
r
ty
dump_
m
arks(
)
:
r
emove a redund
a
nt c
a
l
l
t
o rollback_lock_file()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
Mich
a
e
l Hag
g
erty
api-loc
k
f
i
le: document e
d
g
e cases
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
Michael Haggerty
co
m
mit_loc
k
_file
(
): rollback loc
k
file
o
n f
a
i
lure to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
M
i
chael Hag
g
erty
cl
o
se_lock_fil
e
(): if c
l
os
e
fails,
roll
b
ack
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
Michael Haggerty
co
m
m
i
t_l
o
ck_file(): d
i
e()
i
f
called
f
or
u
n
l
ocked
lockfile
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
Mich
a
e
l Haggerty
commit_
l
ock_fi
l
e(): inli
n
e tempora
r
y v
a
riable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
Mi
c
hael Hagg
e
rty
remove
_
lock_file
(
):
c
a
l
l rollback_loc
k
_file
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
M
i
c
h
a
el Hagge
r
ty
lock_
f
i
le(): e
x
it early
if
l
o
ckfile cannot be o
p
ened
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
Mich
a
el Ha
g
gerty
prepa
r
e_index(
)
: d
e
clare return
val
u
e to be (cons
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
Mi
c
hael Hag
g
erty
dele
t
e_re
f
_loose(): do
n
't muck a
r
ound i
n
t
he lock_file
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
M
i
ch
a
el Haggerty
ca
c
he
.
h:
d
efine c
o
nstants LOCK_SUFFI
X
and L
O
CK_
S
UFFIX_
L
EN
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
Michael Haggerty
lockfile
.
c: document the v
a
rious s
t
ates of lo
c
k_file
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
M
ichael Haggerty
l
o
c
k_f
i
le(): a
l
ways init
i
alize and register lock_file
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
Micha
e
l
H
a
ggerty
hold_loc
k
_file_for_append(): release
lock on errors
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
Mi
c
hael Hag
g
e
rty
l
o
ckfile: un
l
ock fi
l
e if l
o
ckf
i
le permissions cannot
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
Mic
h
ael
Hagge
r
ty
rollback_l
o
c
k
_
f
ile(): set
fd
to -1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
M
i
chael Haggerty
rollback_
l
ock_file(): exit early i
f
lock is
n
ot active
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
Michael Ha
g
ge
r
ty
r
o
ll
b
ack_lock_f
i
le(): do not clear filename re
d
un
d
ant
l
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
Michael Haggerty
close
_
lo
c
k_
f
il
e
():
e
x
i
t (success
f
ull
y
)
if file
i
s a
l
r
eady
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
Michael
H
ag
g
e
r
ty
api-loc
k
file:
r
e
vise and expan
d
the documen
t
ati
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
Michael Haggerty
unable_to_loc
k
_die(): r
e
name
f
un
c
tion from unable_to_
l
ock_in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
R
ené
S
charfe
d
a
emon
:
remove w
r
i
te-onl
y
v
ariab
l
e
maxf
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
R
e
n
é
Scharfe
d
aemon:
f
i
x error message after
b
ind()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
René Scharfe
daemon: handle gethostbyname() error
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
René Scharf
e
sha1-lookup: handle d
u
pli
c
ates in sha1_p
o
s()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-01
René S
c
harfe
sha1-
a
r
ray: add test-sha1-array an
d
basic tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-09-30
René Scharfe
t009
0
:
a
v
oid passing emp
t
y strin
g
t
o
printf %d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-09-30
Junio C
H
amano
Sy
n
c with 2
.
1
.
2
commit
|
commitdiff
|
tree
2014-09-30
Junio C Hamano
Merge br
a
nch 'jt/i
t
imer-autoconf'
commit
|
commitdiff
|
tree
2014-09-30
Junio C Hamano
Merge branch 'jc/test-lazy-prereq'
commit
|
commitdiff
|
tree
2014-09-30
Junio C
Hamano
Merge b
r
anch 'sb/m
e
r
ge-recursive-copy-pa
s
t
e-
f
ix'
commit
|
commitdiff
|
tree
2014-09-30
Junio C Ha
m
ano
Merge branc
h
'pr/use-def
a
ult-sigpipe-setting'
commit
|
commitdiff
|
tree
2014-09-30
Junio C Ha
m
ano
Git 2
.
1
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-09-30
Junio C H
a
m
a
no
Me
r
ge branch 'jk/fsck-exit-co
d
e-fix' into ma
i
nt
commit
|
commitdiff
|
tree
2014-09-30
Junio C H
a
mano
M
e
r
g
e branch 'ta/config-add-to-empty-o
r
-true-fi
x
' into
.
.
.
commit
|
commitdiff
|
tree
2014-09-30
Jun
i
o C Ha
m
ano
Merge branch '
m
k/reachable-protect-d
e
tache
d
-head
'
int
o
.
.
.
commit
|
commitdiff
|
tree
2014-09-30
Ju
n
io C Ham
a
no
Merge branch 'mb/fast
-
im
p
ort-delete-root' i
n
to maint
commit
|
commitdiff
|
tree
2014-09-30
Juni
o
C Ham
a
no
Merge branch 'jk/index-
p
ack
-
th
r
eading-races'
i
nto m
a
i
n
t
commit
|
commitdiff
|
tree
2014-09-30
Juni
o
C Hamano
Merge
bra
n
ch
'jk/send-pa
c
k-m
a
n
y-ref
s
p
e
cs'
i
nto m
a
int
commit
|
commitdiff
|
tree
2014-09-30
Junio C
H
ama
n
o
Mer
g
e branch 'so/rebas
e
-doc' into maint
commit
|
commitdiff
|
tree
2014-09-29
B
e
n W
a
lton
trace
.
c: do not mark
g
etnanotime(
)
as "inli
n
e"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-09-29
Junio C Ha
m
ano
Upd
a
te
draft relea
s
e notes to
2
.
2
commit
|
commitdiff
|
tree
2014-09-29
Junio C
H
amano
Merge br
a
nch
'jk/mbo
x
-f
r
o
m
-
l
ine'
commit
|
commitdiff
|
tree
2014-09-29
Junio C
H
amano
Merge
branc
h
'sb/t
6
031-typofix'
commit
|
commitdiff
|
tree
2014-09-29
Juni
o
C Hamano
Merge br
a
nch '
s
b/t9300-typofix'
commit
|
commitdiff
|
tree
2014-09-29
J
u
n
io C Hama
n
o
M
e
rg
e
branch 'rs/remote-simplify'
commit
|
commitdiff
|
tree
2014-09-29
Junio C Hamano
Merge branch 'rs/grap
h
-s
i
mplif
y
'
commit
|
commitdiff
|
tree
2014-09-29
Junio C Hamano
Merge bra
n
ch
'
da/
r
ev
-
parse
-
v
e
rify-qu
i
e
t
'
commit
|
commitdiff
|
tree
2014-09-29
Junio C Hamano
Merg
e
branch
'hj
/
pret
t
y-naked-d
e
coration'
commit
|
commitdiff
|
tree
2014-09-29
Sergey Organov
Documentation/git-r
e
b
a
s
e
.
txt: document whe
n
-
-
fork
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-09-29
Ben Walt
o
n
t/l
i
b
-cre
d
ential: u
s
e writ
e
_
s
cript
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-09-28
J
u
nio C H
a
mano
M
er
g
e
branch 'maint'
commit
|
commitdiff
|
tree
2014-09-28
J
u
nio
C
Hamano
Mer
g
e b
r
anch 'maint' of git://
g
ithub
.
c
om/
g
it
-
l10
n
/
git
.
.
.
commit
|
commitdiff
|
tree
2014-09-26
Junio
C Hamano
Up
d
ate
draft release notes to 2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-09-26
J
u
nio C Hamano
M
erge branch 'sb/he
l
p-unkn
o
wn-command-sort-fix'
commit
|
commitdiff
|
tree
2014-09-26
J
u
ni
o
C Ha
m
ano
Merge branch
'
jk
/
b
ranch-ver
b
ose-me
r
ged'
commit
|
commitdiff
|
tree
2014-09-26
Junio
C Hamano
Me
r
ge bran
c
h '
r
s/r
e
allo
c
-array'
commit
|
commitdiff
|
tree
2014-09-26
J
unio C Hamano
M
erg
e
bran
c
h 'jk/close-s
t
derr-of
-
cred
e
n
t
ial-cac
h
e-d
e
amon'
commit
|
commitdiff
|
tree
2014-09-26
Junio
C
Ham
a
no
Me
r
ge bra
n
ch 'jc/ign
o
r
e
-s
i
gpipe-while-running-hooks'
commit
|
commitdiff
|
tree
2014-09-26
Junio C Hamano
Merge branch
'
j
k/prune
-
p
acked-server
-
info'
commit
|
commitdiff
|
tree
2014-09-26
Ju
n
io
C
Hama
n
o
Merge
b
ranch
'
jc/hash-object-fsck-tag'
commit
|
commitdiff
|
tree
2014-09-26
Junio C Hamano
Merg
e
branch '
j
c/hash-obj
e
c
t
'
commit
|
commitdiff
|
tree
2014-09-26
J
u
nio C
H
amano
M
e
rg
e
b
r
anch 'js/
f
sck-tag-va
l
idati
o
n'
commit
|
commitdiff
|
tree
2014-09-26
Junio C
H
amano
Mer
g
e
b
ranc
h
'jk/fas
t
er-na
m
e-co
n
flicts
'
commit
|
commitdiff
|
tree
2014-09-26
Junio C Hama
n
o
Merge bra
n
c
h 'jk
/
write-packed-refs-v
i
a
-stdio'
commit
|
commitdiff
|
tree
next