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

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to