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

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

Also update the test to check that this works.

diff --git a/git-subtree.sh b/git-subtree.sh
index 454ce7ef2228fcd2698a0f3a21b0ffb48fa26951..0949fefe20112d7d03e3036286313453a6da156b 100755 (executable)
--- a/git-subtree.sh
+++ b/git-subtree.sh
@@ -102,7 +102,7 @@ esac
 if [ -z "$prefix" ]; then
        die "You must provide the --prefix option."
 fi
 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 $?
 
 if [ "$command" != "pull" ]; then
        revs=$(git rev-parse $default --revs-only "$@") || exit $?


@@ -175,7 +175,7 @@ find_latest_squash()
        sq=
        main=
        sub=
        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"
                --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=
        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
                --pretty=format:'START %H%n%s%n%n%b%nEND%n' $revs |
        while read a b junk; do
                case "$a" in

diff --git a/test.sh b/test.sh
index bed7f2790629a76d9ec58bf8cca5b51619dd2ef5..12b04565747cb995fb91c2dec8709690b367523c 100755 (executable)
--- a/test.sh
+++ b/test.sh
@@ -82,7 +82,7 @@ git branch subdir
 
 git fetch ../subproj sub1
 git branch sub1 FETCH_HEAD
 
 git fetch ../subproj sub1
 git branch sub1 FETCH_HEAD

-git subtree add --prefix=subdir FETCH_HEAD
+git subtree add --prefix=subdir/ FETCH_HEAD

 
 # this shouldn't actually do anything, since FETCH_HEAD is already a parent
 git merge -m 'merge -s -ours' -s ours FETCH_HEAD
 
 # this shouldn't actually do anything, since FETCH_HEAD is already a parent
 git merge -m 'merge -s -ours' -s ours FETCH_HEAD


@@ -118,7 +118,7 @@ create sub9
 git commit -m 'sub9'
 
 cd ../mainline
 git commit -m 'sub9'
 
 cd ../mainline

-split2=$(git subtree split --annotate='*' --prefix subdir --rejoin)
+split2=$(git subtree split --annotate='*' --prefix subdir/ --rejoin)

 git branch split2 "$split2"
 
 create subdir/main-sub10
 git branch split2 "$split2"
 
 create subdir/main-sub10

diff --git a/todo b/todo
index 5e72b2e5100bccbf820cf47269d8a66009d0a74f..7e44b0024fa35ae76f62875704fcd24e3f690c7d 100644 (file)
--- a/todo
+++ b/todo
@@ -36,10 +36,6 @@
                one of the other git tools that git-subtree calls.  Should
                detect this situation and print the *real* problem.
        
                one of the other git tools that git-subtree calls.  Should
                detect this situation and print the *real* problem.
        

-       In fact, the prefix should *not* end with slash, and we
-               should detect (and fix) it if it does.  Otherwise the
-               log message looks weird.
-               

        "pull --squash" should do fetch-synthesize-merge, but instead just
                does "pull" directly, which doesn't work at all.
 
        "pull --squash" should do fetch-synthesize-merge, but instead just
                does "pull" directly, which doesn't work at all.