From: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date: Wed, 23 Nov 2011 12:45:36 +0000 (+0700)
Subject: revert: do not pass non-literal string as format to git_path()
X-Git-Tag: v1.7.8-rc4~5
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b4524d343b085b63c68cf5e0a70007c19a048197;p=git.git

revert: do not pass non-literal string as format to git_path()

This fixes the following warning.

    CC builtin/revert.o
builtin/revert.c: In function ‘write_cherry_pick_head’:
builtin/revert.c:311: warning: format not a string literal and no format arguments

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin/revert.c b/builtin/revert.c
index 0c61668b8..9b9b2e574 100644
--- a/builtin/revert.c
+++ b/builtin/revert.c
@@ -308,7 +308,7 @@ static void write_cherry_pick_head(struct commit *commit, const char *pseudoref)
 
 	strbuf_addf(&buf, "%s\n", sha1_to_hex(commit->object.sha1));
 
-	filename = git_path(pseudoref);
+	filename = git_path("%s", pseudoref);
 	fd = open(filename, O_WRONLY | O_CREAT, 0666);
 	if (fd < 0)
 		die_errno(_("Could not open '%s' for writing"), filename);