Junio C Hamano <gitster@xxxxxxxxx> writes:
> In any case, I wouldn't have much time during the remainder of the
> day to requeue and/or comment; please check what I push out on 'pu'.
BTW, I do agree with this hunk:
@@ -1068,18 +1064,20 @@ static void abbrev_sha1_in_line(struct strbuf *line)
static void read_rebase_todolist(const char *fname, struct string_list *lines)
{
struct strbuf line = STRBUF_INIT;
- FILE *f = fopen(git_path(fname), "r");
+ FILE *f = fopen(git_path("%s", fname), "r");
if (!f)
- die_errno("Could not open file %s for reading", git_path(fname));
+ die_errno("Could not open file %s for reading",
+ git_path("%s", fname));
Let me know if you want me to resend. In any case, I'm fine with your
"SQUASH ??" version even though I prefer mine (cf. other message).
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html