From: "René Scharfe" <rene.scharfe@lsrfire.ath.cx>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 6/6] mktree --missing: allow missing objects
Date: Mon, 11 May 2009 00:13:41 +0200 [thread overview]
Message-ID: <4A075195.5020508@lsrfire.ath.cx> (raw)
In-Reply-To: <1241981391-19639-7-git-send-email-gitster@pobox.com>
Junio C Hamano schrieb:
> -static void mktree_line(char *buf, size_t len, int line_termination)
> +static void mktree_line(char *buf, size_t len, int line_termination, int allow_missing)
> {
> char *ptr, *ntr;
> unsigned mode;
> @@ -92,9 +92,12 @@ static void mktree_line(char *buf, size_t len, int line_termination)
>
> /* It is perfectly normal if we do not have a commit from a submodule */
> if (!S_ISGITLINK(mode))
> + allow_missing = 1;
> +
> + if (!allow_missing)
> type = sha1_object_info(sha1, NULL);
> else
> - type = OBJ_COMMIT;
> + type = object_type(mode);
>
> if (type < 0)
> die("object %s unavailable", sha1_to_hex(sha1));
Don't you need this, above?
- if (!S_ISGITLINK(mode))
+ if (S_ISGITLINK(mode))
René
next prev parent reply other threads:[~2009-05-10 22:14 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-10 13:41 questions about git-mktree Jon Seymour
2009-05-10 15:12 ` Uwe Kleine-König
2009-05-10 15:27 ` A Large Angry SCM
2009-05-10 15:31 ` Jakub Narebski
2009-05-10 16:39 ` Junio C Hamano
2009-05-10 17:10 ` Junio C Hamano
2009-05-10 18:49 ` [PATCH 0/6] Modernize mktree somewhat Junio C Hamano
2009-05-10 18:49 ` [PATCH 1/6] build-in git-mktree Junio C Hamano
2009-05-10 18:49 ` [PATCH 2/6] mktree: use parse-options Junio C Hamano
2009-05-10 18:49 ` [PATCH 3/6] builtin-mktree.c: use a helper function to handle one line of input Junio C Hamano
2009-05-10 18:49 ` [PATCH 4/6] mktree: do not barf on a submodule commit Junio C Hamano
2009-05-10 18:49 ` [PATCH 5/6] t1010: add mktree test Junio C Hamano
2009-05-10 18:49 ` [PATCH 6/6] mktree --missing: allow missing objects Junio C Hamano
2009-05-10 22:13 ` René Scharfe [this message]
2009-05-11 0:29 ` Junio C Hamano
2009-05-10 18:54 ` questions about git-mktree - [PATCH] proposed '--batch' option Josh Micich
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=4A075195.5020508@lsrfire.ath.cx \
--to=rene.scharfe@lsrfire.ath.cx \
--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 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).