Bug 708938

Summary:	fedpkg gives insufficient error explanation when switching branches fails
Product:	[Fedora] Fedora	Reporter:	Honza Horak <hhorak>
Component:	fedora-packager	Assignee:	David Cantrell <dcantrell>
Status:	CLOSED WONTFIX	QA Contact:	Fedora Extras Quality Assurance <extras-qa>
Severity:	unspecified	Docs Contact:
Priority:	unspecified
Version:	15	CC:	dcantrell, dennis, rhbugs
Target Milestone:	---
Target Release:	---
Hardware:	Unspecified
OS:	Unspecified
Whiteboard:
Fixed In Version:		Doc Type:	Bug Fix
Doc Text:		Story Points:	---
Clone Of:		Environment:
Last Closed:	2012-08-07 19:52:41 UTC	Type:	---
Regression:	---	Mount Type:	---
Documentation:	---	CRM:
Verified Versions:		Category:	---
oVirt Team:	---	RHEL 7.3 requirements from Atomic Host:
Cloudforms Team:	---	Target Upstream Version:

Description Honza Horak 2011-05-30 08:28:11 UTC

Description of problem:
Suppose we have two branches foo and bar and there is a tracked file in branch bar "bar.txt", but it is not tracked in branch foo.

If we are in branch foo and try to switch to bar, it doesn't work and fedpkg print the following error: 

$ fedpkg switch-branch bar
Unable to switch to another branch: Could not check out bar

User is confused because he doesn't know what is wrong. 

If we try git directly, we get much more sufficient explanation:

$ git checkout bar
error: The following untracked working tree files would be overwritten by checkout:
	bar.txt
Please move or remove them before you can switch branches.
Aborting

fedpkg should print the same error or just forward the error message from git.

Version-Release number of selected component (if applicable):
$ rpm -q fedpkg 
fedpkg-0.5.9.0-1.fc15.noarch

How reproducible:
every-time

Steps to Reproduce:
1. branches foo and bar exist
2. commit file bar.txt into branch bar
3. create an untracked file bar.txt in branch foo
4. try switch from branch foo to bar using fedpkg
  
Actual results:
Unable to switch to another branch: Could not check out bar
=> user is confused

Expected results:
error: The following untracked working tree files would be overwritten by checkout:
	bar.txt
Please move or remove them before you can switch branches.
Aborting
=> user knows what to do

Additional info:

Comment 1 Jesse Keating 2011-05-31 18:50:03 UTC

Unfortunately I don't think I get a better error out of GitPython.  I'll look into it though.

Comment 2 Fedora End Of Life 2012-08-07 19:52:44 UTC

This message is a notice that Fedora 15 is now at end of life. Fedora
has stopped maintaining and issuing updates for Fedora 15. It is
Fedora's policy to close all bug reports from releases that are no
longer maintained. At this time, all open bugs with a Fedora 'version'
of '15' have been closed as WONTFIX.

(Please note: Our normal process is to give advanced warning of this
occurring, but we forgot to do that. A thousand apologies.)

Package Maintainer: If you wish for this bug to remain open because you
plan to fix it in a currently maintained version, feel free to reopen
this bug and simply change the 'version' to a later Fedora version.

Bug Reporter: Thank you for reporting this issue and we are sorry that
we were unable to fix it before Fedora 15 reached end of life. If you
would still like to see this bug fixed and are able to reproduce it
against a later version of Fedora, you are encouraged to click on
"Clone This Bug" (top right of this page) and open it against that
version of Fedora.

Although we aim to fix as many bugs as possible during every release's
lifetime, sometimes those efforts are overtaken by events. Often a
more recent Fedora release includes newer upstream software that fixes
bugs or makes them obsolete.

The process we are following is described here:
http://fedoraproject.org/wiki/BugZappers/HouseKeeping