From: Phillip Wood <phillip.wood123@gmail.com>
To: Junio C Hamano <gitster@pobox.com>,
Ghanshyam Thakkar <shyamthakkar001@gmail.com>
Cc: git@vger.kernel.org, ps@pks.im
Subject: Re: [PATCH v4 2/3] add-patch: classify '@' as a synonym for 'HEAD'
Date: Wed, 7 Feb 2024 10:38:41 +0000 [thread overview]
Message-ID: <1aabcaec-7266-40f8-b7ce-e82b8df58891@gmail.com> (raw)
In-Reply-To: <xmqqil31dqx6.fsf@gitster.g>
On 07/02/2024 01:05, Junio C Hamano wrote:
> Ghanshyam Thakkar <shyamthakkar001@gmail.com> writes:
>
>> Currently, (checkout, reset, restore) commands correctly take '@' as a
>> synonym for 'HEAD'. However, in patch mode (-p/--patch), for both '@'
>> and 'HEAD', different prompts/messages are given by the commands
>> mentioned above (because of applying reverse mode(-R) in case of '@').
>> This is due to the literal and only string comparison with the word
>> 'HEAD' in run_add_p(). Synonymity between '@' and 'HEAD' is obviously
>> desired, especially since '@' already resolves to 'HEAD'.
>>
>> Therefore, replace '@' to 'HEAD' at the beginning of
>> add-patch.c:run_add_p().
>
> Of course there is only one possible downside for this approach, in
> that if we are using "revision" in an error message, users who asked
> for "@" may complain when an error message says "HEAD" in it. I think
> the simplicity of the implementation far outweighs this downside.
I agree, if we were replacing the revision the user gave us with a hex
object id that would be confusing but as "@" is just a shortcut for
"HEAD" I think replacing it in the error message is fine. It was a good
idea just to replace "@" with "HEAD", this version is much simpler.
Best Wishes
Phillip
>> There is also logic in builtin/checkout.c to
>> convert all command line input rev to the raw object name for underlying
>> machinery (e.g., diff-index) that does not recognize the <a>...<b>
>> notation, but we'd need to leave 'HEAD' intact. Now we need to teach
>> that '@' is a synonym to 'HEAD' to that code and leave '@' intact, too.
>
> Makes me wonder why we cannot use the same "normalize @ to HEAD
> upfront" approach here, though?
>
> It would involve translating "@" given to new_branch_info->name to
> "HEAD" early, possibly in setup_new_branch_info_and_source_tree(),
> and that probably will fix the other strcmp() with "HEAD" that
> appears in builtin/checkout.c:update_refs_for_switch() as well, no?
>
>> + /* helpful in deciding the patch mode ahead */
>> + if(revision && !strcmp(revision, "@"))
>> + revision = "HEAD";
>
> Style. "if (revision ...)"
>
next prev parent reply other threads:[~2024-02-07 10:39 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-28 18:11 [GSOC][RFC PATCH 0/2] add-patch: compare object id Ghanshyam Thakkar
2024-01-28 18:11 ` [RFC PATCH 1/2] add-patch: compare object id instead of literal string Ghanshyam Thakkar
2024-01-29 11:48 ` Patrick Steinhardt
2024-01-30 6:39 ` Ghanshyam Thakkar
2024-01-30 16:42 ` Junio C Hamano
2024-01-29 18:27 ` Junio C Hamano
2024-01-29 18:58 ` Junio C Hamano
2024-01-30 5:35 ` Ghanshyam Thakkar
2024-01-28 18:11 ` [RFC PATCH 2/2] checkout: remove HEAD special case Ghanshyam Thakkar
2024-01-29 11:48 ` Patrick Steinhardt
2024-02-02 15:03 ` [PATCH v2 0/2] add-patch: Support '@' as a synonym for 'HEAD' Ghanshyam Thakkar
2024-02-02 15:03 ` [PATCH v2 1/2] add-patch: remove non-relevant NEEDSWORK comment Ghanshyam Thakkar
2024-02-02 15:03 ` [PATCH v2 2/2] add-patch: classify '@' as a synonym for 'HEAD' Ghanshyam Thakkar
2024-02-02 17:08 ` Junio C Hamano
2024-02-02 17:43 ` Junio C Hamano
2024-02-02 17:53 ` Ghanshyam Thakkar
2024-02-02 17:51 ` Ghanshyam Thakkar
2024-02-02 17:31 ` [PATCH v2 0/2] add-patch: Support " Ghanshyam Thakkar
2024-02-03 11:25 ` [PATCH v3 0/2] add-patch: " Ghanshyam Thakkar
2024-02-06 22:50 ` [PATCH v4 0/3] '@' as a synonym for 'HEAD' in patch mode Ghanshyam Thakkar
2024-02-11 20:20 ` [PATCH v5 0/2] add-patch: classify '@' as a synonym for 'HEAD' Ghanshyam Thakkar
2024-02-13 0:05 ` [PATCH v6 " Ghanshyam Thakkar
2024-02-14 11:06 ` Phillip Wood
2024-02-13 0:05 ` [PATCH v6 1/2] " Ghanshyam Thakkar
2024-02-13 0:05 ` [PATCH v6 2/2] add -p tests: remove PERL prerequisites Ghanshyam Thakkar
2024-02-11 20:20 ` [PATCH v5 1/2] add-patch: classify '@' as a synonym for 'HEAD' Ghanshyam Thakkar
2024-02-12 21:45 ` Junio C Hamano
2024-02-11 20:20 ` [PATCH v5 2/2] add -p tests: remove PERL prerequisites Ghanshyam Thakkar
2024-02-06 22:50 ` [PATCH v4 1/3] add-patch: remove unnecessary NEEDSWORK comment Ghanshyam Thakkar
2024-02-07 10:51 ` Phillip Wood
2024-02-06 22:50 ` [PATCH v4 2/3] add-patch: classify '@' as a synonym for 'HEAD' Ghanshyam Thakkar
2024-02-07 1:05 ` Junio C Hamano
2024-02-07 10:38 ` Phillip Wood [this message]
2024-02-09 15:57 ` Ghanshyam Thakkar
2024-02-06 22:50 ` [PATCH v4 3/3] add -p tests: remove Perl prerequisite Ghanshyam Thakkar
2024-02-07 10:50 ` Phillip Wood
2024-02-07 13:51 ` Phillip Wood
2024-02-07 16:02 ` Junio C Hamano
2024-02-07 16:58 ` Eric Sunshine
2024-02-03 11:25 ` [PATCH v3 1/2] add-patch: remove unnecessary NEEDSWORK comment Ghanshyam Thakkar
2024-02-03 11:25 ` [PATCH v3 2/2] add-patch: classify '@' as a synonym for 'HEAD' Ghanshyam Thakkar
2024-02-03 22:33 ` Junio C Hamano
2024-02-05 15:14 ` Ghanshyam Thakkar
2024-02-05 16:37 ` Phillip Wood
2024-02-05 20:38 ` Ghanshyam Thakkar
2024-02-05 23:07 ` 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
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=1aabcaec-7266-40f8-b7ce-e82b8df58891@gmail.com \
--to=phillip.wood123@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=phillip.wood@dunelm.org.uk \
--cc=ps@pks.im \
--cc=shyamthakkar001@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.
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).