diff options
| author | Siddharth Kannan <kannan.siddharth12@gmail.com> | 2017-02-04 14:31:03 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-02-06 10:18:20 -0800 |
| commit | 1a7e780f0dd7bea62aedd7bb57cd1df70bb4c3bd (patch) | |
| tree | efcc8ce4e75e248ab2274061e60f02a42fa66101 | |
| parent | 6e3a7b3398559305c7a239a42e447c21a8f39ff8 (diff) | |
| download | git-1a7e780f0dd7bea62aedd7bb57cd1df70bb4c3bd.tar.gz | |
parse-remote: remove reference to unused op_prep
The 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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | git-parse-remote.sh | 3 | ||||
| -rwxr-xr-x | git-rebase.sh | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/git-parse-remote.sh b/git-parse-remote.sh index d3c39980f3..9698a05c3b 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 48d7c5ded4..780655e247 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" \ - "against" "git rebase $(gettext '<branch>')" + "git rebase $(gettext '<branch>')" fi test "$fork_point" = auto && fork_point=t |