Merge branch 'sh/write-pack-file-warning-message-fix'

gitster · gitster · commit 56e2874a81be · 2014-03-14T14:27:17.000-07:00
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
diff --git 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"? */

Original file line number	Diff line number	Diff line change
`@@ -823,7 +823,7 @@ static void write_pack_file(void)`
`823`	`823`	`utb.modtime = --last_mtime;`
`824`	`824`	`if (utime(pack_tmp_name, &utb) < 0)`
`825`	`825`	`warning("failed utime() on %s: %s",`
`826`		`- tmpname, strerror(errno));`
	`826`	`+ pack_tmp_name, strerror(errno));`
`827`	`827`	`}`
`828`	`828`
`829`	`829`	`/* Enough space for "-<sha-1>.pack"? */`