{"thread":{"id":"39357","subject":"[PATCH 00/14] Make git-pull a builtin","startedAt":"2015-05-18T15:05:57Z","lastAt":"2015-06-02T11:26:06Z","messageCount":43,"participants":["Paul Tan","Johannes Schindelin","Junio C Hamano","Stefan Beller"],"isPatch":true,"patchVersion":1,"patchTotal":14},"messages":[{"id":"261452","messageId":"1431961571-20370-1-git-send-email-pyokagan@gmail.com","threadId":"39357","inReplyTo":null,"subject":"[PATCH 00/14] Make git-pull a builtin","fromName":"Paul Tan","fromEmail":"pyokagan@gmail.com","sentAt":"2015-05-18T15:05:57Z","receivedAt":"2015-05-18T15:05:57Z","isPatch":true,"sender":{"key":"pyokagan@gmail.com","avatar":"https://avatars.githubusercontent.com/u/109479?v=4"},"body":"This series directly depends on the changes made in jc/merge and\npt/pull-tests. The commit messages assume that the behavioral changes\nproposed in pt/pull-log-n, pt/pull-tags-error-diag, pt/pull-ff-vs-merge-ff,\nand [1] have been introduced.\n\ngit-pull is a commonly executed command to check for new changes in the\nupstream repository and, if there are, fetch and integrate them into the\ncurrent branch. Currently it is implemented by the shell script git-pull.sh.\nHowever, compared to C, shell scripts have certain deficiencies:\n\n1. Usually have to rely on spawning a lot of processes, which can be slow on\n systems that do not implement copy-on-write semantics.\n\n2. They introduce a lot of dependencies, especially on non-POSIX systems.\n\n3. They cannot take advantage of git's C API and internal caches.\n\nThis series rewrites git-pull.sh into a C builtin, thus improving its\nperformance and portability. It is part of my GSoC project to rewrite git-pull\nand git-am into builtins[2].\n\n[1] http://thread.gmane.org/gmane.comp.version-control.git/269249\n[2] https://gist.github.com/pyokagan/1b7b0d1f4dab6ba3cef1\n\nPaul Tan (14):\n pull: implement fetch + merge\n pull: pass verbosity, --progress flags to fetch and merge\n pull: pass git-merge's options to git-merge\n pull: pass git-fetch's options to git-fetch\n pull: error on no merge candidates\n pull: support pull.ff config\n pull: check if in unresolved merge state\n pull: fast-forward working tree if head is updated\n pull: implement pulling into an unborn branch\n pull: set reflog message\n pull: teach git pull about --rebase\n pull: configure --rebase via branch..rebase or pull.rebase\n pull --rebase: exit early when the working directory is dirty\n pull --rebase: error on no merge candidate cases\n\n Makefile | 2 +-\n advice.c | 8 +\n advice.h | 1 +\n builtin.h | 1 +\n builtin/pull.c | 919 +++++++++++++++++++++++++++++++++++++++++++\n contrib/examples/git-pull.sh | 339 ++++++++++++++++\n git-pull.sh | 339 ----------------\n git.c | 1 +\n 8 files changed, 1270 insertions(+), 340 deletions(-)\n create mode 100644 builtin/pull.c\n create mode 100755 contrib/examples/git-pull.sh\n delete mode 100755 git-pull.sh\n\n-- \n2.1.4\n"},{"id":"261454","messageId":"1431961571-20370-2-git-send-email-pyokagan@gmail.com","threadId":"39357","inReplyTo":"1431961571-20370-1-git-send-email-pyokagan@gmail.com","subject":"[PATCH 01/14] pull: implement fetch + merge","fromName":"Paul Tan","fromEmail":"pyokagan@gmail.com","sentAt":"2015-05-18T15:05:58Z","receivedAt":"2015-05-18T15:05:58Z","isPatch":true,"sender":{"key":"pyokagan@gmail.com","avatar":"https://avatars.githubusercontent.com/u/109479?v=4"},"body":"Start off the rewrite of git-pull.sh to C by implementing a simple\ngit-pull builtin that:\n\n1. Parses the command line arguments into [ [...]]\n\n2. Runs git-fetch, passing the repo and refspecs to it.\n\n3. Runs git-merge FETCH_HEAD.\n\nDue to missing features, several tests are disabled:\n\n* Passing flags to git fetch, rebase, merge:\n\n * t5521: verbosity flags -v, -s\n\n* Passing flags to git-merge, git-rebase:\n\n * t5150, t5572: Pass --ff, --no-ff, --ff-only to git-merge\n\n * t5520, t5521, t7406: Support --rebase, branch.*.rebase and\n pull.rebase config\n\n * t6029, t4013: -s/--strategy\n\n * t6037: -X/--strategy-option\n\n * t5524: --log\n\n* Passing flags to git-fetch:\n\n * t5521: --dry-run\n\n * t5500: --depth\n\n * t5521: --force\n\n * t5521: --all\n\n * t7403: --no-recurse-submodules\n\n* t7601: pull.ff config sets --ff, --no-ff, --ff-only\n\n* t5520: branch.*.rebase or pull.rebase sets --rebase, --rebase=preserve\n\n* t5520: Pulling into void\n\n* t5520: appropriate user-friendly error messages on no merge candidates\n case\n\n* t5520: appropriate user-friendly error messages if index has\n unresolved entries.\n\n* t5520: fast-forward working tree if branch head is updated by\n git-fetch\n\n* t5520: set reflog action to \"pull args...\"\n\nThese features will be re-implemented in succeeding patches.\n\nSigned-off-by: Paul Tan \n---\n Makefile | 2 +-\n builtin.h | 1 +\n builtin/pull.c | 83 +++++++++++\n contrib/examples/git-pull.sh | 339 +++++++++++++++++++++++++++++++++++++++++++\n git-pull.sh | 339 -------------------------------------------\n git.c | 1 +\n t/t4013-diff-various.sh | 3 +\n t/t5150-request-pull.sh | 2 +-\n t/t5500-fetch-pack.sh | 10 +-\n t/t5520-pull.sh | 68 ++++-----\n t/t5521-pull-options.sh | 20 +--\n t/t5524-pull-msg.sh | 2 +-\n t/t5572-pull-submodule.sh | 4 +\n t/t6029-merge-subtree.sh | 6 +-\n t/t6037-merge-ours-theirs.sh | 2 +-\n t/t7403-submodule-sync.sh | 8 +-\n t/t7406-submodule-update.sh | 2 +\n t/t7601-merge-pull-config.sh | 4 +-\n 18 files changed, 495 insertions(+), 401 deletions(-)\n create mode 100644 builtin/pull.c\n create mode 100755 contrib/examples/git-pull.sh\n delete mode 100755 git-pull.sh\n\ndiff --git a/Makefile b/Makefile\nindex 36655d5..51087dc 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -474,7 +474,6 @@ SCRIPT_SH += git-merge-octopus.sh\n SCRIPT_SH += git-merge-one-file.sh\n SCRIPT_SH += git-merge-resolve.sh\n SCRIPT_SH += git-mergetool.sh\n-SCRIPT_SH += git-pull.sh\n SCRIPT_SH += git-quiltimport.sh\n SCRIPT_SH += git-rebase.sh\n SCRIPT_SH += git-remote-testgit.sh\n@@ -876,6 +875,7 @@ BUILTIN_OBJS += builtin/pack-refs.o\n BUILTIN_OBJS += builtin/patch-id.o\n BUILTIN_OBJS += builtin/prune-packed.o\n BUILTIN_OBJS += builtin/prune.o\n+BUILTIN_OBJS += builtin/pull.o\n BUILTIN_OBJS += builtin/push.o\n BUILTIN_OBJS += builtin/read-tree.o\n BUILTIN_OBJS += builtin/receive-pack.o\ndiff --git a/builtin.h b/builtin.h\nindex b87df70..ea3c834 100644\n--- a/builtin.h\n+++ b/builtin.h\n@@ -98,6 +98,7 @@ extern int cmd_pack_redundant(int argc, const char **argv, const char *prefix);\n extern int cmd_patch_id(int argc, const char **argv, const char *prefix);\n extern int cmd_prune(int argc, const char **argv, const char *prefix);\n extern int cmd_prune_packed(int argc, const char **argv, const char *prefix);\n+extern int cmd_pull(int argc, const char **argv, const char *prefix);\n extern int cmd_push(int argc, const char **argv, const char *prefix);\n extern int cmd_read_tree(int argc, const char **argv, const char *prefix);\n extern int cmd_receive_pack(int argc, const char **argv, const char *prefix);\ndiff --git a/builtin/pull.c b/builtin/pull.c\nnew file mode 100644\nindex 0000000..0b771b9\n--- /dev/null\n+++ b/builtin/pull.c\n@@ -0,0 +1,83 @@\n+/*\n+ * Builtin \"git pull\"\n+ *\n+ * Based on git-pull.sh by Junio C Hamano\n+ *\n+ * Fetch one or more remote refs and merge it/them into the current HEAD.\n+ */\n+#include \"cache.h\"\n+#include \"builtin.h\"\n+#include \"parse-options.h\"\n+#include \"argv-array.h\"\n+#include \"run-command.h\"\n+\n+static const char * const pull_usage[] = {\n+\tN_(\"git pull [options] [ [...]]\"),\n+\tNULL\n+};\n+\n+static struct option pull_options[] = {\n+\tOPT_END()\n+};\n+\n+/**\n+ * Parses argv into [ [...]], returning their values in `repo`\n+ * as a string and `refspecs` as a null-terminated array of strings. If `repo`\n+ * is not provided in argv, it is set to NULL.\n+ */\n+static void parse_repo_refspecs(int argc, const char **argv, const char **repo, const char ***refspecs)\n+{\n+\tif (argc > 0) {\n+\t\t*repo = *argv++;\n+\t\targc--;\n+\t} else\n+\t\t*repo = NULL;\n+\t*refspecs = argv;\n+}\n+\n+/**\n+ * Runs git-fetch, returning its exit status. `repo` and `refspecs` are the\n+ * repository and refspecs to fetch, or NULL if they are not provided.\n+ */\n+static int run_fetch(const char *repo, const char **refspecs)\n+{\n+\tstruct argv_array args = ARGV_ARRAY_INIT;\n+\tint ret;\n+\n+\targv_array_pushl(&args, \"fetch\", \"--update-head-ok\", NULL);\n+\tif (repo)\n+\t\targv_array_push(&args, repo);\n+\twhile (*refspecs)\n+\t\targv_array_push(&args, *refspecs++);\n+\tret = run_command_v_opt(args.argv, RUN_GIT_CMD);\n+\targv_array_clear(&args);\n+\treturn ret;\n+}\n+\n+/**\n+ * Runs git-merge, returning its exit status.\n+ */\n+static int run_merge(void)\n+{\n+\tint ret;\n+\tstruct argv_array args = ARGV_ARRAY_INIT;\n+\n+\targv_array_pushl(&args, \"merge\", NULL);\n+\targv_array_push(&args, \"FETCH_HEAD\");\n+\tret = run_command_v_opt(args.argv, RUN_GIT_CMD);\n+\targv_array_clear(&args);\n+\treturn ret;\n+}\n+\n+int cmd_pull(int argc, const char **argv, const char *prefix)\n+{\n+\tconst char *repo, **refspecs;\n+\n+\targc = parse_options(argc, argv, prefix, pull_options, pull_usage, 0);\n+\tparse_repo_refspecs(argc, argv, &repo, &refspecs);\n+\n+\tif (run_fetch(repo, refspecs))\n+\t\treturn 1;\n+\n+\treturn run_merge();\n+}\ndiff --git a/contrib/examples/git-pull.sh b/contrib/examples/git-pull.sh\nnew file mode 100755\nindex 0000000..5ff4545\n--- /dev/null\n+++ b/contrib/examples/git-pull.sh\n@@ -0,0 +1,339 @@\n+#!/bin/sh\n+#\n+# Copyright (c) 2005 Junio C Hamano\n+#\n+# Fetch one or more remote refs and merge it/them into the current HEAD.\n+\n+USAGE='[-n | --no-stat] [--[no-]commit] [--[no-]squash] [--[no-]ff|--ff-only] [--[no-]rebase|--rebase=preserve] [-s strategy]... [] ...'\n+LONG_USAGE='Fetch one or more remote refs and integrate it/them with the current HEAD.'\n+SUBDIRECTORY_OK=Yes\n+OPTIONS_SPEC=\n+. git-sh-setup\n+. git-sh-i18n\n+set_reflog_action \"pull${1+ $*}\"\n+require_work_tree_exists\n+cd_to_toplevel\n+\n+\n+die_conflict () {\n+ git diff-index --cached --name-status -r --ignore-submodules HEAD --\n+ if [ $(git config --bool --get advice.resolveConflict || echo true) = \"true\" ]; then\n+\tdie \"$(gettext \"Pull is not possible because you have unmerged files.\n+Please, fix them up in the work tree, and then use 'git add/rm '\n+as appropriate to mark resolution and make a commit.\")\"\n+ else\n+\tdie \"$(gettext \"Pull is not possible because you have unmerged files.\")\"\n+ fi\n+}\n+\n+die_merge () {\n+ if [ $(git config --bool --get advice.resolveConflict || echo true) = \"true\" ]; then\n+\tdie \"$(gettext \"You have not concluded your merge (MERGE_HEAD exists).\n+Please, commit your changes before you can merge.\")\"\n+ else\n+\tdie \"$(gettext \"You have not concluded your merge (MERGE_HEAD exists).\")\"\n+ fi\n+}\n+\n+test -z \"$(git ls-files -u)\" || die_conflict\n+test -f \"$GIT_DIR/MERGE_HEAD\" && die_merge\n+\n+bool_or_string_config () {\n+\tgit config --bool \"$1\" 2>/dev/null || git config \"$1\"\n+}\n+\n+strategy_args= diffstat= no_commit= squash= no_ff= ff_only=\n+log_arg= verbosity= progress= recurse_submodules= verify_signatures=\n+merge_args= edit= rebase_args=\n+curr_branch=$(git symbolic-ref -q HEAD)\n+curr_branch_short=\"${curr_branch#refs/heads/}\"\n+rebase=$(bool_or_string_config branch.$curr_branch_short.rebase)\n+if test -z \"$rebase\"\n+then\n+\trebase=$(bool_or_string_config pull.rebase)\n+fi\n+\n+# Setup default fast-forward options via `pull.ff`\n+pull_ff=$(git config pull.ff)\n+case \"$pull_ff\" in\n+false)\n+\tno_ff=--no-ff\n+\t;;\n+only)\n+\tff_only=--ff-only\n+\t;;\n+esac\n+\n+\n+dry_run=\n+while :\n+do\n+\tcase \"$1\" in\n+\t-q|--quiet)\n+\t\tverbosity=\"$verbosity -q\" ;;\n+\t-v|--verbose)\n+\t\tverbosity=\"$verbosity -v\" ;;\n+\t--progress)\n+\t\tprogress=--progress ;;\n+\t--no-progress)\n+\t\tprogress=--no-progress ;;\n+\t-n|--no-stat|--no-summary)\n+\t\tdiffstat=--no-stat ;;\n+\t--stat|--summary)\n+\t\tdiffstat=--stat ;;\n+\t--log|--log=*|--no-log)\n+\t\tlog_arg=\"$1\" ;;\n+\t--no-c|--no-co|--no-com|--no-comm|--no-commi|--no-commit)\n+\t\tno_commit=--no-commit ;;\n+\t--c|--co|--com|--comm|--commi|--commit)\n+\t\tno_commit=--commit ;;\n+\t-e|--edit)\n+\t\tedit=--edit ;;\n+\t--no-edit)\n+\t\tedit=--no-edit ;;\n+\t--sq|--squ|--squa|--squas|--squash)\n+\t\tsquash=--squash ;;\n+\t--no-sq|--no-squ|--no-squa|--no-squas|--no-squash)\n+\t\tsquash=--no-squash ;;\n+\t--ff)\n+\t\tno_ff=--ff ;;\n+\t--no-ff)\n+\t\tno_ff=--no-ff ;;\n+\t--ff-only)\n+\t\tff_only=--ff-only ;;\n+\t-s=*|--s=*|--st=*|--str=*|--stra=*|--strat=*|--strate=*|\\\n+\t\t--strateg=*|--strategy=*|\\\n+\t-s|--s|--st|--str|--stra|--strat|--strate|--strateg|--strategy)\n+\t\tcase \"$#,$1\" in\n+\t\t*,*=*)\n+\t\t\tstrategy=$(expr \"z$1\" : 'z-[^=]*=\\(.*\\)') ;;\n+\t\t1,*)\n+\t\t\tusage ;;\n+\t\t*)\n+\t\t\tstrategy=\"$2\"\n+\t\t\tshift ;;\n+\t\tesac\n+\t\tstrategy_args=\"${strategy_args}-s $strategy \"\n+\t\t;;\n+\t-X*)\n+\t\tcase \"$#,$1\" in\n+\t\t1,-X)\n+\t\t\tusage ;;\n+\t\t*,-X)\n+\t\t\txx=\"-X $(git rev-parse --sq-quote \"$2\")\"\n+\t\t\tshift ;;\n+\t\t*,*)\n+\t\t\txx=$(git rev-parse --sq-quote \"$1\") ;;\n+\t\tesac\n+\t\tmerge_args=\"$merge_args$xx \"\n+\t\t;;\n+\t-r=*|--r=*|--re=*|--reb=*|--reba=*|--rebas=*|--rebase=*)\n+\t\trebase=\"${1#*=}\"\n+\t\t;;\n+\t-r|--r|--re|--reb|--reba|--rebas|--rebase)\n+\t\trebase=true\n+\t\t;;\n+\t--no-r|--no-re|--no-reb|--no-reba|--no-rebas|--no-rebase)\n+\t\trebase=false\n+\t\t;;\n+\t--recurse-submodules)\n+\t\trecurse_submodules=--recurse-submodules\n+\t\t;;\n+\t--recurse-submodules=*)\n+\t\trecurse_submodules=\"$1\"\n+\t\t;;\n+\t--no-recurse-submodules)\n+\t\trecurse_submodules=--no-recurse-submodules\n+\t\t;;\n+\t--verify-signatures)\n+\t\tverify_signatures=--verify-signatures\n+\t\t;;\n+\t--no-verify-signatures)\n+\t\tverify_signatures=--no-verify-signatures\n+\t\t;;\n+\t--gpg-sign|-S)\n+\t\tgpg_sign_args=-S\n+\t\t;;\n+\t--gpg-sign=*)\n+\t\tgpg_sign_args=$(git rev-parse --sq-quote \"-S${1#--gpg-sign=}\")\n+\t\t;;\n+\t-S*)\n+\t\tgpg_sign_args=$(git rev-parse --sq-quote \"$1\")\n+\t\t;;\n+\t--d|--dr|--dry|--dry-|--dry-r|--dry-ru|--dry-run)\n+\t\tdry_run=--dry-run\n+\t\t;;\n+\t-h|--help-all)\n+\t\tusage\n+\t\t;;\n+\t*)\n+\t\t# Pass thru anything that may be meant for fetch.\n+\t\tbreak\n+\t\t;;\n+\tesac\n+\tshift\n+done\n+\n+case \"$rebase\" in\n+preserve)\n+\trebase=true\n+\trebase_args=--preserve-merges\n+\t;;\n+true|false|'')\n+\t;;\n+*)\n+\techo \"Invalid value for --rebase, should be true, false, or preserve\"\n+\tusage\n+\texit 1\n+\t;;\n+esac\n+\n+error_on_no_merge_candidates () {\n+\texec >&2\n+\tfor opt\n+\tdo\n+\t\tcase \"$opt\" in\n+\t\t-t|--t|--ta|--tag|--tags)\n+\t\t\techo \"It doesn't make sense to pull all tags; you probably meant:\"\n+\t\t\techo \" git fetch --tags\"\n+\t\t\texit 1\n+\t\tesac\n+\tdone\n+\n+\tif test true = \"$rebase\"\n+\tthen\n+\t\top_type=rebase\n+\t\top_prep=against\n+\telse\n+\t\top_type=merge\n+\t\top_prep=with\n+\tfi\n+\n+\tupstream=$(git config \"branch.$curr_branch_short.merge\")\n+\tremote=$(git config \"branch.$curr_branch_short.remote\")\n+\n+\tif [ $# -gt 1 ]; then\n+\t\tif [ \"$rebase\" = true ]; then\n+\t\t\tprintf \"There is no candidate for rebasing against \"\n+\t\telse\n+\t\t\tprintf \"There are no candidates for merging \"\n+\t\tfi\n+\t\techo \"among the refs that you just fetched.\"\n+\t\techo \"Generally this means that you provided a wildcard refspec which had no\"\n+\t\techo \"matches on the remote end.\"\n+\telif [ $# -gt 0 ] && [ \"$1\" != \"$remote\" ]; then\n+\t\techo \"You asked to pull from the remote '$1', but did not specify\"\n+\t\techo \"a branch. Because this is not the default configured remote\"\n+\t\techo \"for your current branch, you must specify a branch on the command line.\"\n+\telif [ -z \"$curr_branch\" -o -z \"$upstream\" ]; then\n+\t\t. git-parse-remote\n+\t\terror_on_missing_default_upstream \"pull\" $op_type $op_prep \\\n+\t\t\t\"git pull \"\n+\telse\n+\t\techo \"Your configuration specifies to $op_type $op_prep the ref '${upstream#refs/heads/}'\"\n+\t\techo \"from the remote, but no such ref was fetched.\"\n+\tfi\n+\texit 1\n+}\n+\n+test true = \"$rebase\" && {\n+\tif ! git rev-parse -q --verify HEAD >/dev/null\n+\tthen\n+\t\t# On an unborn branch\n+\t\tif test -f \"$(git rev-parse --git-path index)\"\n+\t\tthen\n+\t\t\tdie \"$(gettext \"updating an unborn branch with changes added to the index\")\"\n+\t\tfi\n+\telse\n+\t\trequire_clean_work_tree \"pull with rebase\" \"Please commit or stash them.\"\n+\tfi\n+\toldremoteref= &&\n+\ttest -n \"$curr_branch\" &&\n+\t. git-parse-remote &&\n+\tremoteref=\"$(get_remote_merge_branch \"$@\" 2>/dev/null)\" &&\n+\toldremoteref=$(git merge-base --fork-point \"$remoteref\" $curr_branch 2>/dev/null)\n+}\n+orig_head=$(git rev-parse -q --verify HEAD)\n+git fetch $verbosity $progress $dry_run $recurse_submodules --update-head-ok \"$@\" || exit 1\n+test -z \"$dry_run\" || exit 0\n+\n+curr_head=$(git rev-parse -q --verify HEAD)\n+if test -n \"$orig_head\" && test \"$curr_head\" != \"$orig_head\"\n+then\n+\t# The fetch involved updating the current branch.\n+\n+\t# The working tree and the index file is still based on the\n+\t# $orig_head commit, but we are merging into $curr_head.\n+\t# First update the working tree to match $curr_head.\n+\n+\teval_gettextln \"Warning: fetch updated the current branch head.\n+Warning: fast-forwarding your working tree from\n+Warning: commit \\$orig_head.\" >&2\n+\tgit update-index -q --refresh\n+\tgit read-tree -u -m \"$orig_head\" \"$curr_head\" ||\n+\t\tdie \"$(eval_gettext \"Cannot fast-forward your working tree.\n+After making sure that you saved anything precious from\n+$ git diff \\$orig_head\n+output, run\n+$ git reset --hard\n+to recover.\")\"\n+\n+fi\n+\n+merge_head=$(sed -e '/\tnot-for-merge\t/d' \\\n+\t-e 's/\t.*//' \"$GIT_DIR\"/FETCH_HEAD | \\\n+\ttr '\\012' ' ')\n+\n+case \"$merge_head\" in\n+'')\n+\terror_on_no_merge_candidates \"$@\"\n+\t;;\n+?*' '?*)\n+\tif test -z \"$orig_head\"\n+\tthen\n+\t\tdie \"$(gettext \"Cannot merge multiple branches into empty head\")\"\n+\tfi\n+\tif test true = \"$rebase\"\n+\tthen\n+\t\tdie \"$(gettext \"Cannot rebase onto multiple branches\")\"\n+\tfi\n+\t;;\n+esac\n+\n+# Pulling into unborn branch: a shorthand for branching off\n+# FETCH_HEAD, for lazy typers.\n+if test -z \"$orig_head\"\n+then\n+\t# Two-way merge: we claim the index is based on an empty tree,\n+\t# and try to fast-forward to HEAD. This ensures we will not\n+\t# lose index/worktree changes that the user already made on\n+\t# the unborn branch.\n+\tempty_tree=4b825dc642cb6eb9a060e54bf8d69288fbee4904\n+\tgit read-tree -m -u $empty_tree $merge_head &&\n+\tgit update-ref -m \"initial pull\" HEAD $merge_head \"$curr_head\"\n+\texit\n+fi\n+\n+if test true = \"$rebase\"\n+then\n+\to=$(git show-branch --merge-base $curr_branch $merge_head $oldremoteref)\n+\tif test \"$oldremoteref\" = \"$o\"\n+\tthen\n+\t\tunset oldremoteref\n+\tfi\n+fi\n+\n+case \"$rebase\" in\n+true)\n+\teval=\"git-rebase $diffstat $strategy_args $merge_args $rebase_args $verbosity\"\n+\teval=\"$eval $gpg_sign_args\"\n+\teval=\"$eval --onto $merge_head ${oldremoteref:-$merge_head}\"\n+\t;;\n+*)\n+\teval=\"git-merge $diffstat $no_commit $verify_signatures $edit $squash $no_ff $ff_only\"\n+\teval=\"$eval $log_arg $strategy_args $merge_args $verbosity $progress\"\n+\teval=\"$eval $gpg_sign_args\"\n+\teval=\"$eval FETCH_HEAD\"\n+\t;;\n+esac\n+eval \"exec $eval\"\ndiff --git a/git-pull.sh b/git-pull.sh\ndeleted file mode 100755\nindex 5ff4545..0000000\n--- a/git-pull.sh\n+++ /dev/null\n@@ -1,339 +0,0 @@\n-#!/bin/sh\n-#\n-# Copyright (c) 2005 Junio C Hamano\n-#\n-# Fetch one or more remote refs and merge it/them into the current HEAD.\n-\n-USAGE='[-n | --no-stat] [--[no-]commit] [--[no-]squash] [--[no-]ff|--ff-only] [--[no-]rebase|--rebase=preserve] [-s strategy]... [] ...'\n-LONG_USAGE='Fetch one or more remote refs and integrate it/them with the current HEAD.'\n-SUBDIRECTORY_OK=Yes\n-OPTIONS_SPEC=\n-. git-sh-setup\n-. git-sh-i18n\n-set_reflog_action \"pull${1+ $*}\"\n-require_work_tree_exists\n-cd_to_toplevel\n-\n-\n-die_conflict () {\n- git diff-index --cached --name-status -r --ignore-submodules HEAD --\n- if [ $(git config --bool --get advice.resolveConflict || echo true) = \"true\" ]; then\n-\tdie \"$(gettext \"Pull is not possible because you have unmerged files.\n-Please, fix them up in the work tree, and then use 'git add/rm '\n-as appropriate to mark resolution and make a commit.\")\"\n- else\n-\tdie \"$(gettext \"Pull is not possible because you have unmerged files.\")\"\n- fi\n-}\n-\n-die_merge () {\n- if [ $(git config --bool --get advice.resolveConflict || echo true) = \"true\" ]; then\n-\tdie \"$(gettext \"You have not concluded your merge (MERGE_HEAD exists).\n-Please, commit your changes before you can merge.\")\"\n- else\n-\tdie \"$(gettext \"You have not concluded your merge (MERGE_HEAD exists).\")\"\n- fi\n-}\n-\n-test -z \"$(git ls-files -u)\" || die_conflict\n-test -f \"$GIT_DIR/MERGE_HEAD\" && die_merge\n-\n-bool_or_string_config () {\n-\tgit config --bool \"$1\" 2>/dev/null || git config \"$1\"\n-}\n-\n-strategy_args= diffstat= no_commit= squash= no_ff= ff_only=\n-log_arg= verbosity= progress= recurse_submodules= verify_signatures=\n-merge_args= edit= rebase_args=\n-curr_branch=$(git symbolic-ref -q HEAD)\n-curr_branch_short=\"${curr_branch#refs/heads/}\"\n-rebase=$(bool_or_string_config branch.$curr_branch_short.rebase)\n-if test -z \"$rebase\"\n-then\n-\trebase=$(bool_or_string_config pull.rebase)\n-fi\n-\n-# Setup default fast-forward options via `pull.ff`\n-pull_ff=$(git config pull.ff)\n-case \"$pull_ff\" in\n-false)\n-\tno_ff=--no-ff\n-\t;;\n-only)\n-\tff_only=--ff-only\n-\t;;\n-esac\n-\n-\n-dry_run=\n-while :\n-do\n-\tcase \"$1\" in\n-\t-q|--quiet)\n-\t\tverbosity=\"$verbosity -q\" ;;\n-\t-v|--verbose)\n-\t\tverbosity=\"$verbosity -v\" ;;\n-\t--progress)\n-\t\tprogress=--progress ;;\n-\t--no-progress)\n-\t\tprogress=--no-progress ;;\n-\t-n|--no-stat|--no-summary)\n-\t\tdiffstat=--no-stat ;;\n-\t--stat|--summary)\n-\t\tdiffstat=--stat ;;\n-\t--log|--log=*|--no-log)\n-\t\tlog_arg=\"$1\" ;;\n-\t--no-c|--no-co|--no-com|--no-comm|--no-commi|--no-commit)\n-\t\tno_commit=--no-commit ;;\n-\t--c|--co|--com|--comm|--commi|--commit)\n-\t\tno_commit=--commit ;;\n-\t-e|--edit)\n-\t\tedit=--edit ;;\n-\t--no-edit)\n-\t\tedit=--no-edit ;;\n-\t--sq|--squ|--squa|--squas|--squash)\n-\t\tsquash=--squash ;;\n-\t--no-sq|--no-squ|--no-squa|--no-squas|--no-squash)\n-\t\tsquash=--no-squash ;;\n-\t--ff)\n-\t\tno_ff=--ff ;;\n-\t--no-ff)\n-\t\tno_ff=--no-ff ;;\n-\t--ff-only)\n-\t\tff_only=--ff-only ;;\n-\t-s=*|--s=*|--st=*|--str=*|--stra=*|--strat=*|--strate=*|\\\n-\t\t--strateg=*|--strategy=*|\\\n-\t-s|--s|--st|--str|--stra|--strat|--strate|--strateg|--strategy)\n-\t\tcase \"$#,$1\" in\n-\t\t*,*=*)\n-\t\t\tstrategy=$(expr \"z$1\" : 'z-[^=]*=\\(.*\\)') ;;\n-\t\t1,*)\n-\t\t\tusage ;;\n-\t\t*)\n-\t\t\tstrategy=\"$2\"\n-\t\t\tshift ;;\n-\t\tesac\n-\t\tstrategy_args=\"${strategy_args}-s $strategy \"\n-\t\t;;\n-\t-X*)\n-\t\tcase \"$#,$1\" in\n-\t\t1,-X)\n-\t\t\tusage ;;\n-\t\t*,-X)\n-\t\t\txx=\"-X $(git rev-parse --sq-quote \"$2\")\"\n-\t\t\tshift ;;\n-\t\t*,*)\n-\t\t\txx=$(git rev-parse --sq-quote \"$1\") ;;\n-\t\tesac\n-\t\tmerge_args=\"$merge_args$xx \"\n-\t\t;;\n-\t-r=*|--r=*|--re=*|--reb=*|--reba=*|--rebas=*|--rebase=*)\n-\t\trebase=\"${1#*=}\"\n-\t\t;;\n-\t-r|--r|--re|--reb|--reba|--rebas|--rebase)\n-\t\trebase=true\n-\t\t;;\n-\t--no-r|--no-re|--no-reb|--no-reba|--no-rebas|--no-rebase)\n-\t\trebase=false\n-\t\t;;\n-\t--recurse-submodules)\n-\t\trecurse_submodules=--recurse-submodules\n-\t\t;;\n-\t--recurse-submodules=*)\n-\t\trecurse_submodules=\"$1\"\n-\t\t;;\n-\t--no-recurse-submodules)\n-\t\trecurse_submodules=--no-recurse-submodules\n-\t\t;;\n-\t--verify-signatures)\n-\t\tverify_signatures=--verify-signatures\n-\t\t;;\n-\t--no-verify-signatures)\n-\t\tverify_signatures=--no-verify-signatures\n-\t\t;;\n-\t--gpg-sign|-S)\n-\t\tgpg_sign_args=-S\n-\t\t;;\n-\t--gpg-sign=*)\n-\t\tgpg_sign_args=$(git rev-parse --sq-quote \"-S${1#--gpg-sign=}\")\n-\t\t;;\n-\t-S*)\n-\t\tgpg_sign_args=$(git rev-parse --sq-quote \"$1\")\n-\t\t;;\n-\t--d|--dr|--dry|--dry-|--dry-r|--dry-ru|--dry-run)\n-\t\tdry_run=--dry-run\n-\t\t;;\n-\t-h|--help-all)\n-\t\tusage\n-\t\t;;\n-\t*)\n-\t\t# Pass thru anything that may be meant for fetch.\n-\t\tbreak\n-\t\t;;\n-\tesac\n-\tshift\n-done\n-\n-case \"$rebase\" in\n-preserve)\n-\trebase=true\n-\trebase_args=--preserve-merges\n-\t;;\n-true|false|'')\n-\t;;\n-*)\n-\techo \"Invalid value for --rebase, should be true, false, or preserve\"\n-\tusage\n-\texit 1\n-\t;;\n-esac\n-\n-error_on_no_merge_candidates () {\n-\texec >&2\n-\tfor opt\n-\tdo\n-\t\tcase \"$opt\" in\n-\t\t-t|--t|--ta|--tag|--tags)\n-\t\t\techo \"It doesn't make sense to pull all tags; you probably meant:\"\n-\t\t\techo \" git fetch --tags\"\n-\t\t\texit 1\n-\t\tesac\n-\tdone\n-\n-\tif test true = \"$rebase\"\n-\tthen\n-\t\top_type=rebase\n-\t\top_prep=against\n-\telse\n-\t\top_type=merge\n-\t\top_prep=with\n-\tfi\n-\n-\tupstream=$(git config \"branch.$curr_branch_short.merge\")\n-\tremote=$(git config \"branch.$curr_branch_short.remote\")\n-\n-\tif [ $# -gt 1 ]; then\n-\t\tif [ \"$rebase\" = true ]; then\n-\t\t\tprintf \"There is no candidate for rebasing against \"\n-\t\telse\n-\t\t\tprintf \"There are no candidates for merging \"\n-\t\tfi\n-\t\techo \"among the refs that you just fetched.\"\n-\t\techo \"Generally this means that you provided a wildcard refspec which had no\"\n-\t\techo \"matches on the remote end.\"\n-\telif [ $# -gt 0 ] && [ \"$1\" != \"$remote\" ]; then\n-\t\techo \"You asked to pull from the remote '$1', but did not specify\"\n-\t\techo \"a branch. Because this is not the default configured remote\"\n-\t\techo \"for your current branch, you must specify a branch on the command line.\"\n-\telif [ -z \"$curr_branch\" -o -z \"$upstream\" ]; then\n-\t\t. git-parse-remote\n-\t\terror_on_missing_default_upstream \"pull\" $op_type $op_prep \\\n-\t\t\t\"git pull \"\n-\telse\n-\t\techo \"Your configuration specifies to $op_type $op_prep the ref '${upstream#refs/heads/}'\"\n-\t\techo \"from the remote, but no such ref was fetched.\"\n-\tfi\n-\texit 1\n-}\n-\n-test true = \"$rebase\" && {\n-\tif ! git rev-parse -q --verify HEAD >/dev/null\n-\tthen\n-\t\t# On an unborn branch\n-\t\tif test -f \"$(git rev-parse --git-path index)\"\n-\t\tthen\n-\t\t\tdie \"$(gettext \"updating an unborn branch with changes added to the index\")\"\n-\t\tfi\n-\telse\n-\t\trequire_clean_work_tree \"pull with rebase\" \"Please commit or stash them.\"\n-\tfi\n-\toldremoteref= &&\n-\ttest -n \"$curr_branch\" &&\n-\t. git-parse-remote &&\n-\tremoteref=\"$(get_remote_merge_branch \"$@\" 2>/dev/null)\" &&\n-\toldremoteref=$(git merge-base --fork-point \"$remoteref\" $curr_branch 2>/dev/null)\n-}\n-orig_head=$(git rev-parse -q --verify HEAD)\n-git fetch $verbosity $progress $dry_run $recurse_submodules --update-head-ok \"$@\" || exit 1\n-test -z \"$dry_run\" || exit 0\n-\n-curr_head=$(git rev-parse -q --verify HEAD)\n-if test -n \"$orig_head\" && test \"$curr_head\" != \"$orig_head\"\n-then\n-\t# The fetch involved updating the current branch.\n-\n-\t# The working tree and the index file is still based on the\n-\t# $orig_head commit, but we are merging into $curr_head.\n-\t# First update the working tree to match $curr_head.\n-\n-\teval_gettextln \"Warning: fetch updated the current branch head.\n-Warning: fast-forwarding your working tree from\n-Warning: commit \\$orig_head.\" >&2\n-\tgit update-index -q --refresh\n-\tgit read-tree -u -m \"$orig_head\" \"$curr_head\" ||\n-\t\tdie \"$(eval_gettext \"Cannot fast-forward your working tree.\n-After making sure that you saved anything precious from\n-$ git diff \\$orig_head\n-output, run\n-$ git reset --hard\n-to recover.\")\"\n-\n-fi\n-\n-merge_head=$(sed -e '/\tnot-for-merge\t/d' \\\n-\t-e 's/\t.*//' \"$GIT_DIR\"/FETCH_HEAD | \\\n-\ttr '\\012' ' ')\n-\n-case \"$merge_head\" in\n-'')\n-\terror_on_no_merge_candidates \"$@\"\n-\t;;\n-?*' '?*)\n-\tif test -z \"$orig_head\"\n-\tthen\n-\t\tdie \"$(gettext \"Cannot merge multiple branches into empty head\")\"\n-\tfi\n-\tif test true = \"$rebase\"\n-\tthen\n-\t\tdie \"$(gettext \"Cannot rebase onto multiple branches\")\"\n-\tfi\n-\t;;\n-esac\n-\n-# Pulling into unborn branch: a shorthand for branching off\n-# FETCH_HEAD, for lazy typers.\n-if test -z \"$orig_head\"\n-then\n-\t# Two-way merge: we claim the index is based on an empty tree,\n-\t# and try to fast-forward to HEAD. This ensures we will not\n-\t# lose index/worktree changes that the user already made on\n-\t# the unborn branch.\n-\tempty_tree=4b825dc642cb6eb9a060e54bf8d69288fbee4904\n-\tgit read-tree -m -u $empty_tree $merge_head &&\n-\tgit update-ref -m \"initial pull\" HEAD $merge_head \"$curr_head\"\n-\texit\n-fi\n-\n-if test true = \"$rebase\"\n-then\n-\to=$(git show-branch --merge-base $curr_branch $merge_head $oldremoteref)\n-\tif test \"$oldremoteref\" = \"$o\"\n-\tthen\n-\t\tunset oldremoteref\n-\tfi\n-fi\n-\n-case \"$rebase\" in\n-true)\n-\teval=\"git-rebase $diffstat $strategy_args $merge_args $rebase_args $verbosity\"\n-\teval=\"$eval $gpg_sign_args\"\n-\teval=\"$eval --onto $merge_head ${oldremoteref:-$merge_head}\"\n-\t;;\n-*)\n-\teval=\"git-merge $diffstat $no_commit $verify_signatures $edit $squash $no_ff $ff_only\"\n-\teval=\"$eval $log_arg $strategy_args $merge_args $verbosity $progress\"\n-\teval=\"$eval $gpg_sign_args\"\n-\teval=\"$eval FETCH_HEAD\"\n-\t;;\n-esac\n-eval \"exec $eval\"\ndiff --git a/git.c b/git.c\nindex 44374b1..e7a7713 100644\n--- a/git.c\n+++ b/git.c\n@@ -445,6 +445,7 @@ static struct cmd_struct commands[] = {\n \t{ \"pickaxe\", cmd_blame, RUN_SETUP },\n \t{ \"prune\", cmd_prune, RUN_SETUP },\n \t{ \"prune-packed\", cmd_prune_packed, RUN_SETUP },\n+\t{ \"pull\", cmd_pull, RUN_SETUP | NEED_WORK_TREE },\n \t{ \"push\", cmd_push, RUN_SETUP },\n \t{ \"read-tree\", cmd_read_tree, RUN_SETUP },\n \t{ \"receive-pack\", cmd_receive_pack },\ndiff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh\nindex 6ec6072..a11e48b 100755\n--- a/t/t4013-diff-various.sh\n+++ b/t/t4013-diff-various.sh\n@@ -7,6 +7,9 @@ test_description='Various diff formatting options'\n \n . ./test-lib.sh\n \n+skip_all='setup for this test suite requires git pull -s'\n+test_done\n+\n LF='\n '\n \ndiff --git a/t/t5150-request-pull.sh b/t/t5150-request-pull.sh\nindex 82c33b8..f5ea605 100755\n--- a/t/t5150-request-pull.sh\n+++ b/t/t5150-request-pull.sh\n@@ -132,7 +132,7 @@ test_expect_success 'pull request when forgot to push' '\n \n '\n \n-test_expect_success 'pull request after push' '\n+test_expect_failure 'pull request after push' '\n \n \trm -fr downstream.git &&\n \tgit init --bare downstream.git &&\ndiff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh\nindex 3a9b775..213b231 100755\n--- a/t/t5500-fetch-pack.sh\n+++ b/t/t5500-fetch-pack.sh\n@@ -226,14 +226,14 @@ test_expect_success 'add two more (part 2)' '\n \tadd B69 $B68\n '\n \n-test_expect_success 'deepening pull in shallow repo' '\n+test_expect_failure 'deepening pull in shallow repo' '\n \t(\n \t\tcd shallow &&\n \t\tgit pull --depth 4 .. B\n \t)\n '\n \n-test_expect_success 'clone shallow object count' '\n+test_expect_failure 'clone shallow object count' '\n \t(\n \t\tcd shallow &&\n \t\tgit count-objects -v\n@@ -248,7 +248,7 @@ test_expect_success 'deepening fetch in shallow repo' '\n \t)\n '\n \n-test_expect_success 'clone shallow object count' '\n+test_expect_failure 'clone shallow object count' '\n \t(\n \t\tcd shallow &&\n \t\tgit count-objects -v\n@@ -272,11 +272,11 @@ test_expect_success 'additional simple shallow deepenings' '\n \t)\n '\n \n-test_expect_success 'clone shallow depth count' '\n+test_expect_failure 'clone shallow depth count' '\n \ttest \"`git --git-dir=shallow/.git rev-list --count HEAD`\" = 11\n '\n \n-test_expect_success 'clone shallow object count' '\n+test_expect_failure 'clone shallow object count' '\n \t(\n \t\tcd shallow &&\n \t\tgit count-objects -v\ndiff --git a/t/t5520-pull.sh b/t/t5520-pull.sh\nindex 62dbfb5..f32b8cb 100755\n--- a/t/t5520-pull.sh\n+++ b/t/t5520-pull.sh\n@@ -26,7 +26,7 @@ test_expect_success 'pulling into void' '\n \ttest_cmp file cloned/file\n '\n \n-test_expect_success 'pulling into void using master:master' '\n+test_expect_failure 'pulling into void using master:master' '\n \tgit init cloned-uho &&\n \t(\n \t\tcd cloned-uho &&\n@@ -76,7 +76,7 @@ test_expect_success 'pulling into void does not remove new staged files' '\n \t)\n '\n \n-test_expect_success 'pulling into void must not create an octopus' '\n+test_expect_failure 'pulling into void must not create an octopus' '\n \tgit init cloned-octopus &&\n \t(\n \t\tcd cloned-octopus &&\n@@ -85,7 +85,7 @@ test_expect_success 'pulling into void must not create an octopus' '\n \t)\n '\n \n-test_expect_success 'test . as a remote' '\n+test_expect_failure 'test . as a remote' '\n \tgit branch copy master &&\n \tgit config branch.copy.remote . &&\n \tgit config branch.copy.merge refs/heads/master &&\n@@ -101,7 +101,7 @@ test_expect_success 'test . as a remote' '\n \ttest_cmp reflog.expected reflog.fuzzy\n '\n \n-test_expect_success 'the default remote . should not break explicit pull' '\n+test_expect_failure 'the default remote . should not break explicit pull' '\n \tgit checkout -b second master^ &&\n \techo modified >file &&\n \tgit commit -a -m modified &&\n@@ -116,7 +116,7 @@ test_expect_success 'the default remote . should not break explicit pull' '\n \ttest_cmp reflog.expected reflog.fuzzy\n '\n \n-test_expect_success 'fail if wildcard spec does not match any refs' '\n+test_expect_failure 'fail if wildcard spec does not match any refs' '\n \tgit checkout -b test copy^ &&\n \ttest_when_finished \"git checkout -f copy && git branch -D test\" &&\n \ttest \"$(cat file)\" = file &&\n@@ -125,7 +125,7 @@ test_expect_success 'fail if wildcard spec does not match any refs' '\n \ttest \"$(cat file)\" = file\n '\n \n-test_expect_success 'fail if no branches specified with non-default remote' '\n+test_expect_failure 'fail if no branches specified with non-default remote' '\n \tgit remote add test_remote . &&\n \ttest_when_finished \"git remote remove test_remote\" &&\n \tgit checkout -b test copy^ &&\n@@ -137,7 +137,7 @@ test_expect_success 'fail if no branches specified with non-default remote' '\n \ttest \"$(cat file)\" = file\n '\n \n-test_expect_success 'fail if not on a branch' '\n+test_expect_failure 'fail if not on a branch' '\n \tgit remote add origin . &&\n \ttest_when_finished \"git remote remove origin\" &&\n \tgit checkout HEAD^ &&\n@@ -148,7 +148,7 @@ test_expect_success 'fail if not on a branch' '\n \ttest \"$(cat file)\" = file\n '\n \n-test_expect_success 'fail if no configuration for current branch' '\n+test_expect_failure 'fail if no configuration for current branch' '\n \tgit remote add test_remote . &&\n \ttest_when_finished \"git remote remove test_remote\" &&\n \tgit checkout -b test copy^ &&\n@@ -160,7 +160,7 @@ test_expect_success 'fail if no configuration for current branch' '\n \ttest \"$(cat file)\" = file\n '\n \n-test_expect_success 'fail if upstream branch does not exist' '\n+test_expect_failure 'fail if upstream branch does not exist' '\n \tgit checkout -b test copy^ &&\n \ttest_when_finished \"git checkout -f copy && git branch -D test\" &&\n \ttest_config branch.test.remote . &&\n@@ -171,7 +171,7 @@ test_expect_success 'fail if upstream branch does not exist' '\n \ttest \"$(cat file)\" = file\n '\n \n-test_expect_success 'fail if the index has unresolved entries' '\n+test_expect_failure 'fail if the index has unresolved entries' '\n \tgit checkout -b third second^ &&\n \ttest_when_finished \"git checkout -f copy && git branch -D third\" &&\n \ttest \"$(cat file)\" = file &&\n@@ -191,7 +191,7 @@ test_expect_success 'fail if the index has unresolved entries' '\n \ttest_cmp expected file\n '\n \n-test_expect_success 'fast-forwards working tree if branch head is updated' '\n+test_expect_failure 'fast-forwards working tree if branch head is updated' '\n \tgit checkout -b third second^ &&\n \ttest_when_finished \"git checkout -f copy && git branch -D third\" &&\n \ttest \"$(cat file)\" = file &&\n@@ -201,7 +201,7 @@ test_expect_success 'fast-forwards working tree if branch head is updated' '\n \ttest \"$(git rev-parse third)\" = \"$(git rev-parse second)\"\n '\n \n-test_expect_success 'fast-forward fails with conflicting work tree' '\n+test_expect_failure 'fast-forward fails with conflicting work tree' '\n \tgit checkout -b third second^ &&\n \ttest_when_finished \"git checkout -f copy && git branch -D third\" &&\n \ttest \"$(cat file)\" = file &&\n@@ -212,7 +212,7 @@ test_expect_success 'fast-forward fails with conflicting work tree' '\n \ttest \"$(git rev-parse third)\" = \"$(git rev-parse second)\"\n '\n \n-test_expect_success '--rebase' '\n+test_expect_failure '--rebase' '\n \tgit branch to-rebase &&\n \techo modified again > file &&\n \tgit commit -m file file &&\n@@ -226,7 +226,7 @@ test_expect_success '--rebase' '\n \ttest new = \"$(git show HEAD:file2)\"\n '\n \n-test_expect_success '--rebase fails with multiple branches' '\n+test_expect_failure '--rebase fails with multiple branches' '\n \tgit reset --hard before-rebase &&\n \ttest_must_fail git pull --rebase . copy master 2>err &&\n \ttest \"$(git rev-parse HEAD)\" = \"$(git rev-parse before-rebase)\" &&\n@@ -234,7 +234,7 @@ test_expect_success '--rebase fails with multiple branches' '\n \ttest modified = \"$(git show HEAD:file)\"\n '\n \n-test_expect_success 'pull.rebase' '\n+test_expect_failure 'pull.rebase' '\n \tgit reset --hard before-rebase &&\n \ttest_config pull.rebase true &&\n \tgit pull . copy &&\n@@ -242,7 +242,7 @@ test_expect_success 'pull.rebase' '\n \ttest new = \"$(git show HEAD:file2)\"\n '\n \n-test_expect_success 'branch.to-rebase.rebase' '\n+test_expect_failure 'branch.to-rebase.rebase' '\n \tgit reset --hard before-rebase &&\n \ttest_config branch.to-rebase.rebase true &&\n \tgit pull . copy &&\n@@ -280,7 +280,7 @@ test_expect_success 'pull.rebase=false create a new merge commit' '\n \ttest file3 = \"$(git show HEAD:file3.t)\"\n '\n \n-test_expect_success 'pull.rebase=true flattens keep-merge' '\n+test_expect_failure 'pull.rebase=true flattens keep-merge' '\n \tgit reset --hard before-preserve-rebase &&\n \ttest_config pull.rebase true &&\n \tgit pull . copy &&\n@@ -288,7 +288,7 @@ test_expect_success 'pull.rebase=true flattens keep-merge' '\n \ttest file3 = \"$(git show HEAD:file3.t)\"\n '\n \n-test_expect_success 'pull.rebase=1 is treated as true and flattens keep-merge' '\n+test_expect_failure 'pull.rebase=1 is treated as true and flattens keep-merge' '\n \tgit reset --hard before-preserve-rebase &&\n \ttest_config pull.rebase 1 &&\n \tgit pull . copy &&\n@@ -296,7 +296,7 @@ test_expect_success 'pull.rebase=1 is treated as true and flattens keep-merge' '\n \ttest file3 = \"$(git show HEAD:file3.t)\"\n '\n \n-test_expect_success 'pull.rebase=preserve rebases and merges keep-merge' '\n+test_expect_failure 'pull.rebase=preserve rebases and merges keep-merge' '\n \tgit reset --hard before-preserve-rebase &&\n \ttest_config pull.rebase preserve &&\n \tgit pull . copy &&\n@@ -304,13 +304,13 @@ test_expect_success 'pull.rebase=preserve rebases and merges keep-merge' '\n \ttest \"$(git rev-parse HEAD^2)\" = \"$(git rev-parse keep-merge)\"\n '\n \n-test_expect_success 'pull.rebase=invalid fails' '\n+test_expect_failure 'pull.rebase=invalid fails' '\n \tgit reset --hard before-preserve-rebase &&\n \ttest_config pull.rebase invalid &&\n \t! git pull . copy\n '\n \n-test_expect_success '--rebase=false create a new merge commit' '\n+test_expect_failure '--rebase=false create a new merge commit' '\n \tgit reset --hard before-preserve-rebase &&\n \ttest_config pull.rebase true &&\n \tgit pull --rebase=false . copy &&\n@@ -319,7 +319,7 @@ test_expect_success '--rebase=false create a new merge commit' '\n \ttest file3 = \"$(git show HEAD:file3.t)\"\n '\n \n-test_expect_success '--rebase=true rebases and flattens keep-merge' '\n+test_expect_failure '--rebase=true rebases and flattens keep-merge' '\n \tgit reset --hard before-preserve-rebase &&\n \ttest_config pull.rebase preserve &&\n \tgit pull --rebase=true . copy &&\n@@ -327,7 +327,7 @@ test_expect_success '--rebase=true rebases and flattens keep-merge' '\n \ttest file3 = \"$(git show HEAD:file3.t)\"\n '\n \n-test_expect_success '--rebase=preserve rebases and merges keep-merge' '\n+test_expect_failure '--rebase=preserve rebases and merges keep-merge' '\n \tgit reset --hard before-preserve-rebase &&\n \ttest_config pull.rebase true &&\n \tgit pull --rebase=preserve . copy &&\n@@ -340,7 +340,7 @@ test_expect_success '--rebase=invalid fails' '\n \t! git pull --rebase=invalid . copy\n '\n \n-test_expect_success '--rebase overrides pull.rebase=preserve and flattens keep-merge' '\n+test_expect_failure '--rebase overrides pull.rebase=preserve and flattens keep-merge' '\n \tgit reset --hard before-preserve-rebase &&\n \ttest_config pull.rebase preserve &&\n \tgit pull --rebase . copy &&\n@@ -348,7 +348,7 @@ test_expect_success '--rebase overrides pull.rebase=preserve and flattens keep-m\n \ttest file3 = \"$(git show HEAD:file3.t)\"\n '\n \n-test_expect_success '--rebase with rebased upstream' '\n+test_expect_failure '--rebase with rebased upstream' '\n \n \tgit remote add -f me . &&\n \tgit checkout copy &&\n@@ -366,7 +366,7 @@ test_expect_success '--rebase with rebased upstream' '\n \n '\n \n-test_expect_success '--rebase with rebased default upstream' '\n+test_expect_failure '--rebase with rebased default upstream' '\n \n \tgit update-ref refs/remotes/me/copy copy-orig &&\n \tgit checkout --track -b to-rebase2 me/copy &&\n@@ -377,7 +377,7 @@ test_expect_success '--rebase with rebased default upstream' '\n \n '\n \n-test_expect_success 'rebased upstream + fetch + pull --rebase' '\n+test_expect_failure 'rebased upstream + fetch + pull --rebase' '\n \n \tgit update-ref refs/remotes/me/copy copy-orig &&\n \tgit reset --hard to-rebase-orig &&\n@@ -390,7 +390,7 @@ test_expect_success 'rebased upstream + fetch + pull --rebase' '\n \n '\n \n-test_expect_success 'pull --rebase dies early with dirty working directory' '\n+test_expect_failure 'pull --rebase dies early with dirty working directory' '\n \n \tgit checkout to-rebase &&\n \tgit update-ref refs/remotes/me/copy copy^ &&\n@@ -409,7 +409,7 @@ test_expect_success 'pull --rebase dies early with dirty working directory' '\n \n '\n \n-test_expect_success 'pull --rebase works on branch yet to be born' '\n+test_expect_failure 'pull --rebase works on branch yet to be born' '\n \tgit rev-parse master >expect &&\n \tmkdir empty_repo &&\n \t(cd empty_repo &&\n@@ -420,7 +420,7 @@ test_expect_success 'pull --rebase works on branch yet to be born' '\n \ttest_cmp expect actual\n '\n \n-test_expect_success 'pull --rebase fails on unborn branch with staged changes' '\n+test_expect_failure 'pull --rebase fails on unborn branch with staged changes' '\n \ttest_when_finished \"rm -rf empty_repo2\" &&\n \tgit init empty_repo2 &&\n \t(\n@@ -456,14 +456,14 @@ test_expect_success 'setup for detecting upstreamed changes' '\n \t)\n '\n \n-test_expect_success 'git pull --rebase detects upstreamed changes' '\n+test_expect_failure 'git pull --rebase detects upstreamed changes' '\n \t(cd dst &&\n \t git pull --rebase &&\n \t test -z \"$(git ls-files -u)\"\n \t)\n '\n \n-test_expect_success 'setup for avoiding reapplying old patches' '\n+test_expect_failure 'setup for avoiding reapplying old patches' '\n \t(cd dst &&\n \t test_might_fail git rebase --abort &&\n \t git reset --hard origin/master\n@@ -485,14 +485,14 @@ test_expect_success 'setup for avoiding reapplying old patches' '\n \t)\n '\n \n-test_expect_success 'git pull --rebase does not reapply old patches' '\n+test_expect_failure 'git pull --rebase does not reapply old patches' '\n \t(cd dst &&\n \t test_must_fail git pull --rebase &&\n \t test 1 = $(find .git/rebase-apply -name \"000*\" | wc -l)\n \t)\n '\n \n-test_expect_success 'git pull --rebase against local branch' '\n+test_expect_failure 'git pull --rebase against local branch' '\n \tgit checkout -b copy2 to-rebase-orig &&\n \tgit pull --rebase . to-rebase &&\n \ttest \"conflicting modification\" = \"$(cat file)\" &&\ndiff --git a/t/t5521-pull-options.sh b/t/t5521-pull-options.sh\nindex 56e7377..0f6094b 100755\n--- a/t/t5521-pull-options.sh\n+++ b/t/t5521-pull-options.sh\n@@ -11,7 +11,7 @@ test_expect_success 'setup' '\n \t git commit -m one)\n '\n \n-test_expect_success 'git pull -q' '\n+test_expect_failure 'git pull -q' '\n \tmkdir clonedq &&\n \t(cd clonedq && git init &&\n \tgit pull -q \"../parent\" >out 2>err &&\n@@ -19,7 +19,7 @@ test_expect_success 'git pull -q' '\n \ttest_must_be_empty out)\n '\n \n-test_expect_success 'git pull -q --rebase' '\n+test_expect_failure 'git pull -q --rebase' '\n \tmkdir clonedqrb &&\n \t(cd clonedqrb && git init &&\n \tgit pull -q --rebase \"../parent\" >out 2>err &&\n@@ -38,7 +38,7 @@ test_expect_success 'git pull' '\n \ttest_must_be_empty out)\n '\n \n-test_expect_success 'git pull --rebase' '\n+test_expect_failure 'git pull --rebase' '\n \tmkdir clonedrb &&\n \t(cd clonedrb && git init &&\n \tgit pull --rebase \"../parent\" >out 2>err &&\n@@ -46,7 +46,7 @@ test_expect_success 'git pull --rebase' '\n \ttest_must_be_empty out)\n '\n \n-test_expect_success 'git pull -v' '\n+test_expect_failure 'git pull -v' '\n \tmkdir clonedv &&\n \t(cd clonedv && git init &&\n \tgit pull -v \"../parent\" >out 2>err &&\n@@ -54,7 +54,7 @@ test_expect_success 'git pull -v' '\n \ttest_must_be_empty out)\n '\n \n-test_expect_success 'git pull -v --rebase' '\n+test_expect_failure 'git pull -v --rebase' '\n \tmkdir clonedvrb &&\n \t(cd clonedvrb && git init &&\n \tgit pull -v --rebase \"../parent\" >out 2>err &&\n@@ -62,7 +62,7 @@ test_expect_success 'git pull -v --rebase' '\n \ttest_must_be_empty out)\n '\n \n-test_expect_success 'git pull -v -q' '\n+test_expect_failure 'git pull -v -q' '\n \tmkdir clonedvq &&\n \t(cd clonedvq && git init &&\n \tgit pull -v -q \"../parent\" >out 2>err &&\n@@ -70,7 +70,7 @@ test_expect_success 'git pull -v -q' '\n \ttest_must_be_empty err)\n '\n \n-test_expect_success 'git pull -q -v' '\n+test_expect_failure 'git pull -q -v' '\n \tmkdir clonedqv &&\n \t(cd clonedqv && git init &&\n \tgit pull -q -v \"../parent\" >out 2>err &&\n@@ -78,7 +78,7 @@ test_expect_success 'git pull -q -v' '\n \ttest -s err)\n '\n \n-test_expect_success 'git pull --force' '\n+test_expect_failure 'git pull --force' '\n \tmkdir clonedoldstyle &&\n \t(cd clonedoldstyle && git init &&\n \tcat >>.git/config <<-\\EOF &&\n@@ -99,7 +99,7 @@ test_expect_success 'git pull --force' '\n \t)\n '\n \n-test_expect_success 'git pull --all' '\n+test_expect_failure 'git pull --all' '\n \tmkdir clonedmulti &&\n \t(cd clonedmulti && git init &&\n \tcat >>.git/config <<-\\EOF &&\n@@ -117,7 +117,7 @@ test_expect_success 'git pull --all' '\n \t)\n '\n \n-test_expect_success 'git pull --dry-run' '\n+test_expect_failure 'git pull --dry-run' '\n \ttest_when_finished \"rm -rf clonedry\" &&\n \tgit init clonedry &&\n \t(\ndiff --git a/t/t5524-pull-msg.sh b/t/t5524-pull-msg.sh\nindex eebb8c9..1ba8054 100755\n--- a/t/t5524-pull-msg.sh\n+++ b/t/t5524-pull-msg.sh\n@@ -25,7 +25,7 @@ test_expect_success setup '\n \tgit commit -m \"do not clobber $dollar signs\"\n '\n \n-test_expect_success pull '\n+test_expect_failure pull '\n (\n \tcd cloned &&\n \tgit pull --log &&\ndiff --git a/t/t5572-pull-submodule.sh b/t/t5572-pull-submodule.sh\nindex accfa5c..408c886 100755\n--- a/t/t5572-pull-submodule.sh\n+++ b/t/t5572-pull-submodule.sh\n@@ -5,6 +5,10 @@ test_description='pull can handle submodules'\n . ./test-lib.sh\n . \"$TEST_DIRECTORY\"/lib-submodule-update.sh\n \n+KNOWN_FAILURE_STASH_DOES_IGNORE_SUBMODULE_CHANGES=1\n+KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR=1\n+KNOWN_FAILURE_CHERRY_PICK_SEES_EMPTY_COMMIT=1\n+\n reset_branch_to_HEAD () {\n \tgit branch -D \"$1\" &&\n \tgit checkout -b \"$1\" HEAD &&\ndiff --git a/t/t6029-merge-subtree.sh b/t/t6029-merge-subtree.sh\nindex 73fc240..54af64e 100755\n--- a/t/t6029-merge-subtree.sh\n+++ b/t/t6029-merge-subtree.sh\n@@ -61,7 +61,7 @@ test_expect_success 'initial merge' '\n \ttest_cmp expected actual\n '\n \n-test_expect_success 'merge update' '\n+test_expect_failure 'merge update' '\n \tcd ../git-gui &&\n \techo git-gui2 > git-gui.sh &&\n \to3=$(git hash-object git-gui.sh) &&\n@@ -95,7 +95,7 @@ test_expect_success 'initial ambiguous subtree' '\n \ttest_cmp expected actual\n '\n \n-test_expect_success 'merge using explicit' '\n+test_expect_failure 'merge using explicit' '\n \tcd ../git &&\n \tgit reset --hard master2 &&\n \tgit pull -Xsubtree=git-gui gui master2 &&\n@@ -108,7 +108,7 @@ test_expect_success 'merge using explicit' '\n \ttest_cmp expected actual\n '\n \n-test_expect_success 'merge2 using explicit' '\n+test_expect_failure 'merge2 using explicit' '\n \tcd ../git &&\n \tgit reset --hard master2 &&\n \tgit pull -Xsubtree=git-gui2 gui master2 &&\ndiff --git a/t/t6037-merge-ours-theirs.sh b/t/t6037-merge-ours-theirs.sh\nindex 3889eca..876e23b 100755\n--- a/t/t6037-merge-ours-theirs.sh\n+++ b/t/t6037-merge-ours-theirs.sh\n@@ -65,7 +65,7 @@ test_expect_success 'binary file with -Xours/-Xtheirs' '\n \tgit diff --exit-code master HEAD -- file\n '\n \n-test_expect_success 'pull passes -X to underlying merge' '\n+test_expect_failure 'pull passes -X to underlying merge' '\n \tgit reset --hard master && git pull -s recursive -Xours . side &&\n \tgit reset --hard master && git pull -s recursive -X ours . side &&\n \tgit reset --hard master && git pull -s recursive -Xtheirs . side &&\ndiff --git a/t/t7403-submodule-sync.sh b/t/t7403-submodule-sync.sh\nindex 79bc135..b448562 100755\n--- a/t/t7403-submodule-sync.sh\n+++ b/t/t7403-submodule-sync.sh\n@@ -96,7 +96,7 @@ test_expect_success 'change submodule url' '\n \t)\n '\n \n-test_expect_success '\"git submodule sync\" should update submodule URLs' '\n+test_expect_failure '\"git submodule sync\" should update submodule URLs' '\n \t(\n \t\tcd super-clone &&\n \t\tgit pull --no-recurse-submodules &&\n@@ -121,7 +121,7 @@ test_expect_success '\"git submodule sync\" should update submodule URLs' '\n \t)\n '\n \n-test_expect_success '\"git submodule sync --recursive\" should update all submodule URLs' '\n+test_expect_failure '\"git submodule sync --recursive\" should update all submodule URLs' '\n \t(\n \t\tcd super-clone &&\n \t\t(\n@@ -149,7 +149,7 @@ test_expect_success 'reset submodule URLs' '\n \treset_submodule_urls super-clone\n '\n \n-test_expect_success '\"git submodule sync\" should update submodule URLs - subdirectory' '\n+test_expect_failure '\"git submodule sync\" should update submodule URLs - subdirectory' '\n \t(\n \t\tcd super-clone &&\n \t\tgit pull --no-recurse-submodules &&\n@@ -177,7 +177,7 @@ test_expect_success '\"git submodule sync\" should update submodule URLs - subdire\n \t)\n '\n \n-test_expect_success '\"git submodule sync --recursive\" should update all submodule URLs - subdirectory' '\n+test_expect_failure '\"git submodule sync --recursive\" should update all submodule URLs - subdirectory' '\n \t(\n \t\tcd super-clone &&\n \t\t(\ndiff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh\nindex dda3929..1ffd837 100755\n--- a/t/t7406-submodule-update.sh\n+++ b/t/t7406-submodule-update.sh\n@@ -11,6 +11,8 @@ submodule and \"git submodule update --rebase/--merge\" does not detach the HEAD.\n \n . ./test-lib.sh\n \n+skip_all='skipping submodule update tests, requires git pull --rebase'\n+test_done\n \n compare_head()\n {\ndiff --git a/t/t7601-merge-pull-config.sh b/t/t7601-merge-pull-config.sh\nindex f768c90..7a846a2 100755\n--- a/t/t7601-merge-pull-config.sh\n+++ b/t/t7601-merge-pull-config.sh\n@@ -45,7 +45,7 @@ test_expect_success 'fast-forward pull succeeds with \"true\" in pull.ff' '\n \ttest \"$(git rev-parse HEAD)\" = \"$(git rev-parse c1)\"\n '\n \n-test_expect_success 'fast-forward pull creates merge with \"false\" in pull.ff' '\n+test_expect_failure 'fast-forward pull creates merge with \"false\" in pull.ff' '\n \tgit reset --hard c0 &&\n \ttest_config pull.ff false &&\n \tgit pull . c1 &&\n@@ -53,7 +53,7 @@ test_expect_success 'fast-forward pull creates merge with \"false\" in pull.ff' '\n \ttest \"$(git rev-parse HEAD^2)\" = \"$(git rev-parse c1)\"\n '\n \n-test_expect_success 'pull prevents non-fast-forward with \"only\" in pull.ff' '\n+test_expect_failure 'pull prevents non-fast-forward with \"only\" in pull.ff' '\n \tgit reset --hard c1 &&\n \ttest_config pull.ff only &&\n \ttest_must_fail git pull . c3\n-- \n2.1.4\n"},{"id":"261453","messageId":"1431961571-20370-3-git-send-email-pyokagan@gmail.com","threadId":"39357","inReplyTo":"1431961571-20370-1-git-send-email-pyokagan@gmail.com","subject":"[PATCH 02/14] pull: pass verbosity, --progress flags to fetch and merge","fromName":"Paul Tan","fromEmail":"pyokagan@gmail.com","sentAt":"2015-05-18T15:05:59Z","receivedAt":"2015-05-18T15:05:59Z","isPatch":true,"sender":{"key":"pyokagan@gmail.com","avatar":"https://avatars.githubusercontent.com/u/109479?v=4"},"body":"7f87aff (Teach/Fix pull/fetch -q/-v options, 2008-11-15) taught git-pull\nto accept the verbosity -v and -q options and pass them to git-fetch and\ngit-merge.\n\nRe-implement support for the verbosity flags by adding it to the options\nlist and introducing argv_push_verbosity() to push the flags into the\nargv array used to execute git-fetch and git-merge.\n\n9839018 (fetch and pull: learn --progress, 2010-02-24) and bebd2fd\n(pull: propagate --progress to merge, 2011-02-20) taught git-pull to\naccept the --progress option and pass it to git-fetch and git-merge.\n\nRe-implement support for this flag by introducing the option callback\nhandler parse_opt_passthru(). This callback is used to pass the\n\"--progress\" or \"--no-progress\" command-line switch to git-fetch and\ngit-merge.\n\nSigned-off-by: Paul Tan \n---\n builtin/pull.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++++\n t/t5521-pull-options.sh | 8 +++----\n 2 files changed, 64 insertions(+), 4 deletions(-)\n\ndiff --git a/builtin/pull.c b/builtin/pull.c\nindex 0b771b9..a4d9c92 100644\n--- a/builtin/pull.c\n+++ b/builtin/pull.c\n@@ -11,16 +11,64 @@\n #include \"argv-array.h\"\n #include \"run-command.h\"\n \n+/**\n+ * Given an option opt, where opt->value points to a char* and opt->defval is a\n+ * string, sets opt->value to the evaluation of \"--$defval=$arg\". If `arg` is\n+ * NULL, then opt->value is set to \"--$defval\". If unset is true, then\n+ * opt->value is set to \"--no-$defval\".\n+ */\n+static int parse_opt_passthru(const struct option *opt, const char *arg, int unset)\n+{\n+\tstruct strbuf sb = STRBUF_INIT;\n+\tchar **opt_value = opt->value;\n+\n+\tassert(opt->defval);\n+\tstrbuf_addstr(&sb, unset ? \"--no-\" : \"--\");\n+\tstrbuf_addstr(&sb, (const char*) opt->defval);\n+\tif (arg) {\n+\t\tstrbuf_addch(&sb, '=');\n+\t\tstrbuf_addstr(&sb, arg);\n+\t}\n+\tif (*opt_value)\n+\t\tfree(*opt_value);\n+\t*opt_value = strbuf_detach(&sb, NULL);\n+\treturn 0;\n+}\n+\n static const char * const pull_usage[] = {\n \tN_(\"git pull [options] [ [...]]\"),\n \tNULL\n };\n \n+/* Shared options */\n+static int opt_verbosity;\n+static char *opt_progress;\n+\n static struct option pull_options[] = {\n+\t/* Shared options */\n+\tOPT__VERBOSITY(&opt_verbosity),\n+\t{ OPTION_CALLBACK, 0, \"progress\", &opt_progress, NULL,\n+\t N_(\"force progress reporting\"),\n+\t PARSE_OPT_NOARG, parse_opt_passthru},\n+\n \tOPT_END()\n };\n \n /**\n+ * Pushes \"-q\" or \"-v\" switches into arr to match the opt_verbosity level.\n+ */\n+static void argv_push_verbosity(struct argv_array *arr)\n+{\n+\tint verbosity;\n+\n+\tfor (verbosity = opt_verbosity; verbosity > 0; verbosity--)\n+\t\targv_array_push(arr, \"-v\");\n+\n+\tfor (verbosity = opt_verbosity; verbosity < 0; verbosity++)\n+\t\targv_array_push(arr, \"-q\");\n+}\n+\n+/**\n * Parses argv into [ [...]], returning their values in `repo`\n * as a string and `refspecs` as a null-terminated array of strings. If `repo`\n * is not provided in argv, it is set to NULL.\n@@ -45,6 +93,12 @@ static int run_fetch(const char *repo, const char **refspecs)\n \tint ret;\n \n \targv_array_pushl(&args, \"fetch\", \"--update-head-ok\", NULL);\n+\n+\t/* Shared options */\n+\targv_push_verbosity(&args);\n+\tif (opt_progress)\n+\t\targv_array_push(&args, opt_progress);\n+\n \tif (repo)\n \t\targv_array_push(&args, repo);\n \twhile (*refspecs)\n@@ -63,6 +117,12 @@ static int run_merge(void)\n \tstruct argv_array args = ARGV_ARRAY_INIT;\n \n \targv_array_pushl(&args, \"merge\", NULL);\n+\n+\t/* Shared options */\n+\targv_push_verbosity(&args);\n+\tif (opt_progress)\n+\t\targv_array_push(&args, opt_progress);\n+\n \targv_array_push(&args, \"FETCH_HEAD\");\n \tret = run_command_v_opt(args.argv, RUN_GIT_CMD);\n \targv_array_clear(&args);\ndiff --git a/t/t5521-pull-options.sh b/t/t5521-pull-options.sh\nindex 0f6094b..89e2104 100755\n--- a/t/t5521-pull-options.sh\n+++ b/t/t5521-pull-options.sh\n@@ -11,7 +11,7 @@ test_expect_success 'setup' '\n \t git commit -m one)\n '\n \n-test_expect_failure 'git pull -q' '\n+test_expect_success 'git pull -q' '\n \tmkdir clonedq &&\n \t(cd clonedq && git init &&\n \tgit pull -q \"../parent\" >out 2>err &&\n@@ -46,7 +46,7 @@ test_expect_failure 'git pull --rebase' '\n \ttest_must_be_empty out)\n '\n \n-test_expect_failure 'git pull -v' '\n+test_expect_success 'git pull -v' '\n \tmkdir clonedv &&\n \t(cd clonedv && git init &&\n \tgit pull -v \"../parent\" >out 2>err &&\n@@ -62,7 +62,7 @@ test_expect_failure 'git pull -v --rebase' '\n \ttest_must_be_empty out)\n '\n \n-test_expect_failure 'git pull -v -q' '\n+test_expect_success 'git pull -v -q' '\n \tmkdir clonedvq &&\n \t(cd clonedvq && git init &&\n \tgit pull -v -q \"../parent\" >out 2>err &&\n@@ -70,7 +70,7 @@ test_expect_failure 'git pull -v -q' '\n \ttest_must_be_empty err)\n '\n \n-test_expect_failure 'git pull -q -v' '\n+test_expect_success 'git pull -q -v' '\n \tmkdir clonedqv &&\n \t(cd clonedqv && git init &&\n \tgit pull -q -v \"../parent\" >out 2>err &&\n-- \n2.1.4\n"},{"id":"261455","messageId":"1431961571-20370-4-git-send-email-pyokagan@gmail.com","threadId":"39357","inReplyTo":"1431961571-20370-1-git-send-email-pyokagan@gmail.com","subject":"[PATCH 03/14] pull: pass git-merge's options to git-merge","fromName":"Paul Tan","fromEmail":"pyokagan@gmail.com","sentAt":"2015-05-18T15:06:00Z","receivedAt":"2015-05-18T15:06:00Z","isPatch":true,"sender":{"key":"pyokagan@gmail.com","avatar":"https://avatars.githubusercontent.com/u/109479?v=4"},"body":"Specify git-merge's options in the option list, and pass any specified\noptions to git-merge.\n\nThese options are:\n\n* -n, --stat, --summary: since d8abe14 (merge, pull: introduce\n '--(no-)stat' option, 2008-04-06)\n\n* --log: since efb779f (merge, pull: add '--(no-)log' command line\n option, 2008-04-06)\n\n* --squash: since 7d0c688 (git-merge --squash, 2006-06-23)\n\n* --commit: since 5072a32 (Teach git-pull about --[no-]ff, --no-squash\n and --commit, 2007-10-29)\n\n* --edit: since 8580830 (\"git pull\" doesn't know \"--edit\", 2012-02-11)\n\n* --ff, --ff-only: since 5072a32 (Teach git-pull about --[no-]ff,\n --no-squash and --commit, 2007-10-29)\n\n* --verify-signatures: since efed002 (merge/pull: verify GPG signatures\n of commits being merged, 2013-03-31)\n\n* -s, --strategy: since 60fb5b2 (Use git-merge in git-pull (second\n try)., 2005-09-25)\n\n* -X, --strategy-option: since ee2c795 (Teach git-pull to pass\n -X