subtree: improve decision on merges kept in split
[gitweb.git] / t / t4132-apply-removal.sh
index bb1ffe3b6cfe491137b34993fe2e3bed99908dff..fec1d6fa51faec22da97eb62165c588e2ba9f655 100755 (executable)
@@ -30,6 +30,7 @@ test_expect_success setup '
        epocWest="1969-12-31 16:00:00.000000000 -0800" &&
         epocGMT="1970-01-01 00:00:00.000000000 +0000" &&
        epocEast="1970-01-01 09:00:00.000000000 +0900" &&
+       epocWest2="1969-12-31 16:00:00 -08:00" &&
 
        sed -e "s/TS0/$epocWest/" -e "s/TS1/$timeWest/" <c >createWest.patch &&
        sed -e "s/TS0/$epocEast/" -e "s/TS1/$timeEast/" <c >createEast.patch &&
@@ -46,9 +47,9 @@ test_expect_success setup '
        sed -e "s/TS0/$timeWest/" -e "s/TS1/$epocWest/" <d >removeWest.patch &&
        sed -e "s/TS0/$timeEast/" -e "s/TS1/$epocEast/" <d >removeEast.patch &&
        sed -e "s/TS0/$timeGMT/" -e "s/TS1/$epocGMT/" <d >removeGMT.patch &&
+       sed -e "s/TS0/$timeWest/" -e "s/TS1/$epocWest2/" <d >removeWest2.patch &&
 
-       echo something >something &&
-       >empty
+       echo something >something
 '
 
 for patch in *.patch
@@ -79,7 +80,7 @@ do
                        git add file &&
                        git apply --index $patch &&
                        test -f file &&
-                       test_cmp empty file
+                       test_must_be_empty file
                        ;;
                remove*)
                        # must remove the file