admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix 'git diff --no-index' with a non-existing symlink target

Browse Source 
When trying to find out mode changes, we should not access the symlink
targets using stat(); instead we use lstat() so that the diff does
not fail trying to find a non-existing symlink target.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Johannes Schindelin
2009-01-29 17:30:51 +01:00
committed by Junio C Hamano
parent 41a4d16e20
commit 418566b6fd
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
diff-no-index.c
View File

@@ -40,7 +40,7 @@ static int get_mode(const char *path, int *mode)
*mode = 0; *mode = 0;
else if (!strcmp(path, "-")) else if (!strcmp(path, "-"))
*mode = create_ce_mode(0666); *mode = create_ce_mode(0666);
else if (stat(path, &st)) else if (lstat(path, &st))
return error("Could not access '%s'", path); return error("Could not access '%s'", path);
else else
*mode = st.st_mode; *mode = st.st_mode;

7
t/t4011-diff-symlink.sh
View File

@@ -82,4 +82,11 @@ test_expect_success \
git diff-index -M -p $tree > current && git diff-index -M -p $tree > current &&
compare_diff_patch current expected' compare_diff_patch current expected'
test_expect_success \
'diff symlinks with non-existing targets' \
'ln -s narf pinky &&
ln -s take\ over brain &&
test_must_fail git diff --no-index pinky brain > output 2> output.err &&
grep narf output &&
! grep error output.err'
test_done test_done