repo.or.cz
/
git
/
haiku.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
unpack_trees(): fix diff-index regression.
2008-03-11
Li
n
us Torvalds
u
npack_trees(): f
i
x di
f
f-index regression
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-10
J
unio
C Hama
n
o
t
rav
e
rs
e
_trees_recursive(): propagate merge errors
u
p
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Linus Torvalds
unpack_t
r
ees(): minor
m
emory leak fix in unuse
d
destination
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Linus Torvald
s
Make 'unpack_trees()' have a separ
a
te source an
d
desti
n
atio
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Li
n
us Torvalds
Make 'unpack_trees
(
)' take the index
t
o work on a
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Linus To
r
valds
Add
'const' where approp
r
iat
e
to in
d
e
x
handling
f
u
n
ctions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Li
n
us
Tor
v
alds
F
ix
tree-walk
i
ng co
m
pare_entry() in th
e
p
res
e
nse of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
L
i
n
u
s Torvalds
Move
'unp
a
ck_trees()' over t
o
'traverse_trees()'
i
nterface
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Linus To
r
valds
Make 'traverse_trees
(
)' tra
v
er
s
e con
f
licting DF ent
r
i
e
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Linus
T
o
rvalds
Add r
e
turn value to 'traverse_tre
e
()
'
callb
a
ck
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Linus To
r
val
d
s
Make
'
traverse_
t
re
e
()'
use linked struc
t
ure rather
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Li
n
us
Torva
l
ds
Add 'df_name_compare()'
helper function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
J
eff K
i
ng
Add a t
e
st for rea
d
-tree -u --r
e
set wi
t
h a D/F
c
onflict
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
J
u
nio C
H
amano
Merge
b
r
anch 'ph/p
a
rs
e
opt'
commit
|
commitdiff
|
tree
2008-03-09
Junio C Hamano
Merge branc
h
'dp/c
l
ean-fix'
commit
|
commitdiff
|
tree
2008-03-09
Jun
i
o C Hamano
Merge
bra
n
ch 'ml/submodule-add-existing'
commit
|
commitdiff
|
tree
2008-03-09
Junio C
Haman
o
M
erge
b
ranch '
m
r/compat
-
snprintf'
commit
|
commitdiff
|
tree
2008-03-09
J
unio C Hama
n
o
Merge branch 'sp/fetch-o
p
tim'
commit
|
commitdiff
|
tree
2008-03-09
Junio
C
Ham
a
no
Merge
branch
'jc/describe-always'
commit
|
commitdiff
|
tree
2008-03-09
Junio C Haman
o
M
erge branch 'jc/am'
commit
|
commitdiff
|
tree
2008-03-09
Junio
C
H
ama
n
o
Merge
b
ranch 'cr/reset-parseop
t
'
commit
|
commitdiff
|
tree
2008-03-09
Junio C Hamano
Merge
b
r
a
nch 'j
n
/gitweb-pickaxe'
commit
|
commitdiff
|
tree
2008-03-09
J
un
i
o C Hama
n
o
Me
r
ge b
r
an
c
h 'k
b
/ma
i
nt-filt
e
r-branch-disap
p
ea
r
'
commit
|
commitdiff
|
tree
2008-03-09
Junio C Hamano
Merge b
r
anch 'ma
i
nt
'
to sync with 1
.
5
.
4
.
4
commit
|
commitdiff
|
tree
2008-03-09
J
unio C Hamano
GIT 1
.
5
.
4
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Santi Béjar
i
dent
.
c: reword e
r
ror message
when t
h
e
user name cannot
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Joh
n
Goerzen
Fix dcommit, rebas
e
w
hen re
w
ri
t
eRo
o
t is
i
n
u
se
commit
|
commitdiff
|
tree
2008-03-08
Junio C Hamano
fil
t
er-br
a
nch
:
handle "disappe
a
ring
t
ree" case cor
r
ectly
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
Cha
r
les Ba
i
l
e
y
me
r
ge-tool docu
m
enta
t
ion
:
describe
custom c
o
mmand
u
s
age
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bailey
git-mergetool d
o
c
ume
n
taiton: show to
o
lnames in typewriter
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
Ade
o
dat
o
Simó
Really make the LF after r
e
set in fast-imp
o
rt
option
a
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
Juni
o
C Hamano
Merge branch 'aw/main
t
-shortlog-blank-lines'
commit
|
commitdiff
|
tree
2008-03-08
Jun
i
o C
H
amano
M
e
rge br
a
nc
h
'mh/maint-htt
p
-p
r
oxy
-
fix' into ma
i
nt
commit
|
commitdiff
|
tree
2008-03-08
Junio C Hamano
Merge branch
'js
/
mai
n
t-daemon' into maint
commit
|
commitdiff
|
tree
2008-03-08
Junio C Hama
n
o
M
e
rge branch 'js/maint-cvsex
p
o
rt'
into maint
commit
|
commitdiff
|
tree
2008-03-08
Junio C Ha
m
a
n
o
M
e
rge b
r
anch 'jc
/
maint-l
o
g-m
e
rge-lef
t
-right'
i
nt
o
m
a
i
nt
commit
|
commitdiff
|
tree
2008-03-08
Juni
o
C Hamano
Merge branch 'ew/maint-svn-c
e
rt-f
i
leprovider' into
.
.
.
commit
|
commitdiff
|
tree
2008-03-08
J
u
nio C Haman
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-03-08
Junio C H
a
man
o
send
-
email:
-
-no-signed
-
o
f
f-cc should
s
uppress 'sob' cc
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
Ju
n
io C Hamano
Merge bran
c
h 'js/refl
o
g-delete'
commit
|
commitdiff
|
tree
2008-03-08
J
u
nio
C Hamano
M
erge branc
h
'dc/fo
r
mat
-
pre
t
ty'
commit
|
commitdiff
|
tree
2008-03-08
J
unio C Hamano
Merge br
a
nc
h
'
cb/mergetool'
commit
|
commitdiff
|
tree
2008-03-08
Junio C Hamano
git-clean: add tes
t
s fo
r
relative path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
Dmitry Potap
o
v
git-clean: co
r
r
e
ct printing relative p
a
th
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
Dmitry Potapov
M
ake private quot
e
_
pat
h
(
) in wt-stat
u
s
.
c available
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
Pi
e
rre Habouzit
un
q
uote_c_style:
f
ix off-by-one
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
Junio
C
H
aman
o
test
-
lib:
fix
TER
M
to du
m
b for test
rep
e
ata
b
ility
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
Uw
e
Kleine-König
config
.
txt: refe
r
to
--uploa
d
-pa
c
k and --
r
ece
i
ve-pa
c
k
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
Junio C
H
amano
Merg
e
b
r
a
n
c
h 'a
r
/
sg
i
d-bs
d
'
commit
|
commitdiff
|
tree
2008-03-07
Junio C Hama
n
o
Merge branch 'c
c
/ru
n
-co
m
mand'
commit
|
commitdiff
|
tree
2008-03-07
J
u
nio C Hamano
Revert part o
f
d089eba (setup: sanitiz
e
a
b
solute a
n
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
Jun
i
o C Hamano
Rever
t
part of 1abf095 (git-add:
a
djust t
o
the
g
et_pa
t
hs
p
ec
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
Junio C Hamano
Revert part of 744
d
acd
(buil
t
in-mv: minimum fix
t
o
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
Ju
n
io
C Hamano
get_pathspec(
)
: die wh
e
n an out-of-tree path is given
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-06
Junio C
Haman
o
M
erge branch 'maint' of git://repo
.
or
.
cz/g
i
t-gui int
o
.
.
.
commit
|
commitdiff
|
tree
2008-03-05
Jakub Nareb
s
ki
gitweb: Fix
and simplify
p
ick
a
xe search
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Mark
Le
v
edahl
git-su
b
module - Allow adding a submod
u
le i
n
-plac
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
A
n
dy Whitcroft
shortlog:
t
a
ke the first po
p
ula
t
ed line of t
h
e description
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Michal Rokos
Add compat/snpr
i
ntf
.
c for
systems
that return
bogus
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Alex Riesen
Do
n
ot use GUID on
d
ir in git ini
t
--shared=all on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Christian Couder
run-command: Redirect stderr
t
o
a pipe before re
d
ir
e
cting
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
C
arlos Rica
Make builtin
-
reset
.
c
use pars
e
_options
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
SZE
D
ER Gábor
ba
s
h: git-branch -d
and -m lists onl
y
l
ocal b
r
anches
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
SZEDER Gábor
b
a
sh:
a
dd git-branch options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Ch
a
rles Bailey
Add a
v
ery basic t
e
st script for gi
t
mergetoo
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Cha
r
les Baile
y
Teach git mer
g
etool to use c
u
stom commands
def
i
ned
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Changed an
i
n
t
ernal variable of mergetool to suppor
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Char
l
es
Bai
l
ey
Tidy up git me
r
g
e
tool'
s
bac
k
up file
b
e
hav
i
o
ur
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Deni
s
C
h
e
n
g
log/show/wha
t
ch
a
nged: introduce format
.
pretty configur
a
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Denis Che
n
g
spe
c
i
f
y explicit "
-
-pr
e
tty=medium" wi
t
h `
g
it log/s
h
ow
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Den
i
s Ch
e
ng
whatcha
n
g
e
d
documentation: share de
s
cription
of --
p
retty
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Ju
n
io C Hama
n
o
a
m
: --rebasing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
J
u
nio C Hamano
am: remove suppor
t
for -
d
.
dotest
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Junio C Hamano
am: read fr
o
m t
h
e
right mailb
o
x when
s
tarted
from a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Junio
C
Ham
a
no
fsck
.
c:
f
ix bo
g
us "empty tre
e
" check
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Shawn O
.
Pearce
Teach git-
f
etch
t
o
exp
l
oit
s
er
v
er side automatic tag
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Shawn
O
.
P
e
arc
e
Te
a
c
h fetch-pack/upload-pack about --i
n
clu
d
e
-t
a
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Shawn O
.
Pearce
git-
p
ack-objects: Automaticall
y
pa
c
k annot
a
t
ed tags
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-04
Junio
C
H
a
m
ano
Rev
e
rt
"un
p
ack-object
s
: prevent wri
t
ing
of inco
n
sistent
.
.
.
commit
|
commitdiff
|
tree
2008-03-04
Junio C Hama
n
o
Revert "receive-
p
ack: us
e
strict mode fo
r
unpacking
.
.
.
commit
|
commitdiff
|
tree
2008-03-04
Ju
n
io C Hamano
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2008-03-04
Shawn O
.
Pearce
Fix 'git rem
o
te
sho
w
' regressio
n
o
n
e
m
p
ty r
e
p
o
sitory
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-04
M
i
ke Hommey
t3
4
07-rebase-abort
.
s
h
: Enhance existing test
s
,
a
nd
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-04
Simon Hausmann
git-p4
:
Fix import of cha
n
gesets with f
i
le deletions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-04
Alex Riesen
Fix test for clean
u
p failure
in t
7
300 on Windows
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-04
Junio C Haman
o
t61
2
0 (d
e
scribe): ch
e
ck --long properly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-04
S
h
awn
O
.
Pear
c
e
Ad
d
gi
t
-des
c
ri
b
e test for "veri
f
y annotated
t
ag names
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-04
Shawn
O
.
Pearce
Test
for packed tag
s
in git-descri
b
e
outp
u
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-04
Shawn O
.
P
earce
Don't allow git-descr
i
be failures
to go unno
t
iced in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Junio C Hamano
des
c
ribe: re-f
i
x display_
n
ame()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
M
a
tthieu Moy
Fi
x
in
c
orrect wo
r
ding in git-merge
.
txt
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Gerrit Pa
p
e
git-merge
.
s
h:
bett
e
r handling of
combine
d
--squash
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Mike
H
omme
y
Fix random crashes in http
_
clea
n
up()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Ju
n
io C Hama
n
o
d
escribe:
f
ix --l
o
ng output
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Junio C
H
amano
git-describe: use tags foun
d
in packed-refs correctly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Brandon
Casey
t39
0
3-stash
.
sh: Add tests
for new
s
tash commands drop
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Bra
n
don Casey
g
i
t-refl
o
g
.
t
x
t: Doc
u
ment new c
o
mmands
--update
r
ef an
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Bran
d
on Casey
t3903-stash
.
s
h: Add missi
n
g '&
&
' to body of testcase
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Jun
i
o C Hamano
Me
r
g
e commit '74359821' into js/
r
e
f
log-delete
commit
|
commitdiff
|
tree
2008-03-03
Martin Koegler
fe
t
ch-pack: c
h
eck parse_comm
i
t/ob
j
ec
t
results
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next