summaryrefslogtreecommitdiff
path: root/git-pull.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2008-03-30 17:29:48 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-03-30 22:22:09 -0700
commit948dd346fd6748f8c2c0ae488759cbbd05a09320 (patch)
tree63ea6a54d1824350aa14b1353b65671ea186c21a /git-pull.sh
parentAdd corner case tests for diff-index and diff-files (diff)
downloadtgif-948dd346fd6748f8c2c0ae488759cbbd05a09320.tar.xz
diff-index: careful when inspecting work tree items
Earlier, if you changed a staged path into a directory in the work tree, we happily ran lstat(2) on it and found that it exists, and declared that the user changed it to a gitlink. This is wrong for two reasons: (1) It may be a directory, but it may not be a submodule, and in the latter case, the change we need to report is "the blob at the path has disappeared". We need to check with resolve_gitlink_ref() to be consistent with what "git add" and "git update-index --add" does. (2) lstat(2) may have succeeded only because a leading component of the path was turned into a symbolic link that points at something that exists in the work tree. In such a case, the path itself does not exist anymore, as far as the index is concerned. This fixes these breakages in diff-index that the previous patch has exposed. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-pull.sh')
0 files changed, 0 insertions, 0 deletions