{"thread":{"id":"25696","subject":"[PATCH] rebase: allow -X for non-recursive strategy","startedAt":"2010-11-09T20:58:19Z","lastAt":"2010-11-10T18:55:01Z","messageCount":3,"participants":["Martin von Zweigbergk","Jonathan Nieder","Sverre Rabbelier"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"155567","messageId":"1289336299-28282-1-git-send-email-martin.von.zweigbergk@gmail.com","threadId":"25696","inReplyTo":null,"subject":"[PATCH] rebase: allow -X for non-recursive strategy","fromName":"Martin von Zweigbergk","fromEmail":"martin.von.zweigbergk@gmail.com","sentAt":"2010-11-09T20:58:19Z","receivedAt":"2010-11-09T20:58:19Z","isPatch":true,"sender":{"key":"martinvonz@gmail.com","avatar":"https://avatars.githubusercontent.com/u/891642?v=4"},"body":"If any strategy options are passed to -X, the strategy will always be\nset to 'recursive'. According to the documentation, it should default to\n'recursive' if it is not set, but it should be possible to set it to\nother values.\n\nSigned-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>\n---\nMaybe I'm missing something, but it looks very much like that '-n'\nshould have been a '-z'. But still, 'strategy' is set to 'recursive' at\nthe start of the script and doesn't seem to be unset anywhere, so the\nblock shouldn't be necessary at all.\n\n git-rebase.sh |    4 ----\n 1 files changed, 0 insertions(+), 4 deletions(-)\n\ndiff --git a/git-rebase.sh b/git-rebase.sh\nindex 42c0628..ec08f9c 100755\n--- a/git-rebase.sh\n+++ b/git-rebase.sh\n@@ -312,10 +312,6 @@ do\n \t\tesac\n \t\tstrategy_opts=\"$strategy_opts $(git rev-parse --sq-quote \"--$newopt\")\"\n \t\tdo_merge=t\n-\t\tif test -n \"$strategy\"\n-\t\tthen\n-\t\t\tstrategy=recursive\n-\t\tfi\n \t\t;;\n \t-s=*|--s=*|--st=*|--str=*|--stra=*|--strat=*|--strate=*|\\\n \t\t--strateg=*|--strategy=*|\\\n-- \n1.7.3.2.167.ga361b\n"},{"id":"155581","messageId":"20101110085554.GA10282@burratino","threadId":"25696","inReplyTo":"1289336299-28282-1-git-send-email-martin.von.zweigbergk@gmail.com","subject":"Re: [PATCH] rebase: allow -X for non-recursive strategy","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2010-11-10T08:55:54Z","receivedAt":"2010-11-10T08:55:54Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Martin von Zweigbergk wrote:\n\n> Subject: [PATCH] rebase: allow -X for non-recursive strategy\n\nI first read this as \"allow -X option, which can be used to set a\nnon-recursive strategy\".  Of course that was nonsense, but maybe\nit can be made clearer?  e.g.\n\n\trebase -X: do not clobber strategy\n\nThis fixes a regression introduced in v1.7.3-rc0~67^2 (2010-07-29).\n"},{"id":"155608","messageId":"AANLkTi=v+KUHDXYDWQXfpar+_jgMJgCn+TRuq1pPNKwB@mail.gmail.com","threadId":"25696","inReplyTo":"20101110085554.GA10282@burratino","subject":"Re: [PATCH] rebase: allow -X for non-recursive strategy","fromName":"Sverre Rabbelier","fromEmail":"srabbelier@gmail.com","sentAt":"2010-11-10T18:55:01Z","receivedAt":"2010-11-10T18:55:01Z","isPatch":true,"sender":{"key":"srabbelier@gmail.com","avatar":"https://avatars.githubusercontent.com/u/3098?v=4"},"body":"Heya,\n\nOn Wed, Nov 10, 2010 at 09:55, Jonathan Nieder <jrnieder@gmail.com> wrote:\n> This fixes a regression introduced in v1.7.3-rc0~67^2 (2010-07-29).\n\nCan has test?\n\n-- \nCheers,\n\nSverre Rabbelier\n"}]}