git/git-pull.sh, branch v1.7.0.5

pull: replace unnecessary sed invocation

2010-03-20T14:25:02Z

Getting the shortened branch name is as easy as using the shell's parameter expansion. Signed-off-by: Stephen Boyd Signed-off-by: Junio C Hamano

pull: re-fix command line generation

2010-01-24T18:11:27Z

14e5d40 (pull: Fix parsing of -X

Merge branch 'ap/merge-backend-opts'

2010-01-21T04:28:50Z

* ap/merge-backend-opts: Document that merge strategies can now take their own options Extend merge-subtree tests to test -Xsubtree=dir. Make "subtree" part more orthogonal to the rest of merge-recursive. pull: Fix parsing of -X

pull: Fix parsing of -X

2010-01-18T06:46:27Z

As -X parameter can contain arbitrary $IFS characters, we need to properly quote it from the shell while forming the command line. Signed-off-by: Junio C Hamano

Teach git-pull to pass -X

2010-01-18T06:45:17Z

This needs the usual sq then eval trick to allow IFS characters in the option. Signed-off-by: Avery Pennarun Signed-off-by: Junio C Hamano

Be more user-friendly when refusing to do something because of conflict.

2010-01-12T21:17:08Z

Various commands refuse to run in the presence of conflicts (commit, merge, pull, cherry-pick/revert). They all used to provide rough, and inconsistant error messages. A new variable advice.resolveconflict is introduced, and allows more verbose messages, pointing the user to the appropriate solution. For commit, the error message used to look like this: $ git commit foo.txt: needs merge foo.txt: unmerged (c34a92682e0394bc0d6f4d4a67a8e2d32395c169) foo.txt: unmerged (3afcd75de8de0bb5076942fcb17446be50451030) foo.txt: unmerged (c9785d77b76dfe4fb038bf927ee518f6ae45ede4) error: Error building trees The "need merge" line is given by refresh_cache. We add the IN_PORCELAIN option to make the output more consistant with the other porcelain commands, and catch the error in return, to stop with a clean error message. The next lines were displayed by a call to cache_tree_update(), which is not reached anymore if we noticed the conflict. The new output looks like: U foo.txt fatal: 'commit' is not possible because you have unmerged files. Please, fix them up in the work tree, and then use 'git add/rm ' as appropriate to mark resolution and make a commit, or use 'git commit -a'. Pull is slightly modified to abort immediately if $GIT_DIR/MERGE_HEAD exists instead of waiting for merge to complain. The behavior of merge and the test-case are slightly modified to reflect the usual flow: start with conflicts, fix them, and afterwards get rid of MERGE_HEAD, with different error messages at each stage. Signed-off-by: Matthieu Moy Signed-off-by: Junio C Hamano

Merge branch 'maint'

2009-12-09T06:47:09Z

* maint: add-interactive: fix deletion of non-empty files pull: clarify advice for the unconfigured error case

Revert recent "git merge HEAD ..." deprecation

2009-12-08T23:26:39Z

This reverts commit c0ecb07048ce2123589a2f077d296e8cf29a9570 "git-pull.sh: Fix call to git-merge for new command format" and commit b81e00a965c62ca72a4b9db425ee173de147808d "git-merge: a deprecation notice of the ancient command line syntax". They caused a "git pull" (without any arguments, and without any local commits---only to update to the other side) to warn that commit log message is ignored because the merge resulted in a fast-forward. Another possible solution is to add an extra option to "git merge" so that "git pull" can tell it that the message given is not coming from the end user (the canned message is passed just in case the merge resulted in a non-ff and caused commit), but I think it is easier _not_ to deprecate the old syntax. Signed-off-by: Junio C Hamano

pull: clarify advice for the unconfigured error case

2009-12-03T18:04:27Z

When pull --rebase fails because it cannot find what branch to merge against, the error message implies we are trying to merge. Say "rebase against" instead of "merge with" to avoid confusion. The configuration suggested to remedy the situation uses a confusing syntax, with variables specified in the dotted form accepted by 'git config' but separated from their values by the '=' delimiter used by config files. Since the user will have to edit this output anyway, it is more helpful to provide a config file snippet to paste into an editor and modify. Signed-off-by: Jan Krüger Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano

git-pull.sh: Fix call to git-merge for new command format

2009-12-02T18:42:48Z

Now "git merge HEAD" is officially deprecated, we should clean our own use as well. Signed-off-by: Horst H. von Brand Signed-off-by: Junio C Hamano