git ubuntu tag failing on changes in work-tree
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
git-ubuntu |
Fix Released
|
Low
|
Robie Basak |
Bug Description
Hi,
this is highly related (or even a dup to) the following bugs, but I wanted to report to let you decide:
- bug 1687940 usd tag --upload complains about unclean working tree
- bug 1687057 git cannot represent empty directories by default
To reproduce:
$ git ubuntu clone strongswan
$ cd strongswan
$ git checkout ubuntu/xenial-devel
# here you get a warning that this is affected by #1687057.
$ git ubuntu tag --upload
12/19/2017 11:34:16 - ERROR:Working tree must be clean to continue.
So due to #1687057 we hit the otherwise fixed #1687940.
And since git status will just not mind talking about empty dirs at all the issue is hard to spot.
So I wonder if in this case we could be smarter about the error message.
For example in pseudo code
if "ERROR:Working tree must be clean"
if "this is a case of #1687057"
Report: "this is affected by #1687057, please build with dpkg-buildpackage and ensure with debdiff that all intended changes (and only those) are included
else
Report: "ERROR:Working tree must be clean"
if "git status" shows no delta
Please tar your current tree and report
else
Report: These are your unclean files
Report: output of git status
Related branches
- Server Team CI bot: Approve (continuous-integration)
- Nish Aravamudan: Approve
-
Diff: 26 lines (+8/-1)1 file modifiedgitubuntu/tag.py (+8/-1)
Robie, I'm assigning to you, as it's related to the empty directory support.