[packages/phorkie] add --no-edit option to avoid git launching $EDITOR fallbacking to vi
glen
glen at pld-linux.org
Sat Sep 14 14:44:34 CEST 2013
commit d9e7b3b81507c39bf861bfdaf26a678e33a6d0a7
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Sat Sep 14 15:41:28 2013 +0300
add --no-edit option to avoid git launching $EDITOR fallbacking to vi
git-no-edit.patch | 10 ++++++++++
phorkie.spec | 4 +++-
2 files changed, 13 insertions(+), 1 deletion(-)
---
diff --git a/phorkie.spec b/phorkie.spec
index b01d544..91e0668 100644
--- a/phorkie.spec
+++ b/phorkie.spec
@@ -5,12 +5,13 @@
Summary: PHP and Git based pastebin
Name: phorkie
Version: 0.3.1
-Release: 0.7
+Release: 0.8
License: AGPL v3
Group: Applications/WWW
Source0: http://downloads.sourceforge.net/phorkie/%{name}-%{version}.tar.bz2
# Source0-md5: 46b93c9270ea7950cea9ac8c58641378
Patch0: geshi-path.patch
+Patch1: git-no-edit.patch
Source1: apache.conf
Source2: lighttpd.conf
URL: http://sourceforge.net/projects/phorkie/
@@ -45,6 +46,7 @@ have multiple files and are stored in git repositories.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
mv data/config.php.dist config.php
diff --git a/git-no-edit.patch b/git-no-edit.patch
new file mode 100644
index 0000000..435f63c
--- /dev/null
+++ b/git-no-edit.patch
@@ -0,0 +1,10 @@
+--- phorkie/src/phorkie/Repository/Post.php~ 2012-09-28 23:10:04.000000000 +0300
++++ phorkie/src/phorkie/Repository/Post.php 2013-09-14 15:37:41.302081945 +0300
+@@ -134,6 +134,7 @@
+ $vc->getCommand('commit')
+ ->setOption('message', '')
+ ->setOption('allow-empty-message')
++ ->setOption('no-edit')
+ ->setOption(
+ 'author',
+ $sessionData['name'] . ' <' . $sessionData['email'] . '>'
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/phorkie.git/commitdiff/d9e7b3b81507c39bf861bfdaf26a678e33a6d0a7
More information about the pld-cvs-commit
mailing list