threads / patch / 48416

patch, 2 partsFix support for merge options.

Subject: [PATCH 1/2] Fix support for merge options.

## tl;dr

5 messages between May 5, 2018 and May 5, 2018. Diffs are folded; open one to read it.

replies: 4people: 2as markdown or json

Yann Dirson· May 5, 2018, 13:24 UTC · lore
---
 git-reintegrate | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
Show changes to git-reintegrate +3 −3
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· May 5, 2018, 13:24 UTC · re: Yann Dirson · lore

[PATCH 2/2] Fix wrong merge-base invocation preventing detection of up-to-date branches.

---
 git-reintegrate | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Show changes to git-reintegrate +1 −1
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· May 5, 2018, 13:40 UTC · re: Yann Dirson · lore

Re: [PATCH 1/2] Fix support for merge options.

Hi Yann,
On Sat, May 5, 2018 at 3:24 PM, Yann Dirson <ydirson@free.fr> wrote:
Show 5 quoted lines
> ---
>  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· May 5, 2018, 15:41 UTC · re: Christian Couder · lore

Re: [PATCH 1/2] Fix support for merge options.

Christian wrote:
Show 17 quoted lines
> Hi Yann,
> 
> On Sat, May 5, 2018 at 3:24 PM, Yann Dirson <ydirson@free.fr> 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 :)
Show 5 quoted lines
> Nice to see you again on the list anyway!
> 
> Best,
> Christian.
>
Christian Couder· May 5, 2018, 15:53 UTC · re: ydirson@free.fr · lore

Re: [PATCH 1/2] Fix support for merge options.

On Sat, May 5, 2018 at 5:41 PM,  <ydirson@free.fr> wrote:
Show 14 quoted lines
> 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/)

← back to recent threads