Repository.rev_parse: support commits, trees, and blobs

[stgit] / t / t2500-clean.sh

diff --git a/t/t2500-clean.sh b/t/t2500-clean.sh
index 99fd29f..8082c21 100755 (executable)
--- a/t/t2500-clean.sh
+++ b/t/t2500-clean.sh
@@ -9,7 +9,7 @@ test_expect_success 'Initialize StGit stack' '
     stg new e0 -m e0 &&
     stg new p0 -m p0 &&
     echo foo > foo.txt &&
-    git add foo.txt &&
+    stg add foo.txt &&
     stg refresh &&
     stg new e1 -m e1 &&
     stg new e2 -m e2 &&
@@ -32,7 +32,7 @@ test_expect_success 'Create a conflict' '
     stg new p2 -m p2
     echo quux > foo.txt &&
     stg refresh &&
-    conflict_old stg push
+    conflict stg push
 '
 
 test_expect_success 'Make sure conflicting patches are preserved' '