undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

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 11:14:18 -08:00
commit abca668a93
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) { 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; ret = CONFIG_NO_WRITE;
lock = NULL; lock = NULL;
goto out_free; goto out_free;
@ -2330,7 +2331,8 @@ int git_config_rename_section_in_file(const char *config_filename,
fclose(config_file); fclose(config_file);
unlock_and_out: unlock_and_out:
if (commit_lock_file(lock) < 0) 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: out:
free(filename_buf); free(filename_buf);
return ret; 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); print_line(extra);
parse_credential_file(fn, c, NULL, print_line); parse_credential_file(fn, c, NULL, print_line);
if (commit_lock_file(&credential_lock) < 0) 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) static void store_credential_file(const char *fn, struct credential *c)

2
fast-import.c
View File

@ -1821,7 +1821,7 @@ static void dump_marks(void)
dump_marks_helper(f, 0, marks); dump_marks_helper(f, 0, marks);
if (commit_lock_file(&mark_lock)) { 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)); export_marks_file, strerror(errno));
return; return;
} }

2
refs.c
View File

@ -4643,7 +4643,7 @@ int reflog_expire(const char *refname, const unsigned char *sha1,
get_lock_file_path(lock->lk)); get_lock_file_path(lock->lk));
rollback_lock_file(&reflog_lock); rollback_lock_file(&reflog_lock);
} else if (commit_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)); log_file, strerror(errno));
} else if (update && commit_ref(lock)) { } else if (update && commit_ref(lock)) {
status |= error("couldn't set %s", lock->ref_name); status |= error("couldn't set %s", lock->ref_name);