diff options
-rwxr-xr-x | masterkey.pl | 4 | ||||
-rwxr-xr-x | svn-commit-git-patch | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/masterkey.pl b/masterkey.pl index e82b350..d24a5a5 100755 --- a/masterkey.pl +++ b/masterkey.pl @@ -46,9 +46,9 @@ sub main { 'body' => 'Hi, This mail is about having your GPG key signed by an Arch Linux master key. -Please reply with an email that is signed with your key ({$recipient_key}) +Please reply with an email that is signed with your key or a subkey of it ({$recipient_key}) and contains the token listed below. It is not necessary to encrypt the mail, -however, signing the mail with your key is required. +however, signing the mail with your key or a subkey of it is required. If you do not have GPG configured in your mail client, it is sufficient to send the signed token as an attachment. diff --git a/svn-commit-git-patch b/svn-commit-git-patch index 54b345d..b25be44 100755 --- a/svn-commit-git-patch +++ b/svn-commit-git-patch @@ -49,5 +49,11 @@ while (my $line = <$fh>) { $message = "$subject\n\n$message"; -system(qw(svn patch --strip 1), $patchfile); +system(qw(patch -p 3 -i), $patchfile); + +system(qw(svn diff)); + +print "Commit message will be:\n$message\n\n\n"; +print "Press Enter to commit"; +<STDIN>; system(qw(svn commit -m), $message); |