summaryrefslogtreecommitdiff
path: root/git-checkout.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-11-22 05:46:57 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-11-24 06:25:55 (GMT)
commit9c20a4706767e6003e62f6500ed94ccddcbe322f (patch)
tree69b036a2f2ab6f8f49bb7d61f71d1f363bd753aa /git-checkout.sh
parentb7884981f8f2a063f577df12c65e9af8b1a4f1b8 (diff)
downloadgit-9c20a4706767e6003e62f6500ed94ccddcbe322f.zip
git-9c20a4706767e6003e62f6500ed94ccddcbe322f.tar.gz
git-9c20a4706767e6003e62f6500ed94ccddcbe322f.tar.bz2
Teach update-index to read from ls-tree.
git-update-index --index-info can almost be usable to read from ls-tree output to update the index (and not the working tree file) to HEAD commit, but not quite. It was designed to read from git-apply --index-info output, and does not want " blob " in ls-tree output. Accept that as well. This lets us update "git-checkout <ent> <path>" that used to filter the extra " blob " string out. Noted by Luben. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-checkout.sh')
-rwxr-xr-xgit-checkout.sh1
1 files changed, 0 insertions, 1 deletions
diff --git a/git-checkout.sh b/git-checkout.sh
index 4c08f36..9509ab4 100755
--- a/git-checkout.sh
+++ b/git-checkout.sh
@@ -82,7 +82,6 @@ then
# rescuing paths and is never meant to remove what
# is not in the named tree-ish.
git-ls-tree -r "$new" "$@" |
- sed -ne 's/^\([0-7]*\) blob \(.*\)$/\1 \2/p' |
git-update-index --index-info || exit $?
fi
git-checkout-index -f -u -- "$@"