From: Paul Tan Date: Tue, 02 Jun 2015 14:22:51 GMT Subject: [PATCH v2 0/2] Improve git-pull's option parsing Message-ID: <1433254973-13797-1-git-send-email-pyokagan@gmail.com> This is a re-roll of [v1]. Thanks Johannes for the reviews last round. Previous versions: [v1] http://thread.gmane.org/gmane.comp.version-control.git/269249 This patch series is based on pt/pull-tests. While parsing the command-line arguments, git-pull stops parsing at the first unrecognized option, assuming that any subsequent options are for git-fetch, and can thus be kept in the shell's positional parameters list, so that it can be passed to git-fetch via the expansion of "$@". However, certain functions in git-pull assume that the positional parameters do not contain any options. Fix this by making git-pull handle git-fetch's options as well at the option parsing stage. With this change in place, we can move on to migrate git-pull to use git-rev-parse --parseopt such that its option parsing is consistent with the other git commands. I believe this is the last required behavior change for my rewrite of git-pull.sh to C. Paul Tan (2): pull: handle git-fetch's options as well pull: use git-rev-parse --parseopt for option parsing Documentation/git-pull.txt | 3 -- git-pull.sh | 128 +++++++++++++++++++++++++++++++-------------- t/t5520-pull.sh | 20 +++++++ t/t5521-pull-options.sh | 14 +++++ 4 files changed, 122 insertions(+), 43 deletions(-) -- 2.1.4