H0llyW00dzZ/git
H0llyW00dzZ/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-02-11 23:31:03 +00:00
Code Releases Activity

fmt-merge-msg: stop treating master specially

Browse Source 
In the context of many projects renaming their primary branch names away
from `master`, Git wants to stop treating the `master` branch specially.

Let's start with `git fmt-merge-msg`.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Johannes Schindelin 2020-06-23 22:33:23 +00:00 committed by Junio C Hamano
parent 0313f36c6e
commit 489947cee5
29 changed files with 94 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fmt-merge-msg.c
View File

@ -451,10 +451,7 @@ static void fmt_merge_msg_title(struct strbuf *out,
strbuf_addf(out, " of %s", srcs.items[i].string); strbuf_addf(out, " of %s", srcs.items[i].string);
} }
if (!strcmp("master", current_branch)) strbuf_addf(out, " into %s\n", current_branch);
strbuf_addch(out, '\n');
else
strbuf_addf(out, " into %s\n", current_branch);
} }
static void fmt_tag_signature(struct strbuf *tagbuf, static void fmt_tag_signature(struct strbuf *tagbuf,

2
t/t1507-rev-parse-upstream.sh
View File

@ -137,7 +137,7 @@ test_expect_success 'merge my-side@{u} records the correct name' '
git branch -t new my-side@{u} && git branch -t new my-side@{u} &&
git merge -s ours new@{u} && git merge -s ours new@{u} &&
git show -s --pretty=tformat:%s >actual && git show -s --pretty=tformat:%s >actual &&
echo "Merge remote-tracking branch ${SQ}origin/side${SQ}" >expect && echo "Merge remote-tracking branch ${SQ}origin/side${SQ} into master" >expect &&
test_cmp expect actual test_cmp expect actual
) )
' '

4
t/t4013-diff-various.sh
View File

@ -117,12 +117,12 @@ test_expect_success setup '
: <<\EOF : <<\EOF
! [initial] Initial ! [initial] Initial
* [master] Merge branch 'side' * [master] Merge branch 'side' into master
! [rearrange] Rearranged lines in dir/sub ! [rearrange] Rearranged lines in dir/sub
! [side] Side ! [side] Side
---- ----
+ [rearrange] Rearranged lines in dir/sub + [rearrange] Rearranged lines in dir/sub
- [master] Merge branch 'side' - [master] Merge branch 'side' into master
* + [side] Side * + [side] Side
* [master^] Third * [master^] Third
* [master~2] Second * [master~2] Second

2
t/t4013/diff.log_--decorate=full_--all
View File

@ -31,7 +31,7 @@ Merge: 9a6d494 c7a2ab9
Author: A U Thor <author@example.com> Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:04:00 2006 +0000 Date: Mon Jun 26 00:04:00 2006 +0000
Merge branch 'side' Merge branch 'side' into master
commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a (refs/heads/side) commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a (refs/heads/side)
Author: A U Thor <author@example.com> Author: A U Thor <author@example.com>

2
t/t4013/diff.log_--decorate_--all
View File

@ -31,7 +31,7 @@ Merge: 9a6d494 c7a2ab9
Author: A U Thor <author@example.com> Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:04:00 2006 +0000 Date: Mon Jun 26 00:04:00 2006 +0000
Merge branch 'side' Merge branch 'side' into master
commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a (side) commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a (side)
Author: A U Thor <author@example.com> Author: A U Thor <author@example.com>

2
t/t4013/diff.log_--patch-with-stat_--summary_master_--_dir_
View File

@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
Author: A U Thor <author@example.com> Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:04:00 2006 +0000 Date: Mon Jun 26 00:04:00 2006 +0000
Merge branch 'side' Merge branch 'side' into master
commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
Author: A U Thor <author@example.com> Author: A U Thor <author@example.com>

2
t/t4013/diff.log_--patch-with-stat_master
View File

@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
Author: A U Thor <author@example.com> Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:04:00 2006 +0000 Date: Mon Jun 26 00:04:00 2006 +0000
Merge branch 'side' Merge branch 'side' into master
commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
Author: A U Thor <author@example.com> Author: A U Thor <author@example.com>

2
t/t4013/diff.log_--patch-with-stat_master_--_dir_
View File

@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
Author: A U Thor <author@example.com> Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:04:00 2006 +0000 Date: Mon Jun 26 00:04:00 2006 +0000
Merge branch 'side' Merge branch 'side' into master
commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
Author: A U Thor <author@example.com> Author: A U Thor <author@example.com>

2
t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_master
View File

