diff options
author | Thomas Rast <trast@inf.ethz.ch> | 2013-08-03 12:36:15 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-08-05 08:27:00 -0700 |
commit | 838f9a15667cfefa9e645c26627ce81ce7599915 (patch) | |
tree | 77c06d6fb1c158f6d8f8b61920e65ab7b25579a2 /t/t7301-clean-interactive.sh | |
parent | log: use true parents for diff even when rewriting (diff) | |
download | tgif-838f9a15667cfefa9e645c26627ce81ce7599915.tar.xz |
log: use true parents for diff when walking reflogs
The reflog walking logic (git log -g) replaces the true parent list
with the preceding commit in the reflog. This results in bogus commit
diffs when combined with options such as -p; the diff is against the
reflog predecessor, not the parent of the commit.
Save the true parents on the side, extending the functions from the
previous commit. The diff logic picks them up and uses them to show
the correct diffs.
We do have to be somewhat careful about repeated calling of
save_parents(), since the reflog may list a commit more than once. We
now store (commit_list*)-1 to distinguish the "not saved yet" and
"root commit" cases. This lets us preserve an empty parent list even
if save_parents() is repeatedly called.
Suggested-by: Jeff King <peff@peff.net>
Signed-off-by: Thomas Rast <trast@inf.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7301-clean-interactive.sh')
0 files changed, 0 insertions, 0 deletions