summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-03-14 21:27:16 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-03-14 21:27:17 (GMT)
commit56e2874a81be7354cc4e135d24ee9823805f5a8b (patch)
tree7756760a56b68808dd37efccc3c480aaf42ac51e /builtin
parent27c2c2ec62c3820e0eccf10afdc66acefc7dcc4b (diff)
parent0eea5a6e91d3da6932c13f16fdf4b4e5ed91b93c (diff)
downloadgit-56e2874a81be7354cc4e135d24ee9823805f5a8b.zip
git-56e2874a81be7354cc4e135d24ee9823805f5a8b.tar.gz
git-56e2874a81be7354cc4e135d24ee9823805f5a8b.tar.bz2
Merge branch 'sh/write-pack-file-warning-message-fix'
A warning from "git pack-objects" were generated by referring to an incorrect variable when forming the filename that we had trouble with. * sh/write-pack-file-warning-message-fix: write_pack_file: use correct variable in diagnostic
Diffstat (limited to 'builtin')
-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 93095c1..1fb972f 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"? */