Fossil SCM
Minor fix to the previous "fossil diff" enhancement to avoid unnecessary warnings about directories not being found if the directory does not contain any files that were changed.
Commit
b789df4bb6dd4d57b5f608956704b6e8d8a51be7
Parent
c46f98055cf4968…
1 file changed
+4
-1
+4
-1
| --- src/diffcmd.c | ||
| +++ src/diffcmd.c | ||
| @@ -943,11 +943,14 @@ | ||
| 943 | 943 | diffFlags, pFileDir); |
| 944 | 944 | } |
| 945 | 945 | if( pFileDir ){ |
| 946 | 946 | int i; |
| 947 | 947 | for(i=0; pFileDir[i].zName; i++){ |
| 948 | - if( pFileDir[i].nUsed==0 && strcmp(pFileDir[0].zName,".")!=0 ){ | |
| 948 | + if( pFileDir[i].nUsed==0 | |
| 949 | + && strcmp(pFileDir[0].zName,".")!=0 | |
| 950 | + && !file_isdir(g.argv[i+2]) | |
| 951 | + ){ | |
| 949 | 952 | fossil_fatal("not found: '%s'", g.argv[i+2]); |
| 950 | 953 | } |
| 951 | 954 | fossil_free(pFileDir[i].zName); |
| 952 | 955 | } |
| 953 | 956 | fossil_free(pFileDir); |
| 954 | 957 |
| --- src/diffcmd.c | |
| +++ src/diffcmd.c | |
| @@ -943,11 +943,14 @@ | |
| 943 | diffFlags, pFileDir); |
| 944 | } |
| 945 | if( pFileDir ){ |
| 946 | int i; |
| 947 | for(i=0; pFileDir[i].zName; i++){ |
| 948 | if( pFileDir[i].nUsed==0 && strcmp(pFileDir[0].zName,".")!=0 ){ |
| 949 | fossil_fatal("not found: '%s'", g.argv[i+2]); |
| 950 | } |
| 951 | fossil_free(pFileDir[i].zName); |
| 952 | } |
| 953 | fossil_free(pFileDir); |
| 954 |
| --- src/diffcmd.c | |
| +++ src/diffcmd.c | |
| @@ -943,11 +943,14 @@ | |
| 943 | diffFlags, pFileDir); |
| 944 | } |
| 945 | if( pFileDir ){ |
| 946 | int i; |
| 947 | for(i=0; pFileDir[i].zName; i++){ |
| 948 | if( pFileDir[i].nUsed==0 |
| 949 | && strcmp(pFileDir[0].zName,".")!=0 |
| 950 | && !file_isdir(g.argv[i+2]) |
| 951 | ){ |
| 952 | fossil_fatal("not found: '%s'", g.argv[i+2]); |
| 953 | } |
| 954 | fossil_free(pFileDir[i].zName); |
| 955 | } |
| 956 | fossil_free(pFileDir); |
| 957 |