From: Junio C Hamano <gitster@pobox.com>
To: Lucien Kong <Lucien.Kong@ensimag.imag.fr>
Cc: git@vger.kernel.org,
Valentin Duperray <Valentin.Duperray@ensimag.imag.fr>,
Franck Jonas <Franck.Jonas@ensimag.imag.fr>,
Thomas Nguy <Thomas.Nguy@ensimag.imag.fr>,
Huynh Khoi Nguyen Nguyen
<Huynh-Khoi-Nguyen.Nguyen@ensimag.imag.fr>,
Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
Subject: Re: [PATCHv8 4/4] status: better advices when splitting a commit (during rebase -i)
Date: Tue, 05 Jun 2012 14:16:03 -0700 [thread overview]
Message-ID: <7vfwa9o3xo.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <1338927687-29822-4-git-send-email-Lucien.Kong@ensimag.imag.fr> (Lucien Kong's message of "Tue, 5 Jun 2012 22:21:27 +0200")
Lucien Kong <Lucien.Kong@ensimag.imag.fr> writes:
> +static int split_commit_in_progress()
static int split_commit_in_progress(void)
> +{
> + FILE *head;
> + struct strbuf buf_head;
> + FILE *orig_head;
> + struct strbuf buf_orig_head;
> + FILE *rebase_amend;
> + struct strbuf buf_rebase_amend;
> + FILE *rebase_orig_head;
> + struct strbuf buf_rebase_orig_head;
> + int split_in_progress = 0;
> +
> + head = fopen(git_path("HEAD"), "r");
> + if (!head)
> + return 0;
> +
> + orig_head = fopen(git_path("ORIG_HEAD"), "r");
> + if (!orig_head) {
> + fclose(head);
> + return 0;
> + }
> +
> + rebase_amend = fopen(git_path("rebase-merge/amend"), "r");
> + if (!rebase_amend) {
> + fclose(head);
> + fclose(orig_head);
> + return 0;
> + }
> +
> + rebase_orig_head = fopen(git_path("rebase-merge/orig-head"), "r");
> + if (!rebase_orig_head) {
> + fclose(head);
> + fclose(orig_head);
> + fclose(rebase_amend);
> + return 0;
> + }
> +
> + strbuf_init(&buf_head, 0);
> + strbuf_init(&buf_orig_head, 0);
> + strbuf_init(&buf_rebase_amend, 0);
> + strbuf_init(&buf_rebase_orig_head, 0);
> +
> + strbuf_getline(&buf_head, head, '\n');
> + strbuf_getline(&buf_orig_head, orig_head, '\n');
> + strbuf_getline(&buf_rebase_amend, rebase_amend, '\n');
> + strbuf_getline(&buf_rebase_orig_head, rebase_orig_head, '\n');
> +
> + fclose(head);
> + fclose(orig_head);
> + fclose(rebase_amend);
> + fclose(rebase_orig_head);
That is somewhat an ugly sequence; wouldn't it make sense to have a
small helper that takes a path in git_path() and returns a pointer
to an allocated string, i.e. something like...
static char *read_line_from_git_path(const char *filename)
{
struct struct buf = STRBUF_INIT;
FILE *fp = fopen(git_path(filename), "r");
if (!fp)
return NULL;
strbuf_getline(&buf, fp, '\n');
fclose(fp);
return strbuf_detach(&buf, NULL);
}
nb. return value from fclose() may need to be be checked as well,
but this is just an illustration.
Reading from git_path("HEAD") looked funny, as you may end up
reading the "ref: refs/heads/master". Of course that would not
compare equal to what you would read from "rebase-merge/amend", and
that may be fine for the purpose of your test, but it still looks
somewhat funny. As modern rebase is done on a detached HEAD,
perhaps it is a good idea to check if the HEAD is detached and
return false from this function if that is not the case. I dunno.
Other than that, all four patches in the series looked good. Will
replace what I queued on 'pu' last night.
Thanks.
next prev parent reply other threads:[~2012-06-05 21:16 UTC|newest]
Thread overview: 97+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-24 9:37 [PATCH/RFC] t7512-status-warnings.sh : better advices for git status Kong Lucien
2012-05-24 17:31 ` Matthieu Moy
2012-05-26 12:38 ` [PATCHv2 1/2] wt-status: " Kong Lucien
2012-05-26 12:38 ` [PATCHv2 2/2] t7512-status-warnings.sh: " Kong Lucien
2012-05-27 12:57 ` Matthieu Moy
2012-05-28 8:43 ` Matthieu Moy
2012-05-26 13:01 ` [PATCHv2 1/2] wt-status: " Nguyen Thai Ngoc Duy
2012-05-26 17:17 ` NGUY Thomas
2012-05-27 12:58 ` Matthieu Moy
2012-05-27 13:10 ` Matthieu Moy
2012-05-28 4:57 ` Junio C Hamano
2012-05-28 7:05 ` Matthieu Moy
2012-05-30 4:27 ` Junio C Hamano
2012-05-28 10:54 ` konglu
2012-05-28 17:36 ` [PATCHv3 1/2] wt-status.*: better advices for git status added Kong Lucien
2012-05-28 17:36 ` [PATCHv3 2/2] t7512-status-warnings.sh: better advices for git status Kong Lucien
2012-05-28 20:36 ` Matthieu Moy
2012-05-28 20:23 ` [PATCHv3 1/2] wt-status.*: better advices for git status added Matthieu Moy
2012-05-29 19:22 ` Junio C Hamano
2012-05-30 11:09 ` konglu
2012-05-30 17:24 ` Junio C Hamano
2012-05-31 6:47 ` Matthieu Moy
2012-05-30 13:23 ` [PATCHv4 1/3] " Kong Lucien
2012-05-30 13:23 ` [PATCHv4 2/3] t7512-status-warnings.sh: better advices for git status Kong Lucien
2012-05-30 13:23 ` [PATCHv4 3/3] Advices about 'git rm' during conflicts (unmerged paths) more relevant Kong Lucien
2012-05-30 18:44 ` Junio C Hamano
2012-05-30 21:50 ` konglu
2012-05-31 7:06 ` Matthieu Moy
2012-05-31 7:59 ` konglu
2012-05-30 18:26 ` [PATCHv4 1/3] wt-status.*: better advices for git status added Junio C Hamano
2012-05-30 19:06 ` Junio C Hamano
2012-05-31 6:42 ` Matthieu Moy
2012-05-31 6:44 ` Matthieu Moy
2012-05-31 6:29 ` Matthieu Moy
2012-05-31 6:34 ` Andrew Ardill
2012-05-31 15:15 ` [PATCHv5 " Kong Lucien
2012-05-31 15:15 ` [PATCHv5 2/3] t7512-status-help.sh: better advices for git status Kong Lucien
2012-05-31 15:15 ` [PATCHv5 3/3] status: don't suggest "git rm" or "git add" if not appropriate Kong Lucien
2012-06-01 8:55 ` Matthieu Moy
2012-06-01 12:15 ` Phil Hord
2012-06-01 14:08 ` konglu
2012-06-01 16:38 ` Junio C Hamano
2012-05-31 21:36 ` [PATCHv5 1/3] wt-status.*: better advices for git status added Junio C Hamano
2012-06-01 9:16 ` konglu
2012-06-01 9:26 ` Matthieu Moy
2012-06-01 14:50 ` Junio C Hamano
2012-06-01 16:51 ` Junio C Hamano
2012-06-01 19:39 ` konglu
2012-06-01 8:42 ` Matthieu Moy
2012-06-01 11:27 ` konglu
2012-06-01 12:40 ` Phil Hord
2012-06-01 16:57 ` Junio C Hamano
2012-06-04 18:00 ` Phil Hord
2012-06-03 18:30 ` [PATCHv6 1/4] " Kong Lucien
2012-06-03 18:30 ` [PATCHv6 2/4] t7512-status-help.sh: better advices for git status Kong Lucien
2012-06-03 21:18 ` Junio C Hamano
2012-06-04 10:04 ` konglu
2012-06-04 15:04 ` Junio C Hamano
2012-06-04 22:07 ` Junio C Hamano
2012-06-03 18:30 ` [PATCHv6 3/4] status: don't suggest "git rm" or "git add" if not appropriate Kong Lucien
2012-06-03 19:34 ` Matthieu Moy
2012-06-03 18:30 ` [PATCHv6 4/4] status: better advices when splitting a commit (during rebase -i) Kong Lucien
2012-06-03 22:00 ` Junio C Hamano
2012-06-04 15:35 ` Phil Hord
2012-06-05 9:13 ` konglu
2012-06-03 21:06 ` [PATCHv6 1/4] wt-status.*: better advices for git status added Junio C Hamano
2012-06-04 9:51 ` konglu
2012-06-04 14:54 ` Junio C Hamano
2012-06-04 17:19 ` [PATCHv7 " Kong Lucien
2012-06-04 17:19 ` [PATCHv7 2/4] t7512-status-help.sh: better advices for git status Kong Lucien
2012-06-04 21:02 ` Matthieu Moy
2012-06-04 23:12 ` Junio C Hamano
2012-06-04 17:19 ` [PATCHv7 3/4] status: don't suggest "git rm" or "git add" if not appropriate Kong Lucien
2012-06-04 17:19 ` [PATCHv7 4/4] status: better advices when splitting a commit (during rebase -i) Kong Lucien
2012-06-04 23:01 ` [PATCHv7 1/4] wt-status.*: better advices for git status added Junio C Hamano
2012-06-05 10:32 ` konglu
2012-06-05 11:33 ` Matthieu Moy
2012-06-05 20:21 ` [PATCHv8 " Lucien Kong
2012-06-05 20:21 ` [PATCHv8 2/4] t7512-status-help.sh: better advices for git status Lucien Kong
2012-06-05 20:21 ` [PATCHv8 3/4] status: don't suggest "git rm" or "git add" if not appropriate Lucien Kong
2012-06-05 20:21 ` [PATCHv8 4/4] status: better advices when splitting a commit (during rebase -i) Lucien Kong
2012-06-05 21:16 ` Junio C Hamano [this message]
2012-06-08 9:29 ` konglu
2012-06-08 15:05 ` Junio C Hamano
2012-06-07 13:17 ` [PATCHv9 1/4] wt-status.*: better advices for git status added Lucien Kong
2012-06-07 13:17 ` [PATCHv9 2/4] t7512-status-help.sh: better advices for git status Lucien Kong
2012-06-07 13:17 ` [PATCHv9 3/4] status: don't suggest "git rm" or "git add" if not appropriate Lucien Kong
2012-06-07 13:17 ` [PATCHv9 4/4] status: better advices when splitting a commit (during rebase -i) Lucien Kong
2012-06-07 18:07 ` Junio C Hamano
2012-06-07 20:42 ` Junio C Hamano
2012-06-07 21:05 ` konglu
2012-06-10 11:17 ` [PATCHv10 1/4] wt-status.*: better advices for git status added Lucien Kong
2012-06-10 11:17 ` [PATCHv10 2/4] t7512-status-help.sh: better advices for git status Lucien Kong
2012-06-10 11:17 ` [PATCHv10 3/4] status: don't suggest "git rm" or "git add" if not appropriate Lucien Kong
2012-06-10 11:17 ` [PATCHv10 4/4] status: better advices when splitting a commit (during rebase -i) Lucien Kong
2012-06-11 20:21 ` Junio C Hamano
2012-06-12 7:14 ` konglu
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=7vfwa9o3xo.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=Franck.Jonas@ensimag.imag.fr \
--cc=Huynh-Khoi-Nguyen.Nguyen@ensimag.imag.fr \
--cc=Lucien.Kong@ensimag.imag.fr \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=Thomas.Nguy@ensimag.imag.fr \
--cc=Valentin.Duperray@ensimag.imag.fr \
--cc=git@vger.kernel.org \
/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).