From: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, remi.lespinet@ensimag.grenoble-inp.fr,
guillaume.pages@ensimag.grenoble-inp.fr,
louis--alexandre.stuber@ensimag.grenoble-inp.fr,
antoine.delaite@ensimag.grenoble-inp.fr
Subject: Re: [PATCH v5 3/4] status: give more information during rebase -i
Date: Thu, 02 Jul 2015 10:10:32 +0200 [thread overview]
Message-ID: <vpqpp4bdlon.fsf@anie.imag.fr> (raw)
In-Reply-To: <xmqqr3or7et9.fsf@gitster.dls.corp.google.com> (Junio C. Hamano's message of "Wed, 01 Jul 2015 14:23:14 -0700")
Junio C Hamano <gitster@pobox.com> 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/
next prev parent reply other threads:[~2015-07-02 8:15 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-30 13:01 [PATCH v4 0/4] More helpful 'git status' during 'rebase -i' Matthieu Moy
2015-06-30 13:01 ` [PATCH v4 1/4] status: factor two rebase-related messages together Matthieu Moy
2015-06-30 13:01 ` [PATCH v4 2/4] status: differentiate interactive from non-interactive rebases Matthieu Moy
2015-06-30 13:01 ` [PATCH v4 3/4] status: give more information during rebase -i Matthieu Moy
2015-06-30 13:01 ` [PATCH v4 4/4] status: add new tests for status " Matthieu Moy
2015-06-30 23:03 ` [PATCH v4 0/4] More helpful 'git status' during 'rebase -i' Junio C Hamano
2015-07-01 8:12 ` Matthieu Moy
2015-07-01 8:30 ` [PATCH v5 1/4] status: factor two rebase-related messages together Matthieu Moy
2015-07-01 8:30 ` [PATCH v5 2/4] status: differentiate interactive from non-interactive rebases Matthieu Moy
2015-07-01 8:30 ` [PATCH v5 3/4] status: give more information during rebase -i Matthieu Moy
2015-07-01 16:18 ` Junio C Hamano
2015-07-01 16:33 ` Eric Sunshine
2015-07-01 16:36 ` Junio C Hamano
2015-07-01 16:37 ` Eric Sunshine
2015-07-01 21:06 ` Matthieu Moy
2015-07-01 21:08 ` [PATCH v6 1/4] status: factor two rebase-related messages together Matthieu Moy
2015-07-01 21:08 ` [PATCH v6 2/4] status: differentiate interactive from non-interactive rebases Matthieu Moy
2015-07-01 21:08 ` [PATCH v6 3/4] status: give more information during rebase -i Matthieu Moy
2015-07-07 22:14 ` Junio C Hamano
2015-07-08 7:10 ` Matthieu Moy
2015-07-01 21:08 ` [PATCH v6 4/4] status: add new tests for status " Matthieu Moy
2015-07-01 21:23 ` [PATCH v5 3/4] status: give more information " Junio C Hamano
2015-07-02 8:01 ` Matthieu Moy
2015-07-03 17:40 ` Junio C Hamano
2015-07-02 8:10 ` Matthieu Moy [this message]
2015-07-01 8:30 ` [PATCH v5 4/4] status: add new tests for status " Matthieu Moy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=vpqpp4bdlon.fsf@anie.imag.fr \
--to=matthieu.moy@grenoble-inp.fr \
--cc=antoine.delaite@ensimag.grenoble-inp.fr \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=guillaume.pages@ensimag.grenoble-inp.fr \
--cc=louis--alexandre.stuber@ensimag.grenoble-inp.fr \
--cc=remi.lespinet@ensimag.grenoble-inp.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).