Merge branch 'maint'

Junio C Hamano · Junio C Hamano · commit 84da035f3862 · 2007-03-07T14:45:25.000-08:00
* 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
@@ -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
@@ -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 \

Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,10 @@ static int update(struct command *cmd)`
`158`	`158`	`cmd->error_string = "failed to lock";`
`159`	`159`	`return error("failed to lock %s", name);`
`160`	`160`	`}`
`161`		`- write_ref_sha1(lock, new_sha1, "push");`
	`161`	`+ if (write_ref_sha1(lock, new_sha1, "push")) {`
	`162`	`+ cmd->error_string = "failed to write";`
	`163`	`+ return -1; /* error() already called */`
	`164`	`+ }`
`162`	`165`	`fprintf(stderr, "%s: %s -> %s\n", name, old_hex, new_hex);`
`163`	`166`	`}`
`164`	`167`	`return 0;`