From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 18 Oct 2017 05:18:59 +0000 (+0900)
Subject: Merge branch 'aw/gc-lockfile-fscanf-fix' into maint
X-Git-Tag: v2.15.0-rc2~5^2~41
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/14431c717d1c549454b00800ee05723c82054765?hp=0f213754f6db9c005d881c13a858901e6d40ccb0

Merge branch 'aw/gc-lockfile-fscanf-fix' into maint

"git gc" tries to avoid running two instances at the same time by
reading and writing pid/host from and to a lock file; it used to
use an incorrect fscanf() format when reading, which has been
corrected.

* aw/gc-lockfile-fscanf-fix:
gc: call fscanf() with %<len>s, not %<len>c, when reading hostname
---

diff --git a/builtin/gc.c b/builtin/gc.c
index e6b84475ae..53c19be8b2 100644
--- a/builtin/gc.c
+++ b/builtin/gc.c
@@ -257,7 +257,7 @@ static const char *lock_repo_for_gc(int force, pid_t* ret_pid)
 		int should_exit;
 
 		if (!scan_fmt)
-			scan_fmt = xstrfmt("%s %%%dc", "%"SCNuMAX, HOST_NAME_MAX);
+			scan_fmt = xstrfmt("%s %%%ds", "%"SCNuMAX, HOST_NAME_MAX);
 		fp = fopen(pidfile_path, "r");
 		memset(locking_host, 0, sizeof(locking_host));
 		should_exit =