Bug 1367575 - Unapplied StGit patches don't display correctly in qgit
Summary: Unapplied StGit patches don't display correctly in qgit
Keywords:
Status: CLOSED ERRATA
Alias: None
Product: Fedora
Classification: Fedora
Component: qgit
Version: rawhide
Hardware: Unspecified
OS: Unspecified
unspecified
unspecified
Target Milestone: ---
Assignee: Dan Horák
QA Contact: Fedora Extras Quality Assurance
URL:
Whiteboard:
Depends On:
Blocks:
TreeView+ depends on / blocked
 
Reported: 2016-08-16 20:26 UTC by Zane Bitter
Modified: 2016-09-09 16:50 UTC (History)
1 user (show)

Fixed In Version: qgit-2.6-3.fc25 qgit-2.6-3.fc24 qgit-2.6-3.fc23 qgit-2.6-3.el7
Clone Of:
Environment:
Last Closed: 2016-09-01 13:36:12 UTC
Type: Bug
Embargoed:


Attachments (Terms of Use)
Patch that resolves the issue (2.12 KB, patch)
2016-08-16 20:26 UTC, Zane Bitter
no flags Details | Diff

Description Zane Bitter 2016-08-16 20:26:58 UTC
Created attachment 1191364 [details]
Patch that resolves the issue

Description of problem:
Since version 2.3, qgit has misinterpreted data in the git repository for unapplied Stacked Git (StGit) patches. The fields are all off by one, so the author appears as the committer, the author date appears as the author, the author date is garbage, and the first line of the commit message disappears altogether.

Version-Release number of selected component (if applicable):
2.6-2.fc23 (but the bug has existed since 2.3)

How reproducible:
100%

Steps to Reproduce:
$ mkdir qgit-test
$ cd qgit-test
$ git init
$ touch .gitignore
$ git add .gitignore
$ git commit -m 'Initial commit'
$ sudo dnf install stgit
$ stg init
$ stg new test -m 'This is a test'
$ stg pop
$ qgit

Actual results:
- The patch headline is missing
- The patch author is set to a 9-digit decimal number
- The author date is set to some time on 31 December 1969

Expected results:
The unapplied patch appears as a normal patch with the headline displayed and non-garbage data.

Additional info:
The cause of the issue is http://repo.or.cz/qgit4/redivivus.git/commitdiff/3a7141cb1db2a3911703915845b18a057c9b1cad?hp=9b5c02f07ea8b4c242790e86fc8238245606358c#patch3 in which the git log format is modified in Git::startRevList(), but the corresponding code in Git::startUnappliedList() is not modified, causing the log for unapplied commits to be misinterpreted. A patch that fixes the issue is attached. (I have also mailed the patch to the upstream maintainer, but upstream releases are rare.)

Comment 1 Fedora Update System 2016-08-22 15:11:34 UTC
qgit-2.6-3.el7 has been submitted as an update to Fedora EPEL 7. https://bodhi.fedoraproject.org/updates/FEDORA-EPEL-2016-1c227b9d60

Comment 2 Fedora Update System 2016-08-22 15:11:40 UTC
qgit-2.6-3.fc25 has been submitted as an update to Fedora 25. https://bodhi.fedoraproject.org/updates/FEDORA-2016-3f099d134d

Comment 3 Fedora Update System 2016-08-22 15:11:44 UTC
qgit-2.6-3.fc23 has been submitted as an update to Fedora 23. https://bodhi.fedoraproject.org/updates/FEDORA-2016-1b2898d44a

Comment 4 Fedora Update System 2016-08-22 15:11:48 UTC
qgit-2.6-3.fc24 has been submitted as an update to Fedora 24. https://bodhi.fedoraproject.org/updates/FEDORA-2016-397e43a27f

Comment 5 Zane Bitter 2016-08-22 16:41:17 UTC
Thanks! Noting for posterity that the patch has also been applied upstream, so there should be no need to carry the patch beyond the next upstream release:

http://repo.or.cz/qgit4/redivivus.git/commit/1c6e0dbccb1ff25ad98a74ef8352c7caa34f902a

Comment 6 Dan Horák 2016-08-22 16:53:59 UTC
(In reply to Zane Bitter from comment #5)
> Thanks! Noting for posterity that the patch has also been applied upstream,
> so there should be no need to carry the patch beyond the next upstream
> release:
> 
> http://repo.or.cz/qgit4/redivivus.git/commit/
> 1c6e0dbccb1ff25ad98a74ef8352c7caa34f902a

perfect :-)

Comment 7 Fedora Update System 2016-08-22 23:52:02 UTC
qgit-2.6-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-3f099d134d

Comment 8 Fedora Update System 2016-08-23 16:20:15 UTC
qgit-2.6-3.fc23 has been pushed to the Fedora 23 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-1b2898d44a

Comment 9 Fedora Update System 2016-08-23 16:22:13 UTC
qgit-2.6-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-397e43a27f

Comment 10 Fedora Update System 2016-08-23 19:52:01 UTC
qgit-2.6-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-1c227b9d60

Comment 11 Fedora Update System 2016-09-01 13:36:10 UTC
qgit-2.6-3.fc25 has been pushed to the Fedora 25 stable repository. If problems still persist, please make note of it in this bug report.

Comment 12 Fedora Update System 2016-09-01 16:54:51 UTC
qgit-2.6-3.fc24 has been pushed to the Fedora 24 stable repository. If problems still persist, please make note of it in this bug report.

Comment 13 Fedora Update System 2016-09-01 18:52:31 UTC
qgit-2.6-3.fc23 has been pushed to the Fedora 23 stable repository. If problems still persist, please make note of it in this bug report.

Comment 14 Fedora Update System 2016-09-09 16:50:40 UTC
qgit-2.6-3.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.