@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
Author: A U Thor <author@example.com> Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:04:00 2006 +0000 Date: Mon Jun 26 00:04:00 2006 +0000
Merge branch 'side' Merge branch 'side' into master
dir/sub | 2 ++ dir/sub | 2 ++
file0 | 3 +++ file0 | 3 +++

2
t/t4013/diff.log_--root_--patch-with-stat_--summary_master
View File

@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
Author: A U Thor <author@example.com> Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:04:00 2006 +0000 Date: Mon Jun 26 00:04:00 2006 +0000
Merge branch 'side' Merge branch 'side' into master
commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
Author: A U Thor <author@example.com> Author: A U Thor <author@example.com>

2
t/t4013/diff.log_--root_--patch-with-stat_master
View File

@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
Author: A U Thor <author@example.com> Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:04:00 2006 +0000 Date: Mon Jun 26 00:04:00 2006 +0000
Merge branch 'side' Merge branch 'side' into master
commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
Author: A U Thor <author@example.com> Author: A U Thor <author@example.com>

2
t/t4013/diff.log_--root_-c_--patch-with-stat_--summary_master
View File

@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
Author: A U Thor <author@example.com> Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:04:00 2006 +0000 Date: Mon Jun 26 00:04:00 2006 +0000
Merge branch 'side' Merge branch 'side' into master
dir/sub | 2 ++ dir/sub | 2 ++
file0 | 3 +++ file0 | 3 +++

2
t/t4013/diff.log_--root_-p_master
View File

@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
Author: A U Thor <author@example.com> Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:04:00 2006 +0000 Date: Mon Jun 26 00:04:00 2006 +0000
Merge branch 'side' Merge branch 'side' into master
commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
Author: A U Thor <author@example.com> Author: A U Thor <author@example.com>

2
t/t4013/diff.log_--root_master
View File

@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
Author: A U Thor <author@example.com> Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:04:00 2006 +0000 Date: Mon Jun 26 00:04:00 2006 +0000
Merge branch 'side' Merge branch 'side' into master
commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
Author: A U Thor <author@example.com> Author: A U Thor <author@example.com>

2
t/t4013/diff.log_-m_-p_--first-parent_master
View File

@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
Author: A U Thor <author@example.com> Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:04:00 2006 +0000 Date: Mon Jun 26 00:04:00 2006 +0000
Merge branch 'side' Merge branch 'side' into master
diff --git a/dir/sub b/dir/sub diff --git a/dir/sub b/dir/sub
index cead32e..992913c 100644 index cead32e..992913c 100644

4
t/t4013/diff.log_-m_-p_master
View File

@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
Author: A U Thor <author@example.com> Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:04:00 2006 +0000 Date: Mon Jun 26 00:04:00 2006 +0000
Merge branch 'side' Merge branch 'side' into master
diff --git a/dir/sub b/dir/sub diff --git a/dir/sub b/dir/sub
index cead32e..992913c 100644 index cead32e..992913c 100644
@ -33,7 +33,7 @@ Merge: 9a6d494 c7a2ab9
Author: A U Thor <author@example.com> Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:04:00 2006 +0000 Date: Mon Jun 26 00:04:00 2006 +0000
Merge branch 'side' Merge branch 'side' into master
diff --git a/dir/sub b/dir/sub diff --git a/dir/sub b/dir/sub
index 7289e35..992913c 100644 index 7289e35..992913c 100644

2
t/t4013/diff.log_-p_--first-parent_master
View File

@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
Author: A U Thor <author@example.com> Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:04:00 2006 +0000 Date: Mon Jun 26 00:04:00 2006 +0000
Merge branch 'side' Merge branch 'side' into master
commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
Author: A U Thor <author@example.com> Author: A U Thor <author@example.com>

2
t/t4013/diff.log_-p_master
View File

@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
Author: A U Thor <author@example.com> Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:04:00 2006 +0000 Date: Mon Jun 26 00:04:00 2006 +0000
Merge branch 'side' Merge branch 'side' into master
commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
Author: A U Thor <author@example.com> Author: A U Thor <author@example.com>

2
t/t4013/diff.log_master
View File

@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
Author: A U Thor <author@example.com> Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:04:00 2006 +0000 Date: Mon Jun 26 00:04:00 2006 +0000
Merge branch 'side' Merge branch 'side' into master
commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
Author: A U Thor <author@example.com> Author: A U Thor <author@example.com>

2
t/t4013/diff.show_--first-parent_master
View File

@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
Author: A U Thor <author@example.com> Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:04:00 2006 +0000 Date: Mon Jun 26 00:04:00 2006 +0000
Merge branch 'side' Merge branch 'side' into master
diff --git a/dir/sub b/dir/sub diff --git a/dir/sub b/dir/sub
index cead32e..992913c 100644 index cead32e..992913c 100644

2
t/t4013/diff.show_-c_master
View File

