Updated git-subtree.sh to handle annotated tags #9
Conversation
This file contains hidden or 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
Command was using tag SHA1 key although it should dereference the tag for certain commit before running the 'git subtree pull'. Below example that triggered the issue # Pull older version of ofc_lib >git subtree pull -P plesiosync_lib/ip/ofc_lib ofc_lib ofc_lib-v0.3 --squash -d # Hack sub-project in super-project >xemacs -nw plesiosync_lib/ip/ofc_lib/src/overflowcontrol.vhdl >git commit -am "testing hack" # Pull latest ofc-lib >git subtree pull -P plesiosync_lib/ip/ofc_lib ofc_lib ofc_lib-v0.7 --squash -d # Resolve conflict >git mergetool >git commit # Check the commit id for ofc_lib >git subtree split -P plesiosync_lib/ip/ofc_lib fatal: 7e5957c2b61a46221b9c02c43e1f9c3925eacb76 is not a valid 'commit' object Can't copy commit 2ff99337166eb08db236828cce4384430390a37c The hash key in fatal line is the annotateg tag key and not the actual commit key.
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.
Command was using tag SHA1 key although it should dereference the tag for certain commit before running the 'git subtree pull'.
Below example that triggered the issue
Pull older version of ofc_lib
The hash key in fatal line is the annotateg tag key and not the actual commit key.