Siddharth KannanThe error_on_missing_default_upstream helper function learned to
take op_prep argument with 15a147e618 ("rebase: use @{upstream}
if no upstream specified", 2011-02-09), but as of 045fac5845
("i18n: git-parse-remote.sh: mark strings for translation",
2016-04-19), the argument is no longer used. Remove it.Signed-off-by: Siddharth Kannan <kannan.siddharth12@gmail.com> --- Thanks a lot for the review, Pranit and Junio! I have made the appropriate changes, and the edit to the file inside contrib/examples/ has been removed from this patch.
git-parse-remote.sh | 3 +-- git-rebase.sh | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-)
Show changes to 2 files +2 −3
git-parse-remote.sh, git-rebase.sh
diff --git a/git-parse-remote.sh b/git-parse-remote.sh index d3c3998..9698a05 100644 --- a/git-parse-remote.sh +++ b/git-parse-remote.sh @@ -56,8 +56,7 @@ get_remote_merge_branch () { error_on_missing_default_upstream () { cmd="$1" op_type="$2" - op_prep="$3" # FIXME: op_prep is no longer used - example="$4" + example="$3" 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 04f6e44..b89f960 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -448,7 +448,7 @@ then then . git-parse-remote error_on_missing_default_upstream "rebase" "rebase" \ - "against" "git rebase $(gettext '<branch>')" + "git rebase $(gettext '<branch>')" fi test "$fork_point" = auto && fork_point=t
-- 2.1.4
