--- oslo-series-final/0025-guilt-push-now-fails-when-there-are-no-more-patches-.patch
+++ oslo-series-v2/v2-0025-guilt-push-now-fails-when-there-are-no-more-patch.patch
@@ -1,8 +1,8 @@

-From d2e7dd493dee57821ab6c856525eceb132aa980a Mon Sep 17 00:00:00 2001
+From 02832dd331f02530f4ca6be10115ea8698b36d5e Mon Sep 17 00:00:00 2001
 From: Per Cederqvist <cederp@opera.com>
-Date: Wed, 19 Mar 2014 21:52:12 +0100
-Subject: [GUILT 25/28] "guilt push" now fails when there are no more patches
- to push.
+Date: Tue, 13 May 2014 21:40:18 +0200
+Subject: [GUILT v2 25/29] "guilt push" now fails when there are no more
+ patches to push.
 To: Jeff Sipek <jeffpc@josefsipek.net>
 Cc: git@vger.kernel.org
 
@@ -22,8 +22,8 @@

 
 Signed-off-by: Per Cederqvist <cederp@opera.com>
 ---
- guilt-push           | 14 ++++-----
+ guilt-push           | 19 ++++++-----
  regression/t-020.out | 89 ++++++++++++++++++++++++++++++++++++++++++++++++++++
  regression/t-020.sh  | 13 +++++++-
- 3 files changed, 108 insertions(+), 8 deletions(-)
+ 3 files changed, 113 insertions(+), 8 deletions(-)
 
  diff --git a/guilt-push b/guilt-push
  index 67687e7..2222350 100755
  --- a/guilt-push
  +++ b/guilt-push
- @@ -55,6 +55,7 @@ fi
-  
-  patch="$1"
-  [ ! -z "$all" ] && patch="-a"
- +[ -z "$patch" ] && { patch=1; num=t; }
-  
-  if [ "$patch" = "-a" ]; then
-  	# we are supposed to push all patches, get the last one out of
+ @@ -56,6 +56,12 @@ fi
+  patch="$1"
+  [ ! -z "$all" ] && patch="-a"
+  
+ +# Treat "guilt push" as "guilt push -n 1".
+ +if [ -z "$patch" ]; then
+ +	patch=1
+ +	num=t
+ +fi
+ +
+  if [ "$patch" = "-a" ]; then
+  	# we are supposed to push all patches, get the last one out of
+  	# series