2007-09-24 02:51:40 +04:00
|
|
|
#!/bin/sh
|
|
|
|
|
#
|
|
|
|
|
# Copyright (c) 2007 Lars Hjemli
|
|
|
|
|
#
|
|
|
|
|
|
2008-09-03 12:59:33 +04:00
|
|
|
test_description='git merge
|
2007-09-24 02:51:40 +04:00
|
|
|
|
|
|
|
|
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 05:23:46 +04: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 02:51:40 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
verify_diff() {
|
2008-03-13 00:36:36 +03:00
|
|
|
if ! test_cmp "$1" "$2"
|
2007-09-24 02:51:40 +04: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 &&
|
2008-07-12 19:47:52 +04:00
|
|
|
if test_must_fail git diff --exit-code
|
2007-09-24 02:51:40 +04:00
|
|
|
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 00:34:34 +03:00
|
|
|
head=$(head -n $i .git/MERGE_HEAD | sed -ne \$p)
|
2007-09-24 02:51:40 +04: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'
|
|
|
|
|
|
2008-07-20 16:34:47 +04:00
|
|
|
test_expect_success 'test option parsing' '
|
2008-07-16 12:33:52 +04:00
|
|
|
test_must_fail git merge -$ c1 &&
|
|
|
|
|
test_must_fail git merge --no-such c1 &&
|
|
|
|
|
test_must_fail git merge -s foobar c1 &&
|
|
|
|
|
test_must_fail git merge -s=foobar c1 &&
|
|
|
|
|
test_must_fail git merge -m &&
|
|
|
|
|
test_must_fail git merge
|
2007-09-24 02:51:40 +04:00
|
|
|
'
|
|
|
|
|
|
2008-07-30 03:17:01 +04:00
|
|
|
test_expect_success 'reject non-strategy with a git-merge-foo name' '
|
|
|
|
|
test_must_fail git merge -s index c1
|
|
|
|
|
'
|
|
|
|
|
|
2007-09-24 02:51:40 +04:00
|
|
|
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'
|
|
|
|
|
|
2009-10-30 01:08:31 +03:00
|
|
|
test_expect_success 'merge c0 with c1 with --ff-only' '
|
|
|
|
|
git reset --hard c0 &&
|
|
|
|
|
git merge --ff-only c1 &&
|
|
|
|
|
git merge --ff-only HEAD c0 c1 &&
|
|
|
|
|
verify_merge file result.1 &&
|
|
|
|
|
verify_head "$c1"
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_debug 'gitk --all'
|
|
|
|
|
|
2007-09-24 02:51:40 +04:00
|
|
|
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'
|
|
|
|
|
|
2009-10-30 01:08:31 +03:00
|
|
|
test_expect_success 'failing merges with --ff-only' '
|
|
|
|
|
git reset --hard c1 &&
|
|
|
|
|
test_tick &&
|
|
|
|
|
test_must_fail git merge --ff-only c2 &&
|
|
|
|
|
test_must_fail git merge --ff-only c3 &&
|
|
|
|
|
test_must_fail git merge --ff-only c2 c3
|
|
|
|
|
'
|
|
|
|
|
|
2007-09-24 02:51:40 +04:00
|
|
|
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'
|
|
|
|
|
|
2009-10-30 01:08:31 +03:00
|
|
|
test_expect_success 'merge c0 with c1 (squash, ff-only)' '
|
|
|
|
|
git reset --hard c0 &&
|
|
|
|
|
git merge --squash --ff-only 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'
|
|
|
|
|
|
2007-09-24 02:51:40 +04:00
|
|
|
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'
|
|
|
|
|
|
2009-10-30 01:08:31 +03:00
|
|
|
test_expect_success 'unsuccesful merge of c1 with c2 (squash, ff-only)' '
|
|
|
|
|
git reset --hard c1 &&
|
|
|
|
|
test_must_fail git merge --squash --ff-only c2
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_debug 'gitk --all'
|
|
|
|
|
|
2007-09-24 02:51:40 +04:00
|
|
|
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 02:51:43 +04: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 05:23:43 +04:00
|
|
|
test_expect_success 'override config option -n with --summary' '
|
2007-09-24 02:51:43 +04: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 00:32:17 +03:00
|
|
|
if ! grep "^ file | *2 +-$" diffstat.txt
|
2007-09-24 02:51:43 +04:00
|
|
|
then
|
2008-04-06 05:23:43 +04: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 02:51:43 +04:00
|
|
|
fi
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_debug 'gitk --all'
|
|
|
|
|
|
2008-04-06 05:23:43 +04:00
|
|
|
test_expect_success 'override config option --stat' '
|
2007-09-24 02:51:43 +04:00
|
|
|
git reset --hard c1 &&
|
2008-04-06 05:23:43 +04:00
|
|
|
git config branch.master.mergeoptions "--stat" &&
|
2007-09-24 02:51:43 +04: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 00:32:17 +03:00
|
|
|
if grep "^ file | *2 +-$" diffstat.txt
|
2007-09-24 02:51:43 +04:00
|
|
|
then
|
|
|
|
|
echo "[OOPS] diffstat was generated"
|
|
|
|
|
false
|
|
|
|
|
fi
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_debug 'gitk --all'
|
|
|
|
|
|
2007-09-24 02:51:44 +04: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 02:51:45 +04: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 12:22:03 +03:00
|
|
|
git config branch.master.mergeoptions "" &&
|
2007-09-24 02:51:45 +04: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 12:22:03 +03: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
|
|
|
|
|
'
|
|
|
|
|
|
2009-10-30 01:08:31 +03:00
|
|
|
test_expect_success 'combining --ff-only and --no-ff is refused' '
|
|
|
|
|
test_must_fail git merge --ff-only --no-ff c1 &&
|
|
|
|
|
test_must_fail git merge --no-ff --ff-only c1
|
|
|
|
|
'
|
|
|
|
|
|
2007-09-24 02:51:45 +04: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 05:23:46 +04: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" &&
|
2008-07-10 11:50:59 +04:00
|
|
|
|
2008-04-06 05:23:46 +04:00
|
|
|
git merge --log c3 &&
|
|
|
|
|
git show -s --pretty=format:%b HEAD >msg.act &&
|
2008-07-10 11:50:59 +04:00
|
|
|
verify_diff msg.log msg.act "[OOPS] bad merge log message" &&
|
|
|
|
|
|
|
|
|
|
git reset --hard HEAD^ &&
|
|
|
|
|
git config merge.log yes &&
|
|
|
|
|
git merge c3 &&
|
|
|
|
|
git show -s --pretty=format:%b HEAD >msg.act &&
|
2008-04-06 05:23:46 +04:00
|
|
|
verify_diff msg.log msg.act "[OOPS] bad merge log message"
|
|
|
|
|
'
|
|
|
|
|
|
2007-09-24 02:51:45 +04:00
|
|
|
test_debug 'gitk --all'
|
|
|
|
|
|
2008-07-13 12:13:55 +04:00
|
|
|
test_expect_success 'merge c1 with c0, c2, c0, and c1' '
|
|
|
|
|
git reset --hard c1 &&
|
|
|
|
|
git config branch.master.mergeoptions "" &&
|
|
|
|
|
test_tick &&
|
|
|
|
|
git merge c0 c2 c0 c1 &&
|
|
|
|
|
verify_merge file result.1-5 &&
|
|
|
|
|
verify_parents $c1 $c2
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_debug 'gitk --all'
|
|
|
|
|
|
2008-07-14 11:09:41 +04:00
|
|
|
test_expect_success 'merge c1 with c0, c2, c0, and c1' '
|
|
|
|
|
git reset --hard c1 &&
|
|
|
|
|
git config branch.master.mergeoptions "" &&
|
|
|
|
|
test_tick &&
|
|
|
|
|
git merge c0 c2 c0 c1 &&
|
|
|
|
|
verify_merge file result.1-5 &&
|
|
|
|
|
verify_parents $c1 $c2
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_debug 'gitk --all'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'merge c1 with c1 and c2' '
|
|
|
|
|
git reset --hard c1 &&
|
|
|
|
|
git config branch.master.mergeoptions "" &&
|
|
|
|
|
test_tick &&
|
|
|
|
|
git merge c1 c2 &&
|
|
|
|
|
verify_merge file result.1-5 &&
|
|
|
|
|
verify_parents $c1 $c2
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_debug 'gitk --all'
|
|
|
|
|
|
2008-08-21 02:09:28 +04:00
|
|
|
test_expect_success 'merge fast-forward in a dirty tree' '
|
|
|
|
|
git reset --hard c0 &&
|
|
|
|
|
mv file file1 &&
|
|
|
|
|
cat file1 >file &&
|
|
|
|
|
rm -f file1 &&
|
|
|
|
|
git merge c2
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_debug 'gitk --all'
|
|
|
|
|
|
merge: fix numerus bugs around "trivial merge" area
The "trivial merge" codepath wants to optimize itself by making an
internal call to the read-tree machinery, but it does not read the index
before doing so, and the codepath is never exercised. Incidentally, this
failure to read the index upfront means that the safety to refuse doing
anything when the index is unmerged does not kick in, either.
These two problem are fixed by using read_cache_unmerged() that does read
the index before checking if it is unmerged at the beginning of
cmd_merge().
The primary logic of the merge, however, assumes that the process never
reads the index in-core, and the call to write_cache_as_tree() it makes
from write_tree_trivial() will always read from the on-disk index that is
prepared the strategy back-ends. This assumption is now broken by the
above fix. To fix this issue, we now call discard_cache() before calling
write_tree_trivial() when it wants to write the on-disk index as a tree.
When multiple strategies are tried, their results are evaluated by reading
the resulting index and inspecting it. The codepath needs to make a call
to read_cache() for each successful strategy, and for that to work, they
need to discard_cache() the one read by the previous round.
Also the "trivial merge" forgot that the current commit is one of the
parents of the resulting commit.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-08-23 23:56:57 +04:00
|
|
|
test_expect_success 'in-index merge' '
|
|
|
|
|
git reset --hard c0 &&
|
|
|
|
|
git merge --no-ff -s resolve c1 > out &&
|
|
|
|
|
grep "Wonderful." out &&
|
|
|
|
|
verify_parents $c0 $c1
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_debug 'gitk --all'
|
|
|
|
|
|
2008-10-03 17:02:31 +04:00
|
|
|
test_expect_success 'refresh the index before merging' '
|
|
|
|
|
git reset --hard c1 &&
|
|
|
|
|
sleep 1 &&
|
|
|
|
|
touch file &&
|
|
|
|
|
git merge c3
|
|
|
|
|
'
|
|
|
|
|
|
2008-10-14 00:54:25 +04:00
|
|
|
cat >expected <<EOF
|
|
|
|
|
Merge branch 'c5' (early part)
|
|
|
|
|
EOF
|
|
|
|
|
|
|
|
|
|
test_expect_success 'merge early part of c2' '
|
|
|
|
|
git reset --hard c3 &&
|
|
|
|
|
echo c4 > c4.c &&
|
|
|
|
|
git add c4.c &&
|
|
|
|
|
git commit -m c4 &&
|
|
|
|
|
git tag c4 &&
|
|
|
|
|
echo c5 > c5.c &&
|
|
|
|
|
git add c5.c &&
|
|
|
|
|
git commit -m c5 &&
|
|
|
|
|
git tag c5 &&
|
|
|
|
|
git reset --hard c3 &&
|
|
|
|
|
echo c6 > c6.c &&
|
|
|
|
|
git add c6.c &&
|
|
|
|
|
git commit -m c6 &&
|
|
|
|
|
git tag c6 &&
|
|
|
|
|
git merge c5~1 &&
|
|
|
|
|
git show -s --pretty=format:%s HEAD > actual &&
|
|
|
|
|
test_cmp actual expected
|
|
|
|
|
'
|
|
|
|
|
|
2008-10-03 17:02:31 +04:00
|
|
|
test_debug 'gitk --all'
|
|
|
|
|
|
builtin-commit: use reduce_heads() only when appropriate
Since commit 6bb6b034 (builtin-commit: use commit_tree(), 2008-09-10),
builtin-commit performs a reduce_heads() unconditionally. However,
it's not always needed, and in some cases even harmful.
reduce_heads() is not needed for the initial commit or for an
"ordinary" commit, because they don't have any or have only one
parent, respectively.
reduce_heads() must be avoided when 'git commit' is run after a 'git
merge --no-ff --no-commit', otherwise it will turn the
non-fast-forward merge into fast-forward. For the same reason,
reduce_heads() must be avoided when amending such a merge commit.
To resolve this issue, 'git merge' will write info about whether
fast-forward is allowed or not to $GIT_DIR/MERGE_MODE. Based on this
info, 'git commit' will only perform reduce_heads() when it's
committing a merge and fast-forward is enabled.
Also add test cases to ensure that non-fast-forward merges are
committed and amended properly.
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2008-10-03 16:04:47 +04:00
|
|
|
test_expect_success 'merge --no-ff --no-commit && commit' '
|
|
|
|
|
git reset --hard c0 &&
|
|
|
|
|
git merge --no-ff --no-commit c1 &&
|
|
|
|
|
EDITOR=: git commit &&
|
|
|
|
|
verify_parents $c0 $c1
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_debug 'gitk --all'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'amending no-ff merge commit' '
|
|
|
|
|
EDITOR=: git commit --amend &&
|
|
|
|
|
verify_parents $c0 $c1
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_debug 'gitk --all'
|
|
|
|
|
|
2007-09-24 02:51:40 +04:00
|
|
|
test_done
|
