From: Junio C Hamano Date: Sun, 13 Nov 2005 10:07:02 +0000 (-0800) Subject: Rename lost+found to lost-found. X-Git-Tag: v0.99.9i^2~13 X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=0086e2c854e3af3209915e4ec2f933bcef400050;p=git.git Rename lost+found to lost-found. Because we use "lost-found" as the directory name to hold dangling object names, it is confusing to call the command git-lost+found, although it makes sense and is even cute ;-). Signed-off-by: Junio C Hamano --- diff --git a/.gitignore b/.gitignore index 328b399f..16a8af63 100644 --- a/.gitignore +++ b/.gitignore @@ -42,7 +42,7 @@ git-index-pack git-init-db git-local-fetch git-log -git-lost+found +git-lost-found git-ls-files git-ls-remote git-ls-tree diff --git a/Documentation/git-lost+found.txt b/Documentation/git-lost+found.txt deleted file mode 100644 index a8cc5739..00000000 --- a/Documentation/git-lost+found.txt +++ /dev/null @@ -1,78 +0,0 @@ -git-lost+found(1) -================= - -NAME ----- -git-lost+found - Recover lost refs that luckily have not yet been pruned. - -SYNOPSIS --------- -'git-lost+found' - -DESCRIPTION ------------ -Finds dangling commits and tags from the object database, and -creates refs to them in .git/lost-found/ directory. Commits and -tags that dereference to commits go to .git/lost-found/commit -and others are stored in .git/lost-found/other directory. - - -OUTPUT ------- -One line description from the commit and tag found along with -their object name are printed on the standard output. - - -EXAMPLE -------- - -Suppose you run 'git tag -f' and mistyped the tag to overwrite. -The ref to your tag is overwritten, but until you run 'git -prune', it is still there. - ------------- -$ git lost+found -[1ef2b196d909eed523d4f3c9bf54b78cdd6843c6] GIT 0.99.9c -... ------------- - -Also you can use gitk to browse how they relate to each other -and existing (probably old) tags. - ------------- -$ gitk $(cd .git/lost-found/commit && echo ??*) ------------- - -After making sure that it is the object you are looking for, you -can reconnect it to your regular .git/refs hierarchy. - ------------- -$ git cat-file -t 1ef2b196 -tag -$ git cat-file tag 1ef2b196 -object fa41bbce8e38c67a218415de6cfa510c7e50032a -type commit -tag v0.99.9c -tagger Junio C Hamano 1131059594 -0800 - -GIT 0.99.9c - -This contains the following changes from the "master" branch, since -... -$ git update-ref refs/tags/not-lost-anymore 1ef2b196 -$ git rev-parse not-lost-anymore -1ef2b196d909eed523d4f3c9bf54b78cdd6843c6 ------------- - -Author ------- -Written by Junio C Hamano 濱野 純 - -Documentation --------------- -Documentation by Junio C Hamano and the git-list . - - -GIT ---- -Part of the gitlink:git[7] suite diff --git a/Documentation/git-lost-found.txt b/Documentation/git-lost-found.txt new file mode 100644 index 00000000..03156f21 --- /dev/null +++ b/Documentation/git-lost-found.txt @@ -0,0 +1,78 @@ +git-lost-found(1) +================= + +NAME +---- +git-lost-found - Recover lost refs that luckily have not yet been pruned. + +SYNOPSIS +-------- +'git-lost-found' + +DESCRIPTION +----------- +Finds dangling commits and tags from the object database, and +creates refs to them in .git/lost-found/ directory. Commits and +tags that dereference to commits go to .git/lost-found/commit +and others are stored in .git/lost-found/other directory. + + +OUTPUT +------ +One line description from the commit and tag found along with +their object name are printed on the standard output. + + +EXAMPLE +------- + +Suppose you run 'git tag -f' and mistyped the tag to overwrite. +The ref to your tag is overwritten, but until you run 'git +prune', it is still there. + +------------ +$ git lost-found +[1ef2b196d909eed523d4f3c9bf54b78cdd6843c6] GIT 0.99.9c +... +------------ + +Also you can use gitk to browse how they relate to each other +and existing (probably old) tags. + +------------ +$ gitk $(cd .git/lost-found/commit && echo ??*) +------------ + +After making sure that it is the object you are looking for, you +can reconnect it to your regular .git/refs hierarchy. + +------------ +$ git cat-file -t 1ef2b196 +tag +$ git cat-file tag 1ef2b196 +object fa41bbce8e38c67a218415de6cfa510c7e50032a +type commit +tag v0.99.9c +tagger Junio C Hamano 1131059594 -0800 + +GIT 0.99.9c + +This contains the following changes from the "master" branch, since +... +$ git update-ref refs/tags/not-lost-anymore 1ef2b196 +$ git rev-parse not-lost-anymore +1ef2b196d909eed523d4f3c9bf54b78cdd6843c6 +------------ + +Author +------ +Written by Junio C Hamano 濱野 純 + +Documentation +-------------- +Documentation by Junio C Hamano and the git-list . + + +GIT +--- +Part of the gitlink:git[7] suite diff --git a/Documentation/git.txt b/Documentation/git.txt index a9d47c11..1c32dd5b 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -309,7 +309,7 @@ gitlink:git-convert-objects[1]:: gitlink:git-cvsimport[1]:: Salvage your data out of another SCM people love to hate. -gitlink:git-lost+found[1]:: +gitlink:git-lost-found[1]:: Recover lost refs that luckily have not yet been pruned. gitlink:git-merge-one-file[1]:: diff --git a/Makefile b/Makefile index b75cb137..5b2eca89 100644 --- a/Makefile +++ b/Makefile @@ -90,7 +90,7 @@ SCRIPT_SH = \ git-applymbox.sh git-applypatch.sh git-am.sh \ git-merge.sh git-merge-stupid.sh git-merge-octopus.sh \ git-merge-resolve.sh git-merge-ours.sh git-grep.sh \ - git-lost+found.sh + git-lost-found.sh SCRIPT_PERL = \ git-archimport.perl git-cvsimport.perl git-relink.perl \ diff --git a/git-lost+found.sh b/git-lost+found.sh deleted file mode 100755 index 3892f520..00000000 --- a/git-lost+found.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh - -. git-sh-setup || die "Not a git archive." - -laf="$GIT_DIR/lost-found" -rm -fr "$laf" && mkdir -p "$laf/commit" "$laf/other" || exit - -git fsck-objects | -while read dangling type sha1 -do - case "$dangling" in - dangling) - if git-rev-parse --verify "$sha1^0" >/dev/null 2>/dev/null - then - dir="$laf/commit" - git-show-branch "$sha1" - else - dir="$laf/other" - fi - echo "$sha1" >"$dir/$sha1" - ;; - esac -done diff --git a/git-lost-found.sh b/git-lost-found.sh new file mode 100755 index 00000000..3892f520 --- /dev/null +++ b/git-lost-found.sh @@ -0,0 +1,23 @@ +#!/bin/sh + +. git-sh-setup || die "Not a git archive." + +laf="$GIT_DIR/lost-found" +rm -fr "$laf" && mkdir -p "$laf/commit" "$laf/other" || exit + +git fsck-objects | +while read dangling type sha1 +do + case "$dangling" in + dangling) + if git-rev-parse --verify "$sha1^0" >/dev/null 2>/dev/null + then + dir="$laf/commit" + git-show-branch "$sha1" + else + dir="$laf/other" + fi + echo "$sha1" >"$dir/$sha1" + ;; + esac +done