global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-16 21:59:45 +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

4
test.sh
View File

@@ -82,7 +82,7 @@ git branch subdir
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
@@ -118,7 +118,7 @@ create sub9
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