diff options
| author | Paul Tan <pyokagan@gmail.com> | 2015-06-02 22:22:52 +0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-02 13:36:22 -0700 |
| commit | eb2a8d9ed3fca2ba2f617b704992d483605f3bb6 (patch) | |
| tree | 1fb26b8369f33f0db94d36d91742d221c74b67b4 /t/t5521-pull-options.sh | |
| parent | 2c9c1c517896ece5003489adac6eaae5f7ad27b3 (diff) | |
| download | git-eb2a8d9ed3fca2ba2f617b704992d483605f3bb6.tar.gz | |
pull: handle git-fetch's options as well
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:
* error_on_no_merge_candidates() uses the number of positional
parameters to determine which error message to print out, and will
thus print the wrong message if git-fetch's options are passed in as
well.
* the call to get_remote_merge_branch() assumes that the positional
parameters only contains the optional repo and refspecs, and will
thus silently fail if git-fetch's options are passed in as well.
* --dry-run is a valid git-fetch option, but if provided after any
git-fetch options, it is not recognized by git-pull and thus git-pull
will continue to run the merge or rebase.
Fix these bugs by teaching git-pull to parse git-fetch's options as
well. Add tests to prevent regressions.
This removes the limitation where git-fetch's options have to come after
git-merge's and git-rebase's options on the command line. Update the
documentation to reflect this.
Signed-off-by: Paul Tan <pyokagan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5521-pull-options.sh')
| -rwxr-xr-x | t/t5521-pull-options.sh | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/t/t5521-pull-options.sh b/t/t5521-pull-options.sh index 56e7377189..18372caa15 100755 --- a/t/t5521-pull-options.sh +++ b/t/t5521-pull-options.sh @@ -130,4 +130,18 @@ test_expect_success 'git pull --dry-run' ' ) ' +test_expect_success 'git pull --all --dry-run' ' + test_when_finished "rm -rf cloneddry" && + git init clonedry && + ( + cd clonedry && + git remote add origin ../parent && + git pull --all --dry-run && + test_path_is_missing .git/FETCH_HEAD && + test_path_is_missing .git/refs/remotes/origin/master && + test_path_is_missing .git/index && + test_path_is_missing file + ) +' + test_done |