2006-07-04 01:09:54 +00:00
|
|
|
#!/bin/sh
|
|
|
|
|
#
|
|
|
|
|
# Copyright (c) 2006, Junio C Hamano
|
|
|
|
|
#
|
|
|
|
|
|
|
|
|
|
test_description='fmt-merge-msg test'
|
|
|
|
|
|
|
|
|
|
. ./test-lib.sh
|
2020-03-04 11:48:03 +00:00
|
|
|
. "$TEST_DIRECTORY/lib-gpg.sh"
|
2006-07-04 01:09:54 +00:00
|
|
|
|
|
|
|
|
test_expect_success setup '
|
|
|
|
|
echo one >one &&
|
|
|
|
|
git add one &&
|
2010-03-24 07:15:59 +00:00
|
|
|
test_tick &&
|
2006-07-04 01:09:54 +00:00
|
|
|
git commit -m "Initial" &&
|
|
|
|
|
|
2010-03-24 07:15:58 +00:00
|
|
|
git clone . remote &&
|
|
|
|
|
|
2006-07-04 01:09:54 +00:00
|
|
|
echo uno >one &&
|
|
|
|
|
echo dos >two &&
|
|
|
|
|
git add two &&
|
2010-03-24 07:15:59 +00:00
|
|
|
test_tick &&
|
2006-07-04 01:09:54 +00:00
|
|
|
git commit -a -m "Second" &&
|
|
|
|
|
|
|
|
|
|
git checkout -b left &&
|
|
|
|
|
|
2010-03-24 07:15:59 +00:00
|
|
|
echo "c1" >one &&
|
|
|
|
|
test_tick &&
|
2006-07-04 01:09:54 +00:00
|
|
|
git commit -a -m "Common #1" &&
|
|
|
|
|
|
2010-03-24 07:15:59 +00:00
|
|
|
echo "c2" >one &&
|
|
|
|
|
test_tick &&
|
2006-07-04 01:09:54 +00:00
|
|
|
git commit -a -m "Common #2" &&
|
|
|
|
|
|
|
|
|
|
git branch right &&
|
|
|
|
|
|
2010-03-24 07:15:59 +00:00
|
|
|
echo "l3" >two &&
|
|
|
|
|
test_tick &&
|
2012-03-13 17:00:00 +00:00
|
|
|
GIT_COMMITTER_NAME="Another Committer" \
|
|
|
|
|
GIT_AUTHOR_NAME="Another Author" git commit -a -m "Left #3" &&
|
2006-07-04 01:09:54 +00:00
|
|
|
|
2010-03-24 07:15:59 +00:00
|
|
|
echo "l4" >two &&
|
|
|
|
|
test_tick &&
|
2012-03-13 17:00:00 +00:00
|
|
|
GIT_COMMITTER_NAME="Another Committer" \
|
|
|
|
|
GIT_AUTHOR_NAME="Another Author" git commit -a -m "Left #4" &&
|
2006-07-04 01:09:54 +00:00
|
|
|
|
2010-03-24 07:15:59 +00:00
|
|
|
echo "l5" >two &&
|
|
|
|
|
test_tick &&
|
2012-03-13 17:00:00 +00:00
|
|
|
GIT_COMMITTER_NAME="Another Committer" \
|
|
|
|
|
GIT_AUTHOR_NAME="Another Author" git commit -a -m "Left #5" &&
|
2010-03-24 07:15:59 +00:00
|
|
|
git tag tag-l5 &&
|
2006-07-04 01:09:54 +00:00
|
|
|
|
|
|
|
|
git checkout right &&
|
|
|
|
|
|
2010-03-24 07:15:59 +00:00
|
|
|
echo "r3" >three &&
|
2006-07-04 01:09:54 +00:00
|
|
|
git add three &&
|
2010-03-24 07:15:59 +00:00
|
|
|
test_tick &&
|
2006-07-04 01:09:54 +00:00
|
|
|
git commit -a -m "Right #3" &&
|
2010-03-24 07:15:59 +00:00
|
|
|
git tag tag-r3 &&
|
2006-07-04 01:09:54 +00:00
|
|
|
|
2010-03-24 07:15:59 +00:00
|
|
|
echo "r4" >three &&
|
|
|
|
|
test_tick &&
|
2006-07-04 01:09:54 +00:00
|
|
|
git commit -a -m "Right #4" &&
|
|
|
|
|
|
2010-03-24 07:15:59 +00:00
|
|
|
echo "r5" >three &&
|
|
|
|
|
test_tick &&
|
2006-07-04 01:09:54 +00:00
|
|
|
git commit -a -m "Right #5" &&
|
|
|
|
|
|
2010-03-24 07:16:00 +00:00
|
|
|
git checkout -b long &&
|
2019-07-19 21:56:23 +00:00
|
|
|
test_commit_bulk --start=0 --message=%s --filename=one 30 &&
|
2010-03-24 07:16:00 +00:00
|
|
|
|
2010-08-17 06:57:40 +00:00
|
|
|
git show-branch &&
|
2006-07-04 01:09:54 +00:00
|
|
|
|
2010-08-17 06:57:40 +00:00
|
|
|
apos="'\''"
|
|
|
|
|
'
|
2006-07-04 01:09:54 +00:00
|
|
|
|
2020-03-04 11:48:03 +00:00
|
|
|
test_expect_success GPG 'set up a signed tag' '
|
|
|
|
|
git tag -s -m signed-tag-msg signed-good-tag left
|
|
|
|
|
'
|
|
|
|
|
|
2010-08-17 06:57:40 +00:00
|
|
|
test_expect_success 'message for merging local branch' '
|
2020-07-30 17:06:42 +00:00
|
|
|
echo "Merge branch ${apos}left${apos}" >expected &&
|
2006-07-04 01:09:54 +00:00
|
|
|
|
|
|
|
|
git checkout master &&
|
|
|
|
|
git fetch . left &&
|
|
|
|
|
|
|
|
|
|
git fmt-merge-msg <.git/FETCH_HEAD >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expected actual
|
2006-07-04 01:09:54 +00:00
|
|
|
'
|
|
|
|
|
|
2020-03-04 11:48:03 +00:00
|
|
|
test_expect_success GPG 'message for merging local tag signed by good key' '
|
|
|
|
|
git checkout master &&
|
|
|
|
|
git fetch . signed-good-tag &&
|
|
|
|
|
git fmt-merge-msg <.git/FETCH_HEAD >actual 2>&1 &&
|
|
|
|
|
grep "^Merge tag ${apos}signed-good-tag${apos}" actual &&
|
|
|
|
|
grep "^# gpg: Signature made" actual &&
|
|
|
|
|
grep "^# gpg: Good signature from" actual
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success GPG 'message for merging local tag signed by unknown key' '
|
|
|
|
|
git checkout master &&
|
|
|
|
|
git fetch . signed-good-tag &&
|
|
|
|
|
GNUPGHOME=. git fmt-merge-msg <.git/FETCH_HEAD >actual 2>&1 &&
|
|
|
|
|
grep "^Merge tag ${apos}signed-good-tag${apos}" actual &&
|
|
|
|
|
grep "^# gpg: Signature made" actual &&
|
2020-05-29 08:20:08 +00:00
|
|
|
grep -E "^# gpg: Can${apos}t check signature: (public key not found|No public key)" actual
|
2020-03-04 11:48:03 +00:00
|
|
|
'
|
|
|
|
|
|
2010-08-17 06:57:40 +00:00
|
|
|
test_expect_success 'message for merging external branch' '
|
2020-07-30 17:06:42 +00:00
|
|
|
echo "Merge branch ${apos}left${apos} of $(pwd)" >expected &&
|
2006-07-04 01:09:54 +00:00
|
|
|
|
|
|
|
|
git checkout master &&
|
2009-03-13 22:35:24 +00:00
|
|
|
git fetch "$(pwd)" left &&
|
2006-07-04 01:09:54 +00:00
|
|
|
|
|
|
|
|
git fmt-merge-msg <.git/FETCH_HEAD >actual &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expected actual
|
2006-07-04 01:09:54 +00:00
|
|
|
'
|
|
|
|
|
|
2010-08-17 06:57:40 +00:00
|
|
|
test_expect_success '[merge] summary/log configuration' '
|
|
|
|
|
cat >expected <<-EOF &&
|
2020-07-30 17:06:42 +00:00
|
|
|
Merge branch ${apos}left${apos}
|
2006-07-04 01:09:54 +00:00
|
|
|
|
2012-06-06 21:24:28 +00:00
|
|
|
# By Another Author (3) and A U Thor (2)
|
|
|
|
|
# Via Another Committer
|
2010-08-17 06:57:40 +00:00
|
|
|
* left:
|
|
|
|
|
Left #5
|
|
|
|
|
Left #4
|
|
|
|
|
Left #3
|
|
|
|
|
Common #2
|
|
|
|
|
Common #1
|
|
|
|
|
EOF
|
2006-07-04 01:09:54 +00:00
|
|
|
|
2013-04-01 19:33:52 +00:00
|
|
|
test_config merge.log true &&
|
|
|
|
|
test_unconfig merge.summary &&
|
2008-04-06 01:23:45 +00:00
|
|
|
|
|
|
|
|
git checkout master &&
|
2010-03-24 07:15:59 +00:00
|
|
|
test_tick &&
|
2008-04-06 01:23:45 +00:00
|
|
|
git fetch . left &&
|
|
|
|
|
|
2010-08-17 06:57:40 +00:00
|
|
|
git fmt-merge-msg <.git/FETCH_HEAD >actual1 &&
|
2008-04-06 01:23:45 +00:00
|
|
|
|
2013-04-01 19:33:52 +00:00
|
|
|
test_unconfig merge.log &&
|
|
|
|
|
test_config merge.summary true &&
|
2006-07-04 01:09:54 +00:00
|
|
|
|
|
|
|
|
git checkout master &&
|
2010-03-24 07:15:59 +00:00
|
|
|
test_tick &&
|
2006-07-04 01:09:54 +00:00
|
|
|
git fetch . left &&
|
|
|
|
|
|
2010-08-17 06:57:40 +00:00
|
|
|
git fmt-merge-msg <.git/FETCH_HEAD >actual2 &&
|
2006-07-04 01:09:54 +00:00
|
|
|
|
2010-08-17 06:57:40 +00:00
|
|
|
test_cmp expected actual1 &&
|
|
|
|
|
test_cmp expected actual2
|
|
|
|
|
'
|
2006-07-04 01:09:54 +00:00
|
|
|
|
2010-09-08 17:59:56 +00:00
|
|
|
test_expect_success 'setup FETCH_HEAD' '
|
|
|
|
|
git checkout master &&
|
|
|
|
|
test_tick &&
|
|
|
|
|
git fetch . left
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'merge.log=3 limits shortlog length' '
|
|
|
|
|
cat >expected <<-EOF &&
|
2020-07-30 17:06:42 +00:00
|
|
|
Merge branch ${apos}left${apos}
|
2010-09-08 17:59:56 +00:00
|
|
|
|
2012-06-06 21:24:28 +00:00
|
|
|
# By Another Author (3) and A U Thor (2)
|
|
|
|
|
# Via Another Committer
|
2010-09-08 17:59:56 +00:00
|
|
|
* left: (5 commits)
|
|
|
|
|
Left #5
|
|
|
|
|
Left #4
|
|
|
|
|
Left #3
|
|
|
|
|
...
|
|
|
|
|
EOF
|
|
|
|
|
|
|
|
|
|
git -c merge.log=3 fmt-merge-msg <.git/FETCH_HEAD >actual &&
|
|
|
|
|
test_cmp expected actual
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'merge.log=5 shows all 5 commits' '
|
|
|
|
|
cat >expected <<-EOF &&
|
2020-07-30 17:06:42 +00:00
|
|
|
Merge branch ${apos}left${apos}
|
2010-09-08 17:59:56 +00:00
|
|
|
|
2012-06-06 21:24:28 +00:00
|
|
|
# By Another Author (3) and A U Thor (2)
|
|
|
|
|
# Via Another Committer
|
2010-09-08 17:59:56 +00:00
|
|
|
* left:
|
|
|
|
|
Left #5
|
|
|
|
|
Left #4
|
|
|
|
|
Left #3
|
|
|
|
|
Common #2
|
|
|
|
|
Common #1
|
|
|
|
|
EOF
|
|
|
|
|
|
|
|
|
|
git -c merge.log=5 fmt-merge-msg <.git/FETCH_HEAD >actual &&
|
|
|
|
|
test_cmp expected actual
|
|
|
|
|
'
|
|
|
|
|
|
2013-04-07 15:25:43 +00:00
|
|
|
test_expect_success '--log=5 with custom comment character' '
|
|
|
|
|
cat >expected <<-EOF &&
|
2020-07-30 17:06:42 +00:00
|
|
|
Merge branch ${apos}left${apos}
|
2013-04-07 15:25:43 +00:00
|
|
|
|
2013-04-18 06:42:25 +00:00
|
|
|
x By Another Author (3) and A U Thor (2)
|
|
|
|
|
x Via Another Committer
|
2013-04-07 15:25:43 +00:00
|
|
|
* left:
|
|
|
|
|
Left #5
|
|
|
|
|
Left #4
|
|
|
|
|
Left #3
|
|
|
|
|
Common #2
|
|
|
|
|
Common #1
|
|
|
|
|
EOF
|
|
|
|
|
|
2013-04-18 06:42:25 +00:00
|
|
|
git -c core.commentchar="x" fmt-merge-msg --log=5 <.git/FETCH_HEAD >actual &&
|
2013-04-07 15:25:43 +00:00
|
|
|
test_cmp expected actual
|
|
|
|
|
'
|
|
|
|
|
|
2010-09-08 17:59:56 +00:00
|
|
|
test_expect_success 'merge.log=0 disables shortlog' '
|
2020-07-30 17:06:42 +00:00
|
|
|
echo "Merge branch ${apos}left${apos}" >expected &&
|
2010-09-08 17:59:56 +00:00
|
|
|
git -c merge.log=0 fmt-merge-msg <.git/FETCH_HEAD >actual &&
|
|
|
|
|
test_cmp expected actual
|
|
|
|
|
'
|
|
|
|
|
|
2010-09-08 17:59:57 +00:00
|
|
|
test_expect_success '--log=3 limits shortlog length' '
|
|
|
|
|
cat >expected <<-EOF &&
|
2020-07-30 17:06:42 +00:00
|
|
|
Merge branch ${apos}left${apos}
|
2010-09-08 17:59:57 +00:00
|
|
|
|
2012-06-06 21:24:28 +00:00
|
|
|
# By Another Author (3) and A U Thor (2)
|
|
|
|
|
# Via Another Committer
|
2010-09-08 17:59:57 +00:00
|
|
|
* left: (5 commits)
|
|
|
|
|
Left #5
|
|
|
|
|
Left #4
|
|
|
|
|
Left #3
|
|
|
|
|
...
|
|
|
|
|
EOF
|
|
|
|
|
|
|
|
|
|
git fmt-merge-msg --log=3 <.git/FETCH_HEAD >actual &&
|
|
|
|
|
test_cmp expected actual
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success '--log=5 shows all 5 commits' '
|
|
|
|
|
cat >expected <<-EOF &&
|
2020-07-30 17:06:42 +00:00
|
|
|
Merge branch ${apos}left${apos}
|
2010-09-08 17:59:57 +00:00
|
|
|
|
2012-06-06 21:24:28 +00:00
|
|
|
# By Another Author (3) and A U Thor (2)
|
|
|
|
|
# Via Another Committer
|
2010-09-08 17:59:57 +00:00
|
|
|
* left:
|
|
|
|
|
Left #5
|
|
|
|
|
Left #4
|
|
|
|
|
Left #3
|
|
|
|
|
Common #2
|
|
|
|
|
Common #1
|
|
|
|
|
EOF
|
|
|
|
|
|
|
|
|
|
git fmt-merge-msg --log=5 <.git/FETCH_HEAD >actual &&
|
|
|
|
|
test_cmp expected actual
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success '--no-log disables shortlog' '
|
2020-07-30 17:06:42 +00:00
|
|
|
echo "Merge branch ${apos}left${apos}" >expected &&
|
2010-09-08 17:59:57 +00:00
|
|
|
git fmt-merge-msg --no-log <.git/FETCH_HEAD >actual &&
|
|
|
|
|
test_cmp expected actual
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success '--log=0 disables shortlog' '
|
2020-07-30 17:06:42 +00:00
|
|
|
echo "Merge branch ${apos}left${apos}" >expected &&
|
2010-09-08 17:59:57 +00:00
|
|
|
git fmt-merge-msg --no-log <.git/FETCH_HEAD >actual &&
|
|
|
|
|
test_cmp expected actual
|
|
|
|
|
'
|
|
|
|
|
|
2010-08-17 23:00:34 +00:00
|
|
|
test_expect_success 'fmt-merge-msg -m' '
|
|
|
|
|
echo "Sync with left" >expected &&
|
|
|
|
|
cat >expected.log <<-EOF &&
|
|
|
|
|
Sync with left
|
|
|
|
|
|
2012-06-06 21:24:28 +00:00
|
|
|
# By Another Author (3) and A U Thor (2)
|
|
|
|
|
# Via Another Committer
|
2010-08-17 23:00:34 +00:00
|
|
|
* ${apos}left${apos} of $(pwd):
|
|
|
|
|
Left #5
|
|
|
|
|
Left #4
|
|
|
|
|
Left #3
|
|
|
|
|
Common #2
|
|
|
|
|
Common #1
|
|
|
|
|
EOF
|
|
|
|
|
|
2013-04-01 19:33:52 +00:00
|
|
|
test_unconfig merge.log &&
|
|
|
|
|
test_unconfig merge.summary &&
|
2010-08-17 23:00:34 +00:00
|
|
|
git checkout master &&
|
|
|
|
|
git fetch "$(pwd)" left &&
|
|
|
|
|
git fmt-merge-msg -m "Sync with left" <.git/FETCH_HEAD >actual &&
|
|
|
|
|
git fmt-merge-msg --log -m "Sync with left" \
|
|
|
|
|
<.git/FETCH_HEAD >actual.log &&
|
2013-04-01 19:33:52 +00:00
|
|
|
test_config merge.log true &&
|
2010-08-17 23:00:34 +00:00
|
|
|
git fmt-merge-msg -m "Sync with left" \
|
|
|
|
|
<.git/FETCH_HEAD >actual.log-config &&
|
|
|
|
|
git fmt-merge-msg --no-log -m "Sync with left" \
|
|
|
|
|
<.git/FETCH_HEAD >actual.nolog &&
|
|
|
|
|
|
|
|
|
|
test_cmp expected actual &&
|
|
|
|
|
test_cmp expected.log actual.log &&
|
|
|
|
|
test_cmp expected.log actual.log-config &&
|
|
|
|
|
test_cmp expected actual.nolog
|
|
|
|
|
'
|
|
|
|
|
|
2010-08-17 06:57:40 +00:00
|
|
|
test_expect_success 'setup: expected shortlog for two branches' '
|
|
|
|
|
cat >expected <<-EOF
|
2020-07-30 17:06:42 +00:00
|
|
|
Merge branches ${apos}left${apos} and ${apos}right${apos}
|
2010-08-17 06:57:40 +00:00
|
|
|
|
2012-06-06 21:24:28 +00:00
|
|
|
# By Another Author (3) and A U Thor (2)
|
|
|
|
|
# Via Another Committer
|
2010-08-17 06:57:40 +00:00
|
|
|
* left:
|
|
|
|
|
Left #5
|
|
|
|
|
Left #4
|
|
|
|
|
Left #3
|
|
|
|
|
Common #2
|
|
|
|
|
Common #1
|
|
|
|
|
|
|
|
|
|
* right:
|
|
|
|
|
Right #5
|
|
|
|
|
Right #4
|
|
|
|
|
Right #3
|
|
|
|
|
Common #2
|
|
|
|
|
Common #1
|
|
|
|
|
EOF
|
|
|
|
|
'
|
2008-04-06 01:23:45 +00:00
|
|
|
|
2010-08-17 06:57:40 +00:00
|
|
|
test_expect_success 'shortlog for two branches' '
|
2013-04-01 19:33:52 +00:00
|
|
|
test_config merge.log true &&
|
|
|
|
|
test_unconfig merge.summary &&
|
2008-04-06 01:23:45 +00:00
|
|
|
git checkout master &&
|
2010-03-24 07:15:59 +00:00
|
|
|
test_tick &&
|
2008-04-06 01:23:45 +00:00
|
|
|
git fetch . left right &&
|
2010-08-17 06:57:40 +00:00
|
|
|
git fmt-merge-msg <.git/FETCH_HEAD >actual1 &&
|
2008-04-06 01:23:45 +00:00
|
|
|
|
2013-04-01 19:33:52 +00:00
|
|
|
test_unconfig merge.log &&
|
|
|
|
|
test_config merge.summary true &&
|
2006-07-04 01:09:54 +00:00
|
|
|
git checkout master &&
|
2010-03-24 07:15:59 +00:00
|
|
|
test_tick &&
|
2006-07-04 01:09:54 +00:00
|
|
|
git fetch . left right &&
|
2010-08-17 06:57:40 +00:00
|
|
|
git fmt-merge-msg <.git/FETCH_HEAD >actual2 &&
|
2006-07-04 01:09:54 +00:00
|
|
|
|
2013-04-01 19:33:52 +00:00
|
|
|
test_config merge.log yes &&
|
|
|
|
|
test_unconfig merge.summary &&
|
2008-04-06 01:23:45 +00:00
|
|
|
git checkout master &&
|
2010-03-24 07:15:59 +00:00
|
|
|
test_tick &&
|
2008-04-06 01:23:45 +00:00
|
|
|
git fetch . left right &&
|
2010-08-17 06:57:40 +00:00
|
|
|
git fmt-merge-msg <.git/FETCH_HEAD >actual3 &&
|
2008-04-06 01:23:45 +00:00
|
|
|
|
2013-04-01 19:33:52 +00:00
|
|
|
test_unconfig merge.log &&
|
|
|
|
|
test_config merge.summary yes &&
|
2006-07-04 01:09:54 +00:00
|
|
|
git checkout master &&
|
2010-03-24 07:15:59 +00:00
|
|
|
test_tick &&
|
2006-07-04 01:09:54 +00:00
|
|
|
git fetch . left right &&
|
2010-08-17 06:57:40 +00:00
|
|
|
git fmt-merge-msg <.git/FETCH_HEAD >actual4 &&
|
2006-07-04 01:09:54 +00:00
|
|
|
|
2010-08-17 06:57:40 +00:00
|
|
|
test_cmp expected actual1 &&
|
|
|
|
|
test_cmp expected actual2 &&
|
|
|
|
|
test_cmp expected actual3 &&
|
|
|
|
|
test_cmp expected actual4
|
2006-07-04 01:09:54 +00:00
|
|
|
'
|
|
|
|
|
|
2009-05-23 18:53:11 +00:00
|
|
|
test_expect_success 'merge-msg -F' '
|
2013-04-01 19:33:52 +00:00
|
|
|
test_unconfig merge.log &&
|
|
|
|
|
test_config merge.summary yes &&
|
2009-05-23 18:53:11 +00:00
|
|
|
git checkout master &&
|
2010-03-24 07:15:59 +00:00
|
|
|
test_tick &&
|
2009-05-23 18:53:11 +00:00
|
|
|
git fetch . left right &&
|
|
|
|
|
git fmt-merge-msg -F .git/FETCH_HEAD >actual &&
|
|
|
|
|
test_cmp expected actual
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'merge-msg -F in subdirectory' '
|
2013-04-01 19:33:52 +00:00
|
|
|
test_unconfig merge.log &&
|
|
|
|
|
test_config merge.summary yes &&
|
2009-05-23 18:53:11 +00:00
|
|
|
git checkout master &&
|
2010-03-24 07:15:59 +00:00
|
|
|
test_tick &&
|
2009-05-23 18:53:11 +00:00
|
|
|
git fetch . left right &&
|
|
|
|
|
mkdir sub &&
|
|
|
|
|
cp .git/FETCH_HEAD sub/FETCH_HEAD &&
|
|
|
|
|
(
|
|
|
|
|
cd sub &&
|
|
|
|
|
git fmt-merge-msg -F FETCH_HEAD >../actual
|
|
|
|
|
) &&
|
|
|
|
|
test_cmp expected actual
|
|
|
|
|
'
|
|
|
|
|
|
2010-03-24 07:15:58 +00:00
|
|
|
test_expect_success 'merge-msg with nothing to merge' '
|
2013-04-01 19:33:52 +00:00
|
|
|
test_unconfig merge.log &&
|
|
|
|
|
test_config merge.summary yes &&
|
2010-03-24 07:15:58 +00:00
|
|
|
|
|
|
|
|
(
|
|
|
|
|
cd remote &&
|
|
|
|
|
git checkout -b unrelated &&
|
2010-03-24 07:15:59 +00:00
|
|
|
test_tick &&
|
2010-03-24 07:15:58 +00:00
|
|
|
git fetch origin &&
|
|
|
|
|
git fmt-merge-msg <.git/FETCH_HEAD >../actual
|
|
|
|
|
) &&
|
|
|
|
|
|
tests: use 'test_must_be_empty' instead of 'test_cmp <empty> <out>'
Using 'test_must_be_empty' is shorter and more idiomatic than
>empty &&
test_cmp empty out
as it saves the creation of an empty file. Furthermore, sometimes the
expected empty file doesn't have such a descriptive name like 'empty',
and its creation is far away from the place where it's finally used
for comparison (e.g. in 't7600-merge.sh', where two expected empty
files are created in the 'setup' test, but are used only about 500
lines later).
These cases were found by instrumenting 'test_cmp' to error out the
test script when it's used to compare empty files, and then converted
manually.
Note that even after this patch there still remain a lot of cases
where we use 'test_cmp' to check empty files:
- Sometimes the expected output is not hard-coded in the test, but
'test_cmp' is used to ensure that two similar git commands produce
the same output, and that output happens to be empty, e.g. the
test 'submodule update --merge - ignores --merge for new
submodules' in 't7406-submodule-update.sh'.
- Repetitive common tasks, including preparing the expected results
and running 'test_cmp', are often extracted into a helper
function, and some of this helper's callsites expect no output.
- For the same reason as above, the whole 'test_expect_success'
block is within a helper function, e.g. in 't3070-wildmatch.sh'.
- Or 'test_cmp' is invoked in a loop, e.g. the test 'cvs update
(-p)' in 't9400-git-cvsserver-server.sh'.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-08-19 21:57:25 +00:00
|
|
|
test_must_be_empty actual
|
2010-03-24 07:15:58 +00:00
|
|
|
'
|
|
|
|
|
|
2010-03-24 07:16:00 +00:00
|
|
|
test_expect_success 'merge-msg tag' '
|
2010-08-17 06:57:40 +00:00
|
|
|
cat >expected <<-EOF &&
|
2020-07-30 17:06:42 +00:00
|
|
|
Merge tag ${apos}tag-r3${apos}
|
2010-08-17 06:57:40 +00:00
|
|
|
|
|
|
|
|
* tag ${apos}tag-r3${apos}:
|
|
|
|
|
Right #3
|
|
|
|
|
Common #2
|
|
|
|
|
Common #1
|
|
|
|
|
EOF
|
2010-03-24 07:16:00 +00:00
|
|
|
|
2013-04-01 19:33:52 +00:00
|
|
|
test_unconfig merge.log &&
|
|
|
|
|
test_config merge.summary yes &&
|
2010-03-24 07:16:00 +00:00
|
|
|
|
|
|
|
|
git checkout master &&
|
|
|
|
|
test_tick &&
|
|
|
|
|
git fetch . tag tag-r3 &&
|
|
|
|
|
|
|
|
|
|
git fmt-merge-msg <.git/FETCH_HEAD >actual &&
|
|
|
|
|
test_cmp expected actual
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'merge-msg two tags' '
|
2010-08-17 06:57:40 +00:00
|
|
|
cat >expected <<-EOF &&
|
2020-07-30 17:06:42 +00:00
|
|
|
Merge tags ${apos}tag-r3${apos} and ${apos}tag-l5${apos}
|
2010-08-17 06:57:40 +00:00
|
|
|
|
|
|
|
|
* tag ${apos}tag-r3${apos}:
|
|
|
|
|
Right #3
|
|
|
|
|
Common #2
|
|
|
|
|
Common #1
|
|
|
|
|
|
2012-06-06 21:24:28 +00:00
|
|
|
# By Another Author (3) and A U Thor (2)
|
|
|
|
|
# Via Another Committer
|
2010-08-17 06:57:40 +00:00
|
|
|
* tag ${apos}tag-l5${apos}:
|
|
|
|
|
Left #5
|
|
|
|
|
Left #4
|
|
|
|
|
Left #3
|
|
|
|
|
Common #2
|
|
|
|
|
Common #1
|
|
|
|
|
EOF
|
|
|
|
|
|
2013-04-01 19:33:52 +00:00
|
|
|
test_unconfig merge.log &&
|
|
|
|
|
test_config merge.summary yes &&
|
2010-03-24 07:16:00 +00:00
|
|
|
|
|
|
|
|
git checkout master &&
|
|
|
|
|
test_tick &&
|
|
|
|
|
git fetch . tag tag-r3 tag tag-l5 &&
|
|
|
|
|
|
|
|
|
|
git fmt-merge-msg <.git/FETCH_HEAD >actual &&
|
|
|
|
|
test_cmp expected actual
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'merge-msg tag and branch' '
|
2010-08-17 06:57:40 +00:00
|
|
|
cat >expected <<-EOF &&
|
2020-07-30 17:06:42 +00:00
|
|
|
Merge branch ${apos}left${apos}, tag ${apos}tag-r3${apos}
|
2010-08-17 06:57:40 +00:00
|
|
|
|
|
|
|
|
* tag ${apos}tag-r3${apos}:
|
|
|
|
|
Right #3
|
|
|
|
|
Common #2
|
|
|
|
|
Common #1
|
|
|
|
|
|
2012-06-06 21:24:28 +00:00
|
|
|
# By Another Author (3) and A U Thor (2)
|
|
|
|
|
# Via Another Committer
|
2010-08-17 06:57:40 +00:00
|
|
|
* left:
|
|
|
|
|
Left #5
|
|
|
|
|
Left #4
|
|
|
|
|
Left #3
|
|
|
|
|
Common #2
|
|
|
|
|
Common #1
|
|
|
|
|
EOF
|
|
|
|
|
|
2013-04-01 19:33:52 +00:00
|
|
|
test_unconfig merge.log &&
|
|
|
|
|
test_config merge.summary yes &&
|
2010-03-24 07:16:00 +00:00
|
|
|
|
|
|
|
|
git checkout master &&
|
|
|
|
|
test_tick &&
|
|
|
|
|
git fetch . tag tag-r3 left &&
|
|
|
|
|
|
|
|
|
|
git fmt-merge-msg <.git/FETCH_HEAD >actual &&
|
|
|
|
|
test_cmp expected actual
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'merge-msg lots of commits' '
|
2010-08-17 06:57:40 +00:00
|
|
|
{
|
|
|
|
|
cat <<-EOF &&
|
2020-07-30 17:06:42 +00:00
|
|
|
Merge branch ${apos}long${apos}
|
2010-08-17 06:57:40 +00:00
|
|
|
|
|
|
|
|
* long: (35 commits)
|
|
|
|
|
EOF
|
|
|
|
|
|
|
|
|
|
i=29 &&
|
|
|
|
|
while test $i -gt 9
|
|
|
|
|
do
|
|
|
|
|
echo " $i" &&
|
|
|
|
|
i=$(($i-1))
|
|
|
|
|
done &&
|
|
|
|
|
echo " ..."
|
|
|
|
|
} >expected &&
|
2010-03-24 07:16:00 +00:00
|
|
|
|
2013-04-01 19:33:52 +00:00
|
|
|
test_config merge.summary yes &&
|
|
|
|
|
|
2010-03-24 07:16:00 +00:00
|
|
|
git checkout master &&
|
|
|
|
|
test_tick &&
|
|
|
|
|
git fetch . long &&
|
|
|
|
|
|
|
|
|
|
git fmt-merge-msg <.git/FETCH_HEAD >actual &&
|
|
|
|
|
test_cmp expected actual
|
|
|
|
|
'
|
|
|
|
|
|
2013-04-01 19:51:50 +00:00
|
|
|
test_expect_success 'merge-msg with "merging" an annotated tag' '
|
|
|
|
|
test_config merge.log true &&
|
|
|
|
|
|
|
|
|
|
git checkout master^0 &&
|
|
|
|
|
git commit --allow-empty -m "One step ahead" &&
|
|
|
|
|
git tag -a -m "An annotated one" annote HEAD &&
|
|
|
|
|
|
|
|
|
|
git checkout master &&
|
|
|
|
|
git fetch . annote &&
|
|
|
|
|
|
|
|
|
|
git fmt-merge-msg <.git/FETCH_HEAD >actual &&
|
|
|
|
|
{
|
|
|
|
|
cat <<-\EOF
|
2020-07-30 17:06:42 +00:00
|
|
|
Merge tag '\''annote'\''
|
2013-04-01 19:51:50 +00:00
|
|
|
|
|
|
|
|
An annotated one
|
|
|
|
|
|
|
|
|
|
* tag '\''annote'\'':
|
|
|
|
|
One step ahead
|
|
|
|
|
EOF
|
|
|
|
|
} >expected &&
|
|
|
|
|
test_cmp expected actual &&
|
|
|
|
|
|
|
|
|
|
test_when_finished "git reset --hard" &&
|
|
|
|
|
annote=$(git rev-parse annote) &&
|
2018-02-14 18:18:55 +00:00
|
|
|
git merge --no-commit --no-ff $annote &&
|
2013-04-01 19:51:50 +00:00
|
|
|
{
|
|
|
|
|
cat <<-EOF
|
2020-07-30 17:06:42 +00:00
|
|
|
Merge tag '\''$annote'\''
|
2013-04-01 19:51:50 +00:00
|
|
|
|
|
|
|
|
An annotated one
|
|
|
|
|
|
|
|
|
|
* tag '\''$annote'\'':
|
|
|
|
|
One step ahead
|
|
|
|
|
EOF
|
|
|
|
|
} >expected &&
|
|
|
|
|
test_cmp expected .git/MERGE_MSG
|
|
|
|
|
'
|
|
|
|
|
|
2006-07-04 01:09:54 +00:00
|
|
|
test_done
|