Logging stops during merge/finish phase of import

Bug #1625864 reported by Mathieu Gagné
6
This bug affects 1 person
Affects Status Importance Assigned to Milestone
git-upstream
Status tracked in Trunk
0.12
Fix Released
Undecided
Unassigned
Trunk
Fix Released
Critical
Darragh Bailey

Bug Description

When importing a new upstream branch, git-upstream stops logging right before the merge/finish phase start.

This is caused by git-upstream invoking itself and not preserving the original logging options.

The faulty code can be found here:
https://github.com/openstack/git-upstream/blob/c195b69c6b31da085bc45dfa410fdfdd092be901/git_upstream/commands/import.py#L184-L192

In fact, I think regression was introduced by this change which was merged 4 days ago:
https://review.openstack.org/#/c/276237/

Revision history for this message
Darragh Bailey (dbailey-k) wrote :

Seems pretty critical to ensure that the original logging options are included if we want to debug what happens during a subsequently called finish phase.

Changed in git-upstream:
importance: Undecided → Critical
Changed in git-upstream:
assignee: nobody → Darragh Bailey (dbailey-k)
Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Fix proposed to git-upstream (master)

Fix proposed to branch: master
Review: https://review.openstack.org/378567

Changed in git-upstream:
status: New → In Progress
Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Fix merged to git-upstream (master)

Reviewed: https://review.openstack.org/378567
Committed: https://git.openstack.org/cgit/openstack/git-upstream/commit/?id=d8bb479880a453025378d620e77bd8b43b8514f8
Submitter: Jenkins
Branch: master

commit d8bb479880a453025378d620e77bd8b43b8514f8
Author: Darragh Bailey <email address hidden>
Date: Wed Sep 28 13:14:03 2016 +0100

    Ensure parent options retained for exec'ed finish

    Retrieve parent parser arguments set by user, and ensure they are made
    available as part of the default script cmdline. This allows the
    logging from the exec'ed finish command called as the last step by
    git-rebase to log to the same file automatically.

    Change-Id: Ia79a54afe8ace7ade2aa5a29ad16855c9883bd54
    Closes-Bug: #1625864

Changed in git-upstream:
status: In Progress → Fix Released
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.