diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-03-04 23:43:23 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-03-04 23:43:23 -0800 |
| commit | 836769e875ecf47e83137a39de5937652e0e861e (patch) | |
| tree | f01bed95ddf704c08fba2704d68d46585c1f13c8 | |
| parent | 05ac6b34e2c2adda5cb85dd0bdacb47fe5db953e (diff) | |
| parent | bdfd739dac4c109ce360d38d0572d8717a46e795 (diff) | |
| download | git-836769e875ecf47e83137a39de5937652e0e861e.tar.gz git-836769e875ecf47e83137a39de5937652e0e861e.tar.xz | |
Merge branch 'maint'
* maint:
Make the 'lock file' exists error more informative
| -rw-r--r-- | lockfile.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lockfile.c b/lockfile.c index 1db1a2fef..3dbb2d1ff 100644 --- a/lockfile.c +++ b/lockfile.c @@ -158,7 +158,7 @@ static int lock_file(struct lock_file *lk, const char *path, int flags) NORETURN void unable_to_lock_index_die(const char *path, int err) { - if (errno == EEXIST) { + if (err == EEXIST) { die("Unable to create '%s.lock': %s.\n\n" "If no other git process is currently running, this probably means a\n" "git process crashed in this repository earlier. Make sure no other git\n" @@ -184,7 +184,7 @@ int hold_lock_file_for_append(struct lock_file *lk, const char *path, int flags) fd = lock_file(lk, path, flags); if (fd < 0) { if (flags & LOCK_DIE_ON_ERROR) - die("unable to create '%s.lock': %s", path, strerror(errno)); + unable_to_lock_index_die(path, errno); return fd; } |