From: Junio C Hamano <gitster@pobox.com>
To: Charvi Mendiratta <charvi077@gmail.com>
Cc: git <git@vger.kernel.org>,
Christian Couder <christian.couder@gmail.com>,
Phillip Wood <phillip.wood123@gmail.com>,
Christian Couder <chriscool@tuxfamily.org>,
Phillip Wood <phillip.wood@dunelm.org.uk>
Subject: Re: [PATCH v2 2/6] commit: add amend suboption to --fixup to create amend! commit
Date: Fri, 26 Feb 2021 11:32:30 -0800 [thread overview]
Message-ID: <xmqqczwmsjzl.fsf@gitster.g> (raw)
In-Reply-To: <CAPSFM5eKnqOhDrZWEd-c_sDNMbQkqtMwpFM0zT-gOVHvMtcZnQ@mail.gmail.com> (Charvi Mendiratta's message of "Fri, 26 Feb 2021 16:08:29 +0530")
> subject of head
> body of head
>
> So, I am not sure about the other option to implement it ?
Thaks, and OK.
>> > + if (have_option_m)
>> > + die(_("cannot combine -m with --fixup:%s"), fixup_message);
>> > + else
>> > + prepare_amend_commit(commit, &sb, &ctx);
>>
>> Hmph, why is -m so special? Should we allow --fixup=amend:<cmd>
>> with -F (or -c/-C for that matter), or are these other options
>> caught at a lot higher layer already and we do not have to check
>> them here?
>
> yes, those options are caught earlier and give the error as below:
> "Only one of -c/-C/-F/--fixup can be used."
> and only `-m` is checked over here.
And the reason why -m cannot be checked early is because we do not
recognize which kind of "fixup" we are doing when "only one of
-c/-C/-F/--fixup" check is made before this function is called?
OK. I wonder if we can tell which kind of fixup we are doing much
earlier, though. Then we could extend it to say "Only one of
-c/-C/-F/-m/--fixup=amend:<commit> can be used", etc., and we do not
have to have this "only -m is checked here, everything else is
checked earlier" curiosity. But I do not know if such a change is
necessarily an improvement. I guess a better "fix" would probably
be to add a comment to this function where it only checks for "-m"
and tell readers why -c/-C/-F do not have to be checked here.
Thanks.
next prev parent reply other threads:[~2021-02-26 19:33 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-17 7:29 [PATCH 0/6][Outreachy] commit: Implementation of "amend!" commit Charvi Mendiratta
2021-02-17 7:37 ` [PATCH 1/6] sequencer: export subject_length() Charvi Mendiratta
2021-02-17 7:37 ` [PATCH 2/6] commit: add amend suboption to --fixup to create amend! commit Charvi Mendiratta
2021-02-17 19:49 ` Junio C Hamano
2021-02-18 10:13 ` Charvi Mendiratta
2021-02-18 19:18 ` Junio C Hamano
2021-02-18 20:37 ` Junio C Hamano
2021-02-19 6:10 ` Charvi Mendiratta
2021-02-19 6:09 ` Charvi Mendiratta
2021-02-20 3:15 ` Junio C Hamano
2021-02-21 6:35 ` Charvi Mendiratta
2021-02-21 7:05 ` Junio C Hamano
2021-02-21 9:20 ` Charvi Mendiratta
2021-02-22 17:35 ` Junio C Hamano
2021-02-23 6:05 ` Charvi Mendiratta
2021-02-17 7:37 ` [PATCH 3/6] commit: add a reword suboption to --fixup Charvi Mendiratta
2021-02-17 19:56 ` Junio C Hamano
2021-02-18 10:14 ` Charvi Mendiratta
2021-02-17 7:37 ` [PATCH 4/6] t7500: add tests for --fixup[amend|reword] options Charvi Mendiratta
2021-02-17 19:59 ` Junio C Hamano
2021-02-18 10:15 ` Charvi Mendiratta
2021-02-18 19:26 ` Junio C Hamano
2021-02-19 6:10 ` Charvi Mendiratta
2021-02-17 7:37 ` [PATCH 5/6] t3437: use --fixup with options to create amend! commit Charvi Mendiratta
2021-02-17 7:37 ` [PATCH 6/6] doc/git-commit: add documentation for fixup[amend|reword] options Charvi Mendiratta
2021-02-18 19:23 ` Junio C Hamano
2021-02-19 6:09 ` Charvi Mendiratta
2021-02-23 19:55 ` [PATCH 0/6][Outreachy] commit: Implementation of "amend!" commit Junio C Hamano
2021-02-24 5:54 ` Charvi Mendiratta
2021-02-25 10:08 ` [PATCH v2 " Charvi Mendiratta
2021-02-25 10:08 ` [PATCH v2 1/6] sequencer: export subject_length() Charvi Mendiratta
2021-02-25 10:08 ` [PATCH v2 2/6] commit: add amend suboption to --fixup to create amend! commit Charvi Mendiratta
2021-02-25 21:00 ` Junio C Hamano
2021-02-26 10:38 ` Charvi Mendiratta
2021-02-26 19:32 ` Junio C Hamano [this message]
2021-02-27 4:56 ` Charvi Mendiratta
2021-02-25 10:08 ` [PATCH v2 3/6] commit: add a reword suboption to --fixup Charvi Mendiratta
2021-02-25 20:32 ` Junio C Hamano
2021-02-26 10:35 ` Charvi Mendiratta
2021-02-25 10:09 ` [PATCH v2 4/6] t7500: add tests for --fixup=[amend|reword] options Charvi Mendiratta
2021-02-25 10:09 ` [PATCH v2 5/6] t3437: use --fixup with options to create amend! commit Charvi Mendiratta
2021-02-25 10:09 ` [PATCH v2 6/6] doc/git-commit: add documentation for fixup=[amend|reword] options Charvi Mendiratta
2021-02-25 20:48 ` Junio C Hamano
2021-02-26 10:36 ` Charvi Mendiratta
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=xmqqczwmsjzl.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=charvi077@gmail.com \
--cc=chriscool@tuxfamily.org \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=phillip.wood123@gmail.com \
--cc=phillip.wood@dunelm.org.uk \
/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.