From cf0e3f99c920d5cc8ca2c37a9bddc3ebddc1aed3 Mon Sep 17 00:00:00 2001
From: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
Date: Thu, 17 Sep 2009 22:06:17 -0400
Subject: [PATCH] {fork,import}: check patchnames for colons

Since colons (':') are invalid characters in git ref names, guilt cannont
use any patch names that contain colons. Refuse to accept a colon in the
patch name.

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
---
 guilt        | 2 ++
 guilt-fork   | 4 ++++
 guilt-import | 4 ++++
 3 files changed, 10 insertions(+)

diff --git a/guilt b/guilt
index 508ddea..44b9fd3 100755
--- a/guilt
+++ b/guilt
@@ -135,6 +135,8 @@ valid_patchname()
 	case "$1" in
 		/*|./*|../*|*/./*|*/../*|*/.|*/..|*/|*\ *|*\	*)
 			return 1;;
+		*:*)
+			return 1;;
 		*)
 			return 0;;
 	esac
diff --git a/guilt-fork b/guilt-fork
index b82cf88..32649fc 100755
--- a/guilt-fork
+++ b/guilt-fork
@@ -31,6 +31,10 @@ else
 	newpatch="${base%-$num}-$(($num+1))${patch#$base}"
 fi
 
+if ! valid_patchname "$newpatch"; then
+	die "The specified patch name contains invalid characters (:)."
+fi
+
 if [ -e "$GUILT_DIR/$branch/$newpatch" ]; then
 	die "Patch \"$newpatch\" already exists. Choose another name."
 fi
diff --git a/guilt-import b/guilt-import
index 4d73cc9..1dcc2aa 100755
--- a/guilt-import
+++ b/guilt-import
@@ -34,6 +34,10 @@ if [ -e "$GUILT_DIR/$branch/$newname" ]; then
 	die "Already tracking a patch under that name."
 fi
 
+if ! valid_patchname "$newname"; then
+	die "The specified patch name contains invalid characters (:)."
+fi
+
 # create any directories as needed
 mkdir_dir=`dirname "$GUILT_DIR/$branch/$newname"`
 [ "$mkdir_dir" != "$GUILT_DIR/$branch" ] && mkdir -p "$mkdir_dir"
-- 
2.11.4.GIT