From: Alex Riesen <raa.lkml@gmail.com>
To: Jeff King <peff@peff.net>
Cc: Junio C Hamano <gitster@pobox.com>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
git@vger.kernel.org
Subject: Re: [PATCH] revert: actually check for a dirty index
Date: Sun, 2 Mar 2008 11:37:53 +0100 [thread overview]
Message-ID: <20080302103753.GB2973@steel.home> (raw)
In-Reply-To: <20080302072252.GA14214@coredump.intra.peff.net>
Jeff King, Sun, Mar 02, 2008 08:22:52 +0100:
> +static int index_is_dirty(void)
> +{
> + struct rev_info rev;
> + int is_dirty = 0;
> +
> + init_revisions(&rev, NULL);
> + setup_revisions(0, NULL, &rev, "HEAD");
> + rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
> + rev.diffopt.format_callback = index_is_dirty_cb;
> + rev.diffopt.format_callback_data = &is_dirty;
> + run_diff_index(&rev, 1);
> +
> + return is_dirty;
> +}
Wouldn't something like what built-commit does more effective?
It does:
struct rev_info rev;
unsigned char sha1[20];
const char *parent = "HEAD";
if (!active_nr && read_cache() < 0)
die("Cannot read index");
if (amend)
parent = "HEAD^1";
if (get_sha1(parent, sha1))
commitable = !!active_nr;
else {
init_revisions(&rev, "");
rev.abbrev = 0;
setup_revisions(0, NULL, &rev, parent);
DIFF_OPT_SET(&rev.diffopt, QUIET);
DIFF_OPT_SET(&rev.diffopt, EXIT_WITH_STATUS);
run_diff_index(&rev, 1 /* cached */);
commitable = !!DIFF_OPT_TST(&rev.diffopt, HAS_CHANGES);
}
Diff-index in this case will stop as soon as the first difference
found, while just using the output method will enforce finding all the
differences, which is just a waste of time, if all you need is just to
know if index is different to HEAD.
next prev parent reply other threads:[~2008-03-02 10:38 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-03-02 6:44 bug in git-revert Jeff King
2008-03-02 7:00 ` Johannes Schindelin
2008-03-02 7:02 ` Jeff King
2008-03-02 7:22 ` [PATCH] revert: actually check for a dirty index Jeff King
2008-03-02 10:37 ` Alex Riesen [this message]
2008-03-03 6:30 ` Jeff King
2008-03-03 7:11 ` Junio C Hamano
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080302103753.GB2973@steel.home \
--to=raa.lkml@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/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.
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 NNTP newsgroup(s).