scalar-diagnose: add directory to archiver more gently
If a directory added to the 'scalar diagnose' archiver does not exist, warn and return 0 from 'add_directory_to_archiver()' rather than failing with a fatal error. This handles a failure edge case where the '.git/logs' has not yet been created when running 'scalar diagnose', but extends to any situation where a directory may be missing in the '.git' dir. Now, when a directory is missing a warning is captured in the diagnostic logs. This provides a user with more complete information than if 'scalar diagnose' simply failed with an error. Helped-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Victoria Dye <vdye@github.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Victoria Dye committed
Aug 12, 2022 at 20:10 UTC
ba307a50467aa0bc588f24a95a786014b42e3054
1 file changed
+8
-2
contrib/scalar/scalar.c
+8
-2
@@ -266,14 +266,20 @@ static int add_directory_to_archiver(struct strvec *archiver_args,
266
const char *path, int recurse)
267
{
268
int at_root = !*path;
269
- DIR *dir = opendir(at_root ? "." : path);
269
+ DIR *dir;
270
struct dirent *e;
271
struct strbuf buf = STRBUF_INIT;
272
size_t len;
273
int res = 0;
274
275
- if (!dir)
275
+ dir = opendir(at_root ? "." : path);
276
+ if (!dir) {
277
+ if (errno == ENOENT) {
278
+ warning(_("could not archive missing directory '%s'"), path);
279
+ return 0;
280
+ }
281
return error_errno(_("could not open directory '%s'"), path);
282
+ }
283
284
if (!at_root)
285
strbuf_addf(&buf, "%s/", path);