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: Implement make-patches
[dgit.git]
/
tests
/
tests
/
gdr-subcommands
diff --git
a/tests/tests/gdr-subcommands
b/tests/tests/gdr-subcommands
index 2a90cdc0680c404d60c1884936d0ef85064538dc..9d50b6c04f7db9134b4752ae1565854577be6bcc 100755
(executable)
--- a/
tests/tests/gdr-subcommands
+++ b/
tests/tests/gdr-subcommands
@@
-138,7
+138,7
@@
make_check () {
git reset --hard HEAD^1
;;
P*)
git reset --hard HEAD^1
;;
P*)
- t-dgit -wgf --quilt=
check
quilt-fixup
+ t-dgit -wgf --quilt=
nofix
quilt-fixup
git diff HEAD~ debian/patches | egrep .
git diff --quiet HEAD~ -- ':.' ':!debian/patches'
git reset --hard HEAD~
git diff HEAD~ debian/patches | egrep .
git diff --quiet HEAD~ -- ':.' ':!debian/patches'
git reset --hard HEAD~
@@
-160,6
+160,7
@@
make_check () {
}
Ec="F:No ongoing git-debrebase session"
}
Ec="F:No ongoing git-debrebase session"
+Ep="F:Patch export produced patch amendments"
# input state:
# stitched? st'd st'd unst'd unst'd
# input state:
# stitched? st'd st'd unst'd unst'd
@@
-174,8
+175,8
@@
subcmd stitch Ns Nu Sltf Stf
subcmd prepush Ns Nu Sltf Stf
subcmd quick ns Sl Sltf Sl
subcmd conclude "$Ec" "$Ec" Sltf Sl
subcmd prepush Ns Nu Sltf Stf
subcmd quick ns Sl Sltf Sl
subcmd conclude "$Ec" "$Ec" Sltf Sl
-#subcmd make-patches sPft sPft uPft uPft
-#subcmd dgit-upload-hook Psft
Psft SPft SPft
+subcmd make-patches sPft "$Ep" uPft "$Ep"
+#subcmd dgit-upload-hook Psft
"$Ep" SPft "$Ep"
#
# result codes, each one is a check:
# E:$pat } this is an error (must come first)
#
# result codes, each one is a check:
# E:$pat } this is an error (must come first)