From 86051d262d485ab2c6aa2554294545281bc777a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kirill=20M=C3=BCller?= <krlmlr@mailbox.org>
Date: Sun, 24 Dec 2017 20:56:12 +0100
Subject: [PATCH] check if merge necessary
---
metatool | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/metatool b/metatool
index 90392e4..b0dd317 100755
--- a/metatool
+++ b/metatool
@@ -55,12 +55,16 @@ push() {
git subtree push --prefix=$project $manyrepos_dir/$project $metarepo_branch
(
cd $manyrepos_dir/$project
+ if [ "`git log ${manyrepos_branch}..${metarepo_branch}`" = "" ]
+ then
+ return
+ fi
git merge $metarepo_branch --no-commit
if ! check_clean
then
git commit --no-edit
else
- git merge --abort || true
+ git merge --abort
fi
)
}