kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'maint' 

* maint:
  Catch write_ref_sha1 failure in receive-pack
  make t8001 work on Mac OS X again
maint
Junio C Hamano 2007-03-07 14:45:25 -08:00
parent dc49cd769b ef203f0856
commit 84da035f38
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
receive-pack.c
View File

@ -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;

3
t/annotate-tests.sh
View File

@ -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 \