--- oslo-series-final/0014-Use-git-check-ref-format-to-validate-patch-names.patch
+++ oslo-series-v2/v2-0014-Use-git-check-ref-format-to-validate-patch-names.patch
@@ -1,7 +1,7 @@

-From d3f86b4d2649a07812bdccb9aac8651ee61eef01 Mon Sep 17 00:00:00 2001
+From 38706cf3854c4cb7c2bfd622fd559fb4a4d72c4d Mon Sep 17 00:00:00 2001
 From: Per Cederqvist <cederp@opera.com>
-Date: Wed, 19 Mar 2014 21:29:13 +0100
-Subject: [GUILT 14/28] Use "git check-ref-format" to validate patch names.
+Date: Tue, 13 May 2014 21:03:54 +0200
+Subject: [GUILT v2 14/29] Use "git check-ref-format" to validate patch names.
 To: Jeff Sipek <jeffpc@josefsipek.net>
 Cc: git@vger.kernel.org
 
@@ -20,12 +20,12 @@

 
 Signed-off-by: Per Cederqvist <cederp@opera.com>
 ---
- guilt                |  23 ++-
+ guilt                |  21 ++-
  guilt-fork           |   2 +-
  guilt-import         |   2 +-
  guilt-new            |   2 +-
  regression/t-025.out | 426 +++++++++++++++++++++++++++++++++++++++++++++++++--
  regression/t-025.sh  |  12 +-
  regression/t-032.out |   4 +-
- 7 files changed, 448 insertions(+), 23 deletions(-)
+ 7 files changed, 446 insertions(+), 23 deletions(-)
 
  diff --git a/guilt b/guilt
  index c59cd0f..ca922aa 100755
  --- a/guilt
  +++ b/guilt
- @@ -132,14 +132,21 @@ fi
+ @@ -132,14 +132,19 @@ fi
   # usage: valid_patchname <patchname>
   valid_patchname()
   {
[...]
  -		*)
  -			return 0;;
  -	esac
- +	if git check-ref-format --allow-onelevel "$1"
- +	then
+ +	if git check-ref-format --allow-onelevel "$1"; then
  +		# Starting with Git version 1.8.5, a branch cannot be
  +		# the single character "@".  Make sure guilt rejects
  +		# that name even if we are currently using an older
  +		# version of Git.  This ensures that the test suite
  +		# runs fine using any version of Git.
- +		if [ "$1" = "@" ]
- +		then
+ +		if [ "$1" = "@" ]; then
  +			return 1
  +		fi
  +		return 0
[...]
   }
   
   get_branch()