All of lore.kernel.org
 help / color / mirror / Atom feed
From: Yann Dirson <ydirson@free.fr>
To: Felipe Contreras <felipe.contreras@gmail.com>
Cc: git@vger.kernel.org, Yann Dirson <ydirson@free.fr>
Subject: [PATCH 1/2] Fix support for merge options.
Date: Sat,  5 May 2018 15:24:22 +0200	[thread overview]
Message-ID: <20180505132423.18324-1-ydirson@free.fr> (raw)

---
 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


             reply	other threads:[~2018-05-05 13:24 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-05-05 13:24 Yann Dirson [this message]
2018-05-05 13:24 ` [PATCH 2/2] Fix wrong merge-base invocation preventing detection of up-to-date branches Yann Dirson
2018-05-05 13:40 ` [PATCH 1/2] Fix support for merge options Christian Couder
2018-05-05 15:41   ` ydirson
2018-05-05 15:53     ` Christian Couder

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180505132423.18324-1-ydirson@free.fr \
    --to=ydirson@free.fr \
    --cc=felipe.contreras@gmail.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.