From cdbc48c4771d8cbcbed3262a037c27e5e6f5c377 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 21 Feb 2017 13:04:25 -0800 Subject: Revert "parse-remote: remove reference to unused op_prep" This reverts commit 1a7e780f0dd7bea62aedd7bb57cd1df70bb4c3bd, because we have no way of knowing how many third-party scripts dot-source this scriptlet and rely on the current behaviour. Without first breaking them, that is. Breaking them first and having to deal with fallout is not worth our effort. The only thing leaving this otherwise unused parameter in may hurt is the performance, which does not matter in this error codepath. --- git-parse-remote.sh | 3 ++- git-rebase.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/git-parse-remote.sh b/git-parse-remote.sh index 9698a05c3b..d3c39980f3 100644 --- a/git-parse-remote.sh +++ b/git-parse-remote.sh @@ -56,7 +56,8 @@ get_remote_merge_branch () { error_on_missing_default_upstream () { cmd="$1" op_type="$2" - example="$3" + op_prep="$3" # FIXME: op_prep is no longer used + example="$4" branch_name=$(git symbolic-ref -q HEAD) display_branch_name="${branch_name#refs/heads/}" # If there's only one remote, use that in the suggestion diff --git a/git-rebase.sh b/git-rebase.sh index 780655e247..48d7c5ded4 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -452,7 +452,7 @@ then then . git-parse-remote error_on_missing_default_upstream "rebase" "rebase" \ - "git rebase $(gettext '')" + "against" "git rebase $(gettext '')" fi test "$fork_point" = auto && fork_point=t -- cgit v1.2.1