Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Revert "Merge branch 'make-builtin-stash-and-rebase-opt-ins'"#35

Closed
derrickstolee wants to merge 2 commits intomicrosoft:gvfs-2.19.0microsoft/git:gvfs-2.19.0from
derrickstolee:rebase-run-commandderrickstolee/git:rebase-run-commandCopy head branch name to clipboard
Closed

Revert "Merge branch 'make-builtin-stash-and-rebase-opt-ins'"#35
derrickstolee wants to merge 2 commits intomicrosoft:gvfs-2.19.0microsoft/git:gvfs-2.19.0from
derrickstolee:rebase-run-commandderrickstolee/git:rebase-run-commandCopy head branch name to clipboard

Conversation

@derrickstolee
Copy link

This reverts commit cec98c6, reversing
changes made to 0bccc7f.

This removes the builtin rebase/stash operations until we can figure out how to make them work well with post-command hooks.

This reverts commit d96bb8b, reversing
changes made to fde33e2.
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
@derrickstolee
Copy link
Author

@dscho This reverts the builtin stash/rebase stuff because it interacts badly with the post-command hooks (on Mac). At this point, it is probably safest to revert it for the next release and harden this interaction before the next release. @jrbriggs thoughts?

@dscho
Copy link
Member

dscho commented Oct 12, 2018

Shouldn't we rather change the sane_execvp() call by something like exit(run_command_v_opt(...))? (Same in stash.c)

@derrickstolee
Copy link
Author

Abandoning in favor of #36

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

Morty Proxy This is a proxified and sanitized view of the page, visit original site.