global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-17 22:26:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

If someone provides a --prefix that ends with slash, strip the slash.

Browse Source 
Prefixes that differ only in the trailing slash should be considered
identical.

Also update the test to check that this works.
This commit is contained in:
Avery Pennarun
2009-10-02 15:22:15 -04:00
parent 39ee6ecf7e
commit 6f2012cdc0
3 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
git-subtree.sh
View File

@@ -102,7 +102,7 @@ esac
if [ -z "$prefix" ]; then
die "You must provide the --prefix option."
fi
dir="$prefix"
dir="$(dirname "$prefix/.")"
if [ "$command" != "pull" ]; then
revs=$(git rev-parse $default --revs-only "$@") || exit $?
@@ -175,7 +175,7 @@ find_latest_squash()
sq=
main=
sub=
git log --grep="^git-subtree-dir: $dir\$" \
git log --grep="^git-subtree-dir: $dir/*\$" \
--pretty=format:'START %H%n%s%n%n%b%nEND%n' HEAD |
while read a b junk; do
debug "$a $b $junk"
@@ -210,7 +210,7 @@ find_existing_splits()
revs="$2"
main=
sub=
git log --grep="^git-subtree-dir: $dir\$" \
git log --grep="^git-subtree-dir: $dir/*\$" \
--pretty=format:'START %H%n%s%n%n%b%nEND%n' $revs |
while read a b junk; do
case "$a" in