From: "Rubén Justo" <rjusto@gmail.com>
To: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: [PATCH] branch: do not fail a no-op --edit-desc
Date: Thu, 29 Sep 2022 23:49:50 +0200 [thread overview]
Message-ID: <ba8a503b-76e2-5de9-1082-3b4c6ecd0cc3@gmail.com> (raw)
In-Reply-To: <xmqqczbftina.fsf@gitster.g>
Let me try again, I think my review was not good :-)
On 28/9/22 21:15, Junio C Hamano wrote:
> In a repository on a branch without branch description, try running
It is a bit confusing the construction "a repository on a branch
without branch description" as "branch" have "repository" inherent.
So "On a branch without description.." holds the same meaning with less
distracting words.
> The simpler solution of course introduces TOCTOU, but you are
I like that the message introduces an appropriate term that also can
be a trigger for some to learn something without distracting others.
Instead of just using: "BUG"
> fooling yourself in your own repository. Not overwriting the branch
> description on the same branch you added in another window, while
> you had this other editor open, may even be a feature ;-)
But.. do we want to implement this this way? Maybe we will have to
implement on purpose this feature in some future refactorization?
And.. the message does not make it clear the situation: if there is
a previous description, will clear; if not, will keep.
> test_expect_success 'use --edit-description' '
> + EDITOR=: git branch --edit-description &&
> + test_must_fail git config branch.main.description &&
> +
> write_script editor <<-\EOF &&
> echo "New contents" >"$1"
> EOF
>
If we want that feature, should we test for it? (do not take
the snippet as tested...):
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
index d5a1fc1375..aa5ee14bae 100755
--- a/t/t3200-branch.sh
+++ b/t/t3200-branch.sh
@@ -1393,6 +1393,16 @@ test_expect_success 'use --edit-description' '
EOF
EDITOR=./editor git branch --edit-description &&
echo "New contents" >expect &&
+ write_script editor <<-\EOF &&
+ if [ -z "$NA" ]; then
+ NA=description GIT_EDITOR=./$0 git branch --edit-description
+ fi
+ echo $NA >$1
+ EOF
+ EDITOR=./editor git branch --edit-description &&
+ test_must_fail git config branch.main.description &&
+ EDITOR=./editor git branch --edit-description &&
+ git config branch.main.description &&
test_cmp expect EDITOR_OUTPUT
next prev parent reply other threads:[~2022-09-29 21:49 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-28 19:15 [PATCH] branch: do not fail a no-op --edit-desc Junio C Hamano
2022-09-28 23:04 ` Rubén Justo
2022-09-28 23:40 ` Junio C Hamano
2022-09-29 21:49 ` Rubén Justo [this message]
2022-09-29 22:26 ` Junio C Hamano
2022-09-30 22:59 ` Rubén Justo
2022-10-01 9:15 ` Rubén Justo
2022-09-30 1:27 ` [PATCH v2] " Junio C Hamano
2022-09-30 10:21 ` Ævar Arnfjörð Bjarmason
2022-09-30 17:01 ` Junio C Hamano
2022-09-30 17:58 ` Ævar Arnfjörð Bjarmason
2022-09-30 18:13 ` Junio C Hamano
2022-09-30 18:06 ` [PATCH v3] " Junio C Hamano
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=ba8a503b-76e2-5de9-1082-3b4c6ecd0cc3@gmail.com \
--to=rjusto@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).