]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'jk/reflog-walk-maint' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 12 Jul 2017 22:20:35 +0000 (15:20 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 12 Jul 2017 22:20:36 +0000 (15:20 -0700)
After "git branch --move" of the currently checked out branch, the
code to walk the reflog of HEAD via "log -g" and friends
incorrectly stopped at the reflog entry that records the renaming
of the branch.

* jk/reflog-walk-maint:
  reflog-walk: include all fields when freeing complete_reflogs
  reflog-walk: don't free reflogs added to cache
  reflog-walk: duplicate strings in complete_reflogs list
  reflog-walk: skip over double-null oid due to HEAD rename


Trivial merge