From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 16 Apr 2012 05:51:44 +0000 (-0700)
Subject: Merge branch 'jh/notes-merge-in-git-dir-worktree'
X-Git-Tag: v1.7.11-rc0~158
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4e520081b5ca75acd6b29f6385a94130ec7afe6d;p=git.git

Merge branch 'jh/notes-merge-in-git-dir-worktree'

Running "notes merge --commit" failed to perform correctly when run
from any directory inside $GIT_DIR/.  When "notes merge" stops with
conflicts, $GIT_DIR/NOTES_MERGE_WORKTREE is the place a user edits
to resolve it.

By Johan Herland (3) and Junio C Hamano (1)
* jh/notes-merge-in-git-dir-worktree:
  notes-merge: Don't remove .git/NOTES_MERGE_WORKTREE; it may be the user's cwd
  notes-merge: use opendir/readdir instead of using read_directory()
  t3310: illustrate failure to "notes merge --commit" inside $GIT_DIR/
  remove_dir_recursively(): Add flag for skipping removal of toplevel dir
---

4e520081b5ca75acd6b29f6385a94130ec7afe6d