This repository has been archived by the owner on Nov 1, 2022. It is now read-only.
Desambiguate revisions and files when invoking git
#1829
Merged
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
User Git repositories may use the same name for: * A file and a branch used by Flux * A file and the tag used by Flux for syncing For instance: ``` ts=2019-03-13T19:36:40.432679542Z caller=loop.go:90 component=sync-loop err="fatal: ambiguous argument 'staging': both revision and filename" ``` (See https://weave-community.slack.com/archives/C4U5ATZ9S/p1552505808477700?thread_ts=1552504490.476100&cid=C4U5ATZ9S ) This change removes that ambiguity by appending `--` at the right places when invoking `git`. In a few cases we were only appending it when adding files at the end, which wasn't correct.
hiddeco
approved these changes
Mar 14, 2019
|
Good catch, @dcondomitti. A lot of people probably got lucky with their choice of filenames vs refs here. |
|
Thanks for the quick fix! 👍 |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
User Git repositories may use the same name for:
For instance:
(See https://weave-community.slack.com/archives/C4U5ATZ9S/p1552505808477700?thread_ts=1552504490.476100&cid=C4U5ATZ9S )
This change removes that ambiguity by appending
--at the right places when invokinggit.In a few cases we were only appending it when adding files at the end, which wasn't correct.