@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
Author: A U Thor <author@example.com> Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:04:00 2006 +0000 Date: Mon Jun 26 00:04:00 2006 +0000
Merge branch 'side' Merge branch 'side' into master
diff --combined dir/sub diff --combined dir/sub
index cead32e,7289e35..992913c index cead32e,7289e35..992913c

4
t/t4013/diff.show_-m_master
View File

@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
Author: A U Thor <author@example.com> Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:04:00 2006 +0000 Date: Mon Jun 26 00:04:00 2006 +0000
Merge branch 'side' Merge branch 'side' into master
diff --git a/dir/sub b/dir/sub diff --git a/dir/sub b/dir/sub
index cead32e..992913c 100644 index cead32e..992913c 100644
@ -33,7 +33,7 @@ Merge: 9a6d494 c7a2ab9
Author: A U Thor <author@example.com> Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:04:00 2006 +0000 Date: Mon Jun 26 00:04:00 2006 +0000
Merge branch 'side' Merge branch 'side' into master
diff --git a/dir/sub b/dir/sub diff --git a/dir/sub b/dir/sub
index 7289e35..992913c 100644 index 7289e35..992913c 100644

2
t/t4013/diff.show_master
View File

@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
Author: A U Thor <author@example.com> Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:04:00 2006 +0000 Date: Mon Jun 26 00:04:00 2006 +0000
Merge branch 'side' Merge branch 'side' into master
diff --cc dir/sub diff --cc dir/sub
index cead32e,7289e35..992913c index cead32e,7289e35..992913c

2
t/t4013/diff.whatchanged_--root_--cc_--patch-with-stat_--summary_master
View File

@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
Author: A U Thor <author@example.com> Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:04:00 2006 +0000 Date: Mon Jun 26 00:04:00 2006 +0000
Merge branch 'side' Merge branch 'side' into master
dir/sub | 2 ++ dir/sub | 2 ++
file0 | 3 +++ file0 | 3 +++

2
t/t4013/diff.whatchanged_--root_-c_--patch-with-stat_--summary_master
View File

@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
Author: A U Thor <author@example.com> Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:04:00 2006 +0000 Date: Mon Jun 26 00:04:00 2006 +0000
Merge branch 'side' Merge branch 'side' into master
dir/sub | 2 ++ dir/sub | 2 ++
file0 | 3 +++ file0 | 3 +++

72
t/t4202-log.sh
View File

