# [PATCH 1/2] Fix support for merge options. 5 messages from 2018-05-05 to 2018-05-05. Participants: Yann Dirson, Christian Couder, ydirson@free.fr. Thread: https://gitlist.dev/t/48416 ## Yann Dirson, 2018-05-05 13:24 Subject: [PATCH 1/2] Fix support for merge options. Message-ID: <20180505132423.18324-1-ydirson@free.fr> URL: https://gitlist.dev/e/20180505132423.18324-1-ydirson%40free.fr ``` --- git-reintegrate | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/git-reintegrate b/git-reintegrate index a1c17d2..da45239 100755 --- a/git-reintegrate +++ b/git-reintegrate @@ -338,7 +338,7 @@ class Integration def finalize_command(cmd, args, message) begin fun = @@map[cmd] || "cmd_#{cmd}".to_sym - send(fun, message, *args) + send(fun, message, *args.split(' ')) rescue NoMethodError raise Integration::Stop, "Unknown command: #{cmd}" end @@ -559,7 +559,7 @@ def do_apply inst = inst.lines.reject do |line| next true if line =~ /^base / if line =~ /^merge (.*)$/ - system(*%W[git merge-base --is-ancestor #{$1} HEAD]) + system(*%W[git merge-base --is-ancestor #{$1.split(' ')[0]} HEAD]) next true if $?.success? end false @@ -621,7 +621,7 @@ def do_status when 'base' $status_base = args when 'merge' - status_merge(*args) + status_merge(*args.split(' ')[0]) when '.' status_dot(*args) else -- 2.11.0 ``` ## Yann Dirson, 2018-05-05 13:24 Subject: [PATCH 2/2] Fix wrong merge-base invocation preventing detection of up-to-date branches. Message-ID: <20180505132423.18324-2-ydirson@free.fr> URL: https://gitlist.dev/e/20180505132423.18324-2-ydirson%40free.fr In-Reply-To: <20180505132423.18324-1-ydirson@free.fr> ``` --- git-reintegrate | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-reintegrate b/git-reintegrate index da45239..a6e3cff 100755 --- a/git-reintegrate +++ b/git-reintegrate @@ -581,7 +581,7 @@ def status_merge(branch_to_merge = nil) elsif system(*%w[git merge-base --is-ancestor], branch_to_merge, $status_base) state = "+" verbose_state = "merged to #{$status_base}" - elsif system(*%w[git-merge-base --is-ancestor], branch_to_merge, $branch.name) + elsif system(*%w[git merge-base --is-ancestor], branch_to_merge, $branch.name) state = "*" verbose_state = "up-to-date" else -- 2.11.0 ``` ## Christian Couder, 2018-05-05 13:40 Subject: Re: [PATCH 1/2] Fix support for merge options. Message-ID: URL: https://gitlist.dev/e/CAP8UFD3jc6Aops56pgQCw7cYKW9ujkUmtDgLfwo%3DVyBy-QNKAg%40mail.gmail.com In-Reply-To: <20180505132423.18324-1-ydirson@free.fr> ``` Hi Yann, On Sat, May 5, 2018 at 3:24 PM, Yann Dirson wrote: > --- > git-reintegrate | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/git-reintegrate b/git-reintegrate It looks like git-reintegrate is not managed in Git but in this repository : https://github.com/felipec/git-reintegrate So could be a bit confusing to send those patches to the Git mailing list without telling that your patches are not to be integrated into Git itself. Nice to see you again on the list anyway! Best, Christian. ``` ## ydirson@free.fr, 2018-05-05 15:41 Subject: Re: [PATCH 1/2] Fix support for merge options. Message-ID: <2107075651.273821698.1525534895640.JavaMail.root@zimbra39-e7> URL: https://gitlist.dev/e/2107075651.273821698.1525534895640.JavaMail.root%40zimbra39-e7 In-Reply-To: ``` Christian wrote: > Hi Yann, > > On Sat, May 5, 2018 at 3:24 PM, Yann Dirson wrote: > > --- > > git-reintegrate | 6 +++--- > > 1 file changed, 3 insertions(+), 3 deletions(-) > > > > diff --git a/git-reintegrate b/git-reintegrate > > It looks like git-reintegrate is not managed in Git but in this > repository : > > https://github.com/felipec/git-reintegrate > > So could be a bit confusing to send those patches to the Git mailing > list without telling that your patches are not to be integrated into > Git itself. Right, I stand corrected, thanks :) > Nice to see you again on the list anyway! > > Best, > Christian. > ``` ## Christian Couder, 2018-05-05 15:53 Subject: Re: [PATCH 1/2] Fix support for merge options. Message-ID: URL: https://gitlist.dev/e/CAP8UFD1KqFS5j%3DZPqEHXrh3jM3LeTbk8_KEy3FGmsVwa%2BkrPAQ%40mail.gmail.com In-Reply-To: <2107075651.273821698.1525534895640.JavaMail.root@zimbra39-e7> ``` On Sat, May 5, 2018 at 5:41 PM, wrote: > Christian wrote: >> >> It looks like git-reintegrate is not managed in Git but in this >> repository : >> >> https://github.com/felipec/git-reintegrate >> >> So could be a bit confusing to send those patches to the Git mailing >> list without telling that your patches are not to be integrated into >> Git itself. > > Right, I stand corrected, thanks :) > >> Nice to see you again on the list anyway! Also congratulations for Shadow's success! (https://shadow.tech/usen/) ```