summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-03-03 20:13:20 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-03-03 20:13:20 (GMT)
commit2156a98045f83dd88386b2d4d3241d66bf722ade (patch)
tree444a56f73ad574ca395ca3451dd947d57ff58943
parent2de34784dfcbb4fe0febe9ab98e0b99138040109 (diff)
parent0eea5a6e91d3da6932c13f16fdf4b4e5ed91b93c (diff)
downloadgit-2156a98045f83dd88386b2d4d3241d66bf722ade.zip
git-2156a98045f83dd88386b2d4d3241d66bf722ade.tar.gz
git-2156a98045f83dd88386b2d4d3241d66bf722ade.tar.bz2
Merge branch 'sh/write-pack-file-warning-message-fix' into sh/finish-tmp-packfile
* sh/write-pack-file-warning-message-fix: write_pack_file: use correct variable in diagnostic
-rw-r--r--builtin/pack-objects.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index c733379..4922ce5 100644
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -823,7 +823,7 @@ static void write_pack_file(void)
utb.modtime = --last_mtime;
if (utime(pack_tmp_name, &utb) < 0)
warning("failed utime() on %s: %s",
- tmpname, strerror(errno));
+ pack_tmp_name, strerror(errno));
}
/* Enough space for "-<sha-1>.pack"? */