@ -483,7 +483,7 @@ test_expect_success 'set up merge history' '
' '
cat > expect <<\EOF cat > expect <<\EOF
* Merge branch 'side' * Merge branch 'side' into master
|\ |\
| * side-2 | * side-2
| * side-1 | * side-1
@ -502,7 +502,7 @@ test_expect_success 'log --graph with merge' '
' '
cat > expect <<\EOF cat > expect <<\EOF
| | | * Merge branch 'side' | | | * Merge branch 'side' into master
| | | |\ | | | |\
| | | | * side-2 | | | | * side-2
| | | | * side-1 | | | | * side-1
@ -521,7 +521,7 @@ test_expect_success 'log --graph --line-prefix="| | | " with merge' '
' '
cat > expect.colors <<\EOF cat > expect.colors <<\EOF
* Merge branch 'side' * Merge branch 'side' into master
<BLUE>|<RESET><CYAN>\<RESET> <BLUE>|<RESET><CYAN>\<RESET>
<BLUE>|<RESET> * side-2 <BLUE>|<RESET> * side-2
<BLUE>|<RESET> * side-1 <BLUE>|<RESET> * side-1
@ -555,7 +555,7 @@ cat > expect <<\EOF
|\ Merge: A B |\ Merge: A B
| | Author: A U Thor <author@example.com> | | Author: A U Thor <author@example.com>
| | | |
| | Merge branch 'side' | | Merge branch 'side' into master
| | | |
| * commit tags/side-2 | * commit tags/side-2
| | Author: A U Thor <author@example.com> | | Author: A U Thor <author@example.com>
@ -632,11 +632,11 @@ test_expect_success 'set up more tangled history' '
' '
cat > expect <<\EOF cat > expect <<\EOF
* Merge tag 'reach' * Merge tag 'reach' into master
|\ |\
| \ | \
| \ | \
*-. \ Merge tags 'octopus-a' and 'octopus-b' *-. \ Merge tags 'octopus-a' and 'octopus-b' into master
|\ \ \ |\ \ \
* | | | seventh * | | | seventh
| | * | octopus-b | | * | octopus-b
@ -646,14 +646,14 @@ cat > expect <<\EOF
|/ / |/ /
| * reach | * reach
|/ |/
* Merge branch 'tangle' * Merge branch 'tangle' into master
|\ |\
| * Merge branch 'side' (early part) into tangle | * Merge branch 'side' (early part) into tangle
| |\ | |\
| * \ Merge branch 'master' (early part) into tangle | * \ Merge branch 'master' (early part) into tangle
| |\ \ | |\ \
| * | | tangle-a | * | | tangle-a
* | | | Merge branch 'side' * | | | Merge branch 'side' into master
|\ \ \ \ |\ \ \ \
| * | | | side-2 | * | | | side-2
| | |_|/ | | |_|/
@ -735,16 +735,16 @@ test_expect_success 'log.decorate configuration' '
test_expect_success 'decorate-refs with glob' ' test_expect_success 'decorate-refs with glob' '
cat >expect.decorate <<-\EOF && cat >expect.decorate <<-\EOF &&
Merge-tag-reach Merge-tag-reach-into-master
Merge-tags-octopus-a-and-octopus-b Merge-tags-octopus-a-and-octopus-b-into-master
seventh seventh
octopus-b (octopus-b) octopus-b (octopus-b)
octopus-a (octopus-a) octopus-a (octopus-a)
reach reach
EOF EOF
cat >expect.no-decorate <<-\EOF && cat >expect.no-decorate <<-\EOF &&
Merge-tag-reach Merge-tag-reach-into-master
Merge-tags-octopus-a-and-octopus-b Merge-tags-octopus-a-and-octopus-b-into-master
seventh seventh
octopus-b octopus-b
octopus-a octopus-a
@ -765,8 +765,8 @@ test_expect_success 'decorate-refs with glob' '
test_expect_success 'decorate-refs without globs' ' test_expect_success 'decorate-refs without globs' '
cat >expect.decorate <<-\EOF && cat >expect.decorate <<-\EOF &&
Merge-tag-reach Merge-tag-reach-into-master
Merge-tags-octopus-a-and-octopus-b Merge-tags-octopus-a-and-octopus-b-into-master
seventh seventh
octopus-b octopus-b
octopus-a octopus-a
@ -779,8 +779,8 @@ test_expect_success 'decorate-refs without globs' '
test_expect_success 'multiple decorate-refs' ' test_expect_success 'multiple decorate-refs' '
cat >expect.decorate <<-\EOF && cat >expect.decorate <<-\EOF &&
Merge-tag-reach Merge-tag-reach-into-master
Merge-tags-octopus-a-and-octopus-b Merge-tags-octopus-a-and-octopus-b-into-master
seventh seventh
octopus-b (octopus-b) octopus-b (octopus-b)
octopus-a (octopus-a) octopus-a (octopus-a)
@ -794,8 +794,8 @@ test_expect_success 'multiple decorate-refs' '
test_expect_success 'decorate-refs-exclude with glob' ' test_expect_success 'decorate-refs-exclude with glob' '
cat >expect.decorate <<-\EOF && cat >expect.decorate <<-\EOF &&
Merge-tag-reach (HEAD -> master) Merge-tag-reach-into-master (HEAD -> master)
Merge-tags-octopus-a-and-octopus-b Merge-tags-octopus-a-and-octopus-b-into-master
seventh (tag: seventh) seventh (tag: seventh)
octopus-b (tag: octopus-b) octopus-b (tag: octopus-b)
octopus-a (tag: octopus-a) octopus-a (tag: octopus-a)
@ -811,8 +811,8 @@ test_expect_success 'decorate-refs-exclude with glob' '
test_expect_success 'decorate-refs-exclude without globs' ' test_expect_success 'decorate-refs-exclude without globs' '
cat >expect.decorate <<-\EOF && cat >expect.decorate <<-\EOF &&
Merge-tag-reach (HEAD -> master) Merge-tag-reach-into-master (HEAD -> master)
Merge-tags-octopus-a-and-octopus-b Merge-tags-octopus-a-and-octopus-b-into-master
seventh (tag: seventh) seventh (tag: seventh)
octopus-b (tag: octopus-b, octopus-b) octopus-b (tag: octopus-b, octopus-b)
octopus-a (tag: octopus-a, octopus-a) octopus-a (tag: octopus-a, octopus-a)
@ -828,8 +828,8 @@ test_expect_success 'decorate-refs-exclude without globs' '
test_expect_success 'multiple decorate-refs-exclude' ' test_expect_success 'multiple decorate-refs-exclude' '
cat >expect.decorate <<-\EOF && cat >expect.decorate <<-\EOF &&
Merge-tag-reach (HEAD -> master) Merge-tag-reach-into-master (HEAD -> master)
Merge-tags-octopus-a-and-octopus-b Merge-tags-octopus-a-and-octopus-b-into-master
seventh (tag: seventh) seventh (tag: seventh)
octopus-b (tag: octopus-b) octopus-b (tag: octopus-b)
octopus-a (tag: octopus-a) octopus-a (tag: octopus-a)
@ -851,8 +851,8 @@ test_expect_success 'multiple decorate-refs-exclude' '
test_expect_success 'decorate-refs and decorate-refs-exclude' ' test_expect_success 'decorate-refs and decorate-refs-exclude' '
cat >expect.no-decorate <<-\EOF && cat >expect.no-decorate <<-\EOF &&
Merge-tag-reach (master) Merge-tag-reach-into-master (master)
Merge-tags-octopus-a-and-octopus-b Merge-tags-octopus-a-and-octopus-b-into-master
seventh seventh
octopus-b octopus-b
octopus-a octopus-a
@ -866,8 +866,8 @@ test_expect_success 'decorate-refs and decorate-refs-exclude' '
test_expect_success 'deocrate-refs and log.excludeDecoration' ' test_expect_success 'deocrate-refs and log.excludeDecoration' '
cat >expect.decorate <<-\EOF && cat >expect.decorate <<-\EOF &&
Merge-tag-reach (master) Merge-tag-reach-into-master (master)
Merge-tags-octopus-a-and-octopus-b Merge-tags-octopus-a-and-octopus-b-into-master
seventh seventh
octopus-b (octopus-b) octopus-b (octopus-b)
octopus-a (octopus-a) octopus-a (octopus-a)
@ -881,10 +881,10 @@ test_expect_success 'deocrate-refs and log.excludeDecoration' '
test_expect_success 'decorate-refs-exclude and simplify-by-decoration' ' test_expect_success 'decorate-refs-exclude and simplify-by-decoration' '
cat >expect.decorate <<-\EOF && cat >expect.decorate <<-\EOF &&
Merge-tag-reach (HEAD -> master) Merge-tag-reach-into-master (HEAD -> master)
reach (tag: reach, reach) reach (tag: reach, reach)
seventh (tag: seventh) seventh (tag: seventh)
Merge-branch-tangle Merge-branch-tangle-into-master
Merge-branch-side-early-part-into-tangle (tangle) Merge-branch-side-early-part-into-tangle (tangle)
tangle-a (tag: tangle-a) tangle-a (tag: tangle-a)
EOF EOF
@ -1068,7 +1068,7 @@ cat >expect <<\EOF
|\ Merge: MERGE_PARENTS |\ Merge: MERGE_PARENTS
| | Author: A U Thor <author@example.com> | | Author: A U Thor <author@example.com>
| | | |
| | Merge branch 'tangle' | | Merge branch 'tangle' into master
| | | |
| * commit COMMIT_OBJECT_NAME | * commit COMMIT_OBJECT_NAME
| |\ Merge: MERGE_PARENTS | |\ Merge: MERGE_PARENTS
@ -1102,7 +1102,7 @@ cat >expect <<\EOF
|\ \ \ \ Merge: MERGE_PARENTS |\ \ \ \ Merge: MERGE_PARENTS
| | | | | Author: A U Thor <author@example.com> | | | | | Author: A U Thor <author@example.com>
| | | | | | | | | |
| | | | | Merge branch 'side' | | | | | Merge branch 'side' into master
| | | | | | | | | |
| * | | | commit COMMIT_OBJECT_NAME | * | | | commit COMMIT_OBJECT_NAME
| | |_|/ Author: A U Thor <author@example.com> | | |_|/ Author: A U Thor <author@example.com>
@ -1343,7 +1343,7 @@ cat >expect <<\EOF
*** |\ Merge: MERGE_PARENTS *** |\ Merge: MERGE_PARENTS
*** | | Author: A U Thor <author@example.com> *** | | Author: A U Thor <author@example.com>
*** | | *** | |
*** | | Merge branch 'tangle' *** | | Merge branch 'tangle' into master
*** | | *** | |
*** | * commit COMMIT_OBJECT_NAME *** | * commit COMMIT_OBJECT_NAME
*** | |\ Merge: MERGE_PARENTS *** | |\ Merge: MERGE_PARENTS
@ -1377,7 +1377,7 @@ cat >expect <<\EOF
*** |\ \ \ \ Merge: MERGE_PARENTS *** |\ \ \ \ Merge: MERGE_PARENTS
*** | | | | | Author: A U Thor <author@example.com> *** | | | | | Author: A U Thor <author@example.com>
*** | | | | | *** | | | | |
*** | | | | | Merge branch 'side' *** | | | | | Merge branch 'side' into master
*** | | | | | *** | | | | |
*** | * | | | commit COMMIT_OBJECT_NAME *** | * | | | commit COMMIT_OBJECT_NAME
*** | | |_|/ Author: A U Thor <author@example.com> *** | | |_|/ Author: A U Thor <author@example.com>
@ -1540,8 +1540,8 @@ cat >expect <<-\EOF
* reach * reach
| |
| A reach.t | A reach.t
* Merge branch 'tangle' * Merge branch 'tangle' into master
* Merge branch 'side' * Merge branch 'side' into master
|\ |\
| * side-2 | * side-2
| |
@ -1562,8 +1562,8 @@ cat >expect <<-\EOF
* reach * reach
| |
| reach.t | reach.t
* Merge branch 'tangle' * Merge branch 'tangle' into master
* Merge branch 'side' * Merge branch 'side' into master
|\ |\
| * side-2 | * side-2
| |

