-
Notifications
You must be signed in to change notification settings - Fork 337
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
git.rs: properly abandon commits from moved/deleted branches on remote (
#864) This bug concerns the way `import_refs` that gets called by `fetch` computes the heads that should be visible after the import. Previously, the list of such heads was computed *before* local branches were updated based on changes to the remote branches. So, commits that should have been abandoned based on this update of the local branches weren't properly abandoned. Now, `import_refs` tracks the heads that need to be visible because of some ref in a mapping keyed by the ref. If the ref moves or is deleted, the corresponding heads are updated. Fixes #864
- Loading branch information
Showing
5 changed files
with
27 additions
and
24 deletions.
There are no files selected for viewing
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
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
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
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
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