--- oslo-series-v2/v2-0006-Fix-the-do_get_patch-function.patch +++ oslo-series-v3/v3-0006-Fix-the-do_get_patch-function.patch @@ -1,7 +1,7 @@ -From 58a2ed5a97ce4da3d5e17b3314e358b9491e6f43 Mon Sep 17 00:00:00 2001 +From 7a7e456d27697c0ef75ff8bf6c719474453e9312 Mon Sep 17 00:00:00 2001 From: Per Cederqvist -Date: Tue, 13 May 2014 21:03:41 +0200 -Subject: [GUILT v2 06/29] Fix the do_get_patch function. +Date: Wed, 14 May 2014 10:42:31 +0200 +Subject: [GUILT v3 06/31] Fix the do_get_patch function. To: Jeff Sipek Cc: git@vger.kernel.org @@ -15,14 +15,20 @@ to give us part 2 and part 3. That made for instance this series of operations fail if guilt.diffstat is true: - guilt push empty-1 - guilt push empty-2 - guilt pop - guilt fold empty-2 - guilt pop - guilt push + $ guilt new empty-1 + $ guilt new empty-2 + $ guilt pop + Now at empty-1 + $ guilt fold empty-2 + $ guilt pop + All patches popped. + $ guilt push + Applying patch..empty-1 + fatal: unrecognized input + To force apply this patch, use 'guilt push -f' Signed-off-by: Per Cederqvist +Signed-off-by: Josef 'Jeff' Sipek --- guilt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)