diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-02-19 23:44:07 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-02-19 23:44:07 -0800 |
| commit | 8c5b85ce87d15e4db37a6408f03b0eb71dde080e (patch) | |
| tree | 71b226a7452da6d52d07a60c9957424cd64d0a19 /builtin-update-index.c | |
| parent | 7d233dea5f4e299fdac8d6cfb610bcd4d60a82b7 (diff) | |
| parent | e43a6fd3e94888d76779ad79fb568ed180e5fcdf (diff) | |
| download | git-8c5b85ce87d15e4db37a6408f03b0eb71dde080e.tar.gz git-8c5b85ce87d15e4db37a6408f03b0eb71dde080e.tar.xz | |
Merge branch 'maint'
* maint:
More friendly message when locking the index fails.
Document git blame --reverse.
Documentation: Note file formats send-email accepts
Diffstat (limited to 'builtin-update-index.c')
| -rw-r--r-- | builtin-update-index.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/builtin-update-index.c b/builtin-update-index.c index 560497750..dd43d5bef 100644 --- a/builtin-update-index.c +++ b/builtin-update-index.c @@ -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)) |