Also, restore support for the GIT_DIR Signed-off-by: Ryan Anderson <[EMAIL PROTECTED]> ---
git-rename-script | 26 ++++++++++---------------- 1 files changed, 10 insertions(+), 16 deletions(-) 1ed66638c7ce328d882639447b80099f096c2993 diff --git a/git-rename-script b/git-rename-script --- a/git-rename-script +++ b/git-rename-script @@ -12,11 +12,8 @@ use strict; sub usage($); # Sanity checks: -my $GIT_DIR = $$ENV{'GIT_DIR'}; -$GIT_DIR = ".git" unless defined $GIT_DIR; - -unless ( -d $GIT_DIR && -d $GIT_DIR . "/objects" && - -d $GIT_DIR . "/objects/00" && -d $GIT_DIR . "/refs") { +unless ( -d ".git" && -d ".git/objects" && + -d ".git/objects/00" && -d ".git/refs") { usage("Git repository not found."); } @@ -34,26 +31,23 @@ if (-e $dst) { my (@allfiles,@srcfiles,@dstfiles); -$/ = "\0"; -open(F,"-|","git-ls-files","-z") +open(F,"-|","git-ls-files") or die "Failed to open pipe from git-ls-files: " . $!; [EMAIL PROTECTED] = map { chomp; $_; } <F>; [EMAIL PROTECTED] = <F>; close(F); +chomp for @allfiles; + -my $safesrc = quotemeta($src); [EMAIL PROTECTED] = grep /^$safesrc/, @allfiles; [EMAIL PROTECTED] = grep /^$src/, @allfiles; @dstfiles = @srcfiles; -s#^$safesrc(/|$)#$dst$1# for @dstfiles; +s#^$src(/|$)#$dst$1# for @dstfiles; rename($src,$dst) or die "rename failed: $!"; -my $rc = system("git-update-cache","--add","--",@dstfiles); -die "git-update-cache failed to add new name with code $?\n" if $rc; - -$rc = system("git-update-cache","--remove","--",@srcfiles); -die "git-update-cache failed to remove old name with code $?\n" if $rc; +system("git-update-cache","--remove","--",@srcfiles); +system("git-update-cache","--add","--",@dstfiles); sub usage($) { -- Ryan Anderson sometimes Pug Majere - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html