Note: This is a public test instance of Red Hat Bugzilla. The data contained within is a snapshot of the live data so any changes you make will not be reflected in the production Bugzilla. Email is disabled so feel free to test any aspect of the site that you want. File any problems you find or give feedback at bugzilla.redhat.com.
Bug 1325775 - Working on branch without remote tracking branch fails due to unpushed changes
Summary: Working on branch without remote tracking branch fails due to unpushed changes
Keywords:
Status: CLOSED ERRATA
Alias: None
Product: Fedora
Classification: Fedora
Component: rpkg
Version: 25
Hardware: Unspecified
OS: Unspecified
unspecified
high
Target Milestone: ---
Assignee: cqi
QA Contact: Fedora Extras Quality Assurance
URL:
Whiteboard:
Depends On:
Blocks:
TreeView+ depends on / blocked
 
Reported: 2016-04-11 07:48 UTC by Pavol Babinčák
Modified: 2017-01-07 00:21 UTC (History)
9 users (show)

Fixed In Version: rpkg-1.47-5.fc25 rpkg-1.47-5.fc24 rpkg-1.47-7.el7
Doc Type: Bug Fix
Doc Text:
Clone Of:
Environment:
Last Closed: 2017-01-07 00:21:16 UTC
Type: Bug
Embargoed:

Attachments (Terms of Use)

Description Pavol Babinčák 2016-04-11 07:48:15 UTC 
Description of problem:
Before issuing some server-side commands (like build, scratch-build) check for pushed changes is made. If developer's local branch doesn't reference remote branch this check fails stating there are no unpushed changes.

This issue affects all clients, e.g. Fedora's fedpkg, Red Hat's rhpkg, etc.

Version-Release number of selected component (if applicable):
pyrpkg-1.43-1.el7.noarch

How reproducible:
Always

Steps to Reproduce:
0. REPO exists on the server, BRANCH doesn't.
1. fedpkg co REPO
2. fedpkg switch-branch BRANCH
3. Now somebody creates new branch on the server
4. fedpkg push origin BRANCH
5. fedpkg scratch-build

Actual results:
Could not execute scratch_build: There are unpushed changes in your repo

Expected results:
- Print error message, for example: "Failed to check unpushed changes because your branch doesn't track remote branch."
- And maybe:
  a) hint git command which adds this remote track (http://stackoverflow.com/a/2286030) or
  b) add some option to the pyrpkg.

Additional info:
Comment 1 Jan Kurik 2016-07-26 04:13:01 UTC 
This bug appears to have been reported against 'rawhide' during the Fedora 25 development cycle.
Changing version to '25'.
Comment 2 cqi 2016-10-11 15:49:13 UTC 
If BRANCH does not exist in the server, switch-branch will fails, for example,

$ fedpkg switch-branch f28
Could not execute switch_branch: Unknown remote branch origin/f28

> 3. Now somebody creates new branch on the server

What would the new branch name be? Same name as the local branch name, or anything else?
Comment 3 Lubomír Sedlář 2016-11-10 13:37:44 UTC 
The local branch can be created without problems directly by calling git.

I think the branch name is not really important. We could just print a message such as:

Failed to check unpushed changes because your branch doesn't track remote branch.
Use the following command to fix that:
    git branch -u origin/REMOTE_BRANCH_NAME
