{"thread":{"id":"3646","subject":"[PATCH] Use resolve in git-pull if NO_PYTHON","startedAt":"2006-03-14T17:16:04Z","lastAt":"2006-03-14T17:26:19Z","messageCount":2,"participants":["Mark Hollomon","Johannes Schindelin"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"17546","messageId":"1142356355-4772-markhollomon@comcast.net","threadId":"3646","inReplyTo":null,"subject":"[PATCH] Use resolve in git-pull if NO_PYTHON","fromName":"Mark Hollomon","fromEmail":"markhollomon@comcast.net","sentAt":"2006-03-14T17:16:04Z","receivedAt":"2006-03-14T17:16:04Z","isPatch":true,"sender":{"key":"markhollomon@comcast.net","avatar":null},"body":"git-pull is hardcoded to use the recursive merge strategy\nfor the twohead case. But if git has been built with NO_PYTHON,\nthat strategy is not available. Teach git-pull to use resolve\nif built with NO_PYTHON.\n\nSigned-off-by: Mark Hollomon <markhollomon@comcast.net>\n\n\n---\n\n git-pull.sh |    7 ++++++-\n 1 files changed, 6 insertions(+), 1 deletions(-)\n\n1eb3abec6f4811e3eeafa50445ed0f2ce5d85b08\ndiff --git a/git-pull.sh b/git-pull.sh\nindex 6caf1aa..ae9c346 100755\n--- a/git-pull.sh\n+++ b/git-pull.sh\n@@ -8,6 +8,11 @@ USAGE='[-n | --no-summary] [--no-commit]\n LONG_USAGE='Fetch one or more remote refs and merge it/them into the current HEAD.'\n . git-sh-setup\n \n+default_twohead_strategy='recursive'\n+if test \"@@NO_PYTHON@@\"; then\n+    default_twohead_strategy='resolve'\n+fi\n+\n strategy_args= no_summary= no_commit=\n while case \"$#,$1\" in 0) break ;; *,-*) ;; *) break ;; esac\n do\n@@ -82,7 +87,7 @@ case \"$merge_head\" in\n \tvar=`git repo-config --get pull.twohead`\n \tif test '' = \"$var\"\n \tthen\n-\t\tstrategy_default_args='-s recursive'\n+\t\tstrategy_default_args=\"-s $default_twohead_strategy\"\n \telse\n \t\tstrategy_default_args=\"-s $var\"\n \tfi\n-- \n1.2.4.g967a\n"},{"id":"17548","messageId":"Pine.LNX.4.63.0603141825200.22344@wbgn013.biozentrum.uni-wuerzburg.de","threadId":"3646","inReplyTo":"1142356355-4772-markhollomon@comcast.net","subject":"Re: [PATCH] Use resolve in git-pull if NO_PYTHON","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2006-03-14T17:26:19Z","receivedAt":"2006-03-14T17:26:19Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Tue, 14 Mar 2006, Mark Hollomon wrote:\n\n> git-pull is hardcoded to use the recursive merge strategy\n> for the twohead case. But if git has been built with NO_PYTHON,\n> that strategy is not available. Teach git-pull to use resolve\n> if built with NO_PYTHON.\n\nD'oh. I forgot to send that patch when I was doing the NO_PYTHON stuff. \nBut I did it differently: There is no good reason that git-pull should \ninsist on its own default strategy when git-merge already has one.\n\nCiao,\nDscho\n"}]}