git/git-pull.sh, branch v2.1.2

Sync with maint

2014-06-12T19:22:38Z

* maint: pull: do not abuse 'break' inside a shell 'case'

pull: do not abuse 'break' inside a shell 'case'

2014-06-12T19:15:49Z

It is not C. The code would break under mksh when 'pull.ff' is set: $ git pull /usr/lib/git-core/git-pull[67]: break: can't break Already up-to-date. Signed-off-by: Jacek Konieczny Signed-off-by: Junio C Hamano

git-pull.sh: use the $( ... ) construct for command substitution

2014-04-23T22:17:02Z

The Git CodingGuidelines prefer the $(...) construct for command substitution instead of using the backquotes `...`. The backquoted form is the traditional method for command substitution, and is supported by POSIX. However, all but the simplest uses become complicated quickly. In particular, embedded command substitutions and/or the use of double quotes require careful escaping with the backslash character. The patch was generated by: for _f in $(find . -name "*.sh") do sed -i 's@`$.*$`@$(\1)@g' ${_f} done and then carefully proof-read. Signed-off-by: Elia Pinto Reviewed-by: Matthieu Moy Signed-off-by: Junio C Hamano

Merge branch 'bc/gpg-sign-everywhere'

2014-02-27T22:01:44Z

Teach "--gpg-sign" option to many commands that create commits. * bc/gpg-sign-everywhere: pull: add the --gpg-sign option. rebase: add the --gpg-sign option rebase: parse options in stuck-long mode rebase: don't try to match -M option rebase: remove useless arguments check am: add the --gpg-sign option am: parse options in stuck-long mode git-sh-setup.sh: add variable to use the stuck-long mode cherry-pick, revert: add the --gpg-sign option

Merge branch 'da/pull-ff-configuration'

2014-02-27T22:01:11Z

"git pull" learned to pay attention to pull.ff configuration variable. * da/pull-ff-configuration: pull: add --ff-only to the help text pull: add pull.ff configuration

pull: add the --gpg-sign option.

2014-02-11T22:52:08Z

git merge already allows us to sign commits, and git rebase has recently learned how to do so as well. Teach git pull to parse the -S/--gpg-sign option and pass this along to merge or rebase, as appropriate. Signed-off-by: brian m. carlson Signed-off-by: Junio C Hamano

Merge branch 'jk/pull-rebase-using-fork-point'

2014-01-17T20:04:29Z

Finishing touches so that an expected error message will not leak to the UI. * jk/pull-rebase-using-fork-point: pull: suppress error when no remoteref is found

pull: suppress error when no remoteref is found

2014-01-17T20:03:32Z

Commit 48059e4 (pull: use merge-base --fork-point when appropriate, 2013-12-08) incorrectly assumes that get_remote_merge_branch will either yield a non-empty string or return an error, but there are circumstances where it will yield an empty string. The previous code then invoked git-rev-list with no arguments, which results in an error suppressed by redirecting stderr to /dev/null. Now we invoke git-merge-base with an empty branch name, which also results in an error. Suppress this in the same way. Signed-off-by: John Keeping Signed-off-by: Junio C Hamano

pull: add --ff-only to the help text

2014-01-16T00:01:07Z

Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano

pull: add pull.ff configuration

2014-01-16T00:01:06Z

Add a `pull.ff` configuration option that is analogous to the `merge.ff` option. This allows us to control the fast-forward behavior for pull-initiated merges only. Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano