Fossil SCM
Only strip trailing newline when importing comments.
Commit
0e4bf2ca5ff0451d7ce47136aefc226c750d39d4
Parent
84804f01c57404a…
1 file changed
+4
-5
+4
-5
| --- src/import.c | ||
| +++ src/import.c | ||
| @@ -606,17 +606,16 @@ | ||
| 606 | 606 | gg.aData = fossil_malloc( gg.nData+1 ); |
| 607 | 607 | got = fread(gg.aData, 1, gg.nData, pIn); |
| 608 | 608 | if( got!=gg.nData ){ |
| 609 | 609 | fossil_fatal("short read: got %d of %d bytes", got, gg.nData); |
| 610 | 610 | } |
| 611 | - /* Strip trailing newline, it's appended to the comment. */ | |
| 612 | - if( gg.aData[got-1] == '\n' ) | |
| 613 | - gg.aData[got-1] = '\0'; | |
| 614 | - else | |
| 615 | - gg.aData[got] = '\0'; | |
| 611 | + gg.aData[got] = '\0'; | |
| 616 | 612 | if( gg.zComment==0 && |
| 617 | 613 | (gg.xFinish==finish_commit || gg.xFinish==finish_tag) ){ |
| 614 | + /* Strip trailing newline, it's appended to the comment. */ | |
| 615 | + if( gg.aData[got-1] == '\n' ) | |
| 616 | + gg.aData[got-1] = '\0'; | |
| 618 | 617 | gg.zComment = gg.aData; |
| 619 | 618 | gg.aData = 0; |
| 620 | 619 | gg.nData = 0; |
| 621 | 620 | } |
| 622 | 621 | } |
| 623 | 622 |
| --- src/import.c | |
| +++ src/import.c | |
| @@ -606,17 +606,16 @@ | |
| 606 | gg.aData = fossil_malloc( gg.nData+1 ); |
| 607 | got = fread(gg.aData, 1, gg.nData, pIn); |
| 608 | if( got!=gg.nData ){ |
| 609 | fossil_fatal("short read: got %d of %d bytes", got, gg.nData); |
| 610 | } |
| 611 | /* Strip trailing newline, it's appended to the comment. */ |
| 612 | if( gg.aData[got-1] == '\n' ) |
| 613 | gg.aData[got-1] = '\0'; |
| 614 | else |
| 615 | gg.aData[got] = '\0'; |
| 616 | if( gg.zComment==0 && |
| 617 | (gg.xFinish==finish_commit || gg.xFinish==finish_tag) ){ |
| 618 | gg.zComment = gg.aData; |
| 619 | gg.aData = 0; |
| 620 | gg.nData = 0; |
| 621 | } |
| 622 | } |
| 623 |
| --- src/import.c | |
| +++ src/import.c | |
| @@ -606,17 +606,16 @@ | |
| 606 | gg.aData = fossil_malloc( gg.nData+1 ); |
| 607 | got = fread(gg.aData, 1, gg.nData, pIn); |
| 608 | if( got!=gg.nData ){ |
| 609 | fossil_fatal("short read: got %d of %d bytes", got, gg.nData); |
| 610 | } |
| 611 | gg.aData[got] = '\0'; |
| 612 | if( gg.zComment==0 && |
| 613 | (gg.xFinish==finish_commit || gg.xFinish==finish_tag) ){ |
| 614 | /* Strip trailing newline, it's appended to the comment. */ |
| 615 | if( gg.aData[got-1] == '\n' ) |
| 616 | gg.aData[got-1] = '\0'; |
| 617 | gg.zComment = gg.aData; |
| 618 | gg.aData = 0; |
| 619 | gg.nData = 0; |
| 620 | } |
| 621 | } |
| 622 |