git: Avoid resetting Git index when trees are identical #3767
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
mlcui-corp
commented
May 27, 2024
yuja
approved these changes
May 27, 2024
mlcui-corp
added a commit
to mlcui-corp/jj
that referenced
this pull request
May 28, 2024
This shares some common code to both the root and the non-root case, and provides easier access to `mut_repo` in the function - as `set_git_head_target` mutably borrows `mut_repo`. This will be used for a cleaner implementation of jj-vcs#3767.
mlcui-corp
added a commit
to mlcui-corp/jj
that referenced
this pull request
May 28, 2024
This shares some common code to both the root and the non-root case, and provides easier access to `mut_repo` in the function - as `set_git_head_target` mutably borrows `mut_repo`. This will be used for a cleaner implementation of jj-vcs#3767.
mlcui-corp
force-pushed
the
push-tmmpsusnvoku
branch
from
aea276b to
d799707
Compare
4 tasks
mlcui-corp
changed the title
mlcui-corp
changed the title
|
DO NOT SUBMIT until #3774 is merged. |
mlcui-corp
force-pushed
the
push-tmmpsusnvoku
branch
from
d799707 to
3149f83
Compare
mlcui-corp
added a commit
that referenced
this pull request
May 29, 2024
This shares some common code to both the root and the non-root case, and provides easier access to `mut_repo` in the function - as `set_git_head_target` mutably borrows `mut_repo`. This will be used for a cleaner implementation of #3767.
This accounts for commit message-only changes which do not change the tree ID, as well as checkouts between commits with identical tree contents. See jj-vcs#3748 for previous work on avoiding resetting HEAD when the *commits* are identical.
mlcui-corp
force-pushed
the
push-tmmpsusnvoku
branch
from
3149f83 to
ec3d391
Compare
|
Please take another look, thanks! This should be much cleaner now. |
yuja
approved these changes
May 29, 2024
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.
This accounts for commit message-only changes which do not change the tree ID, as well as checkouts between commits with identical tree contents.
See #3748 for previous work on avoiding resetting HEAD when the commits are identical.
Checklist
If applicable:
CHANGELOG.md