From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 26 Apr 2012 17:35:33 +0000 (-0700)
Subject: Merge branch 'jk/diff-no-rename-empty' into maint
X-Git-Tag: v1.7.10.1~12
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3f231e235fb4b9c4d937a50fa4fbf35f9ed10387;p=git.git

Merge branch 'jk/diff-no-rename-empty' into maint

Rename detection logic used to match two empty files as renames during
merge-recursive, leading unnatural mismerges.

By Jeff King
* jk/diff-no-rename-empty:
  merge-recursive: don't detect renames of empty files
  teach diffcore-rename to optionally ignore empty content
  make is_empty_blob_sha1 available everywhere
  drop casts from users EMPTY_TREE_SHA1_BIN
---

3f231e235fb4b9c4d937a50fa4fbf35f9ed10387