Skip to content

Commit

Permalink
check if merge necessary
Browse files Browse the repository at this point in the history
  • Loading branch information
krlmlr committed Dec 24, 2017
1 parent 5479c62 commit 86051d2
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion metatool
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
}
Expand Down

0 comments on commit 86051d2

Please sign in to comment.