Remove git-rename. git-mv does the same
Signed-off-by: Josef Weidendorfer <Josef.Weidendorfer@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
b0c698a6e4
commit
1331df8781
1
.gitignore
vendored
1
.gitignore
vendored
@ -74,7 +74,6 @@ git-read-tree
|
||||
git-rebase
|
||||
git-receive-pack
|
||||
git-relink
|
||||
git-rename
|
||||
git-repack
|
||||
git-request-pull
|
||||
git-reset
|
||||
|
@ -1,32 +0,0 @@
|
||||
git-rename(1)
|
||||
=============
|
||||
|
||||
NAME
|
||||
----
|
||||
git-rename - Script used to rename a file, directory or symlink.
|
||||
|
||||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-rename' <source> <destination>
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
This script is used to rename a file, directory or symlink.
|
||||
|
||||
The index is updated after successful completion, but the change must still be
|
||||
committed.
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Linus Torvalds <torvalds@osdl.org>
|
||||
Rewritten by Ryan Anderson <ryan@michonline.com>
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the gitlink:git[7] suite
|
||||
|
@ -262,9 +262,6 @@ gitlink:git-push[1]::
|
||||
gitlink:git-rebase[1]::
|
||||
Rebase local commits to new upstream head.
|
||||
|
||||
gitlink:git-rename[1]::
|
||||
Rename files and directories.
|
||||
|
||||
gitlink:git-repack[1]::
|
||||
Pack unpacked objects in a repository.
|
||||
|
||||
|
2
Makefile
2
Makefile
@ -96,7 +96,7 @@ SCRIPT_SH = \
|
||||
|
||||
SCRIPT_PERL = \
|
||||
git-archimport.perl git-cvsimport.perl git-relink.perl \
|
||||
git-rename.perl git-shortlog.perl git-fmt-merge-msg.perl \
|
||||
git-shortlog.perl git-fmt-merge-msg.perl \
|
||||
git-svnimport.perl git-mv.perl git-cvsexportcommit.perl
|
||||
|
||||
SCRIPT_PYTHON = \
|
||||
|
@ -1,70 +0,0 @@
|
||||
#!/usr/bin/perl
|
||||
#
|
||||
# Copyright 2005, Ryan Anderson <ryan@michonline.com>
|
||||
#
|
||||
# This file is licensed under the GPL v2, or a later version
|
||||
# at the discretion of Linus Torvalds.
|
||||
|
||||
|
||||
use warnings;
|
||||
use strict;
|
||||
|
||||
sub usage($);
|
||||
|
||||
# Sanity checks:
|
||||
my $GIT_DIR = $ENV{'GIT_DIR'} || ".git";
|
||||
|
||||
unless ( -d $GIT_DIR && -d $GIT_DIR . "/objects" &&
|
||||
-d $GIT_DIR . "/objects/" && -d $GIT_DIR . "/refs") {
|
||||
usage("Git repository not found.");
|
||||
}
|
||||
|
||||
usage("") if scalar @ARGV != 2;
|
||||
|
||||
my ($src,$dst) = @ARGV;
|
||||
|
||||
unless (-f $src || -l $src || -d $src) {
|
||||
usage("git rename: bad source '$src'");
|
||||
}
|
||||
|
||||
if (-e $dst) {
|
||||
usage("git rename: destinations '$dst' already exists");
|
||||
}
|
||||
|
||||
my (@allfiles,@srcfiles,@dstfiles);
|
||||
|
||||
$/ = "\0";
|
||||
open(F,"-|","git-ls-files","-z")
|
||||
or die "Failed to open pipe from git-ls-files: " . $!;
|
||||
|
||||
@allfiles = map { chomp; $_; } <F>;
|
||||
close(F);
|
||||
|
||||
my $safesrc = quotemeta($src);
|
||||
@srcfiles = grep /^$safesrc/, @allfiles;
|
||||
@dstfiles = @srcfiles;
|
||||
s#^$safesrc(/|$)#$dst$1# for @dstfiles;
|
||||
|
||||
rename($src,$dst)
|
||||
or die "rename failed: $!";
|
||||
|
||||
my $rc = system("git-update-index","--add","--",@dstfiles);
|
||||
die "git-update-index failed to add new name with code $?\n" if $rc;
|
||||
|
||||
$rc = system("git-update-index","--remove","--",@srcfiles);
|
||||
die "git-update-index failed to remove old name with code $?\n" if $rc;
|
||||
|
||||
|
||||
sub usage($) {
|
||||
my $s = shift;
|
||||
print $s, "\n" if (length $s != 0);
|
||||
print <<EOT;
|
||||
$0 <source> <dest>
|
||||
source must exist and be either a file, symlink or directory.
|
||||
dest must NOT exist.
|
||||
|
||||
Renames source to dest, and updates the git cache to reflect the change.
|
||||
Use "git commit" to make record the change permanently.
|
||||
EOT
|
||||
exit(1);
|
||||
}
|
Loading…
Reference in New Issue
Block a user