36
t/t6200-fmt-merge-msg.sh
View File

@ -79,7 +79,7 @@ test_expect_success GPG 'set up a signed tag' '
' '
test_expect_success 'message for merging local branch' ' test_expect_success 'message for merging local branch' '
echo "Merge branch ${apos}left${apos}" >expected && echo "Merge branch ${apos}left${apos} into master" >expected &&
git checkout master && git checkout master &&
git fetch . left && git fetch . left &&
@ -107,7 +107,7 @@ test_expect_success GPG 'message for merging local tag signed by unknown key' '
' '
test_expect_success 'message for merging external branch' ' test_expect_success 'message for merging external branch' '
echo "Merge branch ${apos}left${apos} of $(pwd)" >expected && echo "Merge branch ${apos}left${apos} of $(pwd) into master" >expected &&
git checkout master && git checkout master &&
git fetch "$(pwd)" left && git fetch "$(pwd)" left &&
@ -118,7 +118,7 @@ test_expect_success 'message for merging external branch' '
test_expect_success '[merge] summary/log configuration' ' test_expect_success '[merge] summary/log configuration' '
cat >expected <<-EOF && cat >expected <<-EOF &&
Merge branch ${apos}left${apos} Merge branch ${apos}left${apos} into master
# By Another Author (3) and A U Thor (2) # By Another Author (3) and A U Thor (2)
# Via Another Committer # Via Another Committer
@ -160,7 +160,7 @@ test_expect_success 'setup FETCH_HEAD' '
test_expect_success 'merge.log=3 limits shortlog length' ' test_expect_success 'merge.log=3 limits shortlog length' '
cat >expected <<-EOF && cat >expected <<-EOF &&
Merge branch ${apos}left${apos} Merge branch ${apos}left${apos} into master
# By Another Author (3) and A U Thor (2) # By Another Author (3) and A U Thor (2)
# Via Another Committer # Via Another Committer
@ -177,7 +177,7 @@ test_expect_success 'merge.log=3 limits shortlog length' '
test_expect_success 'merge.log=5 shows all 5 commits' ' test_expect_success 'merge.log=5 shows all 5 commits' '
cat >expected <<-EOF && cat >expected <<-EOF &&
Merge branch ${apos}left${apos} Merge branch ${apos}left${apos} into master
# By Another Author (3) and A U Thor (2) # By Another Author (3) and A U Thor (2)
# Via Another Committer # Via Another Committer
@ -195,7 +195,7 @@ test_expect_success 'merge.log=5 shows all 5 commits' '
test_expect_success '--log=5 with custom comment character' ' test_expect_success '--log=5 with custom comment character' '
cat >expected <<-EOF && cat >expected <<-EOF &&
Merge branch ${apos}left${apos} Merge branch ${apos}left${apos} into master
x By Another Author (3) and A U Thor (2) x By Another Author (3) and A U Thor (2)
x Via Another Committer x Via Another Committer
@ -212,14 +212,14 @@ test_expect_success '--log=5 with custom comment character' '
' '
test_expect_success 'merge.log=0 disables shortlog' ' test_expect_success 'merge.log=0 disables shortlog' '
echo "Merge branch ${apos}left${apos}" >expected && echo "Merge branch ${apos}left${apos} into master" >expected &&
git -c merge.log=0 fmt-merge-msg <.git/FETCH_HEAD >actual && git -c merge.log=0 fmt-merge-msg <.git/FETCH_HEAD >actual &&
test_cmp expected actual test_cmp expected actual
' '
test_expect_success '--log=3 limits shortlog length' ' test_expect_success '--log=3 limits shortlog length' '
cat >expected <<-EOF && cat >expected <<-EOF &&
Merge branch ${apos}left${apos} Merge branch ${apos}left${apos} into master
# By Another Author (3) and A U Thor (2) # By Another Author (3) and A U Thor (2)
# Via Another Committer # Via Another Committer
@ -236,7 +236,7 @@ test_expect_success '--log=3 limits shortlog length' '
test_expect_success '--log=5 shows all 5 commits' ' test_expect_success '--log=5 shows all 5 commits' '
cat >expected <<-EOF && cat >expected <<-EOF &&
Merge branch ${apos}left${apos} Merge branch ${apos}left${apos} into master
# By Another Author (3) and A U Thor (2) # By Another Author (3) and A U Thor (2)
# Via Another Committer # Via Another Committer
@ -253,13 +253,13 @@ test_expect_success '--log=5 shows all 5 commits' '
' '
test_expect_success '--no-log disables shortlog' ' test_expect_success '--no-log disables shortlog' '
echo "Merge branch ${apos}left${apos}" >expected && echo "Merge branch ${apos}left${apos} into master" >expected &&
git fmt-merge-msg --no-log <.git/FETCH_HEAD >actual && git fmt-merge-msg --no-log <.git/FETCH_HEAD >actual &&
test_cmp expected actual test_cmp expected actual
' '
test_expect_success '--log=0 disables shortlog' ' test_expect_success '--log=0 disables shortlog' '
echo "Merge branch ${apos}left${apos}" >expected && echo "Merge branch ${apos}left${apos} into master" >expected &&
git fmt-merge-msg --no-log <.git/FETCH_HEAD >actual && git fmt-merge-msg --no-log <.git/FETCH_HEAD >actual &&
test_cmp expected actual test_cmp expected actual
' '
@ -300,7 +300,7 @@ test_expect_success 'fmt-merge-msg -m' '
test_expect_success 'setup: expected shortlog for two branches' ' test_expect_success 'setup: expected shortlog for two branches' '
cat >expected <<-EOF cat >expected <<-EOF
Merge branches ${apos}left${apos} and ${apos}right${apos} Merge branches ${apos}left${apos} and ${apos}right${apos} into master
# By Another Author (3) and A U Thor (2) # By Another Author (3) and A U Thor (2)
# Via Another Committer # Via Another Committer
@ -397,7 +397,7 @@ test_expect_success 'merge-msg with nothing to merge' '
test_expect_success 'merge-msg tag' ' test_expect_success 'merge-msg tag' '
cat >expected <<-EOF && cat >expected <<-EOF &&
Merge tag ${apos}tag-r3${apos} Merge tag ${apos}tag-r3${apos} into master
* tag ${apos}tag-r3${apos}: * tag ${apos}tag-r3${apos}:
Right #3 Right #3
@ -418,7 +418,7 @@ test_expect_success 'merge-msg tag' '
test_expect_success 'merge-msg two tags' ' test_expect_success 'merge-msg two tags' '
cat >expected <<-EOF && cat >expected <<-EOF &&
Merge tags ${apos}tag-r3${apos} and ${apos}tag-l5${apos} Merge tags ${apos}tag-r3${apos} and ${apos}tag-l5${apos} into master
* tag ${apos}tag-r3${apos}: * tag ${apos}tag-r3${apos}:
Right #3 Right #3
@ -448,7 +448,7 @@ test_expect_success 'merge-msg two tags' '
test_expect_success 'merge-msg tag and branch' ' test_expect_success 'merge-msg tag and branch' '
cat >expected <<-EOF && cat >expected <<-EOF &&
Merge branch ${apos}left${apos}, tag ${apos}tag-r3${apos} Merge branch ${apos}left${apos}, tag ${apos}tag-r3${apos} into master
* tag ${apos}tag-r3${apos}: * tag ${apos}tag-r3${apos}:
Right #3 Right #3
@ -479,7 +479,7 @@ test_expect_success 'merge-msg tag and branch' '
test_expect_success 'merge-msg lots of commits' ' test_expect_success 'merge-msg lots of commits' '
{ {
cat <<-EOF && cat <<-EOF &&
Merge branch ${apos}long${apos} Merge branch ${apos}long${apos} into master
* long: (35 commits) * long: (35 commits)
EOF EOF
@ -516,7 +516,7 @@ test_expect_success 'merge-msg with "merging" an annotated tag' '
git fmt-merge-msg <.git/FETCH_HEAD >actual && git fmt-merge-msg <.git/FETCH_HEAD >actual &&
{ {
cat <<-\EOF cat <<-\EOF
Merge tag '\''annote'\'' Merge tag '\''annote'\'' into master
An annotated one An annotated one
@ -531,7 +531,7 @@ test_expect_success 'merge-msg with "merging" an annotated tag' '
git merge --no-commit --no-ff $annote && git merge --no-commit --no-ff $annote &&
{ {
cat <<-EOF cat <<-EOF
Merge tag '\''$annote'\'' Merge tag '\''$annote'\'' into master
An annotated one An annotated one

14
t/t7600-merge.sh
View File

@ -14,9 +14,9 @@ Testing basic merge operations/option parsing.
! [c4] c4 ! [c4] c4
! [c5] c5 ! [c5] c5
! [c6] c6 ! [c6] c6
* [master] Merge commit 'c1' * [master] Merge commit 'c1' into master
-------- --------
- [master] Merge commit 'c1' - [master] Merge commit 'c1' into master
+ * [c1] commit 1 + * [c1] commit 1
+ [c6] c6 + [c6] c6
+ [c5] c5 + [c5] c5
@ -44,8 +44,8 @@ test_write_lines '1 X' 2 '3 X' 4 '5 X' 6 7 8 '9 X' >result.1-3-5-9
test_write_lines 1 2 3 4 5 6 7 8 '9 Z' >result.9z test_write_lines 1 2 3 4 5 6 7 8 '9 Z' >result.9z
create_merge_msgs () { create_merge_msgs () {
echo "Merge tag 'c2'" >msg.1-5 && echo "Merge tag 'c2' into master" >msg.1-5 &&
echo "Merge tags 'c2' and 'c3'" >msg.1-5-9 && echo "Merge tags 'c2' and 'c3' into master" >msg.1-5-9 &&
{ {
echo "Squashed commit of the following:" && echo "Squashed commit of the following:" &&
echo && echo &&
@ -258,7 +258,7 @@ test_expect_success 'merge c3 with c7 with commit.cleanup = scissors' '
git commit --no-edit -a && git commit --no-edit -a &&
cat >expect <<-\EOF && cat >expect <<-\EOF &&
Merge tag '"'"'c7'"'"' Merge tag '"'"'c7'"'"' into master
# ------------------------ >8 ------------------------ # ------------------------ >8 ------------------------
# Do not modify or remove the line above. # Do not modify or remove the line above.
@ -808,10 +808,10 @@ test_expect_success 'merge with conflicted --autostash changes' '
' '
cat >expected.branch <<\EOF cat >expected.branch <<\EOF
Merge branch 'c5-branch' (early part) Merge branch 'c5-branch' (early part) into master
EOF EOF
cat >expected.tag <<\EOF cat >expected.tag <<\EOF
Merge commit 'c5~1' Merge commit 'c5~1' into master
EOF EOF
test_expect_success 'merge early part of c2' ' test_expect_success 'merge early part of c2' '

10
t/t7608-merge-messages.sh
View File

@ -16,7 +16,7 @@ test_expect_success 'merge local branch' '
git checkout master && git checkout master &&
test_commit master-2 && test_commit master-2 &&
git merge local-branch && git merge local-branch &&
check_oneline "Merge branch Qlocal-branchQ" check_oneline "Merge branch Qlocal-branchQ into master"
' '
test_expect_success 'merge octopus branches' ' test_expect_success 'merge octopus branches' '
@ -26,7 +26,7 @@ test_expect_success 'merge octopus branches' '
test_commit octopus-2 && test_commit octopus-2 &&
git checkout master && git checkout master &&
git merge octopus-a octopus-b && git merge octopus-a octopus-b &&
check_oneline "Merge branches Qoctopus-aQ and Qoctopus-bQ" check_oneline "Merge branches Qoctopus-aQ and Qoctopus-bQ into master"
' '
test_expect_success 'merge tag' ' test_expect_success 'merge tag' '
@ -35,7 +35,7 @@ test_expect_success 'merge tag' '
git checkout master && git checkout master &&
test_commit master-3 && test_commit master-3 &&
git merge tag-1 && git merge tag-1 &&
check_oneline "Merge tag Qtag-1Q" check_oneline "Merge tag Qtag-1Q into master"
' '
test_expect_success 'ambiguous tag' ' test_expect_success 'ambiguous tag' '
@ -44,7 +44,7 @@ test_expect_success 'ambiguous tag' '
git checkout master && git checkout master &&
test_commit master-4 && test_commit master-4 &&
git merge ambiguous && git merge ambiguous &&
check_oneline "Merge tag QambiguousQ" check_oneline "Merge tag QambiguousQ into master"
' '
test_expect_success 'remote-tracking branch' ' test_expect_success 'remote-tracking branch' '
@ -54,7 +54,7 @@ test_expect_success 'remote-tracking branch' '
git checkout master && git checkout master &&
test_commit master-5 && test_commit master-5 &&
git merge origin/master && git merge origin/master &&
check_oneline "Merge remote-tracking branch Qorigin/masterQ" check_oneline "Merge remote-tracking branch Qorigin/masterQ into master"
' '
test_done test_done