From: "Tony Tung via GitGitGadget" <gitgitgadget@gmail•com>
To: git@vger•kernel.org
Cc: Tony Tung <tonytung@merly•org>, Tony Tung <tonytung@merly•org>
Subject: [PATCH] sequencer: remove use of comment character
Date: Mon, 30 Oct 2023 03:08:12 +0000 [thread overview]
Message-ID: <pull.1603.git.1698635292629.gitgitgadget@gmail.com> (raw)
From: Tony Tung <tonytung@merly•org>
Instead of using the hardcoded `# `, use the
user-defined comment_line_char. Adds a test
to prevent regressions.
Signed-off-by: Tony Tung <tonytung@merly•org>
---
sequencer: remove use of hardcoded comment char
Instead of using the hardcoded # , use the user-defined
comment_line_char. Adds a test to prevent regressions.
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1603%2Fttung%2Fttung%2Fcommentchar-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1603/ttung/ttung/commentchar-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/1603
sequencer.c | 5 +++--
t/t3404-rebase-interactive.sh | 39 +++++++++++++++++++++++++++++++++++
2 files changed, 42 insertions(+), 2 deletions(-)
diff --git a/sequencer.c b/sequencer.c
index d584cac8ed9..8c6666d5e43 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -6082,8 +6082,9 @@ static int add_decorations_to_list(const struct commit *commit,
/* If the branch is checked out, then leave a comment instead. */
if ((path = branch_checked_out(decoration->name))) {
item->command = TODO_COMMENT;
- strbuf_addf(ctx->buf, "# Ref %s checked out at '%s'\n",
- decoration->name, path);
+ strbuf_commented_addf(ctx->buf, comment_line_char,
+ "Ref %s checked out at '%s'\n",
+ decoration->name, path);
} else {
struct string_list_item *sti;
item->command = TODO_UPDATE_REF;
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index 8ea2bf13026..076dca87871 100755
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -1839,6 +1839,45 @@ test_expect_success '--update-refs adds label and update-ref commands' '
)
'
+test_expect_success '--update-refs works with core.commentChar' '
+ git checkout -b update-refs-with-commentchar no-conflict-branch &&
+ test_config core.commentChar : &&
+ git branch -f base HEAD~4 &&
+ git branch -f first HEAD~3 &&
+ git branch -f second HEAD~3 &&
+ git branch -f third HEAD~1 &&
+ git commit --allow-empty --fixup=third &&
+ git branch -f is-not-reordered &&
+ git commit --allow-empty --fixup=HEAD~4 &&
+ git branch -f shared-tip &&
+ git checkout update-refs &&
+ (
+ write_script fake-editor.sh <<-\EOF &&
+ grep "^[^:]" "$1"
+ exit 1
+ EOF
+ test_set_editor "$(pwd)/fake-editor.sh" &&
+
+ cat >expect <<-EOF &&
+ pick $(git log -1 --format=%h J) J
+ fixup $(git log -1 --format=%h update-refs) fixup! J : empty
+ update-ref refs/heads/second
+ update-ref refs/heads/first
+ pick $(git log -1 --format=%h K) K
+ pick $(git log -1 --format=%h L) L
+ fixup $(git log -1 --format=%h is-not-reordered) fixup! L : empty
+ update-ref refs/heads/third
+ pick $(git log -1 --format=%h M) M
+ update-ref refs/heads/no-conflict-branch
+ update-ref refs/heads/is-not-reordered
+ update-ref refs/heads/update-refs-with-commentchar
+ EOF
+
+ test_must_fail git rebase -i --autosquash --update-refs primary shared-tip >todo &&
+ test_cmp expect todo
+ )
+'
+
test_expect_success '--update-refs adds commands with --rebase-merges' '
git checkout -b update-refs-with-merge no-conflict-branch &&
git branch -f base HEAD~4 &&
base-commit: 2e8e77cbac8ac17f94eee2087187fa1718e38b14
--
gitgitgadget
next reply other threads:[~2023-10-30 3:08 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-30 3:08 Tony Tung via GitGitGadget [this message]
2023-10-30 4:00 ` [PATCH] sequencer: remove use of comment character Junio C Hamano
2023-10-30 17:26 ` Elijah Newren
2023-10-30 23:35 ` Junio C Hamano
2023-10-31 4:42 ` Tony Tung
2023-10-31 4:50 ` Tony Tung
2023-10-31 5:33 ` Junio C Hamano
2023-10-31 6:20 ` Elijah Newren
2023-10-31 5:09 ` [PATCH v2 0/2] sequencer: remove use of hardcoded comment char Tony Tung via GitGitGadget
2023-10-31 5:09 ` [PATCH v2 1/2] sequencer: remove use of comment character Tony Tung via GitGitGadget
2023-10-31 11:43 ` Phillip Wood
2023-11-01 4:59 ` Junio C Hamano
2023-10-31 5:09 ` [PATCH v2 2/2] sequencer: fix remaining hardcoded comment char Tony Tung via GitGitGadget
2023-10-31 11:27 ` Phillip Wood
2023-10-31 6:55 ` [PATCH v2 0/2] sequencer: remove use of " Elijah Newren
2023-10-31 11:18 ` Phillip Wood
2023-11-01 0:16 ` Junio C Hamano
2023-11-01 0:21 ` Elijah Newren
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=pull.1603.git.1698635292629.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=tonytung@merly$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox