From 02fa79ac37ed5d4c19f5fc86dab3a075900af33a Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Tue, 19 Apr 2011 09:31:12 +0200 Subject: [PATCH] [commit-patch] Avoid running 'interdiff' and 'patch -R' also when the working patch is just a series of comment lines. 'mtn diff' will output three comment lines when there are no changes. patch ignores them, so should we. --- commit-patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/commit-patch b/commit-patch index 79bd581..ac490bf 100755 --- a/commit-patch +++ b/commit-patch @@ -234,7 +234,7 @@ $SIG{PIPE} = $SIG{INT} = $SIG{QUIT} = sub { print "Cleanly aborting..\n"; }; my ($out, $working_patch, $non_committed_patch); run([split(/ /,$vc{diff}), @changed, @removed], '>', \$working_patch, '2>', \$err);# CVS diff dies. Sigh. or die "$err\n"; -unless ($working_patch =~ /^\s*$/s) { +unless ($working_patch =~ /^(#[^\n]*|\s)*$/s) { run(["interdiff", $vc{patcharg}, $patch, '-'], '<', \$working_patch, '>', \$non_committed_patch, '2>', \$err) or die "$err\n"; run(["patch", $vc{patcharg}, "-R"], '<', \$working_patch, '>', \$out, '2>', \$err) or die "$out\n$err\n"; -- 2.51.2