[PATCH] fast-import: Don't barf if import-marks file is missing
- From
Ramkumar Ramachandra <artagnon@gmail.com>
- Date
- Jan 11, 2011, 17:14 UTC
- Message-ID
- <1294766058-29739-1-git-send-email-artagnon@gmail.com>
- In-Reply-To
- <7vwrmd7kxe.fsf@alter.siamese.dyndns.org>
The --import-marks option used to barf when the specified marks file doesn't exist. Change its meaning to "read marks file if it exists" so that callers don't have to handle bootstraping as a special case.
Requested-by: Jonathan Nieder <jrnieder@gmail.com> Thanks-to: Junio C Hamano <gitster@pobox.com> Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> --- Documentation/git-fast-import.txt | 2 +- fast-import.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt index f56dfca..94fbe54 100644 --- a/Documentation/git-fast-import.txt +++ b/Documentation/git-fast-import.txt @@ -72,7 +72,7 @@ OPTIONS --import-marks=<file>:: Before processing any input, load the marks specified in - <file>. The input file must exist, must be readable, and + <file>, if it exists. The input file must be readable, and must use the same format as produced by \--export-marks. Multiple options may be supplied to import more than one set of marks. If a mark is defined to different values, diff --git a/fast-import.c b/fast-import.c index 7857760..cbd5124 100644 --- a/fast-import.c +++ b/fast-import.c @@ -1795,7 +1795,11 @@ static void read_marks(void) { char line[512]; FILE *f = fopen(import_marks_file, "r"); - if (!f) + if (f) + ; + else if (errno == ENOENT) + return; /* Marks file does not exist */ + else die_errno("cannot read '%s'", import_marks_file); while (fgets(line, sizeof(line), f)) { uintmax_t mark;
-- 1.7.2.2.409.gdbb11.dirty