development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-07-17 02:57:48 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Merge branch 'sg/lock-file-commit-error'

Browse source 
Cosmetic improvement to lock-file error messages.

* sg/lock-file-commit-error:
  Make error message after failing commit_lock_file() less confusing
This commit is contained in:
Junio C Hamano 2015-12-11 10:40:54 -08:00
parent 7d722536dd 08a3651fe7
commit e0048d3e0d
4 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
config.c
View file

@ -2144,7 +2144,8 @@ int git_config_set_multivar_in_file(const char *config_filename,
}
if (commit_lock_file(lock) < 0) {
error("could not commit config file %s", config_filename);
error("could not write config file %s: %s", config_filename,
strerror(errno));
ret = CONFIG_NO_WRITE;
lock = NULL;
goto out_free;
@ -2330,7 +2331,8 @@ int git_config_rename_section_in_file(const char *config_filename,
fclose(config_file);
unlock_and_out:
if (commit_lock_file(lock) < 0)
ret = error("could not commit config file %s", config_filename);
ret = error("could not write config file %s: %s",
config_filename, strerror(errno));
out:
free(filename_buf);
return ret;

3
credential-store.c
View file

@ -64,7 +64,8 @@ static void rewrite_credential_file(const char *fn, struct credential *c,
print_line(extra);
parse_credential_file(fn, c, NULL, print_line);
if (commit_lock_file(&credential_lock) < 0)
die_errno("unable to commit credential store");
die_errno("unable to write credential store: %s",
strerror(errno));
}
static void store_credential_file(const char *fn, struct credential *c)

2
fast-import.c
View file

@ -1824,7 +1824,7 @@ static void dump_marks(void)
dump_marks_helper(f, 0, marks);
if (commit_lock_file(&mark_lock)) {
failure |= error("Unable to commit marks file %s: %s",
failure |= error("Unable to write file %s: %s",
export_marks_file, strerror(errno));
return;
}

2
refs/files-backend.c
View file

@ -3494,7 +3494,7 @@ int reflog_expire(const char *refname, const unsigned char *sha1,
get_lock_file_path(lock->lk));
rollback_lock_file(&reflog_lock);
} else if (commit_lock_file(&reflog_lock)) {
status |= error("unable to commit reflog '%s' (%s)",
status |= error("unable to write reflog '%s' (%s)",
log_file, strerror(errno));
} else if (update && commit_ref(lock)) {
status |= error("couldn't set %s", lock->ref_name);