Re: What's cooking in git.git (Dec 2017, #03; Wed, 13)
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Dec 14, 2017, 21:08 UTC
- Message-ID
- <xmqq1sjxt3tz.fsf@gitster.mtv.corp.google.com>
- In-Reply-To
- <xmqqk1xpusyh.fsf@gitster.mtv.corp.google.com>
Junio C Hamano <gitster@pobox.com> writes:
> I think you only sent 3/3 in newer rounds, which made it not to > apply to my tree. If you meant to drop changes in 1/3 and 2/3, > perhaps because they were needless churn, then 3/3 needs to be > updated not to depend on the changes these two made.
Here is what I reconstructed to suit my taste better ;-)
-- >8 -- From: Kaartic Sivaraam <kaartic.sivaraam@gmail.com> Date: Mon, 27 Nov 2017 22:51:02 +0530 Subject: [PATCH v4 1/3] rebase: consistently use branch_name variable
The variable "branch_name" holds the <branch> parameter in "git rebase <upstream> <branch>", but one codepath did not use it after assigning $1 to it (instead it kept using $1). Make it use the variable consistently.
Also, update an error message to say there is no such branch or commit, as we are expecting either of them, and not limiting ourselves to a branch name.
Signed-off-by: Kaartic Sivaraam <kaartic.sivaraam@gmail.com> --- git-rebase.sh | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/git-rebase.sh b/git-rebase.sh index 60b70f3def..5526b17a36 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -528,15 +528,18 @@ case "$#" in branch_name="$1" switch_to="$1" - if git show-ref --verify --quiet -- "refs/heads/$1" && - orig_head=$(git rev-parse -q --verify "refs/heads/$1") + # Is it a local branch? + if git show-ref --verify --quiet -- "refs/heads/$branch_name" && + orig_head=$(git rev-parse -q --verify "refs/heads/$branch_name") then - head_name="refs/heads/$1" - elif orig_head=$(git rev-parse -q --verify "$1") + head_name="refs/heads/$branch_name" + # If not is it a valid ref (branch or commit)? + elif orig_head=$(git rev-parse -q --verify "$branch_name") then head_name="detached HEAD" + else - die "$(eval_gettext "fatal: no such branch: \$branch_name")" + die "$(eval_gettext "fatal: no such branch/commit: \$branch_name")" fi ;; 0) @@ -547,7 +550,7 @@ case "$#" in branch_name=$(expr "z$branch_name" : 'zrefs/heads/\(.*\)') else head_name="detached HEAD" - branch_name=HEAD ;# detached + branch_name=HEAD fi orig_head=$(git rev-parse --verify HEAD) || exit ;;
-- 2.15.1-554-g7ec1e7e2b9