Hello community, here is the log from the commit of package git-review for openSUSE:Factory checked in at 2017-11-14 13:00:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/git-review (Old) and /work/SRC/openSUSE:Factory/.git-review.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "git-review" Tue Nov 14 13:00:43 2017 rev:12 rq:541537 version:1.25.0 Changes: -------- --- /work/SRC/openSUSE:Factory/git-review/git-review.changes 2015-08-29 20:04:43.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.git-review.new/git-review.changes 2017-11-14 13:01:06.102437378 +0100 @@ -1,0 +2,5 @@ +Mon Nov 13 16:33:47 UTC 2017 - [email protected] + +- add git-2.15-compat.patch: fix compat with git 2.15 + +------------------------------------------------------------------- New: ---- git-2.15-compat.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ git-review.spec ++++++ --- /var/tmp/diff_new_pack.4WIOQZ/_old 2017-11-14 13:01:10.722268457 +0100 +++ /var/tmp/diff_new_pack.4WIOQZ/_new 2017-11-14 13:01:10.726268311 +0100 @@ -1,7 +1,7 @@ # # spec file for package git-review # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,6 +25,7 @@ Url: https://launchpad.net/git-review #Source0: http://pypi.python.org/packages/source/g/git-review/git-review-%{version}.tar.gz Source: %{name}-%{version}.tar.gz +Patch0: git-2.15-compat.patch BuildRequires: python-devel BuildRequires: python-pbr BuildRequires: python-setuptools @@ -50,6 +51,7 @@ %prep %setup -q -n git-review-%{version} +%patch0 -p1 %build python setup.py build ++++++ git-2.15-compat.patch ++++++ >From d3d66a471529547d6df65c6bf9e26d7eeea91a80 Mon Sep 17 00:00:00 2001 From: Clark Boylan <[email protected]> Date: Sun, 5 Nov 2017 14:32:52 -0800 Subject: Support git 2.15 and newer The 2.15 release of git drops support for `git branch --set-upstream` and replaces it with `git branch --set-upstream-to` which was added in git 1.8. Move from --set-upstream to --set-upstream-to in order to support git 2.15 and beyond. Note that this specifically affects the `git review -d` functionality as it is what needs to update the upstream. This does drop support for git 1.7 and older though as this option did not exist then. Polling linux distros and OS X the oldest git I can find is on CentOS 7 which has 1.8 so this should be fine. Story: 2001266 Co-Authored-By: Harry Mallon <[email protected]> Change-Id: I5ded1ab39bb2c76bdc38655299bac11b4584e138 --- doc/source/installation.rst | 2 ++ git_review/cmd.py | 8 ++++---- git_review/tests/test_git_review.py | 6 +++--- 3 files changed, 9 insertions(+), 7 deletions(-) Index: git-review-1.25.0/doc/source/installation.rst =================================================================== --- git-review-1.25.0.orig/doc/source/installation.rst +++ git-review-1.25.0/doc/source/installation.rst @@ -13,6 +13,8 @@ http://pip.readthedocs.org/en/latest/ins For installation from source simply add git-review to your $PATH after installing the dependencies listed in requirements.txt +.. note:: ``git-review`` requires git version 1.8 or greater. + Setup ===== Index: git-review-1.25.0/git_review/cmd.py =================================================================== --- git-review-1.25.0.orig/git_review/cmd.py +++ git-review-1.25.0/git_review/cmd.py @@ -1121,11 +1121,11 @@ def checkout_review(branch_name, remote, run_command_exc(CheckoutNewBranchFailed, "git", "checkout", "-b", branch_name, "FETCH_HEAD") - # --set-upstream-to is not supported in git 1.7 + # --set-upstream-to is supported starting in git 1.8 run_command_exc(SetUpstreamBranchFailed, - "git", "branch", "--set-upstream", - branch_name, - '%s/%s' % (remote, remote_branch)) + "git", "branch", "--set-upstream-to", + '%s/%s' % (remote, remote_branch), + branch_name) except CheckoutNewBranchFailed as e: if re.search("already exists\.?", e.output): Index: git-review-1.25.0/git_review/tests/test_git_review.py =================================================================== --- git-review-1.25.0.orig/git_review/tests/test_git_review.py +++ git-review-1.25.0/git_review/tests/test_git_review.py @@ -260,9 +260,9 @@ class GitReviewTestCase(tests.BaseGitRev # track different branch than expected in changeset branch = self._run_git('rev-parse', '--abbrev-ref', 'HEAD') self._run_git('branch', - '--set-upstream', - branch, - 'remotes/origin/other') + '--set-upstream-to', + 'remotes/origin/other', + branch) self.assertRaises( Exception, # cmd.BranchTrackingMismatch inside self._run_git_review, '-d', change_id)
