From: Jeff King Date: Thu, 27 Jan 2011 00:26:59 +0000 (-0500) Subject: rebase: use explicit "--" with checkout X-Git-Tag: ko-maint~4 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=3b21a438c99b38c772247201d30b7ee80b278463;p=git.git 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 Signed-off-by: Junio C Hamano --- diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index a27952d9f..20ebd097d 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -870,7 +870,7 @@ first and then run 'git rebase --continue' again." if test ! -z "$1" then - output git checkout "$1" || + output git checkout "$1" -- || die "Could not checkout $1" fi diff --git a/git-rebase.sh b/git-rebase.sh index 6a7e5e0b1..1f42fb75e 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -522,7 +522,7 @@ then if test -z "$force_rebase" then # Lazily switch to the target branch if needed... - test -z "$switch_to" || git checkout "$switch_to" + test -z "$switch_to" || git checkout "$switch_to" -- say "Current branch $branch_name is up to date." exit 0 else