From: Johannes Sixt <j.sixt@viscovery•net>
To: "SZEDER Gábor" <szeder@ira•uka.de>
Cc: Junio C Hamano <gitster@pobox•com>, git@vger•kernel.org
Subject: Re: [PATCH v2] rerere: fix overeager gc
Date: Thu, 01 Jul 2010 12:10:55 +0200 [thread overview]
Message-ID: <4C2C69AF.4010303@viscovery.net> (raw)
In-Reply-To: <1277977009-22780-1-git-send-email-szeder@ira.uka.de>
Am 7/1/2010 11:36, schrieb SZEDER Gábor:
> -static time_t rerere_created_at(const char *name)
> +static time_t rerere_last_checked_at(const char *name)
rerere_last_used_at?
> @@ -378,7 +378,13 @@ static int merge(const char *name, const char *path)
> }
> ret = ll_merge(&result, path, &base, NULL, &cur, "", &other, "", 0);
> if (!ret) {
> - FILE *f = fopen(path, "w");
> + FILE *f;
> +
> + if (utime(rerere_path(name, "preimage"), NULL) < 0)
> + warning("failed utime() on %s: %s",
> + rerere_path(name, "preimage"),
> + strerror(errno));
> + f = fopen(path, "w");
I think this should be outside of 'if (!ret)' condition because even if
the merge fails, the resolution was *used*.
Mental note: update mingw_utime to accept NULL for the second parameter...
-- Hannes
next prev parent reply other threads:[~2010-07-01 10:11 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-29 11:38 [RFC PATCH] rerere: fix overeager gc SZEDER Gábor
2010-06-29 17:59 ` Junio C Hamano
2010-06-30 6:12 ` Johannes Sixt
2010-06-30 8:01 ` SZEDER Gábor
2010-06-30 15:22 ` Junio C Hamano
2010-06-30 15:40 ` Johannes Sixt
2010-07-01 9:36 ` [PATCH v2] " SZEDER Gábor
2010-07-01 10:10 ` Johannes Sixt [this message]
2010-07-01 11:07 ` [PATCH 1/2] mingw: utime() handles NULL times parameter SZEDER Gábor
2010-07-01 12:16 ` [PATCH 1/2 fixed] mingw_utime(): handle " Johannes Sixt
2010-07-01 11:07 ` [PATCH 2/2] rerere: fix overeager gc SZEDER Gábor
2010-07-01 16:27 ` [RFC PATCH] " Junio C Hamano
2010-07-02 5:49 ` Johannes Sixt
2010-07-02 17:25 ` Junio C Hamano
2010-07-05 6:02 ` Johannes Sixt
2010-07-08 14:35 ` [PATCH v4] " SZEDER Gábor
2010-07-09 0:06 ` [RFC PATCH] " Junio C Hamano
2010-07-12 23:42 ` [PATCH 1/2] mingw_utime(): handle NULL times parameter SZEDER Gábor
2010-07-12 23:42 ` [PATCH 2/2] rerere: fix overeager gc SZEDER Gábor
2010-07-13 0:40 ` Junio C Hamano
2010-07-14 12:19 ` SZEDER Gábor
2010-07-14 16:23 ` Junio C Hamano
2010-07-14 18:33 ` SZEDER Gábor
2010-07-08 6:27 ` [RFC PATCH] " Johannes Sixt
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=4C2C69AF.4010303@viscovery.net \
--to=j.sixt@viscovery$(echo .)net \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=szeder@ira$(echo .)uka.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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