Merge branch 'maint'
* maint: git-submodule.sh: fix filename in comment. git-add--interactive.perl: Remove two unused variables
This commit is contained in:
commit
8df9be792b
@ -1067,7 +1067,6 @@ EOF
|
||||
}
|
||||
|
||||
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);
|
||||
|
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user