Merge branch 'maint'

* maint:
Catch write_ref_sha1 failure in receive-pack
make t8001 work on Mac OS X again

diff --git a/receive-pack.c b/receive-pack.c
index 7f1dcc045c0818db3d515755e4bf1ae0d82f9647..dda98549ca47bd1a253a22ca389eced5d95f11ef 100644 (file)
--- a/receive-pack.c
+++ b/receive-pack.c
@@ -158,7 +158,10 @@ static int update(struct command *cmd)
                        cmd->error_string = "failed to lock";
                        return error("failed to lock %s", name);
                }
-               write_ref_sha1(lock, new_sha1, "push");
+               if (write_ref_sha1(lock, new_sha1, "push")) {
+                       cmd->error_string = "failed to write";
+                       return -1; /* error() already called */
+               }
                fprintf(stderr, "%s: %s -> %s\n", name, old_hex, new_hex);
        }
        return 0;

diff --git a/t/annotate-tests.sh b/t/annotate-tests.sh
index 87403da780814787f6c4ea15a790381a5b2395d3..cacb273afff1fbddf152bb440451fa141589cf33 100644 (file)
--- a/t/annotate-tests.sh
+++ b/t/annotate-tests.sh
@@ -114,7 +114,8 @@ test_expect_success \
 test_expect_success \
     'some edit' \
     'mv file file.orig &&
-    sed -e "s/^3A/99/" -e "/^1A/d" < file.orig > file &&
+    sed -e "s/^3A/99/" -e "/^1A/d" -e "/^incomplete/d" < file.orig > file &&
+    echo "incomplete" | tr -d "\\012" >>file &&
     GIT_AUTHOR_NAME="D" git commit -a -m "edit"'
 
 test_expect_success \