Merge branch 'master' into db/fetch-pack
There's a number of tricky conflicts between master and this topic right now due to the rewrite of builtin-push. Junio must have handled these via rerere; I'd rather not deal with them again so I'm pre-merging master into the topic. Besides this topic somehow started to depend on the strbuf series that was in next, but is now in master. It no longer compiles on its own without the strbuf API. * master: (184 commits) Whip post 1.5.3.4 maintenance series into shape. Minor usage update in setgitperms.perl manual: use 'URL' instead of 'url'. manual: add some markup. manual: Fix example finding commits referencing given content. Fix wording in push definition. Fix some typos, punctuation, missing words, minor markup. manual: Fix or remove em dashes. Add a --dry-run option to git-push. Add a --dry-run option to git-send-pack. Fix in-place editing functions in convert.c instaweb: support for Ruby's WEBrick server instaweb: allow for use of auto-generated scripts Add 'git-p4 commit' as an alias for 'git-p4 submit' hg-to-git speedup through selectable repack intervals git-svn: respect Subversion's [auth] section configuration values gtksourceview2 support for gitview fix contrib/hooks/post-receive-email hooks.recipients error message Support cvs via git-shell rebase -i: use diff plumbing instead of porcelain ... Conflicts: Makefile builtin-push.c rsh.c
This commit is contained in:
Shawn O. Pearce
71
t/t3060-ls-files-with-tree.sh
Executable file
71
t/t3060-ls-files-with-tree.sh
Executable file
@ -0,0 +1,71 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# Copyright (c) 2007 Carl D. Worth
|
||||
#
|
||||
|
||||
test_description='git ls-files test (--with-tree).
|
||||
|
||||
This test runs git ls-files --with-tree and in particular in
|
||||
a scenario known to trigger a crash with some versions of git.
|
||||
'
|
||||
. ./test-lib.sh
|
||||
|
||||
test_expect_success setup '
|
||||
|
||||
# The bug we are exercising requires a fair number of entries
|
||||
# in a sub-directory so that add_index_entry will trigger a
|
||||
# realloc.
|
||||
|
||||
echo file >expected &&
|
||||
mkdir sub &&
|
||||
bad= &&
|
||||
for n in 0 1 2 3 4 5
|
||||
do
|
||||
for m in 0 1 2 3 4 5 6 7 8 9
|
||||
do
|
||||
num=00$n$m &&
|
||||
>sub/file-$num &&
|
||||
echo file-$num >>expected || {
|
||||
bad=t
|
||||
break
|
||||
}
|
||||
done && test -z "$bad" || {
|
||||
bad=t
|
||||
break
|
||||
}
|
||||
done && test -z "$bad" &&
|
||||
git add . &&
|
||||
git commit -m "add a bunch of files" &&
|
||||
|
||||
# We remove them all so that we will have something to add
|
||||
# back with --with-tree and so that we will definitely be
|
||||
# under the realloc size to trigger the bug.
|
||||
rm -rf sub &&
|
||||
git commit -a -m "remove them all" &&
|
||||
|
||||
# The bug also requires some entry before our directory so that
|
||||
# prune_path will modify the_index.cache
|
||||
|
||||
mkdir a_directory_that_sorts_before_sub &&
|
||||
>a_directory_that_sorts_before_sub/file &&
|
||||
mkdir sub &&
|
||||
>sub/file &&
|
||||
git add .
|
||||
'
|
||||
|
||||
# We have to run from a sub-directory to trigger prune_path
|
||||
# Then we finally get to run our --with-tree test
|
||||
cd sub
|
||||
|
||||
test_expect_success 'git -ls-files --with-tree should succeed from subdir' '
|
||||
|
||||
git ls-files --with-tree=HEAD~1 >../output
|
||||
|
||||
'
|
||||
|
||||
cd ..
|
||||
test_expect_success \
|
||||
'git -ls-files --with-tree should add entries from named tree.' \
|
||||
'diff -u expected output'
|
||||
|
||||
test_done
|
||||
@ -80,7 +80,7 @@ cat "$1".tmp
|
||||
action=pick
|
||||
for line in $FAKE_LINES; do
|
||||
case $line in
|
||||
squash)
|
||||
squash|edit)
|
||||
action="$line";;
|
||||
*)
|
||||
echo sed -n "${line}s/^pick/$action/p"
|
||||
@ -180,7 +180,7 @@ test_expect_success 'squash' '
|
||||
'
|
||||
|
||||
test_expect_success 'retain authorship when squashing' '
|
||||
git show HEAD | grep "^Author: Nitfol"
|
||||
git show HEAD | grep "^Author: Twerp Snog"
|
||||
'
|
||||
|
||||
test_expect_success 'preserve merges with -p' '
|
||||
@ -297,4 +297,24 @@ test_expect_success 'ignore patch if in upstream' '
|
||||
test $HEAD = $(git rev-parse HEAD^)
|
||||
'
|
||||
|
||||
test_expect_success '--continue tries to commit, even for "edit"' '
|
||||
parent=$(git rev-parse HEAD^) &&
|
||||
test_tick &&
|
||||
FAKE_LINES="edit 1" git rebase -i HEAD^ &&
|
||||
echo edited > file7 &&
|
||||
git add file7 &&
|
||||
FAKE_COMMIT_MESSAGE="chouette!" git rebase --continue &&
|
||||
test edited = $(git show HEAD:file7) &&
|
||||
git show HEAD | grep chouette &&
|
||||
test $parent = $(git rev-parse HEAD^)
|
||||
'
|
||||
|
||||
test_expect_success 'rebase a detached HEAD' '
|
||||
grandparent=$(git rev-parse HEAD~2) &&
|
||||
git checkout $(git rev-parse HEAD) &&
|
||||
test_tick &&
|
||||
FAKE_LINES="2 1" git rebase -i HEAD~2 &&
|
||||
test $grandparent = $(git rev-parse HEAD~2)
|
||||
'
|
||||
|
||||
test_done
|
||||
|
||||
@ -8,7 +8,7 @@ test_description='commit and log output encodings'
|
||||
. ./test-lib.sh
|
||||
|
||||
compare_with () {
|
||||
git show -s $1 | sed -e '1,/^$/d' -e 's/^ //' -e '$d' >current &&
|
||||
git show -s $1 | sed -e '1,/^$/d' -e 's/^ //' >current &&
|
||||
git diff current "$2"
|
||||
}
|
||||
|
||||
|
||||
@ -4,5 +4,4 @@ Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:02:00 2006 +0000
|
||||
|
||||
Third
|
||||
|
||||
$
|
||||
|
||||
@ -36,7 +36,8 @@ test_expect_success \
|
||||
echo simple textfile >a/a &&
|
||||
mkdir a/bin &&
|
||||
cp /bin/sh a/bin &&
|
||||
printf "A\$Format:%s\$O" "$SUBSTFORMAT" >a/substfile &&
|
||||
printf "A\$Format:%s\$O" "$SUBSTFORMAT" >a/substfile1 &&
|
||||
printf "A not substituted O" >a/substfile2 &&
|
||||
ln -s a a/l1 &&
|
||||
(p=long_path_to_a_file && cd a &&
|
||||
for depth in 1 2 3 4 5; do mkdir $p && cd $p; done &&
|
||||
@ -108,20 +109,22 @@ test_expect_success \
|
||||
'diff -r a c/prefix/a'
|
||||
|
||||
test_expect_success \
|
||||
'create an archive with a substfile' \
|
||||
'echo substfile export-subst >a/.gitattributes &&
|
||||
'create an archive with a substfiles' \
|
||||
'echo "substfile?" export-subst >a/.gitattributes &&
|
||||
git archive HEAD >f.tar &&
|
||||
rm a/.gitattributes'
|
||||
|
||||
test_expect_success \
|
||||
'extract substfile' \
|
||||
'extract substfiles' \
|
||||
'(mkdir f && cd f && $TAR xf -) <f.tar'
|
||||
|
||||
test_expect_success \
|
||||
'validate substfile contents' \
|
||||
'git log --max-count=1 "--pretty=format:A${SUBSTFORMAT}O" HEAD \
|
||||
>f/a/substfile.expected &&
|
||||
diff f/a/substfile.expected f/a/substfile'
|
||||
>f/a/substfile1.expected &&
|
||||
diff f/a/substfile1.expected f/a/substfile1 &&
|
||||
diff a/substfile2 f/a/substfile2
|
||||
'
|
||||
|
||||
test_expect_success \
|
||||
'git archive --format=zip' \
|
||||
|
||||
56
t/t5402-post-merge-hook.sh
Executable file
56
t/t5402-post-merge-hook.sh
Executable file
@ -0,0 +1,56 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# Copyright (c) 2006 Josh England
|
||||
#
|
||||
|
||||
test_description='Test the post-merge hook.'
|
||||
. ./test-lib.sh
|
||||
|
||||
test_expect_success setup '
|
||||
echo Data for commit0. >a &&
|
||||
git update-index --add a &&
|
||||
tree0=$(git write-tree) &&
|
||||
commit0=$(echo setup | git commit-tree $tree0) &&
|
||||
echo Changed data for commit1. >a &&
|
||||
git update-index a &&
|
||||
tree1=$(git write-tree) &&
|
||||
commit1=$(echo modify | git commit-tree $tree1 -p $commit0) &&
|
||||
git update-ref refs/heads/master $commit0 &&
|
||||
git-clone ./. clone1 &&
|
||||
GIT_DIR=clone1/.git git update-index --add a &&
|
||||
git-clone ./. clone2 &&
|
||||
GIT_DIR=clone2/.git git update-index --add a
|
||||
'
|
||||
|
||||
for clone in 1 2; do
|
||||
cat >clone${clone}/.git/hooks/post-merge <<'EOF'
|
||||
#!/bin/sh
|
||||
echo $@ >> $GIT_DIR/post-merge.args
|
||||
EOF
|
||||
chmod u+x clone${clone}/.git/hooks/post-merge
|
||||
done
|
||||
|
||||
test_expect_failure 'post-merge does not run for up-to-date ' '
|
||||
GIT_DIR=clone1/.git git merge $commit0 &&
|
||||
test -e clone1/.git/post-merge.args
|
||||
'
|
||||
|
||||
test_expect_success 'post-merge runs as expected ' '
|
||||
GIT_DIR=clone1/.git git merge $commit1 &&
|
||||
test -e clone1/.git/post-merge.args
|
||||
'
|
||||
|
||||
test_expect_success 'post-merge from normal merge receives the right argument ' '
|
||||
grep 0 clone1/.git/post-merge.args
|
||||
'
|
||||
|
||||
test_expect_success 'post-merge from squash merge runs as expected ' '
|
||||
GIT_DIR=clone2/.git git merge --squash $commit1 &&
|
||||
test -e clone2/.git/post-merge.args
|
||||
'
|
||||
|
||||
test_expect_success 'post-merge from squash merge receives the right argument ' '
|
||||
grep 1 clone2/.git/post-merge.args
|
||||
'
|
||||
|
||||
test_done
|
||||
74
t/t5403-post-checkout-hook.sh
Executable file
74
t/t5403-post-checkout-hook.sh
Executable file
@ -0,0 +1,74 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# Copyright (c) 2006 Josh England
|
||||
#
|
||||
|
||||
test_description='Test the post-checkout hook.'
|
||||
. ./test-lib.sh
|
||||
|
||||
test_expect_success setup '
|
||||
echo Data for commit0. >a &&
|
||||
echo Data for commit0. >b &&
|
||||
git update-index --add a &&
|
||||
git update-index --add b &&
|
||||
tree0=$(git write-tree) &&
|
||||
commit0=$(echo setup | git commit-tree $tree0) &&
|
||||
git update-ref refs/heads/master $commit0 &&
|
||||
git-clone ./. clone1 &&
|
||||
git-clone ./. clone2 &&
|
||||
GIT_DIR=clone2/.git git branch -a new2 &&
|
||||
echo Data for commit1. >clone2/b &&
|
||||
GIT_DIR=clone2/.git git add clone2/b &&
|
||||
GIT_DIR=clone2/.git git commit -m new2
|
||||
'
|
||||
|
||||
for clone in 1 2; do
|
||||
cat >clone${clone}/.git/hooks/post-checkout <<'EOF'
|
||||
#!/bin/sh
|
||||
echo $@ > $GIT_DIR/post-checkout.args
|
||||
EOF
|
||||
chmod u+x clone${clone}/.git/hooks/post-checkout
|
||||
done
|
||||
|
||||
test_expect_success 'post-checkout runs as expected ' '
|
||||
GIT_DIR=clone1/.git git checkout master &&
|
||||
test -e clone1/.git/post-checkout.args
|
||||
'
|
||||
|
||||
test_expect_success 'post-checkout receives the right arguments with HEAD unchanged ' '
|
||||
old=$(awk "{print \$1}" clone1/.git/post-checkout.args) &&
|
||||
new=$(awk "{print \$2}" clone1/.git/post-checkout.args) &&
|
||||
flag=$(awk "{print \$3}" clone1/.git/post-checkout.args) &&
|
||||
test $old = $new -a $flag = 1
|
||||
'
|
||||
|
||||
test_expect_success 'post-checkout runs as expected ' '
|
||||
GIT_DIR=clone1/.git git checkout master &&
|
||||
test -e clone1/.git/post-checkout.args
|
||||
'
|
||||
|
||||
test_expect_success 'post-checkout args are correct with git checkout -b ' '
|
||||
GIT_DIR=clone1/.git git checkout -b new1 &&
|
||||
old=$(awk "{print \$1}" clone1/.git/post-checkout.args) &&
|
||||
new=$(awk "{print \$2}" clone1/.git/post-checkout.args) &&
|
||||
flag=$(awk "{print \$3}" clone1/.git/post-checkout.args) &&
|
||||
test $old = $new -a $flag = 1
|
||||
'
|
||||
|
||||
test_expect_success 'post-checkout receives the right args with HEAD changed ' '
|
||||
GIT_DIR=clone2/.git git checkout new2 &&
|
||||
old=$(awk "{print \$1}" clone2/.git/post-checkout.args) &&
|
||||
new=$(awk "{print \$2}" clone2/.git/post-checkout.args) &&
|
||||
flag=$(awk "{print \$3}" clone2/.git/post-checkout.args) &&
|
||||
test $old != $new -a $flag = 1
|
||||
'
|
||||
|
||||
test_expect_success 'post-checkout receives the right args when not switching branches ' '
|
||||
GIT_DIR=clone2/.git git checkout master b &&
|
||||
old=$(awk "{print \$1}" clone2/.git/post-checkout.args) &&
|
||||
new=$(awk "{print \$2}" clone2/.git/post-checkout.args) &&
|
||||
flag=$(awk "{print \$3}" clone2/.git/post-checkout.args) &&
|
||||
test $old = $new -a $flag = 0
|
||||
'
|
||||
|
||||
test_done
|
||||
100
t/t5505-remote.sh
Executable file
100
t/t5505-remote.sh
Executable file
@ -0,0 +1,100 @@
|
||||
#!/bin/sh
|
||||
|
||||
test_description='git remote porcelain-ish'
|
||||
|
||||
. ./test-lib.sh
|
||||
|
||||
GIT_CONFIG=.git/config
|
||||
export GIT_CONFIG
|
||||
|
||||
setup_repository () {
|
||||
mkdir "$1" && (
|
||||
cd "$1" &&
|
||||
git init &&
|
||||
>file &&
|
||||
git add file &&
|
||||
git commit -m "Initial" &&
|
||||
git checkout -b side &&
|
||||
>elif &&
|
||||
git add elif &&
|
||||
git commit -m "Second" &&
|
||||
git checkout master
|
||||
)
|
||||
}
|
||||
|
||||
tokens_match () {
|
||||
echo "$1" | tr ' ' '\012' | sort | sed -e '/^$/d' >expect &&
|
||||
echo "$2" | tr ' ' '\012' | sort | sed -e '/^$/d' >actual &&
|
||||
diff -u expect actual
|
||||
}
|
||||
|
||||
check_remote_track () {
|
||||
actual=$(git remote show "$1" | sed -n -e '$p') &&
|
||||
shift &&
|
||||
tokens_match "$*" "$actual"
|
||||
}
|
||||
|
||||
check_tracking_branch () {
|
||||
f="" &&
|
||||
r=$(git for-each-ref "--format=%(refname)" |
|
||||
sed -ne "s|^refs/remotes/$1/||p") &&
|
||||
shift &&
|
||||
tokens_match "$*" "$r"
|
||||
}
|
||||
|
||||
test_expect_success setup '
|
||||
|
||||
setup_repository one &&
|
||||
setup_repository two &&
|
||||
(
|
||||
cd two && git branch another
|
||||
) &&
|
||||
git clone one test
|
||||
|
||||
'
|
||||
|
||||
test_expect_success 'remote information for the origin' '
|
||||
(
|
||||
cd test &&
|
||||
tokens_match origin "$(git remote)" &&
|
||||
check_remote_track origin master side &&
|
||||
check_tracking_branch origin HEAD master side
|
||||
)
|
||||
'
|
||||
|
||||
test_expect_success 'add another remote' '
|
||||
(
|
||||
cd test &&
|
||||
git remote add -f second ../two &&
|
||||
tokens_match "origin second" "$(git remote)" &&
|
||||
check_remote_track origin master side &&
|
||||
check_remote_track second master side another &&
|
||||
check_tracking_branch second master side another &&
|
||||
git for-each-ref "--format=%(refname)" refs/remotes |
|
||||
sed -e "/^refs\/remotes\/origin\//d" \
|
||||
-e "/^refs\/remotes\/second\//d" >actual &&
|
||||
>expect &&
|
||||
diff -u expect actual
|
||||
)
|
||||
'
|
||||
|
||||
test_expect_success 'remove remote' '
|
||||
(
|
||||
cd test &&
|
||||
git remote rm second
|
||||
)
|
||||
'
|
||||
|
||||
test_expect_success 'remove remote' '
|
||||
(
|
||||
cd test &&
|
||||
tokens_match origin "$(git remote)" &&
|
||||
check_remote_track origin master side &&
|
||||
git for-each-ref "--format=%(refname)" refs/remotes |
|
||||
sed -e "/^refs\/remotes\/origin\//d" >actual &&
|
||||
>expect &&
|
||||
diff -u expect actual
|
||||
)
|
||||
'
|
||||
|
||||
test_done
|
||||
@ -244,4 +244,14 @@ test_expect_success 'push with colon-less refspec (4)' '
|
||||
|
||||
'
|
||||
|
||||
test_expect_success 'push with dry-run' '
|
||||
|
||||
mk_test heads/master &&
|
||||
cd testrepo &&
|
||||
old_commit=$(git show-ref -s --verify refs/heads/master) &&
|
||||
cd .. &&
|
||||
git push --dry-run testrepo &&
|
||||
check_push_result $old_commit heads/master
|
||||
'
|
||||
|
||||
test_done
|
||||
|
||||
@ -79,9 +79,7 @@ EOF
|
||||
|
||||
test_format encoding %e <<'EOF'
|
||||
commit 131a310eb913d107dd3c09a65d1651175898735d
|
||||
<unknown>
|
||||
commit 86c75cfd708a0e5868dc876ed5b8bb66c80b4873
|
||||
<unknown>
|
||||
EOF
|
||||
|
||||
test_format subject %s <<'EOF'
|
||||
@ -93,9 +91,7 @@ EOF
|
||||
|
||||
test_format body %b <<'EOF'
|
||||
commit 131a310eb913d107dd3c09a65d1651175898735d
|
||||
<unknown>
|
||||
commit 86c75cfd708a0e5868dc876ed5b8bb66c80b4873
|
||||
<unknown>
|
||||
EOF
|
||||
|
||||
test_format colors %Credfoo%Cgreenbar%Cbluebaz%Cresetxyzzy <<'EOF'
|
||||
@ -121,9 +117,7 @@ test_format complex-encoding %e <<'EOF'
|
||||
commit f58db70b055c5718631e5c61528b28b12090cdea
|
||||
iso8859-1
|
||||
commit 131a310eb913d107dd3c09a65d1651175898735d
|
||||
<unknown>
|
||||
commit 86c75cfd708a0e5868dc876ed5b8bb66c80b4873
|
||||
<unknown>
|
||||
EOF
|
||||
|
||||
test_format complex-subject %s <<'EOF'
|
||||
@ -142,9 +136,7 @@ and it will be encoded in iso8859-1. We should therefore
|
||||
include an iso8859 character: ¡bueno!
|
||||
|
||||
commit 131a310eb913d107dd3c09a65d1651175898735d
|
||||
<unknown>
|
||||
commit 86c75cfd708a0e5868dc876ed5b8bb66c80b4873
|
||||
<unknown>
|
||||
EOF
|
||||
|
||||
test_done
|
||||
|
||||
151
t/t6300-for-each-ref.sh
Normal file
151
t/t6300-for-each-ref.sh
Normal file
@ -0,0 +1,151 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# Copyright (c) 2007 Andy Parkins
|
||||
#
|
||||
|
||||
test_description='for-each-ref test'
|
||||
|
||||
. ./test-lib.sh
|
||||
|
||||
# Mon Jul 3 15:18:43 2006 +0000
|
||||
datestamp=1151939923
|
||||
setdate_and_increment () {
|
||||
GIT_COMMITTER_DATE="$datestamp +0200"
|
||||
datestamp=$(expr "$datestamp" + 1)
|
||||
GIT_AUTHOR_DATE="$datestamp +0200"
|
||||
datestamp=$(expr "$datestamp" + 1)
|
||||
export GIT_COMMITTER_DATE GIT_AUTHOR_DATE
|
||||
}
|
||||
|
||||
test_expect_success 'Create sample commit with known timestamp' '
|
||||
setdate_and_increment &&
|
||||
echo "Using $datestamp" > one &&
|
||||
git add one &&
|
||||
git commit -m "Initial" &&
|
||||
setdate_and_increment &&
|
||||
git tag -a -m "Tagging at $datestamp" testtag
|
||||
'
|
||||
|
||||
test_expect_success 'Check atom names are valid' '
|
||||
bad=
|
||||
for token in \
|
||||
refname objecttype objectsize objectname tree parent \
|
||||
numparent object type author authorname authoremail \
|
||||
authordate committer committername committeremail \
|
||||
committerdate tag tagger taggername taggeremail \
|
||||
taggerdate creator creatordate subject body contents
|
||||
do
|
||||
git for-each-ref --format="$token=%($token)" refs/heads || {
|
||||
bad=$token
|
||||
break
|
||||
}
|
||||
done
|
||||
test -z "$bad"
|
||||
'
|
||||
|
||||
test_expect_failure 'Check invalid atoms names are errors' '
|
||||
git-for-each-ref --format="%(INVALID)" refs/heads
|
||||
'
|
||||
|
||||
test_expect_success 'Check format specifiers are ignored in naming date atoms' '
|
||||
git-for-each-ref --format="%(authordate)" refs/heads &&
|
||||
git-for-each-ref --format="%(authordate:default) %(authordate)" refs/heads &&
|
||||
git-for-each-ref --format="%(authordate) %(authordate:default)" refs/heads &&
|
||||
git-for-each-ref --format="%(authordate:default) %(authordate:default)" refs/heads
|
||||
'
|
||||
|
||||
test_expect_success 'Check valid format specifiers for date fields' '
|
||||
git-for-each-ref --format="%(authordate:default)" refs/heads &&
|
||||
git-for-each-ref --format="%(authordate:relative)" refs/heads &&
|
||||
git-for-each-ref --format="%(authordate:short)" refs/heads &&
|
||||
git-for-each-ref --format="%(authordate:local)" refs/heads &&
|
||||
git-for-each-ref --format="%(authordate:iso8601)" refs/heads &&
|
||||
git-for-each-ref --format="%(authordate:rfc2822)" refs/heads
|
||||
'
|
||||
|
||||
test_expect_failure 'Check invalid format specifiers are errors' '
|
||||
git-for-each-ref --format="%(authordate:INVALID)" refs/heads
|
||||
'
|
||||
|
||||
cat >expected <<\EOF
|
||||
'refs/heads/master' 'Mon Jul 3 17:18:43 2006 +0200' 'Mon Jul 3 17:18:44 2006 +0200'
|
||||
'refs/tags/testtag' 'Mon Jul 3 17:18:45 2006 +0200'
|
||||
EOF
|
||||
|
||||
test_expect_success 'Check unformatted date fields output' '
|
||||
(git for-each-ref --shell --format="%(refname) %(committerdate) %(authordate)" refs/heads &&
|
||||
git for-each-ref --shell --format="%(refname) %(taggerdate)" refs/tags) >actual &&
|
||||
git diff expected actual
|
||||
'
|
||||
|
||||
test_expect_success 'Check format "default" formatted date fields output' '
|
||||
f=default &&
|
||||
(git for-each-ref --shell --format="%(refname) %(committerdate:$f) %(authordate:$f)" refs/heads &&
|
||||
git for-each-ref --shell --format="%(refname) %(taggerdate:$f)" refs/tags) >actual &&
|
||||
git diff expected actual
|
||||
'
|
||||
|
||||
# Don't know how to do relative check because I can't know when this script
|
||||
# is going to be run and can't fake the current time to git, and hence can't
|
||||
# provide expected output. Instead, I'll just make sure that "relative"
|
||||
# doesn't exit in error
|
||||
#
|
||||
#cat >expected <<\EOF
|
||||
#
|
||||
#EOF
|
||||
#
|
||||
test_expect_success 'Check format "relative" date fields output' '
|
||||
f=relative &&
|
||||
(git for-each-ref --shell --format="%(refname) %(committerdate:$f) %(authordate:$f)" refs/heads &&
|
||||
git for-each-ref --shell --format="%(refname) %(taggerdate:$f)" refs/tags) >actual
|
||||
'
|
||||
|
||||
cat >expected <<\EOF
|
||||
'refs/heads/master' '2006-07-03' '2006-07-03'
|
||||
'refs/tags/testtag' '2006-07-03'
|
||||
EOF
|
||||
|
||||
test_expect_success 'Check format "short" date fields output' '
|
||||
f=short &&
|
||||
(git for-each-ref --shell --format="%(refname) %(committerdate:$f) %(authordate:$f)" refs/heads &&
|
||||
git for-each-ref --shell --format="%(refname) %(taggerdate:$f)" refs/tags) >actual &&
|
||||
git diff expected actual
|
||||
'
|
||||
|
||||
cat >expected <<\EOF
|
||||
'refs/heads/master' 'Mon Jul 3 15:18:43 2006' 'Mon Jul 3 15:18:44 2006'
|
||||
'refs/tags/testtag' 'Mon Jul 3 15:18:45 2006'
|
||||
EOF
|
||||
|
||||
test_expect_success 'Check format "local" date fields output' '
|
||||
f=local &&
|
||||
(git for-each-ref --shell --format="%(refname) %(committerdate:$f) %(authordate:$f)" refs/heads &&
|
||||
git for-each-ref --shell --format="%(refname) %(taggerdate:$f)" refs/tags) >actual &&
|
||||
git diff expected actual
|
||||
'
|
||||
|
||||
cat >expected <<\EOF
|
||||
'refs/heads/master' '2006-07-03 17:18:43 +0200' '2006-07-03 17:18:44 +0200'
|
||||
'refs/tags/testtag' '2006-07-03 17:18:45 +0200'
|
||||
EOF
|
||||
|
||||
test_expect_success 'Check format "iso8601" date fields output' '
|
||||
f=iso8601 &&
|
||||
(git for-each-ref --shell --format="%(refname) %(committerdate:$f) %(authordate:$f)" refs/heads &&
|
||||
git for-each-ref --shell --format="%(refname) %(taggerdate:$f)" refs/tags) >actual &&
|
||||
git diff expected actual
|
||||
'
|
||||
|
||||
cat >expected <<\EOF
|
||||
'refs/heads/master' 'Mon, 3 Jul 2006 17:18:43 +0200' 'Mon, 3 Jul 2006 17:18:44 +0200'
|
||||
'refs/tags/testtag' 'Mon, 3 Jul 2006 17:18:45 +0200'
|
||||
EOF
|
||||
|
||||
test_expect_success 'Check format "rfc2822" date fields output' '
|
||||
f=rfc2822 &&
|
||||
(git for-each-ref --shell --format="%(refname) %(committerdate:$f) %(authordate:$f)" refs/heads &&
|
||||
git for-each-ref --shell --format="%(refname) %(taggerdate:$f)" refs/tags) >actual &&
|
||||
git diff expected actual
|
||||
'
|
||||
|
||||
test_done
|
||||
@ -81,7 +81,7 @@ test_expect_success 'explicit commit message should override template' '
|
||||
git add foo &&
|
||||
GIT_EDITOR=../t7500/add-content git commit --template "$TEMPLATE" \
|
||||
-m "command line msg" &&
|
||||
commit_msg_is "command line msg<unknown>"
|
||||
commit_msg_is "command line msg"
|
||||
'
|
||||
|
||||
test_expect_success 'commit message from file should override template' '
|
||||
@ -90,7 +90,7 @@ test_expect_success 'commit message from file should override template' '
|
||||
echo "standard input msg" |
|
||||
GIT_EDITOR=../t7500/add-content git commit \
|
||||
--template "$TEMPLATE" --file - &&
|
||||
commit_msg_is "standard input msg<unknown>"
|
||||
commit_msg_is "standard input msg"
|
||||
'
|
||||
|
||||
test_done
|
||||
|
||||
440
t/t7600-merge.sh
Executable file
440
t/t7600-merge.sh
Executable file
@ -0,0 +1,440 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# Copyright (c) 2007 Lars Hjemli
|
||||
#
|
||||
|
||||
test_description='git-merge
|
||||
|
||||
Testing basic merge operations/option parsing.'
|
||||
|
||||
. ./test-lib.sh
|
||||
|
||||
cat >file <<EOF
|
||||
1
|
||||
2
|
||||
3
|
||||
4
|
||||
5
|
||||
6
|
||||
7
|
||||
8
|
||||
9
|
||||
EOF
|
||||
|
||||
cat >file.1 <<EOF
|
||||
1 X
|
||||
2
|
||||
3
|
||||
4
|
||||
5
|
||||
6
|
||||
7
|
||||
8
|
||||
9
|
||||
EOF
|
||||
|
||||
cat >file.5 <<EOF
|
||||
1
|
||||
2
|
||||
3
|
||||
4
|
||||
5 X
|
||||
6
|
||||
7
|
||||
8
|
||||
9
|
||||
EOF
|
||||
|
||||
cat >file.9 <<EOF
|
||||
1
|
||||
2
|
||||
3
|
||||
4
|
||||
5
|
||||
6
|
||||
7
|
||||
8
|
||||
9 X
|
||||
EOF
|
||||
|
||||
cat >result.1 <<EOF
|
||||
1 X
|
||||
2
|
||||
3
|
||||
4
|
||||
5
|
||||
6
|
||||
7
|
||||
8
|
||||
9
|
||||
EOF
|
||||
|
||||
cat >result.1-5 <<EOF
|
||||
1 X
|
||||
2
|
||||
3
|
||||
4
|
||||
5 X
|
||||
6
|
||||
7
|
||||
8
|
||||
9
|
||||
EOF
|
||||
|
||||
cat >result.1-5-9 <<EOF
|
||||
1 X
|
||||
2
|
||||
3
|
||||
4
|
||||
5 X
|
||||
6
|
||||
7
|
||||
8
|
||||
9 X
|
||||
EOF
|
||||
|
||||
create_merge_msgs() {
|
||||
echo "Merge commit 'c2'" >msg.1-5 &&
|
||||
echo "Merge commit 'c2'; commit 'c3'" >msg.1-5-9 &&
|
||||
echo "Squashed commit of the following:" >squash.1 &&
|
||||
echo >>squash.1 &&
|
||||
git log --no-merges ^HEAD c1 >>squash.1 &&
|
||||
echo "Squashed commit of the following:" >squash.1-5 &&
|
||||
echo >>squash.1-5 &&
|
||||
git log --no-merges ^HEAD c2 >>squash.1-5 &&
|
||||
echo "Squashed commit of the following:" >squash.1-5-9 &&
|
||||
echo >>squash.1-5-9 &&
|
||||
git log --no-merges ^HEAD c2 c3 >>squash.1-5-9
|
||||
}
|
||||
|
||||
verify_diff() {
|
||||
if ! diff -u "$1" "$2"
|
||||
then
|
||||
echo "$3"
|
||||
false
|
||||
fi
|
||||
}
|
||||
|
||||
verify_merge() {
|
||||
verify_diff "$2" "$1" "[OOPS] bad merge result" &&
|
||||
if test $(git ls-files -u | wc -l) -gt 0
|
||||
then
|
||||
echo "[OOPS] unmerged files"
|
||||
false
|
||||
fi &&
|
||||
if ! git diff --exit-code
|
||||
then
|
||||
echo "[OOPS] working tree != index"
|
||||
false
|
||||
fi &&
|
||||
if test -n "$3"
|
||||
then
|
||||
git show -s --pretty=format:%s HEAD >msg.act &&
|
||||
verify_diff "$3" msg.act "[OOPS] bad merge message"
|
||||
fi
|
||||
}
|
||||
|
||||
verify_head() {
|
||||
if test "$1" != "$(git rev-parse HEAD)"
|
||||
then
|
||||
echo "[OOPS] HEAD != $1"
|
||||
false
|
||||
fi
|
||||
}
|
||||
|
||||
verify_parents() {
|
||||
i=1
|
||||
while test $# -gt 0
|
||||
do
|
||||
if test "$1" != "$(git rev-parse HEAD^$i)"
|
||||
then
|
||||
echo "[OOPS] HEAD^$i != $1"
|
||||
return 1
|
||||
fi
|
||||
i=$(expr $i + 1)
|
||||
shift
|
||||
done
|
||||
}
|
||||
|
||||
verify_mergeheads() {
|
||||
i=1
|
||||
if ! test -f .git/MERGE_HEAD
|
||||
then
|
||||
echo "[OOPS] MERGE_HEAD is missing"
|
||||
false
|
||||
fi &&
|
||||
while test $# -gt 0
|
||||
do
|
||||
head=$(head -n $i .git/MERGE_HEAD | tail -n 1)
|
||||
if test "$1" != "$head"
|
||||
then
|
||||
echo "[OOPS] MERGE_HEAD $i != $1"
|
||||
return 1
|
||||
fi
|
||||
i=$(expr $i + 1)
|
||||
shift
|
||||
done
|
||||
}
|
||||
|
||||
verify_no_mergehead() {
|
||||
if test -f .git/MERGE_HEAD
|
||||
then
|
||||
echo "[OOPS] MERGE_HEAD exists"
|
||||
false
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
test_expect_success 'setup' '
|
||||
git add file &&
|
||||
test_tick &&
|
||||
git commit -m "commit 0" &&
|
||||
git tag c0 &&
|
||||
c0=$(git rev-parse HEAD) &&
|
||||
cp file.1 file &&
|
||||
git add file &&
|
||||
test_tick &&
|
||||
git commit -m "commit 1" &&
|
||||
git tag c1 &&
|
||||
c1=$(git rev-parse HEAD) &&
|
||||
git reset --hard "$c0" &&
|
||||
cp file.5 file &&
|
||||
git add file &&
|
||||
test_tick &&
|
||||
git commit -m "commit 2" &&
|
||||
git tag c2 &&
|
||||
c2=$(git rev-parse HEAD) &&
|
||||
git reset --hard "$c0" &&
|
||||
cp file.9 file &&
|
||||
git add file &&
|
||||
test_tick &&
|
||||
git commit -m "commit 3" &&
|
||||
git tag c3 &&
|
||||
c3=$(git rev-parse HEAD)
|
||||
git reset --hard "$c0" &&
|
||||
create_merge_msgs
|
||||
'
|
||||
|
||||
test_debug 'gitk --all'
|
||||
|
||||
test_expect_success 'test option parsing' '
|
||||
if git merge -$ c1
|
||||
then
|
||||
echo "[OOPS] -$ accepted"
|
||||
false
|
||||
fi &&
|
||||
if git merge --no-such c1
|
||||
then
|
||||
echo "[OOPS] --no-such accepted"
|
||||
false
|
||||
fi &&
|
||||
if git merge -s foobar c1
|
||||
then
|
||||
echo "[OOPS] -s foobar accepted"
|
||||
false
|
||||
fi &&
|
||||
if git merge -s=foobar c1
|
||||
then
|
||||
echo "[OOPS] -s=foobar accepted"
|
||||
false
|
||||
fi &&
|
||||
if git merge -m
|
||||
then
|
||||
echo "[OOPS] missing commit msg accepted"
|
||||
false
|
||||
fi &&
|
||||
if git merge
|
||||
then
|
||||
echo "[OOPS] missing commit references accepted"
|
||||
false
|
||||
fi
|
||||
'
|
||||
|
||||
test_expect_success 'merge c0 with c1' '
|
||||
git reset --hard c0 &&
|
||||
git merge c1 &&
|
||||
verify_merge file result.1 &&
|
||||
verify_head "$c1"
|
||||
'
|
||||
|
||||
test_debug 'gitk --all'
|
||||
|
||||
test_expect_success 'merge c1 with c2' '
|
||||
git reset --hard c1 &&
|
||||
test_tick &&
|
||||
git merge c2 &&
|
||||
verify_merge file result.1-5 msg.1-5 &&
|
||||
verify_parents $c1 $c2
|
||||
'
|
||||
|
||||
test_debug 'gitk --all'
|
||||
|
||||
test_expect_success 'merge c1 with c2 and c3' '
|
||||
git reset --hard c1 &&
|
||||
test_tick &&
|
||||
git merge c2 c3 &&
|
||||
verify_merge file result.1-5-9 msg.1-5-9 &&
|
||||
verify_parents $c1 $c2 $c3
|
||||
'
|
||||
|
||||
test_debug 'gitk --all'
|
||||
|
||||
test_expect_success 'merge c0 with c1 (no-commit)' '
|
||||
git reset --hard c0 &&
|
||||
git merge --no-commit c1 &&
|
||||
verify_merge file result.1 &&
|
||||
verify_head $c1
|
||||
'
|
||||
|
||||
test_debug 'gitk --all'
|
||||
|
||||
test_expect_success 'merge c1 with c2 (no-commit)' '
|
||||
git reset --hard c1 &&
|
||||
git merge --no-commit c2 &&
|
||||
verify_merge file result.1-5 &&
|
||||
verify_head $c1 &&
|
||||
verify_mergeheads $c2
|
||||
'
|
||||
|
||||
test_debug 'gitk --all'
|
||||
|
||||
test_expect_success 'merge c1 with c2 and c3 (no-commit)' '
|
||||
git reset --hard c1 &&
|
||||
git merge --no-commit c2 c3 &&
|
||||
verify_merge file result.1-5-9 &&
|
||||
verify_head $c1 &&
|
||||
verify_mergeheads $c2 $c3
|
||||
'
|
||||
|
||||
test_debug 'gitk --all'
|
||||
|
||||
test_expect_success 'merge c0 with c1 (squash)' '
|
||||
git reset --hard c0 &&
|
||||
git merge --squash c1 &&
|
||||
verify_merge file result.1 &&
|
||||
verify_head $c0 &&
|
||||
verify_no_mergehead &&
|
||||
verify_diff squash.1 .git/SQUASH_MSG "[OOPS] bad squash message"
|
||||
'
|
||||
|
||||
test_debug 'gitk --all'
|
||||
|
||||
test_expect_success 'merge c1 with c2 (squash)' '
|
||||
git reset --hard c1 &&
|
||||
git merge --squash c2 &&
|
||||
verify_merge file result.1-5 &&
|
||||
verify_head $c1 &&
|
||||
verify_no_mergehead &&
|
||||
verify_diff squash.1-5 .git/SQUASH_MSG "[OOPS] bad squash message"
|
||||
'
|
||||
|
||||
test_debug 'gitk --all'
|
||||
|
||||
test_expect_success 'merge c1 with c2 and c3 (squash)' '
|
||||
git reset --hard c1 &&
|
||||
git merge --squash c2 c3 &&
|
||||
verify_merge file result.1-5-9 &&
|
||||
verify_head $c1 &&
|
||||
verify_no_mergehead &&
|
||||
verify_diff squash.1-5-9 .git/SQUASH_MSG "[OOPS] bad squash message"
|
||||
'
|
||||
|
||||
test_debug 'gitk --all'
|
||||
|
||||
test_expect_success 'merge c1 with c2 (no-commit in config)' '
|
||||
git reset --hard c1 &&
|
||||
git config branch.master.mergeoptions "--no-commit" &&
|
||||
git merge c2 &&
|
||||
verify_merge file result.1-5 &&
|
||||
verify_head $c1 &&
|
||||
verify_mergeheads $c2
|
||||
'
|
||||
|
||||
test_debug 'gitk --all'
|
||||
|
||||
test_expect_success 'merge c1 with c2 (squash in config)' '
|
||||
git reset --hard c1 &&
|
||||
git config branch.master.mergeoptions "--squash" &&
|
||||
git merge c2 &&
|
||||
verify_merge file result.1-5 &&
|
||||
verify_head $c1 &&
|
||||
verify_no_mergehead &&
|
||||
verify_diff squash.1-5 .git/SQUASH_MSG "[OOPS] bad squash message"
|
||||
'
|
||||
|
||||
test_debug 'gitk --all'
|
||||
|
||||
test_expect_success 'override config option -n' '
|
||||
git reset --hard c1 &&
|
||||
git config branch.master.mergeoptions "-n" &&
|
||||
test_tick &&
|
||||
git merge --summary c2 >diffstat.txt &&
|
||||
verify_merge file result.1-5 msg.1-5 &&
|
||||
verify_parents $c1 $c2 &&
|
||||
if ! grep -e "^ file | \+2 +-$" diffstat.txt
|
||||
then
|
||||
echo "[OOPS] diffstat was not generated"
|
||||
fi
|
||||
'
|
||||
|
||||
test_debug 'gitk --all'
|
||||
|
||||
test_expect_success 'override config option --summary' '
|
||||
git reset --hard c1 &&
|
||||
git config branch.master.mergeoptions "--summary" &&
|
||||
test_tick &&
|
||||
git merge -n c2 >diffstat.txt &&
|
||||
verify_merge file result.1-5 msg.1-5 &&
|
||||
verify_parents $c1 $c2 &&
|
||||
if grep -e "^ file | \+2 +-$" diffstat.txt
|
||||
then
|
||||
echo "[OOPS] diffstat was generated"
|
||||
false
|
||||
fi
|
||||
'
|
||||
|
||||
test_debug 'gitk --all'
|
||||
|
||||
test_expect_success 'merge c1 with c2 (override --no-commit)' '
|
||||
git reset --hard c1 &&
|
||||
git config branch.master.mergeoptions "--no-commit" &&
|
||||
test_tick &&
|
||||
git merge --commit c2 &&
|
||||
verify_merge file result.1-5 msg.1-5 &&
|
||||
verify_parents $c1 $c2
|
||||
'
|
||||
|
||||
test_debug 'gitk --all'
|
||||
|
||||
test_expect_success 'merge c1 with c2 (override --squash)' '
|
||||
git reset --hard c1 &&
|
||||
git config branch.master.mergeoptions "--squash" &&
|
||||
test_tick &&
|
||||
git merge --no-squash c2 &&
|
||||
verify_merge file result.1-5 msg.1-5 &&
|
||||
verify_parents $c1 $c2
|
||||
'
|
||||
|
||||
test_debug 'gitk --all'
|
||||
|
||||
test_expect_success 'merge c0 with c1 (no-ff)' '
|
||||
git reset --hard c0 &&
|
||||
test_tick &&
|
||||
git merge --no-ff c1 &&
|
||||
verify_merge file result.1 &&
|
||||
verify_parents $c0 $c1
|
||||
'
|
||||
|
||||
test_debug 'gitk --all'
|
||||
|
||||
test_expect_success 'merge c0 with c1 (ff overrides no-ff)' '
|
||||
git reset --hard c0 &&
|
||||
git config branch.master.mergeoptions "--no-ff" &&
|
||||
git merge --ff c1 &&
|
||||
verify_merge file result.1 &&
|
||||
verify_head $c1
|
||||
'
|
||||
|
||||
test_debug 'gitk --all'
|
||||
|
||||
test_done
|
||||
@ -30,7 +30,7 @@ test_expect_success 'Extract patches' '
|
||||
'
|
||||
|
||||
test_expect_success 'Send patches' '
|
||||
git send-email -from="Example <nobody@example.com>" --to=nobody@example.com --smtp-server="$(pwd)/fake.sendmail" $patches 2>errors
|
||||
git send-email --from="Example <nobody@example.com>" --to=nobody@example.com --smtp-server="$(pwd)/fake.sendmail" $patches 2>errors
|
||||
'
|
||||
|
||||
cat >expected <<\EOF
|
||||
|
||||
@ -140,6 +140,7 @@ test_expect_success 'test show-ignore' "
|
||||
cd test_wc &&
|
||||
mkdir -p deeply/nested/directory &&
|
||||
svn add deeply &&
|
||||
svn up &&
|
||||
svn propset -R svn:ignore 'no-such-file*' .
|
||||
svn commit -m 'propset svn:ignore'
|
||||
cd .. &&
|
||||
|
||||
@ -19,8 +19,7 @@ test_expect_success 'initialize repo' "
|
||||
poke trunk/readme &&
|
||||
svn commit -m 'another commit' &&
|
||||
svn up &&
|
||||
svn mv -m 'rename to thunk' trunk thunk &&
|
||||
svn up &&
|
||||
svn mv trunk thunk &&
|
||||
echo goodbye >> thunk/readme &&
|
||||
poke thunk/readme &&
|
||||
svn commit -m 'bye now' &&
|
||||
@ -52,8 +51,10 @@ test_expect_success 'init and fetch from one svn-remote' "
|
||||
"
|
||||
|
||||
test_expect_success 'follow deleted parent' "
|
||||
svn cp -m 'resurrecting trunk as junk' \
|
||||
-r2 $svnrepo/trunk $svnrepo/junk &&
|
||||
(svn cp -m 'resurrecting trunk as junk' \
|
||||
$svnrepo/trunk@2 $svnrepo/junk ||
|
||||
svn cp -m 'resurrecting trunk as junk' \
|
||||
-r2 $svnrepo/trunk $svnrepo/junk) &&
|
||||
git config --add svn-remote.svn.fetch \
|
||||
junk:refs/remotes/svn/junk &&
|
||||
git-svn fetch -i svn/thunk &&
|
||||
|
||||
Reference in New Issue
Block a user