chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git-debrebase: Rename new-upstream-v0 command to new-upstream
[dgit.git]
/
tests
/
tests
/
unrepresentable
diff --git
a/tests/tests/unrepresentable
b/tests/tests/unrepresentable
index b2de45289396b2108ff978d5cf8898ef231266f4..e4b0da85a4e2fcb5c686697687ef210640ba063b 100755
(executable)
--- a/
tests/tests/unrepresentable
+++ b/
tests/tests/unrepresentable
@@
-12,6
+12,11
@@
cd $p
start () { git checkout quilt-tip-1.1~0; }
attempt () { t-dgit -wgf --quilt=smash quilt-fixup; }
start () { git checkout quilt-tip-1.1~0; }
attempt () { t-dgit -wgf --quilt=smash quilt-fixup; }
+good () {
+ attempt
+ t-dgit --quilt=nofix -wgf build-source
+ t-dgit -wgf --dry-run push --new
+}
badly-1 () {
wrongfn=$1
badly-1 () {
wrongfn=$1
@@
-37,13
+42,13
@@
badly-2
start
git rm src.c
git commit -m deleted
start
git rm src.c
git commit -m deleted
-attempt
+good
start
git rm orig-exec
git rm -f orig-unwriteable
git commit -m 'deleted funny'
start
git rm orig-exec
git rm -f orig-unwriteable
git commit -m 'deleted funny'
-attempt
+good
badly-1 src.c 'mode or type changed'
chmod +x src.c
badly-1 src.c 'mode or type changed'
chmod +x src.c
@@
-57,6
+62,6
@@
badly-1 new 'creation with non-default mode'
badly-2
start
badly-2
start
-attempt
+good
t-ok
t-ok