Re: [PATCH] git-p4 - Add option --sha1 to submit in p4

From: Luke Diamand <luke@diamand.org>
Date: May 2, 2018, 18:53 UTC
Message-ID: <CAE5ih7-=SUaL+VUTNJ0W5x44U7UeRqLhWSCtP5X4mwCF-qSdBw@mail.gmail.com>
In-Reply-To: <1093388937.5389750.1525276285911@mail.yahoo.com>

On 2 May 2018 at 16:51, Merland Romain <merlorom@yahoo.fr> wrote:

> Thanks Luke,
>
> Following your comments, I will:
> - change the option name to --commit if it suits you

Seems like a good name.

> - add an option --force-rebase which defaults to false. Setting it to true
> will rebase even with --commit option used.

Or "--disable-rebase" ? I think there's no reason you couldn't rebase after doing a commit like this is there?

And "--disable-rebase" would be useful generally, not just with the --commit option, but also with the regular options.

"--force-rebase" is a bit confusing since for the normal flow, it always rebases anyway, and there's no need to force!

But you're the one who is using this in anger, so your opinion likely counts for more than mine!

> it can be useful too if some commits have been skipped and user wants to
> rebase anyway
> - add an entry in the documentation
> - (learn how to create a test and) add tests for these specific cases

To create a test just look in t/ for the t98*.sh files. Cut-n-paste one or add to an existing one. Send an email here if you get stuck (but it's pretty straightforward).

You can run only the git-p4 tests with:

$ (cd t && make T=t98* -j)

>
> What is the best practice ? to send a new email with the new diff ? to
> continue this discussion ?

I think either, probably a new email is easiest. See Documentation/SubmittingPatches for the general process.

Regards! Luke