diff options
| author | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2012-01-12 15:35:37 +0200 |
|---|---|---|
| committer | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2012-05-08 11:39:40 +0300 |
| commit | ad1538dcbc09030779db9f34da336eb5fce62350 (patch) | |
| tree | f54615f1748b5c71333147c7b8dfae18bcc73091 /gbp/scripts | |
| parent | 7f5128b7b752d0a02b09ef3bcc6743a524453055 (diff) | |
| download | git-buildpackage-ad1538dcbc09030779db9f34da336eb5fce62350.tar.gz git-buildpackage-ad1538dcbc09030779db9f34da336eb5fce62350.tar.bz2 git-buildpackage-ad1538dcbc09030779db9f34da336eb5fce62350.zip | |
Add 'packaging-branch' cmdline option
This is the counterpart of 'debian-branch' (basically identical to that)
to not confuse rpm maintainers.
Also, adds this option to gbp-clone and gbp-pull commands (as an
alternative to the 'debian-branch option), which are usable for RPM in
their current form.
Diffstat (limited to 'gbp/scripts')
| -rwxr-xr-x | gbp/scripts/clone.py | 1 | ||||
| -rwxr-xr-x | gbp/scripts/pull.py | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/gbp/scripts/clone.py b/gbp/scripts/clone.py index 4d992df9..4f9277b4 100755 --- a/gbp/scripts/clone.py +++ b/gbp/scripts/clone.py @@ -39,6 +39,7 @@ def parse_args (argv): help="track all branches, not only debian and upstream") branch_group.add_config_file_option(option_name="upstream-branch", dest="upstream_branch") branch_group.add_config_file_option(option_name="debian-branch", dest="packaging_branch") + branch_group.add_config_file_option(option_name="packaging-branch", dest="packaging_branch") branch_group.add_boolean_config_file_option(option_name="pristine-tar", dest="pristine_tar") branch_group.add_option("--depth", action="store", dest="depth", default=0, help="git history depth (for creating shallow clones)") diff --git a/gbp/scripts/pull.py b/gbp/scripts/pull.py index e8f78197..d541c80d 100755 --- a/gbp/scripts/pull.py +++ b/gbp/scripts/pull.py @@ -103,6 +103,7 @@ def main(argv): help="redo the patch queue branch after a pull. Warning: this drops the old patch-queue branch") branch_group.add_config_file_option(option_name="upstream-branch", dest="upstream_branch") branch_group.add_config_file_option(option_name="debian-branch", dest="packaging_branch") + branch_group.add_config_file_option(option_name="packaging-branch", dest="packaging_branch") branch_group.add_boolean_config_file_option(option_name="pristine-tar", dest="pristine_tar") branch_group.add_option("--depth", action="store", dest="depth", default=0, help="git history depth (for deepening shallow clones)") |