Comment 4 Pavol Babinčák 2016-11-16 17:39:56 UTC 
I like Lubomir's solution.
Comment 5 cqi 2016-11-25 07:02:41 UTC 
PR: https://pagure.io/rpkg/pull-request/156
Comment 6 cqi 2016-11-28 12:07:43 UTC 
Patch is merged in upstream.
Comment 7 Fedora Update System 2016-12-07 13:13:55 UTC 
fedpkg-1.26-1.fc25 rpkg-1.47-2.fc25 has been submitted as an update to Fedora 25. https://bodhi.fedoraproject.org/updates/FEDORA-2016-ea5bded2cf
Comment 8 Fedora Update System 2016-12-07 13:15:53 UTC 
fedpkg-1.26-1.fc24 rpkg-1.47-2.fc24 has been submitted as an update to Fedora 24. https://bodhi.fedoraproject.org/updates/FEDORA-2016-a383ccbf57
Comment 9 Fedora Update System 2016-12-07 13:18:53 UTC 
fedpkg-1.26-1.el7 rpkg-1.47-2.el7 has been submitted as an update to Fedora EPEL 7. https://bodhi.fedoraproject.org/updates/FEDORA-EPEL-2016-14415f0f51
Comment 10 Fedora Update System 2016-12-08 04:52:39 UTC 
fedpkg-1.26-1.fc24, rpkg-1.47-2.fc24 has been pushed to the Fedora 24 testing repository. If problems still persist, please make note of it in this bug report.
See https://fedoraproject.org/wiki/QA:Updates_Testing for
instructions on how to install test updates.
You can provide feedback for this update here: https://bodhi.fedoraproject.org/updates/FEDORA-2016-a383ccbf57
Comment 11 Fedora Update System 2016-12-08 04:56:14 UTC 
fedpkg-1.26-1.fc25, rpkg-1.47-2.fc25 has been pushed to the Fedora 25 testing repository. If problems still persist, please make note of it in this bug report.
See https://fedoraproject.org/wiki/QA:Updates_Testing for
instructions on how to install test updates.
You can provide feedback for this update here: https://bodhi.fedoraproject.org/updates/FEDORA-2016-ea5bded2cf
Comment 12 Fedora Update System 2016-12-08 05:48:35 UTC 
fedpkg-1.26-1.el7, rpkg-1.47-2.el7 has been pushed to the Fedora EPEL 7 testing repository. If problems still persist, please make note of it in this bug report.
See https://fedoraproject.org/wiki/QA:Updates_Testing for
instructions on how to install test updates.
You can provide feedback for this update here: https://bodhi.fedoraproject.org/updates/FEDORA-EPEL-2016-14415f0f51
Comment 13 Fedora Update System 2016-12-09 11:34:47 UTC 
fedpkg-1.26-2.el7 rpkg-1.47-3.el7 has been submitted as an update to Fedora EPEL 7. https://bodhi.fedoraproject.org/updates/FEDORA-EPEL-2016-14415f0f51
Comment 14 Fedora Update System 2016-12-09 11:38:05 UTC 
fedpkg-1.26-2.fc24 rpkg-1.47-3.fc24 has been submitted as an update to Fedora 24. https://bodhi.fedoraproject.org/updates/FEDORA-2016-a383ccbf57
Comment 15 Fedora Update System 2016-12-09 11:40:02 UTC 
fedpkg-1.26-2.fc25 rpkg-1.47-3.fc25 has been submitted as an update to Fedora 25. https://bodhi.fedoraproject.org/updates/FEDORA-2016-ea5bded2cf
Comment 16 Fedora Update System 2016-12-10 03:56:09 UTC 
fedpkg-1.26-2.fc25, rpkg-1.47-3.fc25 has been pushed to the Fedora 25 testing repository. If problems still persist, please make note of it in this bug report.
See https://fedoraproject.org/wiki/QA:Updates_Testing for
instructions on how to install test updates.
You can provide feedback for this update here: https://bodhi.fedoraproject.org/updates/FEDORA-2016-ea5bded2cf
Comment 17 Fedora Update System 2016-12-10 04:28:19 UTC 
fedpkg-1.26-2.fc24, rpkg-1.47-3.fc24 has been pushed to the Fedora 24 testing repository. If problems still persist, please make note of it in this bug report.
See https://fedoraproject.org/wiki/QA:Updates_Testing for
instructions on how to install test updates.
You can provide feedback for this update here: https://bodhi.fedoraproject.org/updates/FEDORA-2016-a383ccbf57
Comment 18 Fedora Update System 2016-12-10 05:53:19 UTC 
fedpkg-1.26-2.el7, rpkg-1.47-3.el7 has been pushed to the Fedora EPEL 7 testing repository. If problems still persist, please make note of it in this bug report.
See https://fedoraproject.org/wiki/QA:Updates_Testing for
instructions on how to install test updates.
You can provide feedback for this update here: https://bodhi.fedoraproject.org/updates/FEDORA-EPEL-2016-14415f0f51
Comment 19 Fedora Update System 2016-12-13 00:56:30 UTC 
fedpkg-1.26-3.fc25 rpkg-1.47-5.fc25 has been submitted as an update to Fedora 25. https://bodhi.fedoraproject.org/updates/FEDORA-2016-ea5bded2cf
Comment 20 Fedora Update System 2016-12-13 01:05:44 UTC 
fedpkg-1.26-3.fc24 rpkg-1.47-5.fc24 has been submitted as an update to Fedora 24. https://bodhi.fedoraproject.org/updates/FEDORA-2016-a383ccbf57
Comment 21 Fedora Update System 2016-12-13 01:10:00 UTC 
fedpkg-1.26-3.el7 rpkg-1.47-5.el7 has been submitted as an update to Fedora EPEL 7. https://bodhi.fedoraproject.org/updates/FEDORA-EPEL-2016-14415f0f51
Comment 22 Fedora Update System 2016-12-14 02:23:29 UTC 
fedpkg-1.26-3.fc25, rpkg-1.47-5.fc25 has been pushed to the Fedora 25 testing repository. If problems still persist, please make note of it in this bug report.
See https://fedoraproject.org/wiki/QA:Updates_Testing for
instructions on how to install test updates.
You can provide feedback for this update here: https://bodhi.fedoraproject.org/updates/FEDORA-2016-ea5bded2cf
Comment 23 Fedora Update System 2016-12-14 02:23:46 UTC 
fedpkg-1.26-3.fc24, rpkg-1.47-5.fc24 has been pushed to the Fedora 24 testing repository. If problems still persist, please make note of it in this bug report.
See https://fedoraproject.org/wiki/QA:Updates_Testing for
instructions on how to install test updates.
You can provide feedback for this update here: https://bodhi.fedoraproject.org/updates/FEDORA-2016-a383ccbf57
Comment 24 Fedora Update System 2016-12-14 03:50:17 UTC 
fedpkg-1.26-3.el7, rpkg-1.47-5.el7 has been pushed to the Fedora EPEL 7 testing repository. If problems still persist, please make note of it in this bug report.
See https://fedoraproject.org/wiki/QA:Updates_Testing for
instructions on how to install test updates.
You can provide feedback for this update here: https://bodhi.fedoraproject.org/updates/FEDORA-EPEL-2016-14415f0f51
Comment 25 Fedora Update System 2016-12-15 23:31:14 UTC 
fedpkg-1.26-3.fc25, rpkg-1.47-5.fc25 has been pushed to the Fedora 25 stable repository. If problems still persist, please make note of it in this bug report.
Comment 26 Fedora Update System 2016-12-16 00:26:13 UTC 
fedpkg-1.26-3.fc25, rpkg-1.47-5.fc25 has been pushed to the Fedora 25 stable repository. If problems still persist, please make note of it in this bug report.
Comment 27 Fedora Update System 2016-12-16 03:53:47 UTC 
fedpkg-1.26-3.fc24, rpkg-1.47-5.fc24 has been pushed to the Fedora 24 stable repository. If problems still persist, please make note of it in this bug report.
Comment 28 Fedora Update System 2016-12-16 12:02:01 UTC 
fedpkg-1.26-4.el7 rpkg-1.47-6.el7 has been submitted as an update to Fedora EPEL 7. https://bodhi.fedoraproject.org/updates/FEDORA-EPEL-2016-14415f0f51
Comment 29 Fedora Update System 2016-12-17 00:51:25 UTC 
fedpkg-1.26-4.el7, rpkg-1.47-6.el7 has been pushed to the Fedora EPEL 7 testing repository. If problems still persist, please make note of it in this bug report.
See https://fedoraproject.org/wiki/QA:Updates_Testing for
instructions on how to install test updates.
You can provide feedback for this update here: https://bodhi.fedoraproject.org/updates/FEDORA-EPEL-2016-14415f0f51
Comment 30 Fedora Update System 2016-12-19 15:21:58 UTC 
fedpkg-1.26-4.el7 rpkg-1.47-7.el7 has been submitted as an update to Fedora EPEL 7. https://bodhi.fedoraproject.org/updates/FEDORA-EPEL-2016-14415f0f51
Comment 31 Fedora Update System 2016-12-20 08:51:41 UTC 
fedpkg-1.26-4.el7, rpkg-1.47-7.el7 has been pushed to the Fedora EPEL 7 testing repository. If problems still persist, please make note of it in this bug report.
See https://fedoraproject.org/wiki/QA:Updates_Testing for
instructions on how to install test updates.
You can provide feedback for this update here: https://bodhi.fedoraproject.org/updates/FEDORA-EPEL-2016-14415f0f51
Comment 32 Fedora Update System 2017-01-07 00:21:16 UTC 
fedpkg-1.26-4.el7, rpkg-1.47-7.el7 has been pushed to the Fedora EPEL 7 stable repository. If problems still persist, please make note of it in this bug report.
Note You need to log in before you can comment on or make changes to this bug.