commit 4135d7d058f245363e836faa15dbedbd91bd1334
from: Stefan Sperling <stsp@stsp.name>
date: Thu Jul 23 14:21:29 2020 UTC

fix symlink change in test_diff_symlinks_in_work_tree

commit - 39449a05d564e098f638d1be356d1efbba3ab38c
commit + 4135d7d058f245363e836faa15dbedbd91bd1334
blob - b29b40b95fb58c581c7b24ef325ee920470bb0cf
blob + 649ab258d4c149e3942f5f2da369992a8dd44f69
--- regress/cmdline/diff.sh
+++ regress/cmdline/diff.sh
@@ -383,7 +383,7 @@ function test_diff_symlinks_in_work_tree {
 	fi
 
 	(cd $testroot/wt && ln -sf beta alpha.link)
-	(cd $testroot/wt && ln -sf gamma epsilon.link)
+	(cd $testroot/wt && ln -sfh gamma epsilon.link)
 	(cd $testroot/wt && ln -sf ../gamma/delta epsilon/beta.link)
 	echo -n '.got/bar' > $testroot/wt/dotgotfoo.link
 	(cd $testroot/wt && got rm nonexistent.link > /dev/null)
@@ -427,7 +427,19 @@ function test_diff_symlinks_in_work_tree {
 	echo '-../beta' >> $testroot/stdout.expected
 	echo '\ No newline at end of file' >> $testroot/stdout.expected
 	echo '+../gamma/delta' >> $testroot/stdout.expected
+	echo '\ No newline at end of file' >> $testroot/stdout.expected
+	echo -n 'blob - ' >> $testroot/stdout.expected
+	got tree -r $testroot/repo -c $commit_id1 -i | \
+		grep 'epsilon.link@ -> epsilon$' | \
+		cut -d' ' -f 1 >> $testroot/stdout.expected
+	echo 'file + epsilon.link' >> $testroot/stdout.expected
+	echo '--- epsilon.link' >> $testroot/stdout.expected
+	echo '+++ epsilon.link' >> $testroot/stdout.expected
+	echo '@@ -1 +1 @@' >> $testroot/stdout.expected
+	echo '-epsilon' >> $testroot/stdout.expected
 	echo '\ No newline at end of file' >> $testroot/stdout.expected
+	echo '+gamma' >> $testroot/stdout.expected
+	echo '\ No newline at end of file' >> $testroot/stdout.expected
 	echo -n 'blob - ' >> $testroot/stdout.expected
 	got tree -r $testroot/repo -c $commit_id1 -i | \
 		grep 'nonexistent.link@ -> nonexistent$' | \