Merge branch 'maint'

* maint:
git-submodule.sh: fix filename in comment.
git-add--interactive.perl: Remove two unused variables

diff --git a/git-add--interactive.perl b/git-add--interactive.perl
index d948aa88dba11d1d7d87f6a523c698cf4f4848f1..710764abb132f16e393fd16178b845d8160e37cf 100755 (executable)
--- a/git-add--interactive.perl
+++ b/git-add--interactive.perl
@@ -1067,7 +1067,6 @@ sub edit_hunk_manually {
 }
 
 sub diff_applies {
-       my $fh;
        return run_git_apply($patch_mode_flavour{APPLY_CHECK} . ' --check',
                             map { @{$_->{TEXT}} } @_);
 }
@@ -1514,7 +1513,6 @@ sub patch_update_file {
        }
 
        if (@result) {
-               my $fh;
                my @patch = reassemble_patch($head->{TEXT}, @result);
                my $apply_routine = $patch_mode_flavour{APPLY};
                &$apply_routine(@patch);

diff --git a/git-submodule.sh b/git-submodule.sh
index 5c61ae2b43d67bf66ddee54ca80ba0607fbf45b8..fbf2fafaaf49ec65090ec4eadb33d1ccedc60436 100755 (executable)
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# git-submodules.sh: add, init, update or list git submodules
+# git-submodule.sh: add, init, update or list git submodules
 #
 # Copyright (c) 2007 Lars Hjemli