summaryrefslogtreecommitdiff
path: root/Documentation/git-branch.txt
diff options
context:
space:
mode:
authorLibravatar Johan Herland <johan@herland.net>2012-03-12 15:57:13 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-03-15 11:13:23 -0700
commita0be62c100897573ef1575ec0d5e8b215e9dcafe (patch)
treede1a9de4859caade3ed7b7d6e3566f9a5423f258 /Documentation/git-branch.txt
parentt3310: illustrate failure to "notes merge --commit" inside $GIT_DIR/ (diff)
downloadtgif-a0be62c100897573ef1575ec0d5e8b215e9dcafe.tar.xz
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 'Documentation/git-branch.txt')
0 files changed, 0 insertions, 0 deletions