sequencer: lib'ify do_recursive_merge()

diff --git a/credential-store.c b/credential-store.c
index fc67d16c10882bf543bd521d2f6dfee8d3c4d213..55ca1b1334319924dcbbf69ec39b2335e6a452aa 100644 (file)
--- a/credential-store.c
+++ b/credential-store.c
@@ -23,7 +23,7 @@ static int parse_credential_file(const char *fn,
                return found_credential;
        }
 
-       while (strbuf_getline(&line, fh, '\n') != EOF) {
+       while (strbuf_getline_lf(&line, fh) != EOF) {
                credential_from_url(&entry, line.buf);
                if (entry.username && entry.password &&
                    credential_match(c, &entry)) {
@@ -64,8 +64,7 @@ static void rewrite_credential_file(const char *fn, struct credential *c,
                print_line(extra);
        parse_credential_file(fn, c, NULL, print_line);
        if (commit_lock_file(&credential_lock) < 0)
-               die_errno("unable to write credential store: %s",
-                         strerror(errno));
+               die_errno("unable to write credential store");
 }
 
 static void store_credential_file(const char *fn, struct credential *c)
@@ -143,7 +142,7 @@ static void lookup_credential(const struct string_list *fns, struct credential *
                        return; /* Found credential */
 }
 
-int main(int argc, char **argv)
+int cmd_main(int argc, const char **argv)
 {
        const char * const usage[] = {
                "git credential-store [<options>] <action>",