Fossil SCM
Fix behavior of "fossil commit" on case-insensitive file systems.
Commit
c1611f7dfab01a36a9ad0675c0f51394c0e2aea0
Parent
40d152478a1e343…
1 file changed
+2
-2
+2
-2
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -767,15 +767,15 @@ | ||
| 767 | 767 | return result; |
| 768 | 768 | } |
| 769 | 769 | isDir = file_isdir(g.argv[ii]); |
| 770 | 770 | if( isDir==1 ){ |
| 771 | 771 | db_prepare(&q, |
| 772 | - "SELECT id FROM vfile WHERE pathname>'%q/' %s AND pathname<'%q0'", | |
| 772 | + "SELECT id FROM vfile WHERE pathname>'%q/' %s AND pathname<'%q0' %s", | |
| 773 | 773 | blob_str(&fname), zCollate, blob_str(&fname), zCollate); |
| 774 | 774 | }else if( isDir==2 ){ |
| 775 | 775 | db_prepare(&q, |
| 776 | - "SELECT id FROM vfile WHERE pathname=%Q", | |
| 776 | + "SELECT id FROM vfile WHERE pathname=%Q %s", | |
| 777 | 777 | blob_str(&fname), zCollate); |
| 778 | 778 | }else{ |
| 779 | 779 | fossil_warning("not found: %s", g.argv[ii]); |
| 780 | 780 | result = 1; |
| 781 | 781 | continue; |
| 782 | 782 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -767,15 +767,15 @@ | |
| 767 | return result; |
| 768 | } |
| 769 | isDir = file_isdir(g.argv[ii]); |
| 770 | if( isDir==1 ){ |
| 771 | db_prepare(&q, |
| 772 | "SELECT id FROM vfile WHERE pathname>'%q/' %s AND pathname<'%q0'", |
| 773 | blob_str(&fname), zCollate, blob_str(&fname), zCollate); |
| 774 | }else if( isDir==2 ){ |
| 775 | db_prepare(&q, |
| 776 | "SELECT id FROM vfile WHERE pathname=%Q", |
| 777 | blob_str(&fname), zCollate); |
| 778 | }else{ |
| 779 | fossil_warning("not found: %s", g.argv[ii]); |
| 780 | result = 1; |
| 781 | continue; |
| 782 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -767,15 +767,15 @@ | |
| 767 | return result; |
| 768 | } |
| 769 | isDir = file_isdir(g.argv[ii]); |
| 770 | if( isDir==1 ){ |
| 771 | db_prepare(&q, |
| 772 | "SELECT id FROM vfile WHERE pathname>'%q/' %s AND pathname<'%q0' %s", |
| 773 | blob_str(&fname), zCollate, blob_str(&fname), zCollate); |
| 774 | }else if( isDir==2 ){ |
| 775 | db_prepare(&q, |
| 776 | "SELECT id FROM vfile WHERE pathname=%Q %s", |
| 777 | blob_str(&fname), zCollate); |
| 778 | }else{ |
| 779 | fossil_warning("not found: %s", g.argv[ii]); |
| 780 | result = 1; |
| 781 | continue; |
| 782 |