PatchSeries: use merge base for the --base argument#21
Merged
derrickstolee merged 2 commits intogitgitgadget:mastergitgitgadget/gitgitgadget:masterfrom Jul 16, 2018
dscho:use-merge-base-explicitlydscho/gitgitgadget:use-merge-base-explicitlyCopy head branch name to clipboard
Merged
PatchSeries: use merge base for the --base argument#21derrickstolee merged 2 commits intogitgitgadget:mastergitgitgadget/gitgitgadget:masterfrom dscho:use-merge-base-explicitlydscho/gitgitgadget:use-merge-base-explicitlyCopy head branch name to clipboard
--base argument#21derrickstolee merged 2 commits intogitgitgadget:mastergitgitgadget/gitgitgadget:masterfrom
dscho:use-merge-base-explicitlydscho/gitgitgadget:use-merge-base-explicitlyCopy head branch name to clipboard
Conversation
The `git format-patch` command is really unhappy when we specify a `--base` argument that is not an ancestor of the processed commits. And while there is support for `--base=auto`, that option is absolutely useless for our use case, as it inserts the merge base of the *current* branch and *its upstream*, both of which are of course nonsensical in GitGitGadget's case. So let's just spawn yet another process to get the correct merge base. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
derrickstolee
approved these changes
Jul 16, 2018
Contributor
derrickstolee
left a comment
There was a problem hiding this comment.
I think this is the best way to do it. It gets the right merge-base, with fewer possible mistakes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The
git format-patchcommand is really unhappy when we specify a--baseargument that is not an ancestor of the processed commits.And while there is support for
--base=auto, that option is absolutely useless for our use case, as it inserts the merge base of the current branch and its upstream, both of which are of course nonsensical in GitGitGadget's case.So let's just spawn yet another process to get the correct merge base.
This should address the problem that is holding up gitgitgadget/git#10.