summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Spahr-Summers <Justin.SpahrSummers@gmail.com>2013-05-13 11:35:37 -0700
committerJustin Spahr-Summers <Justin.SpahrSummers@gmail.com>2013-05-13 11:35:37 -0700
commit7cd53f92f05609628da0a79ae5870b18bea149af (patch)
tree988a8d82e0a055fca059c5ff1703e016f18c23be
parent000e68961cb44b04435a733e151f8b1357547bd1 (diff)
parentb0c7bb743fb1a9830e399382039b3b099ee401e2 (diff)
downloadlibgit2-empty-name.tar.gz
Merge remote-tracking branch 'carlosmn/empty-name' into empty-nameempty-name
-rw-r--r--src/signature.c6
-rw-r--r--tests-clar/commit/signature.c14
2 files changed, 7 insertions, 13 deletions
diff --git a/src/signature.c b/src/signature.c
index 649dbcd3d..54a70657e 100644
--- a/src/signature.c
+++ b/src/signature.c
@@ -66,12 +66,6 @@ int git_signature_new(git_signature **sig_out, const char *name, const char *ema
p->name = extract_trimmed(name, strlen(name));
p->email = extract_trimmed(email, strlen(email));
- if (p->name == NULL || p->email == NULL ||
- p->name[0] == '\0' || p->email[0] == '\0') {
- git_signature_free(p);
- return signature_error("Empty name or email");
- }
-
p->when.time = time;
p->when.offset = offset;
diff --git a/tests-clar/commit/signature.c b/tests-clar/commit/signature.c
index 9364efb10..f5794d4ab 100644
--- a/tests-clar/commit/signature.c
+++ b/tests-clar/commit/signature.c
@@ -49,13 +49,13 @@ void test_commit_signature__angle_brackets_in_email_are_not_supported(void)
void test_commit_signature__create_empties(void)
{
- // can not create a signature with empty name or email
+ // can create a signature with empty name or email
cl_git_pass(try_build_signature("nulltoken", "emeric.fermas@gmail.com", 1234567890, 60));
- cl_git_fail(try_build_signature("", "emeric.fermas@gmail.com", 1234567890, 60));
- cl_git_fail(try_build_signature(" ", "emeric.fermas@gmail.com", 1234567890, 60));
- cl_git_fail(try_build_signature("nulltoken", "", 1234567890, 60));
- cl_git_fail(try_build_signature("nulltoken", " ", 1234567890, 60));
+ cl_git_pass(try_build_signature("", "emeric.fermas@gmail.com", 1234567890, 60));
+ cl_git_pass(try_build_signature(" ", "emeric.fermas@gmail.com", 1234567890, 60));
+ cl_git_pass(try_build_signature("nulltoken", "", 1234567890, 60));
+ cl_git_pass(try_build_signature("nulltoken", " ", 1234567890, 60));
}
void test_commit_signature__create_one_char(void)
@@ -74,6 +74,6 @@ void test_commit_signature__create_zero_char(void)
{
// creating a zero character signature
git_signature *sign;
- cl_git_fail(git_signature_new(&sign, "", "x@y.z", 1234567890, 60));
- cl_assert(sign == NULL);
+ cl_git_pass(git_signature_new(&sign, "", "x@y.z", 1234567890, 60));
+ cl_assert(sign != NULL);
}