diff options
author | Junio C Hamano <gitster@pobox.com> | 2014-03-14 14:27:16 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-03-14 14:27:17 -0700 |
commit | 56e2874a81be7354cc4e135d24ee9823805f5a8b (patch) | |
tree | 7756760a56b68808dd37efccc3c480aaf42ac51e | |
parent | 27c2c2ec62c3820e0eccf10afdc66acefc7dcc4b (diff) | |
parent | 0eea5a6e91d3da6932c13f16fdf4b4e5ed91b93c (diff) | |
download | git-56e2874a81be7354cc4e135d24ee9823805f5a8b.tar.gz git-56e2874a81be7354cc4e135d24ee9823805f5a8b.tar.xz |
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
-rw-r--r-- | builtin/pack-objects.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index 93095c119..1fb972f45 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"? */ |