From 963141bb01f711e8ddd2790b5ff98cdc1b6ee1e7 Mon Sep 17 00:00:00 2001 From: Frantisek Hrbata Date: Fri, 18 Dec 2020 15:50:01 +0100 Subject: [PATCH] git-mr-merge: check for base and subject Signed-off-by: Frantisek Hrbata --- git-mr-merge | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/git-mr-merge b/git-mr-merge index 5de79dc..4d45b61 100755 --- a/git-mr-merge +++ b/git-mr-merge @@ -17,7 +17,7 @@ import mrlib import tempfile parser = argparse.ArgumentParser(description="Merge MR to current branch.") -parser.add_argument("mr", metavar="REV", +parser.add_argument("mr", metavar="MR", help="MR revision which should be merged.") parser.add_argument("-f", "--force", action="store_true", help="Proceed with the merge even if the MR base does not match.") @@ -33,7 +33,13 @@ mr = mrlib.verify_mrs([args.mr], refs)[0] tags = mrlib.load_tags([mr], refs=refs, commits=False) mrtags = mrlib.get_commit_tags(tags, mr, mrlib.rev_zero) base = mrlib.get_tag_value(mrtags, "B") +if not base: + sys.exit("No MR base.") + subj = "Merge of " + mrlib.get_tag_value(mrtags, "S") +if not subj: + sys.exit("No MR subject.") + desc = mrlib.get_tag_value(mrtags, "D").replace("\\n", "\n") rv, out, err = mrlib.run(["git", "merge-base", "HEAD", mr]) -- 1.7.10.4