summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--receive-pack.c5
-rw-r--r--t/annotate-tests.sh3
2 files changed, 6 insertions, 2 deletions
diff --git a/receive-pack.c b/receive-pack.c
index 7f1dcc0..dda9854 100644
--- 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 87403da..cacb273 100644
--- 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 \