Commit a080037cde55ce3dccdc664b5bfaf4362d67acbb
2019-06-24T15:49:31
Merge pull request #5137 from libgit2/ethomson/error_messages errors: use lowercase
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100
diff --git a/src/streams/socket.c b/src/streams/socket.c
index 066580f..33f7883 100644
--- a/src/streams/socket.c
+++ b/src/streams/socket.c
@@ -138,7 +138,7 @@ static ssize_t socket_write(git_stream *stream, const char *data, size_t len, in
errno = 0;
if ((written = p_send(st->s, data, len, flags)) < 0) {
- net_set_error("Error sending data");
+ net_set_error("error sending data");
return -1;
}
@@ -151,7 +151,7 @@ static ssize_t socket_read(git_stream *stream, void *data, size_t len)
git_socket_stream *st = (git_socket_stream *) stream;
if ((ret = p_recv(st->s, data, len, 0)) < 0)
- net_set_error("Error receiving socket data");
+ net_set_error("error receiving socket data");
return ret;
}
diff --git a/src/transports/auth_negotiate.c b/src/transports/auth_negotiate.c
index f0f2b08..deb6c31 100644
--- a/src/transports/auth_negotiate.c
+++ b/src/transports/auth_negotiate.c
@@ -144,7 +144,7 @@ static int negotiate_next_token(
&output_token,
NULL,
NULL))) {
- negotiate_err_set(status_major, status_minor, "Negotiate failure");
+ negotiate_err_set(status_major, status_minor, "negotiate failure");
error = -1;
goto done;
}
diff --git a/src/worktree.c b/src/worktree.c
index 2dc7244..7213b8a 100644
--- a/src/worktree.c
+++ b/src/worktree.c
@@ -238,21 +238,21 @@ int git_worktree_validate(const git_worktree *wt)
if (!is_worktree_dir(wt->gitdir_path)) {
git_error_set(GIT_ERROR_WORKTREE,
- "Worktree gitdir ('%s') is not valid",
+ "worktree gitdir ('%s') is not valid",
wt->gitlink_path);
return GIT_ERROR;
}
if (wt->parent_path && !git_path_exists(wt->parent_path)) {
git_error_set(GIT_ERROR_WORKTREE,
- "Worktree parent directory ('%s') does not exist ",
+ "worktree parent directory ('%s') does not exist ",
wt->parent_path);
return GIT_ERROR;
}
if (!git_path_exists(wt->commondir_path)) {
git_error_set(GIT_ERROR_WORKTREE,
- "Worktree common directory ('%s') does not exist ",
+ "worktree common directory ('%s') does not exist ",
wt->commondir_path);
return GIT_ERROR;
}
@@ -517,7 +517,7 @@ int git_worktree_is_prunable(git_worktree *wt,
{
if (!reason.size)
git_buf_attach_notowned(&reason, "no reason given", 15);
- git_error_set(GIT_ERROR_WORKTREE, "Not pruning locked working tree: '%s'", reason.ptr);
+ git_error_set(GIT_ERROR_WORKTREE, "not pruning locked working tree: '%s'", reason.ptr);
git_buf_dispose(&reason);
return 0;
@@ -526,7 +526,7 @@ int git_worktree_is_prunable(git_worktree *wt,
if ((popts.flags & GIT_WORKTREE_PRUNE_VALID) == 0 &&
git_worktree_validate(wt) == 0)
{
- git_error_set(GIT_ERROR_WORKTREE, "Not pruning valid working tree");
+ git_error_set(GIT_ERROR_WORKTREE, "not pruning valid working tree");
return 0;
}
@@ -558,7 +558,7 @@ int git_worktree_prune(git_worktree *wt,
goto out;
if (!git_path_exists(path.ptr))
{
- git_error_set(GIT_ERROR_WORKTREE, "Worktree gitdir '%s' does not exist", path.ptr);
+ git_error_set(GIT_ERROR_WORKTREE, "worktree gitdir '%s' does not exist", path.ptr);
err = -1;
goto out;
}
@@ -578,7 +578,7 @@ int git_worktree_prune(git_worktree *wt,
git_buf_attach(&path, wtpath, 0);
if (!git_path_exists(path.ptr))
{
- git_error_set(GIT_ERROR_WORKTREE, "Working tree '%s' does not exist", path.ptr);
+ git_error_set(GIT_ERROR_WORKTREE, "working tree '%s' does not exist", path.ptr);
err = -1;
goto out;
}