builtin/commit: replace sequencer_in_use/rebase_in_progress combo by an enum

[dscho]

In 116a408, I introduced the variable rebase_in_progress to be able to discern between the situation where a git cherry-pick operation resulted in an empty patch vs a git rebase operation.

Junio pointed out in https://public-inbox.org/git/xmqqr234i2q0.fsf@gitster-ct.c.googlers.com/ that these variables should probably be combined into a single enum that has three states:

• regular commit
• interrupted rebase
• interrupted cherry-pick

While at it, we should probably see whether we need to take care of git revert, too: it also could result in an empty patch.

[Fmstrat]

I'd like to take this on. (and am testing a patch)

[Fmstrat]

@dscho So I wrote a patch that does this, however the DCO is proving problematic. GitHub is giving me the message saying there is no signoff, but I think it is because my GitHub username is not my full name (Full name is mentioned as the requirement in the SubmittingPatches doc).

Should I allow it to use Fmstrat instead of my full name?

#531

[dscho]

however the DCO is proving problematic. GitHub is giving me the message saying there is no signoff, but I think it is because my GitHub username is not my full name (Full name is mentioned as the requirement in the SubmittingPatches doc).

Can you make sure that your user.name and user.email are set correctly, and then call git commit --amend --reset-author, then force-push? That should pacify the DCO bot.

[Fmstrat]

So now that the PR is approved, out of curiosity (having never contributed to git) what is the standard timeline for GitGitGadget's push to the mailing list and follow through? edit Nvm, I took a look at closed PRs and unsurprisingly it varies based on severity and complexity ;)

And is this the best place to continue to look for issues I can contribute through? (I wasn't sure if the issue tracker here was the master list)

[dscho]

So now that the PR is approved

That means nothing ;-)

what is the standard timeline for GitGitGadget's push to the mailing list and follow through?

Well, at first you will have to /submit it (as described in GitGitGadget's welcome message)... before that, your contribution was not seen by the Git mailing list (my review on GitHub does not count, the Git project is not run on GitHub, this repository is a mere mirror of the official repository at git://git.kernel.org/pub/scm/git/git.git/).

[phillipwood]

This is already addressed in pu by pw/advise-rebase-skip

[phil-blain]

@dscho I think this issue can be closed :)