Fix rebase autostash #52
Closed
Conversation
This file contains 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
We already called that function at this point, and stored the result in the `path` variable. We might just as well use it ;-) Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
It was reported by Gábor Szeder and analyzed by Alban Gruin that the
built-in rebase stores only abbreviated stash hashes in the `autostash`
file.
This is problematic e.g. in t5520-pull.sh, where the abbreviated hash is
so short that it sometimes consists only of digits, which are
subsequently mistaken ("DWIMmed") for numbers by `git stash apply`.
Let's align the behavior of the built-in rebase with the scripted rebase
and store the full stash hash instead. That makes it a lot less likely
that it consists only of digits.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
|
/submit |
|
Submitted as pull.52.git.gitgitgadget@gmail.com |
|
/submit |
|
An error occurred while submitting: Error: d3b47a4 was already submitted |
When `git stash apply <argument>` sees an argument that consists only of
digits, it tries to be smart and interpret it as `stash@{<number>}`.
Unfortunately, an all-digit hash (which is unlikely but still possible)
is therefore misinterpreted as `stash@{<n>}` reflog.
To prevent that from happening, let's append `^0` after the stash hash,
to make sure that it is interpreted as an OID rather than as a number.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
dscho
force-pushed
the
fix-rebase-autostash
branch
from
d3b47a4
to
07140a7
Compare
|
/submit |
|
Submitted as pull.52.v2.git.gitgitgadget@gmail.com |
|
This patch series was integrated into pu via git@498042f. |
|
This patch series was integrated into next via git@680e648. |
|
This patch series was integrated into pu via git@b78c5fe. |
|
This patch series was integrated into next via git@b78c5fe. |
|
This patch series was integrated into master via git@b78c5fe. |
|
Closed via b78c5fe. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Gábor reported in https://public-inbox.org/git/20181019124625.GB30222@szeder.dev/ that
t5520-pull.shfails from time to time, and Alban root-caused this to a bug in the built-in rebase.This patch series fixes that, and while at it also fixes an oversight of yours truly when helping Pratik with his GSoC project, and it also adds a change on top that makes really, really certain that
git stash applyinterprets the OID passed to it correctly (as opposed to an insanely large number for thestashreflog).Please note that I based these patches on top of
next(they might be most appropriately applied on top ofrebase-in-c-6-final, though).(Sorry for the v2, v1 did not send due to an UTF-8 character in the Cc: list, a bug that still needs to be fixed in GitGitGadget.)
Cc: SZEDER Gabor szeder.dev@gmail.com, Alban Gruin alban.gruin@gmail.com