Fossil SCM
Fix "fossil extras" when a "extra" entry matches partly with current directory name (reported by j. van den hoff)
Commit
565ba734d2a6c1d6c0772e3a6e4411fc1c2c4471
Parent
4cb4fd1a8d5eb51…
1 file changed
+2
+2
| --- src/file.c | ||
| +++ src/file.c | ||
| @@ -977,10 +977,12 @@ | ||
| 977 | 977 | for(j=i+1; zPwd[j]; j++){ |
| 978 | 978 | if( zPwd[j]=='/' ){ |
| 979 | 979 | blob_append(pOut, "/..", 3); |
| 980 | 980 | } |
| 981 | 981 | } |
| 982 | + while( i>0 && (zPwd[i]!='/')) --i; | |
| 983 | + blob_append(pOut, zPath+i, j-i); | |
| 982 | 984 | } |
| 983 | 985 | if( slash && i>0 && zPath[strlen(zPath)-1]=='/'){ |
| 984 | 986 | blob_append(pOut, "/", 1); |
| 985 | 987 | } |
| 986 | 988 | blob_reset(&tmp); |
| 987 | 989 |
| --- src/file.c | |
| +++ src/file.c | |
| @@ -977,10 +977,12 @@ | |
| 977 | for(j=i+1; zPwd[j]; j++){ |
| 978 | if( zPwd[j]=='/' ){ |
| 979 | blob_append(pOut, "/..", 3); |
| 980 | } |
| 981 | } |
| 982 | } |
| 983 | if( slash && i>0 && zPath[strlen(zPath)-1]=='/'){ |
| 984 | blob_append(pOut, "/", 1); |
| 985 | } |
| 986 | blob_reset(&tmp); |
| 987 |
| --- src/file.c | |
| +++ src/file.c | |
| @@ -977,10 +977,12 @@ | |
| 977 | for(j=i+1; zPwd[j]; j++){ |
| 978 | if( zPwd[j]=='/' ){ |
| 979 | blob_append(pOut, "/..", 3); |
| 980 | } |
| 981 | } |
| 982 | while( i>0 && (zPwd[i]!='/')) --i; |
| 983 | blob_append(pOut, zPath+i, j-i); |
| 984 | } |
| 985 | if( slash && i>0 && zPath[strlen(zPath)-1]=='/'){ |
| 986 | blob_append(pOut, "/", 1); |
| 987 | } |
| 988 | blob_reset(&tmp); |
| 989 |