repo.or.cz
/
git
/
gitster.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
xdiff: fix merging of hunks with -W context and -u context
2016-09-14
René
Scharf
e
x
d
if
f
: fi
x
m
e
rg
i
ng
of hunks
w
ith -W
contex
t
and
-u
.
.
.
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2016-08-14
René Scharfe
receive-pack: use
F
LEX
_
A
LL
O
C_MEM in queue
_
command()
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2016-08-14
R
e
né Scharfe
c
o
mmit: use FLEX_ARRAY in struct merge_remote
_
de
s
c
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2016-08-14
René Scharf
e
merge-r
e
cursiv
e
: fix v
e
rbos
e
out
p
u
t
for multiple b
a
s
e
.
.
.
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2016-08-14
René Scharfe
com
m
it: factor out set_merge_remote_desc()
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2016-08-14
René Scharfe
commit: use xstrdup()
in
get_mer
g
e_parent()
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2016-08-14
Re
n
é Scharfe
mailinfo: recycle strbuf in ch
e
ck_he
a
d
e
r(
)
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2016-08-14
Re
n
é Scharfe
corre
c
t FLEXPTR_* examp
l
e i
n
comment
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2016-08-06
René Scharfe
use strbu
f
_a
d
d_unique_abbrev() for adding short h
a
shes
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2016-08-05
R
e
né S
c
harfe
n
edmalloc
:
work around overz
e
alous
GCC 6 wa
r
ning
Signed-off-by: René Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2016-08-05
R
ené Scharfe
merge:
u
se strin
g
_list_split(
)
in
add_
s
trat
e
g
i
es()
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2016-08-05
René
S
charfe
merge-recursive:
use STRING_
L
I
S
T_INIT_NODUP
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2016-08-05
René Sch
a
r
fe
u
se strb
u
f_addstr() instead o
f
strbuf_
a
ddf()
w
ith "%s"
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2016-08-01
René Scharfe
use strbuf_addstr() f
o
r a
d
ding constant st
r
ings to
.
.
.
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2016-07-22
René Schar
f
e
s
t
rbuf: avoid ca
l
ling
s
t
r
buf_grow() twice in strbuf_addbuf()
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2016-07-19
Ren
é
Scharfe
subm
o
dule-confi
g
: use
e
xplicit empty string inste
a
d
.
.
.
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2016-07-19
René Scharfe
use strbu
f
_addbuf() for app
e
nding
a
strbuf
t
o another
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2016-07-12
René Scharfe
worktree: use st
r
buf_add_ab
s
olute_path()
dir
e
c
t
ly
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2016-07-12
René Sc
h
arfe
rm:
r
euse strbuf for
a
ll remove
_
di
r
_
r
ecur
s
ivel
y
() call
s
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2016-07-07
René Scha
r
fe
n
o
tes-merge: use
O
_EXC
L
to a
v
oid overwriting existing
.
.
.
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2016-07-07
René Scharfe
.
gitattributes: set file type f
o
r
C files
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2016-06-09
René Sc
h
arfe
xdiff: fix merging
of ap
p
ended
h
unk wi
t
h -W
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2016-05-31
R
ené Sch
a
rfe
perf: make the tests work without a worktree
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2016-05-31
René Schar
f
e
grep: -W:
don'
t
e
x
tend context to trailing empty
lines
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2016-05-31
R
e
né
Scharfe
t7810:
add test for
grep -W an
d
trailing empty conte
x
t
.
.
.
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2016-05-31
René Scharfe
xdi
f
f
:
don
'
t
trim commo
n
tail with -W
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2016-05-31
René
Scharfe
xdif
f
: -
W
: d
o
n't include c
o
mmon trai
l
ing empty lines
.
.
.
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2016-05-31
René Scharfe
xdiff: ignore empty lines before added f
u
nctions wit
h
-W
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2016-05-31
René Sc
h
arf
e
xdiff: hand
l
e app
e
n
d
e
d chunks b
e
t
t
e
r with -
W
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2016-05-31
René Scharfe
xdiff: factor o
u
t match_func_rec(
)
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2016-05-31
René
S
c
harfe
t4
0
51: rewr
i
te, a
d
d mo
r
e tes
t
s
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2016-05-30
René
S
charfe
p
a
t
ch-id: use starts
_
with()
a
nd skip_pr
e
fix()
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2016-05-30
René Sc
h
arfe
a
ppl
y
: re
m
ove unused par
a
m
eters from name_ter
m
in
a
te()
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2015-11-28
René Scharfe
wt-status: corre
c
t a
n
d simpli
f
y
check fo
r
detached
.
.
.
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2015-11-20
René Sc
h
ar
f
e
show-ref: st
o
p using PA
R
SE_OPT_NO_INTERNA
L
_HELP
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2015-11-20
René Scha
r
fe
fsck: tre
a
t
a
NUL in a tag header as an
e
rror
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2015-11-20
René Sc
h
arfe
g
r
ep: stop usi
n
g PARSE_
O
PT
_
NO_INT
E
RNAL_HELP
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2015-11-20
René Scharfe
t1450: add tests for N
U
L in header
s
of commits an
d
.
.
.
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2015-11-20
René Scharfe
parse
-
option
s
: allow -h as a short op
t
ion
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2015-11-20
René Scharfe
parse-opti
o
ns: inline
parse_options_usage() at its
.
.
.
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2015-11-20
René Scharfe
p
a
r
se-options: deduplicate parse_options_u
s
age() calls
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2015-11-02
R
ené Sc
h
arfe
daemon: plug me
m
ory
leak
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2015-11-02
Re
n
é S
c
har
f
e
run-comm
a
nd: fac
t
or o
u
t child_pr
o
ce
s
s
_clear()
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2015-11-01
René
S
c
harfe
show-branch
:
use
a
rgv_
a
rray for
d
efault arguments
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2015-11-01
Re
n
é S
c
harfe
wt-statu
s
:
u
s
e skip_prefix() to ge
t
rid of m
a
gic
string
.
.
.
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2015-11-01
René
S
c
harfe
wt-status: don'
t
skip a magical n
u
mber of characters
.
.
.
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2015-11-01
René Scharfe
wt-sta
t
us: avo
i
d
building bogus branch name wi
t
h d
e
tached
.
.
.
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2015-11-01
René Scharfe
wt-status: exit earl
y
us
i
ng got
o
in
wt
_
sho
r
tstatus_pri
n
t_tra
.
.
.
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2015-11-01
René Sc
h
arfe
t7060: add
t
es
t
for status --b
r
anch
on a d
e
tached
H
EAD
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2015-10-26
René Scharfe
use
p
o
p_c
o
mmit() for c
o
ns
u
m
ing the first
e
n
try
o
f a
.
.
.
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2015-08-28
R
e
né Scharfe
a
rchive-zip:
s
u
p
port more than 65535 entr
i
es
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2015-08-28
R
ené
S
charfe
a
r
chive-zip:
use a local var
i
able to
s
tore the creato
r
.
.
.
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2015-08-28
René Scharf
e
t5004: test ZIP arch
i
ves
w
ith many
e
ntries
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2015-07-12
Re
n
é Scharfe
di
f
f: parse ws
-
er
r
or-high
l
ight option
mo
r
e stric
t
ly
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2015-05-20
René
S
ch
a
rfe
dir:
remove unused variab
l
e sb
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2015-05-20
René Sch
a
rfe
cl
e
a
n
: remove unused variable bu
f
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2015-05-20
René Sc
h
arfe
u
s
e fil
e
_exists(
)
to check
i
f a file e
x
ists
i
n the
.
.
.
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2015-05-19
René Scharfe
pack-b
i
tm
a
ps: plug
memory l
e
ak, fix
allocation s
i
ze
.
.
.
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2015-03-10
René
S
charfe
use is
x
digit() for
c
hecking if a character i
s
a hexadecimal
.
.
.
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2015-03-10
René
S
charfe
daemon: deglobalize ho
s
t
n
ame informati
o
n
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2015-03-10
René Scharfe
daemon:
u
se strbuf for hostname in
f
o
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2015-03-05
René Scharfe
zlib: initialize git
_
zstream in g
i
t_deflate_init{,_gzip
.
.
.
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2015-03-05
René
S
charfe
archive-zip: mark te
x
t
files in archives
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2015-02-22
René S
c
har
f
e
sha
1
_name: use strlcpy()
to copy st
r
i
ngs
Signed-of-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2015-02-22
Ren
é
Scharfe
pret
t
y: use starts_with
(
) to check for a
p
refix
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2015-02-22
Ren
é
Scharfe
for-each-ref: use skip_prefix()
t
o avo
i
d duplic
a
te
.
.
.
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2015-02-22
René Sc
h
arfe
c
o
nn
e
ct:
use
strcmp()
f
o
r
string comparison
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2015-02-17
René Scharfe
daemon:
use callback t
o
build inter
p
o
late
d
path
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2015-02-17
René
Scharfe
daem
o
n:
l
o
o
k up client-suppli
e
d hostname lazily
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2014-12-29
R
ené Scharfe
ref
s
:
plug str
b
u
f
l
ea
k
in lock_ref
_
sha1_basic()
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2014-12-29
R
e
né Scharfe
transport
:
simplify
d
u
p
licating a substrin
g
in
t
ransport_
g
e
t
.
.
.
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2014-12-29
René Scharf
e
merg
e
: rel
e
a
se strbuf after use i
n
suggest_conflicts()
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2014-12-29
René Scharfe
c
o
mmi
t
-tre
e
: simp
l
ify
p
a
r
sing
of option -S us
i
n
g skip_prefix()
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2014-12-12
René Scharfe
use strbuf
_
complete_line() f
o
r a
d
din
g
a newline if
.
.
.
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2014-11-17
R
ené Scharfe
use labs() for variables of type long instead
o
f abs(
)
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2014-11-17
René Sc
h
arfe
use
labs() for
v
a
r
iables of type
long
inste
a
d of abs()
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2014-11-10
René Scharfe
run-command: use void
t
o dec
l
are that functions take
.
.
.
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2014-11-10
Re
n
é Scha
r
fe
use a
r
gs member of s
t
ruct c
h
ild_process
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2014-11-10
René Scharfe
t
r
a
iler: use CHI
L
D_PR
O
C
ES
S
_INIT i
n
apply_command()
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2014-10-28
R
e
né
Scha
r
fe
api-run-comman
d
: add
m
issing li
s
t item marker
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2014-10-28
R
ené S
c
harfe
u
s
e
chi
l
d_process_init
(
)
t
o initialize struct chil
d
_p
r
ocess
.
.
.
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2014-10-28
R
ené Scharfe
receive-
p
ack: av
o
id minor le
a
k in case start_a
s
ync
.
.
.
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2014-10-28
R
ené Scharfe
grep:
a
dd color
.
gr
e
p
.
m
a
tchcontext an
d
c
o
lor
.
grep
.
mat
c
hs
e
lected
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2014-10-19
René Sc
h
arfe
use
env_array mem
b
er of struct
c
hild_process
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2014-10-19
Ren
é
Scharfe
run-comm
a
nd: add env_array, an o
p
tional ar
g
v_arr
a
y
.
.
.
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2014-10-13
Ren
é
Scha
r
fe
receive-pack: plug m
i
nor m
e
mory leak in unpack()
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2014-10-07
René Sch
a
rfe
use ski
p
_
prefix
(
) to avoid mor
e
magic numb
e
r
s
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2014-10-07
René Scharfe
m
ailsplit: remove
u
nn
e
ce
s
sary
u
nlink(2)
call
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2014-10-07
Re
n
é Scharf
e
bundle: p
l
u
g
minor memory l
e
ak in is_
t
ag_in_date
_
range()
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2014-10-01
René
S
ch
a
rfe
daemon: remove
w
r
ite-onl
y
variab
l
e maxfd
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2014-10-01
René
S
ch
a
r
f
e
daemon
:
fix err
o
r message after bind()
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2014-10-01
René Scharfe
daemon
:
handle gethost
b
yname() error
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2014-10-01
R
e
né Scharfe
s
h
a
1
-
look
u
p: handle duplic
a
tes in s
h
a1_pos()
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2014-10-01
René Scharfe
s
ha1-array: add test
-
s
ha1-array and bas
i
c
te
s
ts
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2014-09-30
René Schar
f
e
t
0090: av
o
id passing empty
s
tri
n
g to print
f
%d
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2014-09-22
René Scharfe
r
e
mot
e
:
simplify
m
atch_n
a
me
_
wit
h
_pat
t
e
rn
(
)
u
sing s
t
rbuf
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2014-09-22
Ren
é
S
charfe
g
raph:
s
implify graph_padding_line()
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2014-09-18
R
ené Sch
a
rfe
u
s
e
R
E
ALLOC_
A
R
R
AY for chang
i
n
g the
a
llocation size
.
.
.
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2014-09-18
René
S
charfe
a
d
d
m
acro REALLOC_ARR
A
Y
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
2014-09-15
R
e
né Scharfe
re
p
ack: call p
r
une_packed_objects() and update_s
e
r
v
e
r_info
.
.
.
Signed-off-by: Rene Scharfe <
l.s.r@web.de
>
commit
|
commitdiff
|
tree
next