@matheusbsbs / matheus-bagliano / commits / 3b21a438c9
Fork 0

rebase: use explicit "--" with checkout

In the case of a ref/pathname conflict, checkout will already do the right thing and checkout the ref. However, for a non-existant ref, this has two advantages: 1. If a file with that pathname exists, rebase will refresh the file from the index and then rebase the current branch instead of producing an error. 2. If no such file exists, the error message using an explicit "--" is better: # before $ git rebase -i origin bogus error: pathspec 'bogus' did not match any file(s) known to git. Could not checkout bogus # after $ git rebase -i origin bogus fatal: invalid reference: bogus Could not checkout bogus The problems seem to be trigger-able only through "git rebase -i", as regular git-rebase checks the validity of the branch parameter as a ref very early on. However, it doesn't hurt to be defensive. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed Jan 26, 2011 at 19:26 UTC 3b21a438c99b38c772247201d30b7ee80b278463
2 files changed +2 -2
git-rebase--interactive.sh
+1 -1
@@ -870,7 +870,7 @@ first and then run 'git rebase --continue' again."
870
871 if test ! -z "$1"
872 then
873 - output git checkout "$1" ||
873 + output git checkout "$1" -- ||
874 die "Could not checkout $1"
875 fi
876
git-rebase.sh
+1 -1
@@ -522,7 +522,7 @@ then
522 if test -z "$force_rebase"
523 then
524 # Lazily switch to the target branch if needed...
525 - test -z "$switch_to" || git checkout "$switch_to"
525 + test -z "$switch_to" || git checkout "$switch_to" --
526 say "Current branch $branch_name is up to date."
527 exit 0
528 else