--- oslo-series-v3/v3-0012-guilt-header-more-robust-header-selection.patch +++ oslo-series-v4/v4-0012-guilt-header-more-robust-header-selection.patch @@ -1,7 +1,7 @@ -From 6c0d77de544d182d58ec2c092791cd9e9620f143 Mon Sep 17 00:00:00 2001 +From 7b5ffec62dd4b73041c532acd08aac7eb49e3ca7 Mon Sep 17 00:00:00 2001 From: Per Cederqvist -Date: Fri, 16 May 2014 11:53:25 +0200 -Subject: [GUILT v3 12/31] "guilt header": more robust header selection. +Date: Sun, 18 May 2014 21:23:16 +0200 +Subject: [GUILT v4 12/33] "guilt header": more robust header selection. To: Jeff Sipek Cc: git@vger.kernel.org @@ -13,13 +13,14 @@ Fixed by comparing exact strings. And as a creeping feature "guilt header" will now try to use the -supplied patch name as an unachored regexp if no exact match was +supplied patch name as an unanchored regexp if no exact match was found. If the regexp yields a unique match, it is used; if more than one patch matches, the names of all patches are listed and the command fails. (Exercise left to the reader: generalized this so that "guilt push" also accepts a unique regular expression.) Signed-off-by: Per Cederqvist +Signed-off-by: Josef 'Jeff' Sipek --- guilt-header | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-)