summaryrefslogtreecommitdiff
path: root/reftable/error.c
diff options
context:
space:
mode:
Diffstat (limited to 'reftable/error.c')
-rw-r--r--reftable/error.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/reftable/error.c b/reftable/error.c
index 0d1766735e..660d029617 100644
--- a/reftable/error.c
+++ b/reftable/error.c
@@ -22,19 +22,21 @@ const char *reftable_error_str(int err)
case REFTABLE_NOT_EXIST_ERROR:
return "file does not exist";
case REFTABLE_LOCK_ERROR:
- return "data is outdated";
+ return "data is locked";
case REFTABLE_API_ERROR:
return "misuse of the reftable API";
case REFTABLE_ZLIB_ERROR:
return "zlib failure";
- case REFTABLE_NAME_CONFLICT:
- return "file/directory conflict";
case REFTABLE_EMPTY_TABLE_ERROR:
return "wrote empty table";
case REFTABLE_REFNAME_ERROR:
return "invalid refname";
case REFTABLE_ENTRY_TOO_BIG_ERROR:
return "entry too large";
+ case REFTABLE_OUTDATED_ERROR:
+ return "data concurrently modified";
+ case REFTABLE_OUT_OF_MEMORY_ERROR:
+ return "out of memory";
case -1:
return "general error";
default: