~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
stgit.el: Repair ! for historical commits
[stgit]
/
t
/
t1301-repair.sh
diff --git
a/t/t1301-repair.sh
b/t/t1301-repair.sh
index
8d5d4e5
..
939699c
100755
(executable)
--- a/
t/t1301-repair.sh
+++ b/
t/t1301-repair.sh
@@
-20,7
+20,7
@@
test_expect_success \
'
stg new foo -m foo &&
echo foo > foo.txt &&
'
stg new foo -m foo &&
echo foo > foo.txt &&
-
git
add foo.txt &&
+
stg
add foo.txt &&
stg refresh
'
stg refresh
'
@@
-32,7
+32,7
@@
test_expect_success \
'Create a GIT commit' \
'
echo bar > bar.txt &&
'Create a GIT commit' \
'
echo bar > bar.txt &&
-
git
add bar.txt &&
+
stg
add bar.txt &&
git commit -a -m bar
'
git commit -a -m bar
'
@@
-46,7
+46,7
@@
test_expect_success \
'Create three more GIT commits' \
'
echo one > numbers.txt &&
'Create three more GIT commits' \
'
echo one > numbers.txt &&
-
git
add numbers.txt &&
+
stg
add numbers.txt &&
git commit -a -m one &&
echo two >> numbers.txt &&
git commit -a -m two &&
git commit -a -m one &&
echo two >> numbers.txt &&
git commit -a -m two &&
@@
-65,7
+65,7
@@
test_expect_success \
'
git checkout -b br master^^ &&
echo woof > woof.txt &&
'
git checkout -b br master^^ &&
echo woof > woof.txt &&
-
git
add woof.txt &&
+
stg
add woof.txt &&
git commit -a -m woof &&
git checkout master &&
git pull . br
git commit -a -m woof &&
git checkout master &&
git pull . br