summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAxel Beckert <abe@deuxchevaux.org>2014-10-10 01:00:03 +0200
committerAxel Beckert <abe@deuxchevaux.org>2014-10-10 01:02:15 +0200
commit54649d9d5e77cc368b0d24ecc0d91c3a20d7913e (patch)
tree5a9550e5594af7bad4ec5c7129e2849deb87b617
parent67a6efe2473541633b790036364ef6716fcd4fa6 (diff)
downloadzsh-54649d9d5e77cc368b0d24ecc0d91c3a20d7913e.tar.gz
zsh-54649d9d5e77cc368b0d24ecc0d91c3a20d7913e.zip
Workflow: Patchname variable and minimal sed to make DEP3 out of "git show"
Maybe we still need patch2quilt, but not file but commit id based. Git-Dch: Ignore
-rw-r--r--debian/pkg-zsh-workflow.md2
1 files changed, 2 insertions, 0 deletions
diff --git a/debian/pkg-zsh-workflow.md b/debian/pkg-zsh-workflow.md
index 7d9daa6ea..4eda7699d 100644
--- a/debian/pkg-zsh-workflow.md
+++ b/debian/pkg-zsh-workflow.md
@@ -119,7 +119,9 @@ When there is an existing patch (e.g. from upstream's git repository),
the above can be largely automated if the patch applies to the current
state of the debian branch.
+ % patchname="cherry-pick-$shortcommitid-description-with-dashes"
% git show $commitid > debian/patches/$patchname
+ % sed -e '1 s/^commit/Origin: commit/' -i debian/patches/$patchname
% echo $patchname >> debian/patches/series
Patches from upstream will likely include changes to the ChangeLog