Skip to content

Commit 7b511b0

Browse files
committed
deserialize-status: silently fallback if we cannot read cache file
Teach Git to not throw a fatal error when an explicitly-specified status-cache file (`git status --deserialize=<foo>`) could not be found or opened for reading and silently fallback to a traditional scan. This matches the behavior when the status-cache file is implicitly given via a config setting. Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
1 parent 43db42d commit 7b511b0

File tree

2 files changed

+28
-6
lines changed

2 files changed

+28
-6
lines changed

builtin/commit.c

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -212,12 +212,18 @@ static int opt_parse_deserialize(const struct option *opt, const char *arg, int
212212
free(deserialize_path);
213213
deserialize_path = xstrdup(arg);
214214
}
215-
if (deserialize_path && *deserialize_path
216-
&& (access(deserialize_path, R_OK) != 0))
217-
die("cannot find serialization file '%s'",
218-
deserialize_path);
219-
220-
do_explicit_deserialize = 1;
215+
if (!deserialize_path || !*deserialize_path)
216+
do_explicit_deserialize = 1; /* read stdin */
217+
else if (access(deserialize_path, R_OK) == 0)
218+
do_explicit_deserialize = 1; /* can read from this file */
219+
else {
220+
/*
221+
* otherwise, silently fallback to the normal
222+
* collection scan
223+
*/
224+
do_implicit_deserialize = 0;
225+
do_explicit_deserialize = 0;
226+
}
221227
}
222228

223229
return 0;

t/t7524-serialized-status.sh

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -439,4 +439,20 @@ test_expect_success 'ensure deserialize -v does not crash' '
439439
grep -q "deserialize/reject:args/verbose" verbose_test.log_v
440440
'
441441

442+
test_expect_success 'fallback when implicit' '
443+
git init -b main implicit_fallback_test &&
444+
git -C implicit_fallback_test -c status.deserializepath=foobar status
445+
'
446+
447+
test_expect_success 'fallback when explicit' '
448+
git init -b main explicit_fallback_test &&
449+
git -C explicit_fallback_test status --deserialize=foobar
450+
'
451+
452+
test_expect_success 'deserialize from stdin' '
453+
git init -b main stdin_test &&
454+
git -C stdin_test status --serialize >serialized_status.dat &&
455+
cat serialize_status.dat | git -C stdin_test status --deserialize
456+
'
457+
442458
test_done

0 commit comments

Comments
 (0)