diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-23 18:52:22 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-23 18:52:22 -0700 |
commit | 399144f21c1b3bcd4c9dadd4f534118475de840d (patch) | |
tree | b8a2ac7f44f605bb446a2cf67a6604417b83c120 | |
parent | fd1fcd9f57406cd5f278adb6b3ceeb1b7637062a (diff) | |
download | git-399144f21c1b3bcd4c9dadd4f534118475de840d.tar.gz git-399144f21c1b3bcd4c9dadd4f534118475de840d.tar.xz |
Add a "git rename" to help with - surprise surprise - renames
It's stupid. We'd want to rename directories too, but this doesn't do
that yet - easy enough to do per se, we just need to carefully list all
the pathnames that got moved (and remember to ignore the files that
weren't tracked but are in the subdirectory that got moved).
Doing the directory case will require a bit more scripting.. Something like
oldfiles=($(git-ls-files | grep '^$src'))
newfiles=($(git-ls-files | sed ':^$src: s:^$src:$dst:'))
mv $src $dst && git-update-cache --add --remove -- "${oldfiles[@]}" "${newfiles[@]}"
might do it, except it needs to be done right, and carefully. Methinks
perl is probably better at this. Hint hint..
-rw-r--r-- | Makefile | 2 | ||||
-rwxr-xr-x | git-rename-script | 7 |
2 files changed, 8 insertions, 1 deletions
@@ -37,7 +37,7 @@ SCRIPTS=git git-apply-patch-script git-merge-one-file-script git-prune-script \ gitk git-cherry git-rebase-script git-relink-script git-repack-script \ git-format-patch-script git-sh-setup-script git-push-script \ git-branch-script git-parse-remote git-verify-tag-script \ - git-ls-remote-script git-clone-dumb-http + git-ls-remote-script git-clone-dumb-http git-rename-script PROG= git-update-cache git-diff-files git-init-db git-write-tree \ git-read-tree git-commit-tree git-cat-file git-fsck-cache \ diff --git a/git-rename-script b/git-rename-script new file mode 100755 index 000000000..3952382db --- /dev/null +++ b/git-rename-script @@ -0,0 +1,7 @@ +#!/bin/sh + +. git-sh-setup-script || die "Not a git archive" + +[ -f "$1" ] || [ -h "$1" ] || die "git rename: bad source" +[ -e "$2" ] && die "git rename: destination already exists" +mv -- "$1" "$2" && git-update-cache --add --remove -- "$1" "$2" |