From: Johannes Sixt <j6t@kdbg.org>
To: Christian Couder <chriscool@tuxfamily.org>
Cc: Junio C Hamano <gitster@pobox.com>,
git@vger.kernel.org, Philip Oakley <philipoakley@iee.orcg>,
Thomas Rast <trast@inf.ethz.ch>
Subject: Re: [PATCH 1/5] replace: forbid replacing an object with one of a different type
Date: Sun, 25 Aug 2013 20:35:47 +0200 [thread overview]
Message-ID: <521A4E83.9000400@kdbg.org> (raw)
In-Reply-To: <20130825130609.4681.25786.chriscool@tuxfamily.org>
Am 25.08.2013 15:06, schrieb Christian Couder:
> @@ -100,6 +101,15 @@ static int replace_object(const char *object_ref, const char *replace_ref,
> if (check_refname_format(ref, 0))
> die("'%s' is not a valid ref name.", ref);
>
> + obj_type = sha1_object_info(object, NULL);
> + repl_type = sha1_object_info(repl, NULL);
> + if (obj_type != repl_type)
> + die("Objects must be of the same type.\n"
> + "Object ref '%s' is of type '%s'\n"
Is it really an "Object ref", not just an "Object"?
> + "while replace ref '%s' is of type '%s'.",
And here:
"while replacement object '%s' is of type '%s'.",
BTW, I appreciate your choice of where in the sentence the line breaks are.
> + object_ref, typename(obj_type),
> + replace_ref, typename(repl_type));
> +
> if (read_ref(ref, prev))
> hashclr(prev);
> else if (!force)
-- Hannes
next prev parent reply other threads:[~2013-08-25 18:35 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-25 13:06 [PATCH 0/5] Check replacement object type and minor updates Christian Couder
2013-08-25 13:06 ` [PATCH 1/5] replace: forbid replacing an object with one of a different type Christian Couder
2013-08-25 18:35 ` Johannes Sixt [this message]
2013-08-25 19:44 ` Christian Couder
2013-08-25 20:18 ` Johannes Sixt
2013-08-26 7:19 ` Christian Couder
2013-08-25 13:06 ` [PATCH 2/5] Documentation/replace: state that objects must be of the same type Christian Couder
2013-08-25 13:06 ` [PATCH 3/5] t6050-replace: test that objects are " Christian Couder
2013-08-25 20:06 ` Johannes Sixt
2013-08-25 13:06 ` [PATCH 4/5] t6050-replace: add test to clean up all the replace refs Christian Couder
2013-08-25 13:06 ` [PATCH 5/5] Documentation/replace: add Creating Replacement Objects section Christian Couder
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=521A4E83.9000400@kdbg.org \
--to=j6t@kdbg.org \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=philipoakley@iee.orcg \
--cc=trast@inf.ethz.ch \
/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).