repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jn/update-contrib-example-merge' into next
2010-08-18
Æ
va
r
Ar
n
fjörð
Bjarmason
t/t
7
0
0
5-e
d
itor: change from skip_a
l
l=* to prereq s
k
ip
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Ævar Arnfjörð Bj
a
rmason
t
/t5
7
05-clone-2gb
:
change f
r
o
m
skip_all
=
* to prereq
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Ævar
A
r
n
f
jörð Bja
r
mason
t/t1304
-
d
efault-acl: change
f
rom
s
kip_
a
ll=* to prereq
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Æ
v
ar Arnfjörð
Bj
a
rmason
t/README: Upd
a
te "Skipping
tes
t
s" t
o
align wi
t
h bes
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Ævar Arnfj
ö
rð
B
jarmason
t/t7800-difftool
.
sh:
S
kip with pre
r
eq on n
o
PERL
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Ævar Arn
f
jörð
Bjarm
a
son
t/t5800-remote-h
e
lpers
.
sh
:
Skip with prereq on python
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Æ
v
a
r Arnfjörð Bjarmason
t
/t40
0
4-diff-renam
e
-symlink
.
sh
:
u
s
e thr
e
e
-
arg <
p
r
e
req>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Ævar Arn
f
jör
ð
Bjarmas
o
n
tests: impli
c
itl
y
sk
i
p
S
YML
I
NK
S
tests using <prereq>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
T
h
omas Rast
Makefile: make gcov invocation configurab
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Ævar Arnfjörð Bjarmason
t/REA
D
ME: Add a note ab
o
ut th
e
dangers
of coverage
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Ævar Arnfjö
r
ð Bjarmason
t/README:
A
new
s
e
ction ab
o
u
t
test coverage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Ævar Arnfjörð Bjarmason
Makefile:
A
dd cover_db_html target
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Æ
var A
r
nfjörð Bjarmaso
n
Makefil
e
: Add
c
ov
e
r_db target
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Ævar Arnfjörð Bjarmason
Ma
k
efile: Split o
u
t
t
he untested functions target
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Æva
r
Arnfjörð B
j
armason
M
akef
i
l
e
:
I
nclude subdir
e
ctories in "
m
ake cover" reports
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Æva
r
Arnfjörð Bjarmason
gitignore: Igno
r
e files generated b
y
"make coverage"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Æva
r
A
rnfjörð Bjarmaso
n
t/README:
A
dd SMOKE_{COMMENT,TAGS}= to s
m
o
ke_
r
eport
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Ævar Arnfjörð Bjarmason
t/
M
akefile: Can't
include GIT-BUILD-OPTIO
N
S, it's a
.
sh
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Æ
v
ar
A
rn
f
jö
r
ð Bjarmason
t/
R
EADME:
D
ocument the Smoke testi
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Ævar Arnfjörð
B
ja
r
ma
s
on
tests:
I
nfrastru
c
ture for Gi
t
s
mo
k
e testing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Ævar
A
rnfjörð Bjar
m
ason
test-lib:
M
ulti-prereq support only checked
the
l
ast
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Ævar Arnfjörð Bjarmason
tests: A SANITY test prereq
for testing i
f
we're root
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Ævar Arn
f
j
ö
rð Bjarma
s
on
t
/
R
E
ADME: Do
c
ument the predefined t
e
st p
r
erequis
i
tes
...the text was lifted from from
Junio C Hamano
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Ævar Arn
f
jörð
B
j
armason
test-lib: Prin
t
m
i
ssing prerequis
i
tes in
test
o
u
tpu
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Æ
v
a
r
Arnfjörð Bjarmason
test-lib: Add support
f
or multiple
t
e
st prerequisi
t
e
s
The implementation was stolen from
Junio C Hamano
and Johannes Sixt,
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Ævar
Arnfjörð Bjarmason
tes
t
-li
b
:
Do
n
'
t
write test-results
when HARNES
S
_ACTIVE
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jun
i
o C Haman
o
Me
r
ge branch 'jn/maint-plug-leak'
commit
|
commitdiff
|
tree
2010-08-18
Junio
C
Hamano
Merge branch 'jl
/
submod
u
le-ign
o
re-diff'
commit
|
commitdiff
|
tree
2010-08-18
Junio C
Ham
a
no
Merge
branc
h
'ml/rebase-x-strategy'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
Merge branch 'jn/fix-abbrev
'
commit
|
commitdiff
|
tree
2010-08-18
Junio
C Hama
n
o
Merge b
r
anch 'vs
/
doc-sp
e
ll'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hama
n
o
Mer
g
e
branch 'jh/u
s
e-tes
t
-must-
f
a
il'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
Merge branc
h
'
jh/c
l
e
a
n
-
e
xclude'
commit
|
commitdiff
|
tree
2010-08-18
Jun
i
o C Hamano
Merge branch 'kf
/
post-re
c
eive
-
sample-hook'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hama
n
o
M
e
rge branch 'ab/report-
c
or
r
u
pt
-
obj
e
ct-with-
t
ype'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
Merge b
r
anc
h
'
j
n/rebas
e
-
rename-am'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Ha
m
ano
Mer
g
e branch 'jn/
f
ast-
i
mport-subtree'
commit
|
commitdiff
|
tree
2010-08-18
Ju
n
i
o C Hamano
Merge
b
ranch 'ar/
s
tring-
l
i
s
t-fore
a
ch'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
Merge bran
c
h
'jh/graph-n
e
xt-line'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
Mer
g
e
b
ranch 'tr/xsize-b
i
ts
'
commit
|
commitdiff
|
tree
2010-08-18
Elijah N
e
wren
merge-re
c
ursiv
e
:
Fix multipl
e
file rename ac
r
oss D
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
E
l
i
j
a
h Newren
t6031: Add a t
e
stcase covering multip
l
e
renames across
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Elijah Newren
mer
g
e-r
e
cursive: Fix typo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Junio C
Hamano
Mer
g
e branch 'tc/checkout-B'
commit
|
commitdiff
|
tree
2010-08-17
Da
v
id Ag
u
i
lar
mergetool: Skip
autoreso
l
ve
d
p
aths
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-17
Pet
r
Onderka
User
d
iff patt
e
rns for C#
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-16
Jonathan Ni
e
der
t7006 (pager
)
: add missing TTY prer
e
qu
i
s
ites
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-16
Ju
n
io
C H
a
man
o
Merge branch 'jc
/
maint
-
follow-renam
e
-fix'
i
nto next
commit
|
commitdiff
|
tree
2010-08-16
Junio
C Ha
m
ano
Merge branch 'mas
t
er' into
nex
t
commit
|
commitdiff
|
tree
2010-08-16
Ngu
y
ễn Thái Ng
ọ
c Duy
merge-file: run setup_git_directory_gently() sooner
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-16
Nguyễn Th
á
i Ngọc Duy
var: run
setup
_
git
_
director
y
_gently() sooner
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-16
N
g
u
y
ễn Thá
i
N
gọc Duy
l
s
-remot
e
:
r
un s
e
tu
p
_git_
d
irec
t
ory_gently
(
) sooner
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-16
Nguyễn Thá
i
Ngọc Du
y
index-pa
c
k: r
u
n
setup_git
_
directory_gently() soone
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-16
Junio C
Ham
a
no
Merge
b
ranch 'jn/m
a
int-setup-fix' (early part)
i
nto
.
.
.
commit
|
commitdiff
|
tree
2010-08-16
N
g
uyễ
n
Thái Ngọc Du
y
config
:
run
setup_git_dir
e
ctory_gently() sooner
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-16
Nguyễn
Thái
Ngọc Duy
bundle: run set
u
p
_
git_direc
t
ory_gentl
y
(
)
s
ooner
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-16
Nguyễn Thái
Ngọ
c
Duy
app
l
y
:
run setu
p
_git_directory_gentl
y
() soo
n
er
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-16
Æva
r
Arnfjörð Bjarmason
lo
g
: test for r
e
gr
e
ssion intro
d
uced in
v
1
.
7
.
2-rc0~103^2~2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-16
J
onathan
Nieder
cherry-pic
k
/
r
ever
t
: Use advise() for hints
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-16
Jonathan
N
ie
d
er
cherry-pick/
r
evert: Use error()
for failure message
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-16
Jonathan N
i
ed
e
r
I
ntroduce
a
dvise()
to pr
i
n
t
hi
n
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-16
J
o
nathan Nieder
E
l
iminate “F
i
n
i
shed cherry-pick/rev
e
rt”
m
e
ssage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-15
Jona
t
ha
n
Nieder
t
9
010 (svn-fe): avoid sym
l
ink
s
in test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-15
Jo
n
athan Nieder
t9010 (svn
-
fe): use Unix-style path
i
n
URI
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-15
J
o
nathan Nieder
vcs-svn:
Avoid %z in forma
t
stri
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-15
Jonat
h
an Nied
e
r
vcs-svn: Rename dirent pool to build on Windows
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-15
J
o
nathan Nieder
compat: a
d
d strt
o
k_r()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-15
Jona
t
han Nieder
treap: style
fi
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-15
Jonat
h
an Nieder
vcs-svn:
r
emove b
u
i
ld
arti
f
acts on "
m
ake cle
a
n"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-15
Jonathan Nieder
svn-fe
man
u
al: Clarif
y
wa
r
ning about del
t
as in dump
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-15
Jonathan Nied
e
r
Update
s
vn-fe manual
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-15
David B
a
r
r
SVN dump
p
arser
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-15
David Barr
Infr
a
structure to wri
t
e
revisions in fast-export fo
r
ma
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-15
David Barr
Add
s
t
r
eam help
e
r library
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-15
David
B
ar
r
Add
st
r
ing-speci
f
ic memory pool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-15
Ja
s
on Evans
Add treap i
m
plementat
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-15
David Barr
Add m
e
mory pool l
i
brary
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-15
Jonathan Nieder
Introduce vcs-svn lib
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-14
Junio C Hamano
Merge bra
n
ch 'ab/perl-inst
a
ll' into
ne
x
t
commit
|
commitdiff
|
tree
2010-08-14
Junio C Hamano
Me
r
ge branch '
j
c/m
a
int-follow
-
rename-fix' int
o
next
commit
|
commitdiff
|
tree
2010-08-14
Junio C Haman
o
M
erge bran
c
h
'gb/s
p
lit-cmdline-errm
s
g
'
into n
e
x
t
commit
|
commitdiff
|
tree
2010-08-14
Ju
n
io C Hamano
Merge branch '
e
n/rebase
-
ag
a
i
nst-re
b
ase-fix' into next
commit
|
commitdiff
|
tree
2010-08-14
Ju
n
io C Ha
m
ano
Merge branch
'jn/
m
aint-plug-leak'
into next
commit
|
commitdiff
|
tree
2010-08-14
Ju
n
i
o
C Haman
o
M
erge branch 'dg/local-mo
d
-error-mes
s
ages' into next
commit
|
commitdiff
|
tree
2010-08-14
Junio C Hamano
Merge branch
'
cc/revert' i
n
to next
commit
|
commitdiff
|
tree
2010-08-14
Junio
C H
a
mano
Merge branch
't
f
/string-lis
t
-init
'
into next
commit
|
commitdiff
|
tree
2010-08-14
Junio C Hamano
Merge
branch
'
mm/rebase-i-exec
'
into next
commit
|
commitdiff
|
tree
2010-08-14
J
un
i
o
C
H
amano
M
er
g
e b
r
a
n
ch 'en/d-f-conflict-fix' into
n
ext
commit
|
commitdiff
|
tree
2010-08-13
Brandon Casey
g
i
t-rebas
e
--interactive
.
sh: use printf inste
a
d of
echo
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-13
Brandon Casey
g
i
t-reba
s
e--interactive
.
sh: rework skip_unnecessary_picks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-13
Junio
C
Hamano
d
if
f
--
f
ollow: do cal
l
diffcore_std() as
necessary
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-13
J
u
nio
C
Haman
o
di
f
f --follow: do not waste cycles whi
l
e recursing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-13
Ævar Arnfjörð Bjarmason
perl/Makefile: Un
s
e
t INSTALL_BASE
when mak
i
ng perl
.
m
ak
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-13
Elijah Newr
e
n
Mark tests that use symlinks as needing SYM
L
INK
S
prerequisite
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-13
Elija
h
Newr
e
n
pull --rebase: Avoid sp
u
rious confli
c
ts and reapplying
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-13
Elijah Newren
t5520-pull
:
Add testcases sho
w
ing s
p
urious conf
l
icts
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-13
Junio C Hamano
Me
r
ge branch 'jl/submodule-i
g
nore-diff' i
n
to next
commit
|
commitdiff
|
tree
2010-08-13
Jun
i
o C H
a
mano
Merg
e
branch 'mm/re
b
ase-i
-
exec' into next
commit
|
commitdiff
|
tree
2010-08-13
Juni
o
C
H
amano
Me
r
ge branc
h
'so/http-u
s
er
-
agent'
i
nto
next
commit
|
commitdiff
|
tree
2010-08-13
J
unio C
Hamano
Merg
e
bran
c
h 'sr/local-confi
g
' in
t
o next
commit
|
commitdiff
|
tree
next