diff options
author | Sean Whitton <spwhitton@spwhitton.name> | 2019-07-22 10:39:56 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2019-07-22 17:08:51 +0100 |
commit | d859eec10fe463619069a01f4489b2a11af31fab (patch) | |
tree | d8abbff798f929bc7783ae9f9f0b3bb1964fc4a1 | |
parent | 5da0b9edfcc16fa72bcf96436ca7a4bf0c2f9d7d (diff) |
git-debpush: Check for unstitched git-debrebase branch
Closes: #932612
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
-rwxr-xr-x | git-debpush | 14 | ||||
-rw-r--r-- | git-debpush.1.pod | 5 |
2 files changed, 19 insertions, 0 deletions
diff --git a/git-debpush b/git-debpush index 8419375..402b1dd 100755 --- a/git-debpush +++ b/git-debpush @@ -411,6 +411,20 @@ case "$quilt_mode" in ;; esac +# ---- git-debrebase branch format checks + +# only check branches, since you can't run `git debrebase conclude` on +# non-branches +case "$branch" in + refs/heads/*) + # see "STITCHING, PSEUDO-MERGES, FFQ RECORD" in git-debrebase(5) + ffq_prev_ref="refs/ffq-prev/${branch#refs/}" + if git show-ref --quiet --verify "$ffq_prev_ref"; then + fail_check unstitched \ + "this looks like an unstitched git-debrebase branch, which should not be pushed" + fi +esac + # ---- Summary if $failed_check; then diff --git a/git-debpush.1.pod b/git-debpush.1.pod index 27b80c9..b9a908e 100644 --- a/git-debpush.1.pod +++ b/git-debpush.1.pod @@ -236,6 +236,11 @@ Ignore apparently pushing the dgit view of a package (as produced by B<dgit clone>) to the maintainer branch, where the dgit view and the maintainer view of the package are not identical. +=item B<unstitched> + +Ignore the fact that the branch to be pushed seems to be a +git-debrebase(1) branch in an unstitched state (see git-debrebase(5)). + =back =back |