Hi Danh, On Tue, 30 Jun 2020, Đoàn Trần Công Danh wrote: > On 2020-06-29 15:27:44+0200, Johannes Schindelin <Johannes.Schindelin@xxxxxx> wrote: > > > This change will also affect git-subtree test. > > > > Good point. The patch looks good. I wonder whether we should also address > > these: > > > > Documentation/git-rebase.txt:* Merge branch 'report-a-bug' > > Documentation/git-rebase.txt:* | Merge branch 'refactor-button' > > Documentation/git-switch.txt:HEAD is now at 9fc9555312 Merge branch 'cc/shared-index-permbits' > > Documentation/howto/using-signed-tag-in-pull-request.txt: Merge tag 'frotz-for-xyzzy' of example.com:/git/froboz.git/ > > Documentation/howto/using-signed-tag-in-pull-request.txt: Merge tag 'frotz-for-xyzzy' of example.com:/git/froboz.git/ > > t/t7606-merge-custom.sh:* (HEAD, master) Merge commit 'c3' > > > > The first three matches are in manual pages, the next two in technical > > documentation, and the last one in a comment in one of the test scripts. > > So none of them are super critical, but maybe there are different > > opinions? > > In _my very opinion_, I don't think it's that critical. > We allow git merge --edit and git fmt-merge-msg -m. > Someone may have configured their Git to remove branch name already. > And some others may always remove the target branch manually. > We probably don't want to introduce another master occurence. > (For sideline watcher: Please not argue on this, > I don't have any opinions about the word: master.) True. > If there're a consensus on changing those documentation, > I won't mind to do that manual work ;) I actually agree that it is not _really_ necessary. > The test is a different story, since some (or most?) distro enable > check (or test) phase for their build infrastructure. > And, we shouldn't break their infrastructures. Actually, the hit in t7606 is in the initial _comment_. So I highly doubt that it would break any build infrastructure to leave it alone. Ciao, Dscho > > > > Ciao, > > Dscho > > > > > We'll need this patch for subtree: > > > ----------------8<------------------- > > > From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= > > > <congdanhqx@xxxxxxxxx> > > > Date: Mon, 29 Jun 2020 22:56:37 +0700 > > > Subject: [PATCH] contrib: subtree: adjust test to change in fmt-merge-msg > > > MIME-Version: 1.0 > > > Content-Type: text/plain; charset=UTF-8 > > > Content-Transfer-Encoding: 8bit > > > > > > We're starting to stop treating `master' specially in fmt-merge-msg. > > > Adjust the test to reflect that change. > > > > > > Signed-off-by: Đoàn Trần Công Danh <congdanhqx@xxxxxxxxx> > > > --- > > > contrib/subtree/t/t7900-subtree.sh | 6 ++++-- > > > 1 file changed, 4 insertions(+), 2 deletions(-) > > > > > > diff --git a/contrib/subtree/t/t7900-subtree.sh b/contrib/subtree/t/t7900-subtree.sh > > > index 57ff4b25c1..53d7accf94 100755 > > > --- a/contrib/subtree/t/t7900-subtree.sh > > > +++ b/contrib/subtree/t/t7900-subtree.sh > > > @@ -196,7 +196,8 @@ test_expect_success 'merge new subproj history into sub dir/ with --prefix' ' > > > cd "$subtree_test_count" && > > > git fetch ./"sub proj" master && > > > git subtree merge --prefix="sub dir" FETCH_HEAD && > > > - check_equal "$(last_commit_message)" "Merge commit '\''$(git rev-parse FETCH_HEAD)'\''" > > > + check_equal "$(last_commit_message)" \ > > > + "Merge commit '\''$(git rev-parse FETCH_HEAD)'\'' into master" > > > ) > > > ' > > > > > > @@ -273,7 +274,8 @@ test_expect_success 'merge new subproj history into subdir/ with a slash appende > > > cd "$test_count" && > > > git fetch ./subproj master && > > > git subtree merge --prefix=subdir/ FETCH_HEAD && > > > - check_equal "$(last_commit_message)" "Merge commit '\''$(git rev-parse FETCH_HEAD)'\''" > > > + check_equal "$(last_commit_message)" \ > > > + "Merge commit '\''$(git rev-parse FETCH_HEAD)'\'' into master" > > > ) > > > ' > > > > > > -- > > > 2.27.0.111.gc72c7da667 > > > Danh > > > > > > -- > Danh >
