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
Merge branch 'mm/discourage-commit-a-to-finish-conflict-resolution'
2014-08-26
Je
f
f K
i
ng
Makefile: drop
C
H
E
C
K
_HEADER_DEPENDENCIES code
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-08-25
Jeff Kin
g
M
a
kefile:
use `fin
d
` to
d
eterm
i
ne
s
tatic
h
eader depend
e
n
c
ies
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-08-25
Jeff Kin
g
git-prompt: do no
t
l
o
ok for r
e
fs/s
t
ash in $GI
T
_DIR
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-08-21
Jeff Ki
n
g
http:
style
f
ixes
f
or curl_multi_init error check
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-08-20
Jeff King
intersect_paths:
r
espect mode in git's tree-sort
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-08-19
Jef
f
King
Makefile: make perf tes
t
s optio
n
a
l
fo
r
profile bu
i
ld
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-08-18
Jeff K
i
n
g
subtree: make "all" default ta
r
get of Makefile
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-08-12
Jeff Kin
g
pack-objects: turn off b
i
tmaps
when we see --shal
l
ow
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-08-07
Je
f
f King
stash:
default l
i
sting to working-tree d
i
ff
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-07-30
Jeff King
pretty:
m
ake
e
m
p
ty userformats truly empty
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-07-30
Jeff King
prett
y
:
t
reat "--format=" as an empty u
s
erf
o
rmat
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-07-30
J
eff King
r
e
vision: drop useless str
i
ng o
f
fse
t
when par
s
ing
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-07-28
Jeff King
t4013: test diff-tree's --
s
tdin com
m
it formatting
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-07-28
Jef
f
Kin
g
t1402: c
h
eck fo
r
refs ending with a
d
ot
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-07-28
Jeff King
diff-tree: avo
i
d lookup_unknow
n
_object
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-07-28
Je
f
f King
o
b
ject_a
s
_type:
s
et commit index
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-07-28
Jeff
Kin
g
alloc:
f
actor out commi
t
index
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-07-28
Jef
f
King
add
o
b
j
ect_as_type
h
elper for c
a
sting obje
c
ts
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-07-28
Jeff
King
p
a
rse_obje
c
t_buffer: do not set
o
bject
t
y
pe
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-07-28
Jeff King
move setting o
f
o
b
ject->type
t
o
al
l
oc_* f
u
ncti
o
ns
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-07-28
J
e
ff Kin
g
a
l
l
oc:
wri
t
e o
u
t all
o
cator
d
e
finitions
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-07-24
J
eff King
apply: avoid possible
b
ogus p
o
inter
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-07-24
Jeff King
fix memory leak
parsing cor
e
.
c
o
mmentchar
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-07-24
Jeff Kin
g
tr
a
nsport: fix l
e
a
k
s in
r
efs_from_altern
a
te_cb
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-07-24
Jeff King
free
r
e
f string r
e
tu
r
ne
d
by dw
i
m_ref
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-07-24
J
e
ff
King
receive-pac
k
: don'
t
copy "dir" pa
r
ameter
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-07-15
Jeff
K
in
g
t
5
539: update a fl
a
ky
t
est
commit
|
commitdiff
|
tree
2014-07-15
Jeff King
p
a
int_do
w
n_t
o
_common:
use prio
_
queue
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-07-15
Je
f
f King
prio-que
u
e: make o
u
tput stable with
r
e
sp
e
ct to insertion
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-07-15
Jef
f
King
prio-q
u
eue:
f
actor o
u
t
compare an
d
s
w
a
p ope
r
a
tions
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-07-14
Jef
f
King
d
iff-tree: avoid l
o
okup_unkn
o
wn_object
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-07-14
Jeff King
object_as
_
type: set com
m
it index
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-07-14
Je
f
f King
alloc: f
a
ctor out commit inde
x
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-07-14
Jeff King
add object_as
_
typ
e
helper f
o
r casti
n
g objects
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-07-14
Jeff King
pa
r
se_object
_
bu
f
fer: do n
o
t
set object type
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-07-14
Jeff King
move setting
o
f
object
-
>
type t
o
a
l
loc_* fu
n
ct
i
o
ns
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-07-14
Jeff King
alloc: write o
u
t
a
llocato
r
definitions
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-07-10
Jeff King
tag: use skip
_
p
r
efi
x
instead of magic nu
m
bers
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-07-10
Jef
f
Ki
n
g
remote-cu
r
l: mark
h
elper-prot
o
co
l
erro
r
s more clearl
y
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-07-10
Jeff Kin
g
remot
e
-curl: use error instead
of
fprintf(stder
r
)
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-07-10
Jef
f
K
in
g
remote-curl: do
not co
m
plai
n
on EOF from pa
r
e
nt
g
it
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-07-02
Jef
f
King
t7300:
r
e
pair filesystem permiss
i
ons w
i
th test_w
h
en_finish
e
d
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-06-30
J
eff
King
prepare_packed_
g
it_one: refactor du
p
licate-pack check
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-06-30
Jeff
K
ing
verify-pack: use
st
r
b
uf_strip_suffix
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-06-30
Jeff K
i
ng
s
t
rbuf: im
p
lement
strbuf_strip_suffix
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-06-30
J
e
ff
K
i
ng
inde
x
-p
a
ck: use strip_suffix to avoid magic numbe
r
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-06-30
Jeff King
us
e
stri
p
_suffix
instea
d
of en
d
s
_
with in simpl
e
cases
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-06-30
Jeff King
replace has_extension
w
it
h
ends_
w
ith
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-06-30
Jeff King
implement ends_
w
ith via
strip
_
suffix
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-06-30
Jeff King
add st
r
i
p
_
suffix fu
n
ction
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-06-25
J
e
f
f King
replace: ad
d
a --raw mode for -
-
edit
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-06-25
Jeff
K
ing
replace: use arg
v
_array i
n
expor
t
_obj
e
ct
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-06-25
Jeff Ki
n
g
avoi
d
double clos
e
o
f
des
c
riptors handed t
o
run
_
co
m
mand
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-06-25
J
e
ff King
replace:
replace
s
paces w
i
th tab
s
in indentation
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-06-25
J
e
ff King
move "%G" format
t
est
f
ro
m
t7510 to t
6
006
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-06-25
Jeff King
setup_git_env(): intro
d
u
c
e
g
i
t_path_from_env() h
e
lper
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-06-20
Jeff King
h
t
tp-push: r
e
f
a
ctor
par
s
ing
o
f
remote obj
e
ct names
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-06-20
Jeff Ki
n
g
u
se
s
kip_prefix to avoi
d
repeated c
a
l
c
u
l
ations
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-06-20
Jeff Ki
n
g
git: a
v
o
id magic number with skip_prefix
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-06-20
Jeff King
fetch-pack: refact
o
r pars
i
ng in get_ack
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-06-20
Jeff King
fast-import: re
f
actor parsing
of spaces
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-06-20
J
e
ff King
stat_opt: check extra strlen call
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-06-20
Jeff
K
i
n
g
d
aemon: use sk
i
p
_prefi
x
to av
o
id magic nu
m
ber
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-06-20
J
eff King
fast-import: us
e
skip_prefix f
o
r pa
r
sing input
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-06-20
Jeff K
i
ng
use skip_prefix to avoid repeati
n
g str
i
ng
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-06-20
Jef
f
Kin
g
use skip
_
p
refi
x
to
avoi
d
magic number
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-06-20
Jeff King
t
r
ansport-helper:
a
void readi
n
g
p
a
st end-of-st
r
ing
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-06-20
J
e
ff King
fast-import: fix
read of uninitialized argv memory
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-06-20
Jeff King
a
p
ply: use skip_prefix
i
nstead of raw additio
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-06-20
Jeff King
r
e
factor skip_pr
e
fix to
return a boolean
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-06-19
Jeff King
u
n
ique_pa
t
h: fix unl
i
kely he
a
p overfl
o
w
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-06-19
Jeff
K
ing
walker_fet
c
h:
fix m
i
n
o
r memory leak
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-06-19
Jeff King
me
r
g
e
: use argv_array
w
hen spaw
n
ing me
r
ge strategy
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-06-19
J
eff King
s
equ
e
ncer: use argv_ar
r
ay_pushf
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-06-19
Jeff Ki
n
g
setup_g
i
t_env: us
e
git_
p
athdup instead of x
m
alloc
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-06-19
J
e
f
f
K
ing
use xstrfm
t
t
o
replace
xmalloc + str
c
py/str
c
at
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-06-19
Je
f
f King
use xstrfmt to replace x
m
a
l
loc +
sprintf
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-06-19
Jeff K
i
ng
u
se xstr
d
u
p
i
nstead of xmalloc + strc
p
y
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-06-19
J
eff King
use xstrfmt
in favor of manual size calculat
i
ons
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-06-19
Jeff King
strbuf: add
x
strfmt
h
elper
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-06-18
Jeff King
avoid using
skip_prefix as a boolean
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-06-18
Jeff King
daem
o
n:
m
ark some
strings as const
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-06-18
Jeff King
p
a
rse_diff
_
color_slot: d
r
op ofs parameter
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-06-17
Jeff
King
pret
t
y:
avoid rea
d
i
n
g past en
d
-of-string
w
ith "%G
"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-06-17
J
e
f
f Ki
n
g
t7510: check %G*
pretty-for
m
at
output
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-06-17
Jeff
K
ing
t
7510: t
e
st a commit signed
by an unkn
o
wn k
e
y
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-06-17
Jeff Kin
g
t
7
5
10: stop referrin
g
to master in later tests
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-06-13
J
e
ff King
reuse cached commit buffer when parsi
n
g
signatures
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-06-13
Jef
f
King
c
o
mmit: record
b
u
f
fer length in cache
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-06-13
Jeff Kin
g
commit: conve
r
t co
m
mit
-
>bu
f
f
e
r to a slab
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-06-13
Jeff
K
ing
commit-
s
l
ab: provide a static initializer
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-06-13
J
e
ff King
u
se get_commit_buffer e
v
erywhere
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-06-13
Jeff King
convert lo
g
m
s
g_reencode to get_commit
_
buffer
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-06-13
Jeff Kin
g
use get_commit_buffer
t
o avoid duplicate code
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-06-13
J
e
ff King
u
se get_cache
d
_commit_buffer w
h
ere appropriate
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-06-13
Jeff Kin
g
provide h
e
lpers to a
c
ce
s
s the
c
ommi
t
buff
e
r
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-06-13
Jeff King
p
r
o
vide a h
e
lper to s
e
t the commit buffer
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-06-13
Jeff Kin
g
prov
i
de a helper t
o
free c
o
mmit
buf
f
er
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-06-12
Jeff K
i
ng
t7700: drop explicit --
n
o
-pack
-
kept-objects
fro
m
.
k
eep
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2014-06-12
Jeff King
sequ
e
ncer: use logmsg_reenco
d
e in
g
et_message
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
next