Menu

#11 diffuse -c does not work with git branch merge operations

Unstable (example)
closed-accepted
nobody
None
5
2014-01-13
2014-01-02
No

diffuse -c is unable to extract the list of involved files from a git merge operation between branches.

This makes diffuse unusable for reviewing large (git) merge commits with lots of involved files (it simply does not work)

This patch fixes the above issue.
The fix is simply to switch from "git log" to "git show" for "-c" operations.
This fix should have no side effects as "git show" works on top of "git log".

/Uffe

1 Attachments

Discussion

  • Derrick Moser

    Derrick Moser - 2014-01-13
    • status: open --> closed-accepted
     
  • Derrick Moser

    Derrick Moser - 2014-01-13

    Thanks for the patch.

     

Log in to post a comment.