summaryrefslogtreecommitdiff
path: root/t/t2101-update-index-reupdate.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-06-03 00:43:22 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-06-03 00:49:34 -0700
commita9b2d42486ee0b461220bf3895114926d9ddf9be (patch)
tree2095415de94a148adfbc4ef960b8ac85e02660f8 /t/t2101-update-index-reupdate.sh
parentadd -i: do not dump patch during application (diff)
downloadtgif-a9b2d42486ee0b461220bf3895114926d9ddf9be.tar.xz
blame: correctly handle a path that used to be a directory
When trying to see if the same path exists in the parent, we ran "diff-tree" with pathspec set to the path we are interested in with the parent, and expect either to have exactly one resulting filepair (either "changed from the parent", "created when there was none") or nothing (when there is no change from the parent). If the path used to be a directory, however, we will also see unbounded number of entries that talk about the files that used to exist underneath the directory in question. Correctly pick only the entry that describes the path we are interested in in such a case (namely, the creation of the path as a regular file). Noticed by Ben Willard. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t2101-update-index-reupdate.sh')
0 files changed, 0 insertions, 0 deletions