diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-02-21 13:04:25 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-02-21 13:04:25 -0800 |
| commit | cdbc48c4771d8cbcbed3262a037c27e5e6f5c377 (patch) | |
| tree | 77f361b3be31439b6e5e654f766cc071dcd711f5 | |
| parent | 1a7e780f0dd7bea62aedd7bb57cd1df70bb4c3bd (diff) | |
| download | git-sk/parse-remote-cleanup.tar.gz | |
Revert "parse-remote: remove reference to unused op_prep"sk/parse-remote-cleanup
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.
| -rw-r--r-- | git-parse-remote.sh | 3 | ||||
| -rwxr-xr-x | 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 '<branch>')" + "against" "git rebase $(gettext '<branch>')" fi test "$fork_point" = auto && fork_point=t |