{"thread":{"id":"3653","subject":"[PATCH] Let merge set the default strategy.","startedAt":"2006-03-15T22:51:41Z","lastAt":"2006-03-15T23:40:41Z","messageCount":2,"participants":["Mark Hollomon","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"17574","messageId":"1142463103-6986-markhollomon@comcast.net","threadId":"3653","inReplyTo":null,"subject":"[PATCH] Let merge set the default strategy.","fromName":"Mark Hollomon","fromEmail":"markhollomon@comcast.net","sentAt":"2006-03-15T22:51:41Z","receivedAt":"2006-03-15T22:51:41Z","isPatch":true,"sender":{"key":"markhollomon@comcast.net","avatar":null},"body":"If the user does not set a merge strategy for git-pull,\nlet git-merge calculate a default strategy.\n\nThis may be preferable to the earlier patch involving\nNO_PYTHON.\n\nSigned-off-by: Mark Hollomon <markhollomon@comcast.net>\n\n\n---\n\n git-pull.sh |   10 +++-------\n 1 files changed, 3 insertions(+), 7 deletions(-)\n\n54e2c920b8ad979bc75d25ae73300be6077f46a0\ndiff --git a/git-pull.sh b/git-pull.sh\nindex 6caf1aa..7764b70 100755\n--- a/git-pull.sh\n+++ b/git-pull.sh\n@@ -71,19 +71,15 @@ case \"$merge_head\" in\n \t;;\n ?*' '?*)\n \tvar=`git repo-config --get pull.octopus`\n-\tif test '' = \"$var\"\n+\tif test '' != \"$var\"\n \tthen\n-\t\tstrategy_default_args='-s octopus'\n-\telse\n \t\tstrategy_default_args=\"-s $var\"\n \tfi\n \t;;\n *)\n \tvar=`git repo-config --get pull.twohead`\n-\tif test '' = \"$var\"\n-\tthen\n-\t\tstrategy_default_args='-s recursive'\n-\telse\n+\tif test '' != \"$var\"\n+        then\n \t\tstrategy_default_args=\"-s $var\"\n \tfi\n \t;;\n-- \n1.2.4.gea75\n"},{"id":"17578","messageId":"7vhd5zff9i.fsf@assigned-by-dhcp.cox.net","threadId":"3653","inReplyTo":"1142463103-6986-markhollomon@comcast.net","subject":"Re: [PATCH] Let merge set the default strategy.","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-03-15T23:40:41Z","receivedAt":"2006-03-15T23:40:41Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Mark Hollomon <markhollomon@comcast.net> writes:\n\n> If the user does not set a merge strategy for git-pull,\n> let git-merge calculate a default strategy.\n\nMakes lot of sense, thanks.\n\n> This may be preferable to the earlier patch involving\n> NO_PYTHON.\n\nWhich earlier patch???\n"}]}