Merge branch 'maint'

* maint: git-submodule.sh: fix filename in comment. git-add--interactive.perl: Remove two unused variables
git-mirror · Jun 25, 2012 · 8df9be7 · 8df9be7
2 parents f71be5c + 4c8a9db
commit 8df9be7
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git 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
@@ -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