diff --git a/commit-patch b/commit-patch
index b06907e..d5a6a83 100755
--- a/commit-patch
+++ b/commit-patch
@@ -25,18 +25,6 @@ sub run {
     IPC::Run::run(@_);
 }
 
-my ($message, $message_filename);
-GetOptions("m|message=s"      => \$message,
-           "F|message-file=s" => \$message_filename,
-           "h|help" => sub { pod2usage(1) },
-           "n|dry-run"        => \$dry_run,
-           "v|verbose"        => \$verbose,
-    ) and scalar @ARGV == 1 or pod2usage(2);
-my $patch = shift;
-
-die "bad patch file: $!" if -z $patch;
-die "Invalid message" if defined $message && $message eq "";
-
 my %clean;
 my $repo=".";
 my %vc;
@@ -88,6 +76,18 @@ while (!$vc{name}) {
     }
 }
 
+my ($message, $message_filename);
+GetOptions("m|message=s"      => \$message,
+           "F|message-file=s" => \$message_filename,
+           "h|help" => sub { pod2usage(1) },
+           "n|dry-run"        => \$dry_run,
+           "v|verbose"        => \$verbose,
+    ) and scalar @ARGV == 1 or pod2usage(2);
+my $patch = shift;
+
+die "bad patch file: $!" if -z $patch;
+die "Invalid message" if defined $message && $message eq "";
+
 my ($lsdiff_out, $err);
 run ["lsdiff", @{$vc{lsdiffarg}}, $patch], '|', ["sort"], '|', ["uniq"], \$lsdiff_out, \$err or die "lsdiff|sort|unique : $! ($err)";
 my @files = split(/\n/, $lsdiff_out);