mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* maint:
  More friendly message when locking the index fails.
  Document git blame --reverse.
  Documentation: Note file formats send-email accepts
This commit is contained in:
Junio C Hamano
2009-02-19 23:44:07 -08:00
parent 7d233dea5f e43a6fd3e9
commit 8c5b85ce87
6 changed files with 38 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
builtin-update-index.c
View File

@ -742,8 +742,7 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
if (newfd < 0) {
if (refresh_flags & REFRESH_QUIET)
exit(128);
die("unable to create '%s.lock': %s",
get_index_file(), strerror(lock_error));
unable_to_lock_index_die(get_index_file(), lock_error);
}
if (write_cache(newfd, active_cache, active_nr) ||
commit_locked_index(lock_file))