Skip to content

fix 1428#1448

Merged
Byron merged 3 commits intomainfrom
fix-1428
Jul 9, 2024
Merged

fix 1428#1448
Byron merged 3 commits intomainfrom
fix-1428

Conversation

@Byron
Copy link
Member

@Byron Byron commented Jul 9, 2024

Tasks

  • reproduce by hand
    • cargo run --bin gix -- remote -n https://github.com/promised-ai/rv ref-map 'refs/heads/*:refs/remotes/origin/*' HEAD:refs/remotes/origin/HEAD
  • see if unit-test is easy enough
  • try trivial fix

Fixes #1428

Notes

  • cargo run --bin gix -- remote -n $PWD ref-map 'refs/heads/*:refs/remotes/origin/*' HEAD:refs/remotes/origin/HEAD would still fail with this error message as the fix is only applied during clone in the form of a retry. It's unclear for now how to more properly fix this so it doesn't do extra work in this case and generally has no issue with this. Unless of course, one would want to add another intermediate step that allows to introspect the available remote references before adding a refspec that would cause this conflict.

@Byron Byron force-pushed the fix-1428 branch 2 times, most recently from 76615a5 to 7953829 Compare July 9, 2024 13:41
@Byron Byron marked this pull request as ready for review July 9, 2024 13:41
@Byron Byron merged commit caae926 into main Jul 9, 2024
@Byron Byron deleted the fix-1428 branch July 9, 2024 14:50
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.

gix cannot clone a repo with a branch called HEAD

1 participant