branch based substitution variables return wrong values
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
git-build-recipe |
Fix Released
|
High
|
William Grant |
Bug Description
Substitution variables that are supposed to refer to one of the "input" branches instead always return the value for the final merged branch.
E.g. my packaging recipe is:
# git-build-recipe format 0.4 deb-version {latest-
lp:~morse-simulator/morse-simulator master
merge packaging lp:~morse-simulator/morse-simulator/+git/morse-packaging master
which results in version 1.3+3855+
expected was 1.3+3854+
git-commit is the commit sha1 of the final merged result instead of the sha1 of the base repo/branch.
revno and revno:packaging are the same (whereas they should have the number of commits in the respective branch).
Changed in git-build-recipe: | |
importance: | Undecided → High |
status: | New → Triaged |
assignee: | nobody → William Grant (wgrant) |
status: | Triaged → In Progress |
Changed in git-build-recipe: | |
status: | In Progress → Fix Committed |
git-build-recipe (0.3) unstable; urgency=medium
[ Colin Watson ]
* Implement nest-part (LP: #1537579).
* Initial upload to Debian (closes: #814031).
* Policy version 3.9.7: no changes required.
[ William Grant ]
* Fix substitution variables to always use the original source commits.
(LP: #1542673)
-- Colin Watson <email address hidden> Thu, 10 Mar 2016 17:33:26 +0000