summaryrefslogtreecommitdiff
path: root/git-debpush
diff options
context:
space:
mode:
Diffstat (limited to 'git-debpush')
-rwxr-xr-xgit-debpush10
1 files changed, 6 insertions, 4 deletions
diff --git a/git-debpush b/git-debpush
index e9b64d4..5ffbd52 100755
--- a/git-debpush
+++ b/git-debpush
@@ -66,7 +66,7 @@ get_file_from_ref () {
# ---- Parse command line
getopt=$(getopt -s bash -o 'nfu:' \
- -l 'no-push,force,branch:,remote:,distro:,quilt:,gbp,dpm,\
+ -l 'no-push,force,branch:,remote:,distro:,upstream:,quilt:,gbp,dpm,\
baredebian,baredebian+git,baredebian+tarball' \
-n "$us" -- "$@")
eval "set - $getopt"
@@ -90,6 +90,7 @@ while true; do
'--remote') remote=$2; shift 2; continue ;;
'--distro') distro=$2; shift 2; continue ;;
'--quilt') quilt_mode=$2; shift 2; continue ;;
+ '--upstream') upstream_tag=$2; shift 2; continue ;;
'--baredebian'|'--baredebian+git')
quilt_mode=baredebian; shift; continue ;;
@@ -214,9 +215,10 @@ esac
upstream_info=""
if $upstream; then
- # xxx want way to override this
- upstream_tag=$(git deborig --just-print --version="$version" \
- | head -n1)
+ if [ "x$upstream_tag" = x ]; then
+ upstream_tag=$(git deborig --just-print --version="$version" \
+ | head -n1)
+ fi
upstream_committish=$(git rev-parse "refs/tags/${upstream_tag}"^{})
upstream_info=" upstream-tag=$upstream_tag upstream=$upstream_committish"
fi