2007-09-24 06:51:40 +08:00
|
|
|
#!/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 &&
|
2008-04-06 09:23:46 +08:00
|
|
|
git log --no-merges ^HEAD c2 c3 >>squash.1-5-9 &&
|
|
|
|
|
echo > msg.nolog &&
|
|
|
|
|
echo "* commit 'c3':" >msg.log &&
|
|
|
|
|
echo " commit 3" >>msg.log &&
|
|
|
|
|
echo >>msg.log
|
2007-09-24 06:51:40 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
verify_diff() {
|
2008-03-13 05:36:36 +08:00
|
|
|
if ! test_cmp "$1" "$2"
|
2007-09-24 06:51:40 +08:00
|
|
|
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
|
2008-03-13 05:34:34 +08:00
|
|
|
head=$(head -n $i .git/MERGE_HEAD | sed -ne \$p)
|
2007-09-24 06:51:40 +08:00
|
|
|
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'
|
|
|
|
|
|
2007-09-24 06:51:43 +08:00
|
|
|
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'
|
|
|
|
|
|
2008-04-06 09:23:43 +08:00
|
|
|
test_expect_success 'override config option -n with --summary' '
|
2007-09-24 06:51:43 +08:00
|
|
|
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 &&
|
2008-03-13 05:32:17 +08:00
|
|
|
if ! grep "^ file | *2 +-$" diffstat.txt
|
2007-09-24 06:51:43 +08:00
|
|
|
then
|
2008-04-06 09:23:43 +08:00
|
|
|
echo "[OOPS] diffstat was not generated with --summary"
|
|
|
|
|
false
|
|
|
|
|
fi
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'override config option -n with --stat' '
|
|
|
|
|
git reset --hard c1 &&
|
|
|
|
|
git config branch.master.mergeoptions "-n" &&
|
|
|
|
|
test_tick &&
|
|
|
|
|
git merge --stat c2 >diffstat.txt &&
|
|
|
|
|
verify_merge file result.1-5 msg.1-5 &&
|
|
|
|
|
verify_parents $c1 $c2 &&
|
|
|
|
|
if ! grep "^ file | *2 +-$" diffstat.txt
|
|
|
|
|
then
|
|
|
|
|
echo "[OOPS] diffstat was not generated with --stat"
|
|
|
|
|
false
|
2007-09-24 06:51:43 +08:00
|
|
|
fi
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_debug 'gitk --all'
|
|
|
|
|
|
2008-04-06 09:23:43 +08:00
|
|
|
test_expect_success 'override config option --stat' '
|
2007-09-24 06:51:43 +08:00
|
|
|
git reset --hard c1 &&
|
2008-04-06 09:23:43 +08:00
|
|
|
git config branch.master.mergeoptions "--stat" &&
|
2007-09-24 06:51:43 +08:00
|
|
|
test_tick &&
|
|
|
|
|
git merge -n c2 >diffstat.txt &&
|
|
|
|
|
verify_merge file result.1-5 msg.1-5 &&
|
|
|
|
|
verify_parents $c1 $c2 &&
|
2008-03-13 05:32:17 +08:00
|
|
|
if grep "^ file | *2 +-$" diffstat.txt
|
2007-09-24 06:51:43 +08:00
|
|
|
then
|
|
|
|
|
echo "[OOPS] diffstat was generated"
|
|
|
|
|
false
|
|
|
|
|
fi
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_debug 'gitk --all'
|
|
|
|
|
|
2007-09-24 06:51:44 +08:00
|
|
|
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'
|
|
|
|
|
|
2007-09-24 06:51:45 +08:00
|
|
|
test_expect_success 'merge c0 with c1 (no-ff)' '
|
|
|
|
|
git reset --hard c0 &&
|
git-merge.sh: better handling of combined --squash,--no-ff,--no-commit options
git-merge used to use either the --squash,--no-squash, --no-ff,--ff,
--no-commit,--commit option, whichever came last in the command line.
This lead to some un-intuitive behavior, having
git merge --no-commit --no-ff <branch>
actually commit the merge. Now git-merge respects --no-commit together
with --no-ff, as well as other combinations of the options. However,
this broke a selftest in t/t7600-merge.sh which expected to have --no-ff
completely override the --squash option, so that
git merge --squash --no-ff <branch>
fast-forwards, and makes a merge commit; combining --squash with --no-ff
doesn't really make sense though, and is now refused by git-merge. The
test is adapted to test --no-ff without the preceding --squash, and
another test is added to make sure the --squash --no-ff combination is
refused.
The unexpected behavior was reported by John Goerzen through
http://bing.sdebian.org/468568
Signed-off-by: Gerrit Pape <pape@smarden.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-03-03 17:22:03 +08:00
|
|
|
git config branch.master.mergeoptions "" &&
|
2007-09-24 06:51:45 +08:00
|
|
|
test_tick &&
|
|
|
|
|
git merge --no-ff c1 &&
|
|
|
|
|
verify_merge file result.1 &&
|
|
|
|
|
verify_parents $c0 $c1
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_debug 'gitk --all'
|
|
|
|
|
|
git-merge.sh: better handling of combined --squash,--no-ff,--no-commit options
git-merge used to use either the --squash,--no-squash, --no-ff,--ff,
--no-commit,--commit option, whichever came last in the command line.
This lead to some un-intuitive behavior, having
git merge --no-commit --no-ff <branch>
actually commit the merge. Now git-merge respects --no-commit together
with --no-ff, as well as other combinations of the options. However,
this broke a selftest in t/t7600-merge.sh which expected to have --no-ff
completely override the --squash option, so that
git merge --squash --no-ff <branch>
fast-forwards, and makes a merge commit; combining --squash with --no-ff
doesn't really make sense though, and is now refused by git-merge. The
test is adapted to test --no-ff without the preceding --squash, and
another test is added to make sure the --squash --no-ff combination is
refused.
The unexpected behavior was reported by John Goerzen through
http://bing.sdebian.org/468568
Signed-off-by: Gerrit Pape <pape@smarden.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-03-03 17:22:03 +08:00
|
|
|
test_expect_success 'combining --squash and --no-ff is refused' '
|
|
|
|
|
test_must_fail git merge --squash --no-ff c1 &&
|
|
|
|
|
test_must_fail git merge --no-ff --squash c1
|
|
|
|
|
'
|
|
|
|
|
|
2007-09-24 06:51:45 +08:00
|
|
|
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
|
|
|
|
|
'
|
|
|
|
|
|
2008-04-06 09:23:46 +08:00
|
|
|
test_expect_success 'merge log message' '
|
|
|
|
|
git reset --hard c0 &&
|
|
|
|
|
git merge --no-log c2 &&
|
|
|
|
|
git show -s --pretty=format:%b HEAD >msg.act &&
|
|
|
|
|
verify_diff msg.nolog msg.act "[OOPS] bad merge log message" &&
|
|
|
|
|
git merge --log c3 &&
|
|
|
|
|
git show -s --pretty=format:%b HEAD >msg.act &&
|
|
|
|
|
verify_diff msg.log msg.act "[OOPS] bad merge log message"
|
|
|
|
|
'
|
|
|
|
|
|
2007-09-24 06:51:45 +08:00
|
|
|
test_debug 'gitk --all'
|
|
|
|
|
|
2007-09-24 06:51:40 +08:00
|
|
|
test_done
|
