From: Miles Bader <miles@gnu.org>
To: Clemens Buchacher <drizzd@aon.at>
Cc: git@vger.kernel.org, Gert Palok <gert@planc.ee>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH v2] do not overwrite untracked during merge from unborn branch
Date: Mon, 15 Nov 2010 10:51:06 +0900 [thread overview]
Message-ID: <87r5enbbhx.fsf@catnip.gol.com> (raw)
In-Reply-To: <20101114215315.GB29579@localhost> (Clemens Buchacher's message of "Sun, 14 Nov 2010 22:53:15 +0100")
Clemens Buchacher <drizzd@aon.at> writes:
> Wrong again! (With args[6] instead of args[7].) I wonder how many
> times I can get it wrong.
Hmm, well the use of external processes to implement such seemingly
basic functionality doesn't exactly help with the argument checking...
... and now that I look (though only briefly :), builtin/read-tree.c
seems almost trivial -- with the bulk of the code devoted to argument
parsing, error reporting, and handling different cases...!
Maybe it would be better to just rewrite "read_empty" (and
"reset_hard"?) in terms of the underlying functions read-tree.c uses?
-Miles
--
`Cars give people wonderful freedom and increase their opportunities.
But they also destroy the environment, to an extent so drastic that
they kill all social life' (from _A Pattern Language_)
next prev parent reply other threads:[~2010-11-15 1:51 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-21 13:18 pulling the root commit overwrites untracked files without warning (1.7.2.3) Gert Palok
2010-10-22 21:14 ` Clemens Buchacher
2010-10-22 21:17 ` Clemens Buchacher
2010-11-14 21:34 ` Clemens Buchacher
2010-11-14 21:46 ` [PATCH] do not overwrite untracked during merge from unborn branch Clemens Buchacher
2010-11-14 21:49 ` [PATCH w/o PGP] " Clemens Buchacher
2010-11-14 21:53 ` [PATCH v2] " Clemens Buchacher
2010-11-15 1:51 ` Miles Bader [this message]
[not found] ` <20101114214953.GB16413@burratino>
2010-11-14 22:07 ` [PATCH v3] " Clemens Buchacher
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=87r5enbbhx.fsf@catnip.gol.com \
--to=miles@gnu.org \
--cc=drizzd@aon.at \
--cc=gert@planc.ee \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.