git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: kristofferhaugsbakk@fastmail.com
Cc: git@vger.kernel.org,  Kristoffer Haugsbakk <code@khaugsbakk.name>,
	stolee@gmail.com,  phillip.wood123@gmail.com,  me@ttaylorr.com
Subject: Re: [PATCH v2 1/3] sequencer: comment checked-out branch properly
Date: Wed, 13 Nov 2024 10:07:10 +0900	[thread overview]
Message-ID: <xmqqikss2b7l.fsf@gitster.g> (raw)
In-Reply-To: <fc3b4438845e9fafd03fb608128099ce37ecd1b9.1731406513.git.code@khaugsbakk.name> (kristofferhaugsbakk@fastmail.com's message of "Tue, 12 Nov 2024 11:20:11 +0100")

kristofferhaugsbakk@fastmail.com writes:

> diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh
> index 09f230eefb2..f61a717b190 100755
> --- a/t/t3400-rebase.sh
> +++ b/t/t3400-rebase.sh
> @@ -456,4 +456,20 @@ test_expect_success 'rebase when inside worktree subdirectory' '
>  	)
>  '
>  
> +test_expect_success 'git rebase --update-ref with core.commentChar and branch on worktree' '
> +	test_when_finished git branch -D base topic2 &&
> +	test_when_finished git checkout main &&
> +	test_when_finished git branch -D wt-topic &&
> +	test_when_finished git worktree remove wt-topic &&
> +	git checkout main &&
> +	git checkout -b base &&
> +	git checkout -b topic2 &&
> +	test_commit msg2 &&
> +	git worktree add wt-topic &&
> +	git checkout base &&
> +	test_commit msg3 &&
> +	git checkout topic2 &&
> +	git -c core.commentChar=% rebase --update-refs base
> +'

Can we improve this test a bit to give it more visibility into the
breakage?

I am sure that the internal machinery gets confused because it wants
to skip commented out lines assuming '%' is used for comments, and
fails to skip lines that are commented with '#', but it is a bit too
opaque how this would break without the fix.  Perhaps add a line or
two of a comment to the test to describe what the expected mode of
failure is?



  reply	other threads:[~2024-11-13  1:07 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 ` [PATCH v2 0/3] sequencer: comment out properly in todo list kristofferhaugsbakk
2024-11-12 10:20   ` [PATCH v2 1/3] sequencer: comment checked-out branch properly kristofferhaugsbakk
2024-11-13  1:07     ` Junio C Hamano [this message]
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=xmqqikss2b7l.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=code@khaugsbakk.name \
    --cc=git@vger.kernel.org \
    --cc=kristofferhaugsbakk@fastmail.com \
    --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 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 NNTP newsgroup(s).