pull --rebase: exit early when the working directory is dirty

diff --git a/server-info.c b/server-info.c
index 6cd38be3291e95e75a7d2348e825d49c8f7ad2af..c1c073b2f05a48772a45602cdc711eef6e211695 100644 (file)
--- a/server-info.c
+++ b/server-info.c
@@ -10,6 +10,8 @@ static FILE *info_ref_fp;
 static int add_info_ref(const char *path, const unsigned char *sha1, int flag, void *cb_data)
 {
        struct object *o = parse_object(sha1);
+       if (!o)
+               return -1;
 
        fprintf(info_ref_fp, "%s        %s\n", sha1_to_hex(sha1), path);
        if (o->type == OBJ_TAG) {
@@ -33,9 +35,10 @@ static int update_info_refs(int force)
        safe_create_leading_directories(path0);
        info_ref_fp = fopen(path1, "w");
        if (!info_ref_fp)
-               return error("unable to update %s", path0);
+               return error("unable to update %s", path1);
        for_each_ref(add_info_ref, NULL);
        fclose(info_ref_fp);
+       adjust_shared_perm(path1);
        rename(path1, path0);
        free(path0);
        free(path1);
@@ -98,7 +101,7 @@ static int read_pack_info_file(const char *infofile)
 
        while (fgets(line, sizeof(line), fp)) {
                int len = strlen(line);
-               if (line[len-1] == '\n')
+               if (len && line[len-1] == '\n')
                        line[--len] = 0;
 
                if (!len)
@@ -225,6 +228,7 @@ static int update_info_packs(int force)
                return error("cannot open %s", name);
        write_pack_info_file(fp);
        fclose(fp);
+       adjust_shared_perm(name);
        rename(name, infofile);
        return 0;
 }