From: "Rubén Justo" <rjusto@gmail.com>
To: Junio C Hamano <gitster@pobox.com>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: "Rubén Justo via GitGitGadget" <gitgitgadget@gmail.com>,
git@vger.kernel.org
Subject: Re: [PATCH] branch: allow "-" as a short-hand for "previous branch"
Date: Sat, 13 Aug 2022 11:19:40 +0200 [thread overview]
Message-ID: <be21e2ba-1c57-a5aa-a986-64413f3983c3@gmail.com> (raw)
In-Reply-To: <xmqqk07iu3c3.fsf@gitster.g>
On Mon, Aug 8, 2022 at 6:06 PM Junio C Hamano <gitster@pobox.com
<mailto:gitster@pobox.com>> wrote:
>
> Johannes Schindelin <Johannes.Schindelin@gmx.de
<mailto:Johannes.Schindelin@gmx.de>> writes:
>
> > @@ -1420,6 +1420,12 @@ static int
interpret_nth_prior_checkout(struct repository *r,
> > const char *brace;
> > char *num_end;
> >
> > + if (namelen == 1 && *name == '-') {
> > + brace = name;
> > + nth = 1;
> > + goto find_nth_checkout;
> > + }
> > +
> > if (namelen < 4)
> > return -1;
> > if (name[0] != '@' || name[1] != '{' || name[2] != '-')
>
> If a solution along this line works, it would be far cleaner design
> than the various hacks we have done in the past, noticing "-" and
> replacing with "@{-1}". For one thing, we wouldn't be receiving a
> "-" from the end user on the command line and in response say @{-1}
> does not make sense in the context in an error message. That alone
> makes the above approach to deal with it at the lowest level quite
> attractive.
>
> In the list archive, however, you may be able to find a few past
> discussions on why this is not a good idea (some of which I may no
> longer agree with). One thing that still worries me a bit is that
> we often disambiguate the command line arguments by seeing "is this
> (still) a rev, or is this a file, or can it be interpreted as both?"
> and "-" is not judged to be a "rev", IIRC.
>
> Luckily, not many commands we have take "-" as if it were a file and
> make it read from the standard input stream, but if there were (or
> if we were to add a command to behave like so), treating "-" to mean
> the same thing as "@{-1}" everywhere may require the "does this look
> like a rev?" heuristics (which is used by the "earlier ones must be
> rev and not file, later ones must be file and cannot be interpreted
> as rev, for you to omit '--' from the command line" logic) to be
> taught that a lone "-" can be a rev.
>
> So it is quite a lot of thing that the new code needs to get right
> before getting there.
Agree. To make a substitution in the command line and to consider "-"
in interpret_nth_prior_checkout, I see them as two very different games.
Previous to this, I thought about making also a "git diff -",
https://github.com/gitgitgadget/git/pull/1314
<https://github.com/gitgitgadget/git/pull/1314>. Suddenly there was 5
commands with this substitution (checkout, merge, rebase, branch, diff)
so I follow a little the path now Johannes suggests, making the
substitution "- ~ @{-1}" deep in the system. For me, the implications,
error cases, test cases... to consider was not worth the change to
get what I was looking for: align the workflow "checkout/merge/branch
-d".
Also discarded the "git diff -" change, because of so many flags and
conditions "diff" has. So I only sent the "branch -" patch.
next prev parent reply other threads:[~2022-08-13 9:19 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-07 22:22 [PATCH] branch: allow "-" as a short-hand for "previous branch" Rubén Justo via GitGitGadget
2022-08-08 13:26 ` Johannes Schindelin
2022-08-08 16:06 ` Junio C Hamano
2022-08-13 9:19 ` Rubén Justo [this message]
2022-08-13 22:28 ` Junio C Hamano
2022-08-16 9:49 ` Johannes Schindelin
2022-08-19 13:05 ` Johannes Schindelin
2022-08-19 18:11 ` Junio C Hamano
2022-08-25 7:57 ` Rubén Justo
2022-08-25 16:23 ` Junio C Hamano
2022-08-25 19:50 ` Rubén Justo
2022-08-13 9:08 ` Rubén Justo
2022-08-08 14:46 ` Junio C Hamano
2022-08-13 9:14 ` Rubén Justo
2022-08-16 9:31 ` Johannes Schindelin
2022-08-16 17:03 ` Rubén Justo
2022-08-19 11:42 ` Johannes Schindelin
2022-08-16 17:11 ` [PATCH v2] allow "-" as short-hand for "@{-1}" in "branch -d" Rubén Justo via GitGitGadget
2022-08-16 18:55 ` Junio C Hamano
2022-08-16 21:27 ` Rubén Justo
2022-08-16 21:18 ` [PATCH v3] branch: allow "-" as a short-hand for "previous branch" Rubén Justo
2022-09-11 14:14 ` [PATCH v4] branch: allow "-" as a shortcut " Rubén Justo
2022-09-12 17:52 ` Junio C Hamano
2022-09-12 21:18 ` Rubén Justo
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=be21e2ba-1c57-a5aa-a986-64413f3983c3@gmail.com \
--to=rjusto@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--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.
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).