This PR addresses #53. Instead of diffing against remote master, first we use merge_base to determine the latest commit both branches (remote master, and the currently active branch) have. Then we diff against that.
This has the extra benefit of eliminating any files that have had net 0 changes (e.g. modified in one commit, then reverted in the second commit).
This PR addresses #53. Instead of diffing against remote master, first we use
merge_base
to determine the latest commit both branches (remote master, and the currently active branch) have. Then we diff against that.This has the extra benefit of eliminating any files that have had net 0 changes (e.g. modified in one commit, then reverted in the second commit).
Tests updated to catch this situation explicitly.
@cfournie @damnMeddlingKid