[PATCH 2/5] add--interactive: factor out regex error handling
- From
Jeff King <peff@peff.net>
- Date
- Jul 27, 2011, 08:05 UTC
- Message-ID
- <20110727080534.GB14002@sigill.intra.peff.net>
- In-Reply-To
- <20110727080303.GA8105@sigill.intra.peff.net>
When perl complains about compiling a regex the user has given us, we trim the error to get a nicer message. It's only one line of code, but it's ugly and non-obvious, so let's factor it into a reusable function.
Signed-off-by: Jeff King <peff@peff.net> --- git-add--interactive.perl | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/git-add--interactive.perl b/git-add--interactive.perl index c5cd300..3e4c8a4 100755 --- a/git-add--interactive.perl +++ b/git-add--interactive.perl @@ -1267,6 +1267,12 @@ sub display_hunks { return $i; } +sub trim_error { + local $_ = shift; + s/ at .*git-add--interactive line \d+, <STDIN> line \d+.*$//; + return $_; +} + sub patch_update_file { my $quit = 0; my ($ix, $num); @@ -1419,9 +1425,8 @@ sub patch_update_file { $search_string = qr{$regex}m; }; if ($@) { - my ($err,$exp) = ($@, $1); - $err =~ s/ at .*git-add--interactive line \d+, <STDIN> line \d+.*$//; - error_msg "Malformed search regexp $exp: $err\n"; + my $exp = $1; + error_msg "Malformed search regexp $exp: " . trim_error($@) . "\n"; next; } my $iy = $ix;
-- 1.7.5.4.31.ge4d5e