summaryrefslogtreecommitdiff
path: root/git-debpush
diff options
context:
space:
mode:
Diffstat (limited to 'git-debpush')
-rwxr-xr-xgit-debpush8
1 files changed, 8 insertions, 0 deletions
diff --git a/git-debpush b/git-debpush
index 80594f5..39ff410 100755
--- a/git-debpush
+++ b/git-debpush
@@ -278,6 +278,14 @@ if ! [ "x$last_debian_tag" = "x" ]; then
fi
fi
+if ! [ "x$upstream_tag" = "x" ] \
+ && ! git merge-base --is-ancestor "$upstream_tag" "$branch" \
+ && ! [ "$quilt_mode" = "baredebian" ]; then
+ fail_check \
+ "upstream tag $upstream_tag is not an ancestor of $branch; probably a mistake"
+fi
+
+
if ! $force && $failed_check; then
fail "some checks failed; you can override with --force"
fi