From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 27 Feb 2014 22:01:14 +0000 (-0800)
Subject: Merge branch 'bk/refresh-missing-ok-in-merge-recursive'
X-Git-Tag: v2.0.0-rc0~164
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=156d6ed9221ff38c4cd3bfcfc6778e31c104fd9b;p=thirdparty%2Fgit.git

Merge branch 'bk/refresh-missing-ok-in-merge-recursive'

Allow "merge-recursive" to work in an empty (temporary) working
tree again when there are renames involved, correcting an old
regression in 1.7.7 era.

* bk/refresh-missing-ok-in-merge-recursive:
  merge-recursive.c: tolerate missing files while refreshing index
  read-cache.c: extend make_cache_entry refresh flag with options
  read-cache.c: refactor --ignore-missing implementation
  t3030-merge-recursive: test known breakage with empty work tree
---

156d6ed9221ff38c4cd3bfcfc6778e31c104fd9b