From: kristofferhaugsbakk@fastmail.com
To: git@vger.kernel.org
Cc: Kristoffer Haugsbakk <code@khaugsbakk.name>,
stolee@gmail.com, phillip.wood123@gmail.com, me@ttaylorr.com
Subject: [PATCH v2 0/3] sequencer: comment out properly in todo list
Date: Tue, 12 Nov 2024 11:20:10 +0100 [thread overview]
Message-ID: <cover.1731406513.git.code@khaugsbakk.name> (raw)
In-Reply-To: <5267b9a9c8cc5cc66979117dc4c1e4d7329e2a03.1729704370.git.code@khaugsbakk.name>
From: Kristoffer Haugsbakk <code@khaugsbakk.name>
Fix three places where the comment char/string is hardcoded (#) in the
todo list.
This series does not depend on any other topics.
Topic `jc/strbuf-commented-something` was mentioned on the v1
discussion. But it was kicked out of `seen` last week. Also it doesn’t
compile when merged into `v2.47.0` or later:
```
strbuf.c: In function ‘strbuf_add_comment_lines’:
strbuf.c:384:24: error: ‘comment_line_str’ undeclared (first use in this function)
384 | add_lines(out, comment_line_str, buf, size, 1);
| ^~~~~~~~~~~~~~~~
strbuf.c:384:24: note: each undeclared identifier is reported only once for each function it appears in
make: *** [Makefile:2795: strbuf.o] Error 1
```
§ Changes in v2
The first version just had patch 1 but this one fixes two other places.
The two other places where unearthered during the v1 discussion.
Rebased on `master` (b31fb630c0 (Merge https://github.com/j6t/git-gui,
2024-11-11)).
§ CI
Some failures that didn’t look relevant.
• linux-leaks
• t0301-credential-cache
• t9211-scalar-clone
• linux-reftable-leaks
• ditto above
§ CC
• Stolee for the first patch
• Reviewers on the previous round
Kristoffer Haugsbakk (3):
sequencer: comment checked-out branch properly
sequencer: comment `--reference` subject line properly
sequencer: comment commit messages properly
sequencer.c | 26 ++++++++++++++++----------
t/t3400-rebase.sh | 16 ++++++++++++++++
t/t3437-rebase-fixup-options.sh | 15 +++++++++++++++
t/t3501-revert-cherry-pick.sh | 12 ++++++++++++
4 files changed, 59 insertions(+), 10 deletions(-)
Range-diff against v1:
1: 5267b9a9c8c ! 1: fc3b4438845 sequencer: comment checked-out branch properly
@@ Commit message
`git rebase --update-ref` does not insert commands for dependent/sub-
branches which are checked out.[1] Instead it leaves a comment about
- that fact. The comment char is hard-coded (#). In turn the comment
+ that fact. The comment char is hardcoded (#). In turn the comment
line gets interpreted as an invalid command when `core.commentChar`
is in use.
@@ Commit message
Signed-off-by: Kristoffer Haugsbakk <code@khaugsbakk.name>
+
+ ## Notes (series) ##
+ v2:
+ • Message: “hardcoded” (more common according to `git grep`)
+
## sequencer.c ##
@@ sequencer.c: static int add_decorations_to_list(const struct commit *commit,
/* If the branch is checked out, then leave a comment instead. */
-: ----------- > 2: 710c5b1a3f6 sequencer: comment `--reference` subject line properly
-: ----------- > 3: 86b4b485e0b sequencer: comment commit messages properly
base-commit: b31fb630c0fc6869a33ed717163e8a1210460d94
--
2.47.0
next prev parent reply other threads:[~2024-11-12 10:20 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-23 17:27 [PATCH] sequencer: comment checked-out branch properly kristofferhaugsbakk
2024-10-23 18:44 ` Taylor Blau
2024-10-23 19:53 ` Kristoffer Haugsbakk
2024-10-31 16:30 ` Phillip Wood
2024-10-31 17:25 ` Kristoffer Haugsbakk
2024-10-31 20:30 ` phillip.wood123
2024-10-31 9:58 ` Phillip Wood
2024-10-31 10:07 ` Kristoffer Haugsbakk
2024-10-31 16:30 ` Phillip Wood
2024-10-23 20:43 ` Taylor Blau
2024-10-23 20:51 ` Kristoffer Haugsbakk
2024-11-12 10:20 ` kristofferhaugsbakk [this message]
2024-11-12 10:20 ` [PATCH v2 1/3] " kristofferhaugsbakk
2024-11-13 1:07 ` Junio C Hamano
2024-11-13 1:18 ` Junio C Hamano
2024-11-13 14:47 ` phillip.wood123
2024-11-13 22:57 ` Junio C Hamano
2024-11-24 20:02 ` Kristoffer Haugsbakk
2024-11-12 10:20 ` [PATCH v2 2/3] sequencer: comment `--reference` subject line properly kristofferhaugsbakk
2024-11-13 1:07 ` Junio C Hamano
2024-11-13 14:48 ` phillip.wood123
2024-11-13 23:00 ` Junio C Hamano
2024-11-12 10:20 ` [PATCH v2 3/3] sequencer: comment commit messages properly kristofferhaugsbakk
2024-11-13 1:03 ` Junio C Hamano
2024-11-13 14:49 ` phillip.wood123
2024-11-24 19:58 ` Kristoffer Haugsbakk
2024-11-13 0:26 ` [PATCH v2 0/3] sequencer: comment out properly in todo list Junio C Hamano
2024-11-24 20:01 ` Kristoffer Haugsbakk
2024-11-24 20:56 ` [PATCH v3 " kristofferhaugsbakk
2024-11-24 20:56 ` [PATCH v3 1/3] sequencer: comment checked-out branch properly kristofferhaugsbakk
2024-11-24 20:56 ` [PATCH v3 2/3] sequencer: comment `--reference` subject line properly kristofferhaugsbakk
2024-11-24 20:56 ` [PATCH v3 3/3] sequencer: comment commit messages properly kristofferhaugsbakk
2024-11-25 10:07 ` [PATCH v3 0/3] sequencer: comment out properly in todo list phillip.wood123
2024-11-25 10:52 ` Kristoffer Haugsbakk
2024-11-25 14:36 ` phillip.wood123
2024-11-25 20:13 ` [PATCH v4 " kristofferhaugsbakk
2024-11-25 20:13 ` [PATCH v4 1/3] sequencer: comment checked-out branch properly kristofferhaugsbakk
2024-11-25 20:13 ` [PATCH v4 2/3] sequencer: comment `--reference` subject line properly kristofferhaugsbakk
2024-11-25 20:13 ` [PATCH v4 3/3] sequencer: comment commit messages properly kristofferhaugsbakk
2024-11-26 1:11 ` [PATCH v4 0/3] sequencer: comment out properly in todo list Junio C Hamano
2024-11-26 11:24 ` Phillip Wood
2024-11-27 12:39 ` Kristoffer Haugsbakk
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=cover.1731406513.git.code@khaugsbakk.name \
--to=kristofferhaugsbakk@fastmail.com \
--cc=code@khaugsbakk.name \
--cc=git@vger.kernel.org \
--cc=me@ttaylorr.com \
--cc=phillip.wood123@gmail.com \
--cc=stolee@gmail.com \
/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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.