Fossil SCM
C
Commit
7724ea65018d5a244270295fd2d7969f9958fe12
Parent
3a20d89d953ba96…
1 file changed
+3
-3
+3
-3
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -486,11 +486,11 @@ | ||
| 486 | 486 | "# environment variables or the \"fossil set editor\" command,\n" |
| 487 | 487 | "# and because no check-in comment was specified using the \"-m\"\n" |
| 488 | 488 | "# or \"-M\" command-line options, you will need to enter the\n" |
| 489 | 489 | "# check-in comment below. Type \".\" on a line by itself when\n" |
| 490 | 490 | "# you are done:\n", -1); |
| 491 | - zFile = NULL; | |
| 491 | + zFile = mprintf("-"); | |
| 492 | 492 | }else{ |
| 493 | 493 | zFile = db_text(0, "SELECT '%qci-comment-' || hex(randomblob(6)) || '.txt'", |
| 494 | 494 | g.zLocalRoot); |
| 495 | 495 | } |
| 496 | 496 | #if defined(_WIN32) |
| @@ -523,14 +523,14 @@ | ||
| 523 | 523 | } |
| 524 | 524 | blob_append(&text, zIn, -1); |
| 525 | 525 | } |
| 526 | 526 | } |
| 527 | 527 | blob_remove_cr(&text); |
| 528 | - if( zFile ) { | |
| 528 | + if( zEditor ) { | |
| 529 | 529 | file_delete(zFile); |
| 530 | - fossil_free(zFile); | |
| 531 | 530 | } |
| 531 | + fossil_free(zFile); | |
| 532 | 532 | blob_zero(pComment); |
| 533 | 533 | while( blob_line(&text, &line) ){ |
| 534 | 534 | int i, n; |
| 535 | 535 | char *z; |
| 536 | 536 | n = blob_size(&line); |
| 537 | 537 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -486,11 +486,11 @@ | |
| 486 | "# environment variables or the \"fossil set editor\" command,\n" |
| 487 | "# and because no check-in comment was specified using the \"-m\"\n" |
| 488 | "# or \"-M\" command-line options, you will need to enter the\n" |
| 489 | "# check-in comment below. Type \".\" on a line by itself when\n" |
| 490 | "# you are done:\n", -1); |
| 491 | zFile = NULL; |
| 492 | }else{ |
| 493 | zFile = db_text(0, "SELECT '%qci-comment-' || hex(randomblob(6)) || '.txt'", |
| 494 | g.zLocalRoot); |
| 495 | } |
| 496 | #if defined(_WIN32) |
| @@ -523,14 +523,14 @@ | |
| 523 | } |
| 524 | blob_append(&text, zIn, -1); |
| 525 | } |
| 526 | } |
| 527 | blob_remove_cr(&text); |
| 528 | if( zFile ) { |
| 529 | file_delete(zFile); |
| 530 | fossil_free(zFile); |
| 531 | } |
| 532 | blob_zero(pComment); |
| 533 | while( blob_line(&text, &line) ){ |
| 534 | int i, n; |
| 535 | char *z; |
| 536 | n = blob_size(&line); |
| 537 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -486,11 +486,11 @@ | |
| 486 | "# environment variables or the \"fossil set editor\" command,\n" |
| 487 | "# and because no check-in comment was specified using the \"-m\"\n" |
| 488 | "# or \"-M\" command-line options, you will need to enter the\n" |
| 489 | "# check-in comment below. Type \".\" on a line by itself when\n" |
| 490 | "# you are done:\n", -1); |
| 491 | zFile = mprintf("-"); |
| 492 | }else{ |
| 493 | zFile = db_text(0, "SELECT '%qci-comment-' || hex(randomblob(6)) || '.txt'", |
| 494 | g.zLocalRoot); |
| 495 | } |
| 496 | #if defined(_WIN32) |
| @@ -523,14 +523,14 @@ | |
| 523 | } |
| 524 | blob_append(&text, zIn, -1); |
| 525 | } |
| 526 | } |
| 527 | blob_remove_cr(&text); |
| 528 | if( zEditor ) { |
| 529 | file_delete(zFile); |
| 530 | } |
| 531 | fossil_free(zFile); |
| 532 | blob_zero(pComment); |
| 533 | while( blob_line(&text, &line) ){ |
| 534 | int i, n; |
| 535 | char *z; |
| 536 | n = blob_size(&line); |
| 537 |