Package: git-buildpackage Version: 0.9.1 Followup-For: Bug #787005 Control: tags -1 patch
Hi, Please find attached a couple of patches for the zsh completion. They fix this issue, and also fix the completion for gbp import-dscs. I made them against 0.8 because for some reason I could not update my local repo copy, git was just hanging. -- System Information: Debian Release: buster/sid APT prefers unstable-debug APT policy: (500, 'unstable-debug'), (500, 'unstable'), (500, 'testing'), (1, 'experimental-debug'), (1, 'experimental') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.13.0-1-amd64 (SMP w/4 CPU cores) Locale: LANG=en_GB.utf8, LC_CTYPE=en_GB.utf8 (charmap=UTF-8), LANGUAGE=en_US:en (charmap=UTF-8) Shell: /bin/sh linked to /usr/bin/dash Init: systemd (via /run/systemd/system) Versions of packages git-buildpackage depends on: ii devscripts 2.17.11 ii git 1:2.15.0-1 ii man-db 2.7.6.1-2 ii python3 3.6.3-2 ii python3-dateutil 2.6.1-1 ii python3-pkg-resources 36.6.0-1 Versions of packages git-buildpackage recommends: ii cowbuilder 0.85 ii pbuilder 0.229 ii pristine-tar 1.42 ii python3-requests 2.18.1-1 ii sbuild 0.73.0-4 Versions of packages git-buildpackage suggests: ii python3-notify2 0.3-3 ii sudo 1.8.21p2-2 ii unzip 6.0-21 -- no debconf information
>From b36b9ff16ee4c2c84e36540b1c8c55ba454fcf78 Mon Sep 17 00:00:00 2001 From: Felipe Sateler <[email protected]> Date: Sun, 5 Nov 2017 12:04:36 -0300 Subject: [PATCH 1/2] zsh: Fix delegation of dscs options to dsc --- debian/git-buildpackage.zsh-completion | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/git-buildpackage.zsh-completion b/debian/git-buildpackage.zsh-completion index 7f0b50d..4a479f8 100644 --- a/debian/git-buildpackage.zsh-completion +++ b/debian/git-buildpackage.zsh-completion @@ -182,7 +182,7 @@ _gbp-import-dsc() { _gbp-import-dscs() { # same options - _gbp-import_dsc + _gbp-import-dsc _arguments \ '--debsnap[Fetch snapshots from snapshots.debian.org]' \ '--ignore-repo-config[Ignore options in gbp.conf]' -- 2.15.0
>From 96694bb24c809eaf28902fe5d365ff07dc500fe8 Mon Sep 17 00:00:00 2001 From: Felipe Sateler <[email protected]> Date: Sun, 5 Nov 2017 12:06:13 -0300 Subject: [PATCH 2/2] zsh: dch does not use git prefix for ignore-branch option --- debian/git-buildpackage.zsh-completion | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/git-buildpackage.zsh-completion b/debian/git-buildpackage.zsh-completion index 4a479f8..b415146 100644 --- a/debian/git-buildpackage.zsh-completion +++ b/debian/git-buildpackage.zsh-completion @@ -376,7 +376,7 @@ _gbp-dch () { __gbp_tag_format_options _arguments \ - '--git-ignore-branch[build although debian-branch != current branch]' \ + '--ignore-branch[build although debian-branch != current branch]' \ '--since=-[Start point for reading commits]:commitish:' \ '--auto[Guess the last commit documented in the changelog]' \ '(--meta --no-meta)--meta[Parse meta tags]' \ -- 2.15.0
