git/builtin/pull.c, branch v2.6.2

Merge branch 'pt/pull-builtin' into maint

2015-10-16T21:32:32Z

* pt/pull-builtin: pull: enclose in brackets in the usage string merge: grammofix in please-commit-before-merge message

pull: enclose in brackets in the usage string

2015-10-16T16:38:32Z

All the other placeholders are already shown that way. Signed-off-by: Alex Henrie Signed-off-by: Junio C Hamano

pull: don't mark values for option "rebase" for translation

2015-09-11T16:50:00Z

"false|true|preserve" are actual values for option "rebase" of the "git-pull" command and should therefore not be marked for translation. Signed-off-by: Ralf Thielow Signed-off-by: Junio C Hamano

Merge branch 'mh/tempfile'

2015-08-25T21:57:09Z

The "lockfile" API has been rebuilt on top of a new "tempfile" API. * mh/tempfile: credential-cache--daemon: use tempfile module credential-cache--daemon: delete socket from main() gc: use tempfile module to handle gc.pid file lock_repo_for_gc(): compute the path to "gc.pid" only once diff: use tempfile module setup_temporary_shallow(): use tempfile module write_shared_index(): use tempfile module register_tempfile(): new function to handle an existing temporary file tempfile: add several functions for creating temporary files prepare_tempfile_object(): new function, extracted from create_tempfile() tempfile: a new module for handling temporary files commit_lock_file(): use get_locked_file_path() lockfile: add accessor get_lock_file_path() lockfile: add accessors get_lock_file_fd() and get_lock_file_fp() create_bundle(): duplicate file descriptor to avoid closing it twice lockfile: move documentation to lockfile.h and lockfile.c

pull: allow dirty tree when rebase.autostash enabled

2015-07-22T19:56:30Z

rebase learned to stash changes when it encounters a dirty work tree, but git pull --rebase does not. Only verify if the working tree is dirty when rebase.autostash is not enabled. Signed-off-by: Kevin Daudt Signed-off-by: Paul Tan Signed-off-by: Junio C Hamano

pull: remove redirection to git-pull.sh

2015-06-18T20:18:59Z

At the beginning of the rewrite of git-pull.sh to C, we introduced a redirection to git-pull.sh if the environment variable _GIT_USE_BUILTIN_PULL was not defined in order to not break test scripts that relied on a functional git-pull. Now that all of git-pull's functionality has been re-implemented in builtin/pull.c, remove this redirection, and retire the old git-pull.sh into contrib/examples/. Signed-off-by: Paul Tan Signed-off-by: Junio C Hamano

pull --rebase: error on no merge candidate cases

2015-06-18T20:18:52Z

Tweak the error messages printed by die_no_merge_candidates() to take into account that we may be "rebasing against" rather than "merging with". Signed-off-by: Paul Tan Signed-off-by: Junio C Hamano

pull --rebase: exit early when the working directory is dirty

2015-06-18T20:18:43Z

Re-implement the behavior introduced by f9189cf (pull --rebase: exit early when the working directory is dirty, 2008-05-21). Signed-off-by: Paul Tan Signed-off-by: Junio C Hamano

pull: configure --rebase via branch..rebase or pull.rebase

2015-06-18T20:17:53Z

Since cd67e4d (Teach 'git pull' about --rebase, 2007-11-28), fetch+rebase could be set by default by defining the config variable branch..rebase. This setting can be overriden on the command line by --rebase and --no-rebase. Since 6b37dff (pull: introduce a pull.rebase option to enable --rebase, 2011-11-06), git-pull --rebase can also be configured via the pull.rebase configuration option. Re-implement support for these two configuration settings by introducing config_get_rebase() which is called before parse_options() to set the default value of opt_rebase. Helped-by: Stefan Beller Helped-by: Duy Nguyen Signed-off-by: Paul Tan Signed-off-by: Junio C Hamano

pull: teach git pull about --rebase

2015-06-18T20:17:46Z

Since cd67e4d (Teach 'git pull' about --rebase, 2007-11-28), if the --rebase option is set, git-rebase is run instead of git-merge. Re-implement this by introducing run_rebase(), which is called instead of run_merge() if opt_rebase is a true value. Since c85c792 (pull --rebase: be cleverer with rebased upstream branches, 2008-01-26), git-pull handles the case where the upstream branch was rebased since it was last fetched. The fork point (old remote ref) of the branch from the upstream branch is calculated before fetch, and then rebased from onto the new remote head (merge_head) after fetch. Re-implement this by introducing get_merge_branch_2() and get_merge_branch_1() to find the upstream branch for the specified/current branch, and get_rebase_fork_point() which will find the fork point between the upstream branch and current branch. However, the above change created a problem where git-rebase cannot detect commits that are already upstream, and thus may result in unnecessary conflicts. cf65426 (pull --rebase: Avoid spurious conflicts and reapplying unnecessary patches, 2010-08-12) fixes this by ignoring the above old remote ref if it is contained within the merge base of the merge head and the current branch. This is re-implemented in run_rebase() where fork_point is not used if it is the merge base returned by get_octopus_merge_base(). Helped-by: Stefan Beller Helped-by: Johannes Schindelin Signed-off-by: Paul Tan Signed-off-by: Junio C Hamano