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: test suite: test ff stitching
[dgit.git]
/
tests
/
tests
/
unrepresentable
diff --git
a/tests/tests/unrepresentable
b/tests/tests/unrepresentable
index 621829e1f0c64a5c39bc2b850be3374c695b426f..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
@@
-25,28
+30,38
@@
badly-2 () {
attempt
}
attempt
}
-badly-1 symlink 'not a plain file'
- ln -s TARGET symlink
- git add symlink
+badly-1 orig-symlink 'modified symlink'
+ ln -sf NEWTARGET orig-symlink
+ git add orig-symlink
+badly-2
+
+badly-1 orig-symlink 'deletion of symlink'
+ git rm -f orig-symlink
badly-2
start
git rm src.c
git commit -m deleted
badly-2
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'
+good
-badly-1 src.c 'mode changed'
+badly-1 src.c 'mode
or type
changed'
chmod +x src.c
git add src.c
badly-2
chmod +x src.c
git add src.c
badly-2
-badly-1 new 'non-default mode'
+badly-1 new '
creation with
non-default mode'
echo hi >new
chmod 755 new
git add new
badly-2
start
echo hi >new
chmod 755 new
git add new
badly-2
start
-attempt
+good
t-ok
t-ok