-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This patch converts a stat() to an lstat() call, thereby fixing the case when the date of a symlink was not the same as the one recorded in the index. The included test case demonstrates this. This is for the case that the symlink points to a non-existing file. If the file exists, worse things than just an error message happen. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
- Loading branch information
Johannes Schindelin
authored and
Junio C Hamano
committed
Dec 27, 2005
1 parent
c97451c
commit 975b31d
Showing
2 changed files
with
86 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,85 @@ | ||
#!/bin/sh | ||
# | ||
# Copyright (c) 2005 Johannes Schindelin | ||
# | ||
|
||
test_description='Test diff of symlinks. | ||
' | ||
. ./test-lib.sh | ||
. ../diff-lib.sh | ||
|
||
cat > expected << EOF | ||
diff --git a/frotz b/frotz | ||
new file mode 120000 | ||
index 0000000..7c465af | ||
--- /dev/null | ||
+++ b/frotz | ||
@@ -0,0 +1 @@ | ||
+xyzzy | ||
\ No newline at end of file | ||
EOF | ||
|
||
test_expect_success \ | ||
'diff new symlink' \ | ||
'ln -s xyzzy frotz && | ||
git-update-index && | ||
tree=$(git-write-tree) && | ||
git-update-index --add frotz && | ||
GIT_DIFF_OPTS=--unified=0 git-diff-index -M -p $tree > current && | ||
compare_diff_patch current expected' | ||
|
||
test_expect_success \ | ||
'diff unchanged symlink' \ | ||
'tree=$(git-write-tree) && | ||
git-update-index frotz && | ||
test -z "$(git-diff-index --name-only $tree)"' | ||
|
||
cat > expected << EOF | ||
diff --git a/frotz b/frotz | ||
deleted file mode 120000 | ||
index 7c465af..0000000 | ||
--- a/frotz | ||
+++ /dev/null | ||
@@ -1 +0,0 @@ | ||
-xyzzy | ||
\ No newline at end of file | ||
EOF | ||
|
||
test_expect_success \ | ||
'diff removed symlink' \ | ||
'rm frotz && | ||
git-diff-index -M -p $tree > current && | ||
compare_diff_patch current expected' | ||
|
||
cat > expected << EOF | ||
diff --git a/frotz b/frotz | ||
EOF | ||
|
||
test_expect_success \ | ||
'diff identical, but newly created symlink' \ | ||
'sleep 1 && | ||
ln -s xyzzy frotz && | ||
git-diff-index -M -p $tree > current && | ||
compare_diff_patch current expected' | ||
|
||
cat > expected << EOF | ||
diff --git a/frotz b/frotz | ||
index 7c465af..df1db54 120000 | ||
--- a/frotz | ||
+++ b/frotz | ||
@@ -1 +1 @@ | ||
-xyzzy | ||
\ No newline at end of file | ||
+yxyyz | ||
\ No newline at end of file | ||
EOF | ||
|
||
test_expect_success \ | ||
'diff different symlink' \ | ||
'rm frotz && | ||
ln -s yxyyz frotz && | ||
git-diff-index -M -p $tree > current && | ||
compare_diff_patch current expected' | ||
|
||
test_done |