diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-03-28 17:42:58 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-28 17:42:58 -0700 |
| commit | faf752693abd0a891a9a47a2d398353cc59ee93a (patch) | |
| tree | c68e63b1a514e4a8fe334cc86a8cf36fe3571673 /builtin | |
| parent | 10439d89ebe77a1fb8f05a8ad5d5f4071639bb3e (diff) | |
| parent | 4c367c6ae978ef18477fba6b00458c32f1d49d0d (diff) | |
| download | git-faf752693abd0a891a9a47a2d398353cc59ee93a.tar.gz git-faf752693abd0a891a9a47a2d398353cc59ee93a.tar.xz | |
Merge branch 'maint'
* maint:
t9350: fix careless use of "cd"
difftool: Fix '--gui' when diff.guitool is unconfigured
fast-export: don't segfault when marks file cannot be opened
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/fast-export.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/fast-export.c b/builtin/fast-export.c index b0a4029c9..c6dd71a7b 100644 --- a/builtin/fast-export.c +++ b/builtin/fast-export.c @@ -503,7 +503,7 @@ static void export_marks(char *file) f = fopen(file, "w"); if (!f) - error("Unable to open marks file %s for writing.", file); + die_errno("Unable to open marks file %s for writing.", file); for (i = 0; i < idnums.size; i++) { if (deco->base && deco->base->type == 1) { |