GIT_TRACE: show which built-in/external commands are executed

diff --git a/git-cvsexportcommit.perl b/git-cvsexportcommit.perl
index 57088c3f0bbdcb27c79c6b3c22dc1b4e7327bb0b..5dcb2f9a8ecdf43e73ae31bf8ba7dff27acaa367 100755 (executable)
--- a/git-cvsexportcommit.perl
+++ b/git-cvsexportcommit.perl
@@ -63,15 +63,15 @@
 }
 
 if ($parent) {
+    my $found;
     # double check that it's a valid parent
     foreach my $p (@parents) {
-       my $found;
        if ($p eq $parent) {
            $found = 1;
            last;
        }; # found it
-       die "Did not find $parent in the parents for this commit!";
     }
+    die "Did not find $parent in the parents for this commit!" if !$found;
 } else { # we don't have a parent from the cmdline...
     if (@parents == 1) { # it's safe to get it from the commit
        $parent = $parents[0];
@@ -134,7 +134,7 @@
        and $status[0] !~ m/^File: no file /) {
        $dirty = 1;
        warn "File $f is already known in your CVS checkout -- perhaps it has been added by another user. Or this may indicate that it exists on a different branch. If this is the case, use -f to force the merge.\n";
-       warn "Status was: $status\n";
+       warn "Status was: $status[0]\n";
     }
 }
 foreach my $f (@mfiles, @dfiles) {