summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Johannes Sixt <j6t@kdbg.org>2015-02-23 19:14:47 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-02-23 11:45:39 -0800
commit817d03e10552c03fce7483df5034d72f883b2fab (patch)
tree2523d04ec95677f83cd0a93589fc39f81a36b639
parentt4008: modernise style (diff)
downloadtgif-817d03e10552c03fce7483df5034d72f883b2fab.tar.xz
test_ln_s_add: refresh stat info of fake symbolic links
We have a helper function test_ln_s_add that inserts a symbolic link into the index even if the file system does not support symbolic links. There is a small flaw in the emulation path: the added entry does not pick up stat information of the fake symbolic link from the file system, as a consequence, the index is not exactly the same as for the "regular" path (where symbolic links are available). To fix this, just call git update-index again. This flaw was revealed by the earlier change that tightened compare_diff_raw(), because a test case in t4008 depends on the correctly updated index. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--t/test-lib-functions.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
index 2f79146e6c..17ecf4f168 100644
--- a/t/test-lib-functions.sh
+++ b/t/test-lib-functions.sh
@@ -707,7 +707,9 @@ test_ln_s_add () {
else
printf '%s' "$1" >"$2" &&
ln_s_obj=$(git hash-object -w "$2") &&
- git update-index --add --cacheinfo 120000 $ln_s_obj "$2"
+ git update-index --add --cacheinfo 120000 $ln_s_obj "$2" &&
+ # pick up stat info from the file
+ git update-index "$2"
fi
}