diff options
| author | Johan Herland <johan@herland.net> | 2012-03-12 14:57:13 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-03-15 18:13:23 (GMT) |
| commit | a0be62c100897573ef1575ec0d5e8b215e9dcafe (patch) | |
| tree | de1a9de4859caade3ed7b7d6e3566f9a5423f258 /t/t3310-notes-merge-manual-resolve.sh | |
| parent | 01bfec8e52dcfa2da47b54b3c89c3181ae09b9a9 (diff) | |
| download | git-a0be62c100897573ef1575ec0d5e8b215e9dcafe.zip git-a0be62c100897573ef1575ec0d5e8b215e9dcafe.tar.gz git-a0be62c100897573ef1575ec0d5e8b215e9dcafe.tar.bz2 | |
notes-merge: use opendir/readdir instead of using read_directory()
notes_merge_commit() only needs to list all entries (non-recursively)
under a directory, which can be easily accomplished with
opendir/readdir and would be more lightweight than read_directory().
read_directory() is designed to list paths inside a working
directory. Using it outside of its scope may lead to undesired effects.
Apparently, one of the undesired effects of read_directory() is that it
doesn't deal with being given absolute paths. This creates problems for
notes_merge_commit() when git_path() returns an absolute path, which
happens when the current working directory is in a subdirectory of the
.git directory.
Originally-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Updated-by: Johan Herland <johan@herland.net>
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3310-notes-merge-manual-resolve.sh')
| -rwxr-xr-x | t/t3310-notes-merge-manual-resolve.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3310-notes-merge-manual-resolve.sh b/t/t3310-notes-merge-manual-resolve.sh index 0c531c3..d6d6ac6 100755 --- a/t/t3310-notes-merge-manual-resolve.sh +++ b/t/t3310-notes-merge-manual-resolve.sh @@ -558,7 +558,7 @@ foo bar EOF -test_expect_failure 'switch cwd before committing notes merge' ' +test_expect_success 'switch cwd before committing notes merge' ' git notes add -m foo HEAD && git notes --ref=other add -m bar HEAD && test_must_fail git notes merge refs/notes/other && |