summaryrefslogtreecommitdiff
path: root/git-checkout.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2005-12-23 14:10:16 -0800
committerLibravatar Junio C Hamano <junkio@cox.net>2005-12-23 14:10:16 -0800
commitd0d14cf33d0e4446ed98b03ac5f81367d368e557 (patch)
tree2ce93147fd50669cd141a491469424013f41eb95 /git-checkout.sh
parentcheckout: sometimes work from a subdirectory. (diff)
parentls-tree: chomp leading directories when run from a subdirectory (diff)
downloadtgif-d0d14cf33d0e4446ed98b03ac5f81367d368e557.tar.xz
Adjust to ls-tree --full-name when run from a subdirectory.
A proposed change to show cwd relative paths by default from ls-tree when run from a subdirectory means we would need to give --full-name option to it. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-checkout.sh')
-rwxr-xr-xgit-checkout.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-checkout.sh b/git-checkout.sh
index 1219ea0b0e..3bbd111773 100755
--- a/git-checkout.sh
+++ b/git-checkout.sh
@@ -80,7 +80,7 @@ then
# from a specific tree-ish; note that this is for
# rescuing paths and is never meant to remove what
# is not in the named tree-ish.
- git-ls-tree -r "$new" "$@" |
+ git-ls-tree --full-name -r "$new" "$@" |
git-update-index --index-info || exit $?
fi
git-checkout-index -f -u -- "$@"