From: Frantisek Hrbata <frantisek@hrbata.com>
Date: Fri, 18 Dec 2020 14:43:59 +0000 (+0100)
Subject: git-mr-merge: add --edit option
X-Git-Tag: v0.2~28
X-Git-Url: http://www.hrbata.com/gitweb/?a=commitdiff_plain;h=59f433cbd9d6b9c98154450e927f93a094d83c22;p=gimrr.git

git-mr-merge: add --edit option

Signed-off-by: Frantisek Hrbata <frantisek@hrbata.com>
---

diff --git a/git-mr-merge b/git-mr-merge
index 04bd451..5de79dc 100755
--- a/git-mr-merge
+++ b/git-mr-merge
@@ -23,6 +23,8 @@ parser.add_argument("-f", "--force", action="store_true",
         help="Proceed with the merge even if the MR base does not match.")
 parser.add_argument("--ff", action="store_true",
         help="Allow fast-forward. By default merge commit is created even for fast-forward merges.")
+parser.add_argument("-e", "--edit", action="store_true",
+        help="Invoke an editor before committing successful mechanical merge.")
 
 args = parser.parse_args()
 refs = mrlib.load_refs()
@@ -55,9 +57,8 @@ if args.ff:
 else:
     cmd += ["--no-ff"]
 
+if args.edit:
+    cmd += ["--edit"]
+
 cmd += [mr]
-rv, out, err = mrlib.run(cmd)
-if out:
-    print(out, end="")
-if err:
-    print(err, file=sys.stderr, end="")
+rv, out, err = mrlib.run(cmd, stdout=False, stderr=False)