undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* maint:
  git-submodule.sh: fix filename in comment.
  git-add--interactive.perl: Remove two unused variables
This commit is contained in:
Junio C Hamano 2012-06-25 11:21:33 -07:00
commit 8df9be792b
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-add--interactive.perl
View File

@ -1067,7 +1067,6 @@ EOF
} }
sub diff_applies { sub diff_applies {
my $fh;
return run_git_apply($patch_mode_flavour{APPLY_CHECK} . ' --check', return run_git_apply($patch_mode_flavour{APPLY_CHECK} . ' --check',
map { @{$_->{TEXT}} } @_); map { @{$_->{TEXT}} } @_);
} }
@ -1514,7 +1513,6 @@ sub patch_update_file {
} }
if (@result) { if (@result) {
my $fh;
my @patch = reassemble_patch($head->{TEXT}, @result); my @patch = reassemble_patch($head->{TEXT}, @result);
my $apply_routine = $patch_mode_flavour{APPLY}; my $apply_routine = $patch_mode_flavour{APPLY};
&$apply_routine(@patch); &$apply_routine(@patch);

2
git-submodule.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/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 # Copyright (c) 2007 Lars Hjemli