use git-merge-base(1) to ensure we merge something tested

1 files changed, 11 insertions, 3 deletions

diff --git a/debian/merge-snapshot b/debian/merge-snapshot
index 71724934ad1..18acea9115e 100755
--- a/debian/merge-snapshot
+++ b/debian/merge-snapshot
@@ -7,10 +7,13 @@ use warnings;
 use Cwd;
 use Git::Wrapper;
 
-my $to_merge = "origin/master";
-
 my $git = Git::Wrapper->new(getcwd);
 
+($git->rev_parse({ abbrev_ref => 1 }, "HEAD"))[0] eq "athena/unstable"
+  or die "on wrong branch!";
+
+my ($to_merge) = $git->merge_base("melete", "origin/master");
+
 chomp(my $prev_version = `dpkg-parsechangelog -SVersion`);
 chomp(my $prev_distn   = `dpkg-parsechangelog -SDistribution`);
 
@@ -21,7 +24,12 @@ $new_date =~ /\A([0-9]{4})-([0-9]{2})-([0-9]{2})/
 $new_date = $1 . $2 . $3;
 my $new_rev = $prev_date eq $new_date ? $prev_rev + 1 : 1;
 
-$git->merge($to_merge);
+$git->merge({
+        message =>
+          "Merge remote-tracking branch 'origin/master' into athena/unstable"
+    },
+    $to_merge
+);
 
 system "dch", "-v29~git${new_date}.${new_rev}",
   $prev_distn eq "UNRELEASED" ? "" : "Package git snapshot.";