t9824: fix broken &&-chain in a subshell

diff --git a/credential-store.c b/credential-store.c
index d62dc29d06570f54c35aa9f55ab11e431ab1c0a9..00aea3aa304f2731da070c447f694591b3021bc9 100644 (file)
--- a/credential-store.c
+++ b/credential-store.c
@@ -52,7 +52,7 @@ static void print_entry(struct credential *c)
 static void print_line(struct strbuf *buf)
 {
        strbuf_addch(buf, '\n');
-       write_or_die(credential_lock.fd, buf->buf, buf->len);
+       write_or_die(get_lock_file_fd(&credential_lock), buf->buf, buf->len);
 }
 
 static void rewrite_credential_file(const char *fn, struct credential *c,
@@ -145,7 +145,7 @@ static void lookup_credential(const struct string_list *fns, struct credential *
 int main(int argc, char **argv)
 {
        const char * const usage[] = {
-               "git credential-store [options] <action>",
+               "git credential-store [<options>] <action>",
                NULL
        };
        const char *op;
@@ -170,7 +170,7 @@ int main(int argc, char **argv)
        } else {
                if ((file = expand_user_path("~/.git-credentials")))
                        string_list_append_nodup(&fns, file);
-               home_config_paths(NULL, &file, "credentials");
+               file = xdg_config_home("credentials");
                if (file)
                        string_list_append_nodup(&fns, file);
        }