From: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Johannes Schindelin <johannes.schindelin@gmx.de>,
Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: [PATCH 3/6] t3427: adjust stale comment
Date: Mon, 09 Nov 2020 00:09:22 +0000 [thread overview]
Message-ID: <1340feb2dfceaf9215495af2fd970d30866f7a76.1604880565.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.784.git.1604880565.gitgitgadget@gmail.com>
From: Johannes Schindelin <johannes.schindelin@gmx.de>
In b6211b89eb3 (tests: avoid variations of the `master` branch name,
2020-09-26), the `master[123]` branch names were renamed to
`topic_[123]`. A non-literal mention of the corresponding files was
missed in that commit.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
t/t3427-rebase-subtree.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t3427-rebase-subtree.sh b/t/t3427-rebase-subtree.sh
index 2a7d958ea7..5839719ba1 100755
--- a/t/t3427-rebase-subtree.sh
+++ b/t/t3427-rebase-subtree.sh
@@ -19,7 +19,7 @@ commit_message() {
# \
# README ---------------------- Add subproject master - topic_4 - files_subtree/topic_5
#
-# Where the merge moves the files master[123].t into the subdirectory
+# Where the merge moves the files topic_[123].t into the subdirectory
# files_subtree/ and topic_4 as well as files_subtree/topic_5 add files to that
# directory directly.
#
--
gitgitgadget
next prev parent reply other threads:[~2020-11-09 0:09 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-09 0:09 [PATCH 0/6] (Mostly whitespace) cleanups in preparation for renaming the default main branch Johannes Schindelin via GitGitGadget
2020-11-09 0:09 ` [PATCH 1/6] t1004: insert missing "branch" in a message Johannes Schindelin via GitGitGadget
2020-11-09 0:09 ` [PATCH 2/6] t3406: indent with tabs, not spaces Johannes Schindelin via GitGitGadget
2020-11-09 0:09 ` Johannes Schindelin via GitGitGadget [this message]
2020-11-09 0:09 ` [PATCH 4/6] t5400,t5402: consistently indent with tabs, not with spaces Johannes Schindelin via GitGitGadget
2020-11-09 0:09 ` [PATCH 5/6] t5570: remove trailing padding Johannes Schindelin via GitGitGadget
2020-11-09 0:09 ` [PATCH 6/6] t9603: use tabs for indentation Johannes Schindelin via GitGitGadget
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1340feb2dfceaf9215495af2fd970d30866f7a76.1604880565.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=johannes.schindelin@gmx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).