git-pr-merge: Fix ambiguous git rev-list invocation #34
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
Add a `--` to the end of `git rev-list` to ensure it works unambiguously
when the feature branch name is the same as a file in the root of the
repo.
This failed with:
$ git rev-list --count firebase '^main'
fatal: ambiguous argument 'firebase': both revision and filename
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'
where `firebase` was the branch name and also a top-level directory.
Use long options for all `git` and `gh` options, and change the use of `git checkout` to `git switch`, as `checkout` can be ambiguous with branches and filenames. `switch` is not ambiguous as it deals only with switching branches and not checking out individual files.
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.
Add a
--to the end ofgit rev-listto ensure it works unambiguouslywhen the feature branch name is the same as a file in the root of the repo.
This failed with:
where
firebasewas the branch name and also a top-level directory.While we're here, make the script a little more robust by using
git switchinstead of
git checkout, which can have the same branch/filename ambiguity.Also use long options for git/gh commands for clarity.