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

pull: do nothing on --dry-run

2010-05-25T17:49:54Z

Pull was never meant to take --dry-run at all. However, it passes unknown arguments to git-fetch, which does do a dry-run. Unfortunately, pull then attempts to merge whatever cruft was in FETCH_HEAD (which the dry-run fetch will not have written to). Even though we never advertise --dry-run as something that should work, it is still worth being defensive because: 1. Other commands (including fetch) take --dry-run, so a user might try it. 2. Rather than simply producing an error, it actually changes the repository in totally unexpected ways. This patch makes "pull --dry-run" equivalent to "fetch --dry-run". Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

Merge branch 'maint'

2010-03-20T18:29:19Z

* maint: Update draft release notes to 1.7.0.3 fetch: Fix minor memory leak fetch: Future-proof initialization of a refspec on stack fetch: Check for a "^{}" suffix with suffixcmp() daemon: parse_host_and_port SIGSEGV if port is specified Makefile: Fix CDPATH problem pull: replace unnecessary sed invocation

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

fetch and pull: learn --progress

2010-02-24T16:35:45Z

Note that in the documentation for git-pull, documentation for the --progress option is displayed under the "Options related to fetching" subtitle via fetch-options.txt. Also, update the documentation of the -q/--quiet option for git-pull to mention its effect on progress reporting during fetching. Signed-off-by: Tay Ray Chuan 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

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

pull: do nothing on --dry-run

Merge branch 'maint'

pull: replace unnecessary sed invocation

fetch and pull: learn --progress

pull: re-fix command line generation

Merge branch 'ap/merge-backend-opts'

pull: Fix parsing of -X

Teach git-pull to pass -X to git-merge

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

Merge branch 'maint'

Teach git-pull to pass -X