Built-in stash/rebase fixes #1852
Merged
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
When converting the `stash apply` command, we were missing at least two error messages: when the diff could not be applied with `--index`, we want to suggest to re-run the command without `--index`. While at it, and because we now can, let's also add an error message in the case that the diff could not be generated in the first place (the shell script could not do that, as it piped the output of `git diff` to `git apply`, and there is no portable way to handle errors in the command whose output is redirected). Noticed by Matthew Cheetham. Signed-off-by: Johannes Schindelin <[email protected]>
|
cc @ungps re: "fixup! stash: convert apply to builtin" cc @mjcheetham, too, as he discovered the problem ;-) |
…builtin The `--gpg-sign` option takes an *optional* argument, not a mandatory one. This fixes git-for-windows#1836. Signed-off-by: Johannes Schindelin <[email protected]>
The `--gpg-sign` option takes an *optional* argument, not a mandatory one. This was discovered as part of the investigation of git-for-windows#1836. Signed-off-by: Johannes Schindelin <[email protected]>
dscho
force-pushed
the
built-in-stash-rebase-fixes
branch
5 times, most recently
from
cdeb59b to
126235f
Compare
In Azure Pipelines, a sane setting is to prevent secret variables from being shared with Pull Requests originating from forks. In Git, we use such a secret variable: we want to mount a file share on which previous we store outcomes of previous runs, and avoid re-running known-good phases (both for speed as well as to avoid spending resources unnecessarily). This file share should not be mounted in PRs. Signed-off-by: Johannes Schindelin <[email protected]>
dscho
force-pushed
the
built-in-stash-rebase-fixes
branch
2 times, most recently
from
68ba9e7 to
fb77ec5
Compare
jamill
approved these changes
Sep 27, 2018
dscho
added a commit
to git-for-windows/build-extra
that referenced
this pull request
Sep 27, 2018
Several corner case bugs [were fixed](git-for-windows/git#1852) in the built-in `rebase`/`stash` commands. Signed-off-by: Johannes Schindelin <[email protected]>
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.
Thanks to some battle-testing by adventurous Git for Windows v2.19.0 users, we already discovered a couple of corner cases where the built-in versions did not quite do the job we expected. This PR intends to fix them all ;-)