Merge branch 'sh/write-pack-file-warning-message-fix'
authorJunio C Hamano <gitster@pobox.com>
Fri, 14 Mar 2014 21:27:16 +0000 (14:27 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 14 Mar 2014 21:27:17 +0000 (14:27 -0700)
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

builtin/pack-objects.c
index 93095c1198d5ce4ae486271aabc57ae894cb2039..1fb972f45aa9076926f4a6cda1dd1034a53b4573 100644 (file)
@@ -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"? */