Skip to contentSkip to conversation

t7400: barf if git-submodule removes or replaces a file

PATCH In review Lars Hjemli 1 participant 1 message Jun 15, 2016

lore
Share & tools
lore

Lars Hjemli

author
#0 lore raw

PATCH 1/5 t7400: barf if git-submodule removes or replaces a file

The test for an unmolested file wouldn't fail properly if the file had been removed or replaced by something other than a regular file. This fixes it.

Signed-off-by Lars Hjemli <[email protected]>
---
  t/t7400-submodule-basic.sh |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
t/t7400-submodule-basic.sh +1 -1
index 3940433..74fafce 100755
@@ -72,7 +72,7 @@ test_expect_success 'update should fail when path is used by a file' '
  	then
  		echo "[OOPS] update should have failed"
  		false
-	elif test -f lib && test "$(cat lib)" != "hello"
+	elif test "$(cat lib)" != "hello"
  	then
  		echo "[OOPS] update failed but lib file was molested"
  		false
Signature · 1 line
1.5.2.1.914.gbd3a7