{"thread":{"id":"48416","subject":"[PATCH 1/2] Fix support for merge options.","startedAt":"2018-05-05T13:24:33Z","lastAt":"2018-05-05T15:53:28Z","messageCount":5,"participants":["Yann Dirson","Christian Couder","ydirson@free.fr"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"346715","messageId":"20180505132423.18324-1-ydirson@free.fr","threadId":"48416","inReplyTo":null,"subject":"[PATCH 1/2] Fix support for merge options.","fromName":"Yann Dirson","fromEmail":"ydirson@free.fr","sentAt":"2018-05-05T13:24:22Z","receivedAt":"2018-05-05T13:24:33Z","isPatch":true,"sender":{"key":"ydirson@free.fr","avatar":null},"body":"---\n git-reintegrate | 6 +++---\n 1 file changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/git-reintegrate b/git-reintegrate\nindex a1c17d2..da45239 100755\n--- a/git-reintegrate\n+++ b/git-reintegrate\n@@ -338,7 +338,7 @@ class Integration\n   def finalize_command(cmd, args, message)\n     begin\n       fun = @@map[cmd] || \"cmd_#{cmd}\".to_sym\n-      send(fun, message, *args)\n+      send(fun, message, *args.split(' '))\n     rescue NoMethodError\n       raise Integration::Stop, \"Unknown command: #{cmd}\"\n     end\n@@ -559,7 +559,7 @@ def do_apply\n   inst = inst.lines.reject do |line|\n     next true if line =~ /^base /\n     if line =~ /^merge (.*)$/\n-      system(*%W[git merge-base --is-ancestor #{$1} HEAD])\n+      system(*%W[git merge-base --is-ancestor #{$1.split(' ')[0]} HEAD])\n       next true if $?.success?\n     end\n     false\n@@ -621,7 +621,7 @@ def do_status\n     when 'base'\n       $status_base = args\n     when 'merge'\n-      status_merge(*args)\n+      status_merge(*args.split(' ')[0])\n     when '.'\n       status_dot(*args)\n     else\n-- \n2.11.0\n\n"},{"id":"346716","messageId":"20180505132423.18324-2-ydirson@free.fr","threadId":"48416","inReplyTo":"20180505132423.18324-1-ydirson@free.fr","subject":"[PATCH 2/2] Fix wrong merge-base invocation preventing detection of up-to-date branches.","fromName":"Yann Dirson","fromEmail":"ydirson@free.fr","sentAt":"2018-05-05T13:24:23Z","receivedAt":"2018-05-05T13:24:37Z","isPatch":true,"sender":{"key":"ydirson@free.fr","avatar":null},"body":"---\n git-reintegrate | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/git-reintegrate b/git-reintegrate\nindex da45239..a6e3cff 100755\n--- a/git-reintegrate\n+++ b/git-reintegrate\n@@ -581,7 +581,7 @@ def status_merge(branch_to_merge = nil)\n   elsif system(*%w[git merge-base --is-ancestor], branch_to_merge, $status_base)\n     state = \"+\"\n     verbose_state = \"merged to #{$status_base}\"\n-  elsif system(*%w[git-merge-base --is-ancestor], branch_to_merge, $branch.name)\n+  elsif system(*%w[git merge-base --is-ancestor], branch_to_merge, $branch.name)\n     state = \"*\"\n     verbose_state = \"up-to-date\"\n   else\n-- \n2.11.0\n\n"},{"id":"346718","messageId":"CAP8UFD3jc6Aops56pgQCw7cYKW9ujkUmtDgLfwo=VyBy-QNKAg@mail.gmail.com","threadId":"48416","inReplyTo":"20180505132423.18324-1-ydirson@free.fr","subject":"Re: [PATCH 1/2] Fix support for merge options.","fromName":"Christian Couder","fromEmail":"christian.couder@gmail.com","sentAt":"2018-05-05T13:40:37Z","receivedAt":"2018-05-05T13:41:16Z","isPatch":true,"sender":{"key":"christian.couder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/208954?v=4"},"body":"Hi Yann,\n\nOn Sat, May 5, 2018 at 3:24 PM, Yann Dirson <ydirson@free.fr> wrote:\n> ---\n>  git-reintegrate | 6 +++---\n>  1 file changed, 3 insertions(+), 3 deletions(-)\n>\n> diff --git a/git-reintegrate b/git-reintegrate\n\nIt looks like git-reintegrate is not managed in Git but in this repository :\n\nhttps://github.com/felipec/git-reintegrate\n\nSo could be a bit confusing to send those patches to the Git mailing\nlist without telling that your patches are not to be integrated into\nGit itself.\n\nNice to see you again on the list anyway!\n\nBest,\nChristian.\n"},{"id":"346720","messageId":"2107075651.273821698.1525534895640.JavaMail.root@zimbra39-e7","threadId":"48416","inReplyTo":"CAP8UFD3jc6Aops56pgQCw7cYKW9ujkUmtDgLfwo=VyBy-QNKAg@mail.gmail.com","subject":"Re: [PATCH 1/2] Fix support for merge options.","fromName":"","fromEmail":"ydirson@free.fr","sentAt":"2018-05-05T15:41:35Z","receivedAt":"2018-05-05T15:41:39Z","isPatch":true,"sender":{"key":"ydirson@free.fr","avatar":null},"body":"Christian wrote:\n> Hi Yann,\n> \n> On Sat, May 5, 2018 at 3:24 PM, Yann Dirson <ydirson@free.fr> wrote:\n> > ---\n> >  git-reintegrate | 6 +++---\n> >  1 file changed, 3 insertions(+), 3 deletions(-)\n> >\n> > diff --git a/git-reintegrate b/git-reintegrate\n> \n> It looks like git-reintegrate is not managed in Git but in this\n> repository :\n> \n> https://github.com/felipec/git-reintegrate\n> \n> So could be a bit confusing to send those patches to the Git mailing\n> list without telling that your patches are not to be integrated into\n> Git itself.\n\nRight, I stand corrected, thanks :)\n\n> Nice to see you again on the list anyway!\n> \n> Best,\n> Christian.\n> \n"},{"id":"346721","messageId":"CAP8UFD1KqFS5j=ZPqEHXrh3jM3LeTbk8_KEy3FGmsVwa+krPAQ@mail.gmail.com","threadId":"48416","inReplyTo":"2107075651.273821698.1525534895640.JavaMail.root@zimbra39-e7","subject":"Re: [PATCH 1/2] Fix support for merge options.","fromName":"Christian Couder","fromEmail":"christian.couder@gmail.com","sentAt":"2018-05-05T15:53:24Z","receivedAt":"2018-05-05T15:53:28Z","isPatch":true,"sender":{"key":"christian.couder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/208954?v=4"},"body":"On Sat, May 5, 2018 at 5:41 PM,  <ydirson@free.fr> wrote:\n> Christian wrote:\n>>\n>> It looks like git-reintegrate is not managed in Git but in this\n>> repository :\n>>\n>> https://github.com/felipec/git-reintegrate\n>>\n>> So could be a bit confusing to send those patches to the Git mailing\n>> list without telling that your patches are not to be integrated into\n>> Git itself.\n>\n> Right, I stand corrected, thanks :)\n>\n>> Nice to see you again on the list anyway!\n\nAlso congratulations for Shadow's success! (https://shadow.tech/usen/)\n"}]}