git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Bryan Larsen <bryan.larsen@gmail.com>
To: git@vger.kernel.org
Subject: [PATCH] add --no-check option to git-write-tree
Date: Fri, 08 Jul 2005 06:37:48 -0400	[thread overview]
Message-ID: <42CE577C.1070404@gmail.com> (raw)

Add --no-check option to git-write-tree.

Signed-off-by: Bryan Larsen <bryan.larsen@gmail.com>
---

  Documentation/git-write-tree.txt |    6 ++++++
  write-tree.c                     |   14 +++++++++++++-
  2 files changed, 19 insertions(+), 1 deletions(-)

diff --git a/Documentation/git-write-tree.txt 
b/Documentation/git-write-tree.txt
--- a/Documentation/git-write-tree.txt
+++ b/Documentation/git-write-tree.txt
@@ -10,6 +10,7 @@ git-write-tree - Creates a tree from the
  SYNOPSIS
  --------
  'git-write-tree'
+		[--no-check]

  DESCRIPTION
  -----------
@@ -23,6 +24,11 @@ In order to have that match what is actu
  now, you need to have done a "git-update-cache" phase before you did the
  "git-write-tree".

+OPTIONS
+-------
+--no-check::
+	Normally "git-write-tree" ensures that the objects referenced by the
+	directory exist in the object database.  This option disabled this check.



diff --git a/write-tree.c b/write-tree.c
--- a/write-tree.c
+++ b/write-tree.c
@@ -5,6 +5,8 @@
   */
  #include "cache.h"

+static int no_check = 0;
+
  static int check_valid_sha1(unsigned char *sha1)
  {
  	int ret;
@@ -61,7 +63,7 @@ static int write_tree(struct cache_entry
  			sha1 = subdir_sha1;
  		}

-		if (check_valid_sha1(sha1) < 0)
+		if (!no_check && check_valid_sha1(sha1) < 0)
  			exit(1);

  		entrylen = pathlen - baselen;
@@ -86,6 +88,16 @@ int main(int argc, char **argv)
  	int i, funny;
  	int entries = read_cache();
  	unsigned char sha1[20];
+	
+	if (argc==2) {
+		if (!strcmp(argv[1], "--no-check"))
+			no_check = 1;
+		else
+			die("unknown option %s", argv[1]);
+	}
+	
+	if (argc>2)
+		die("too many options");

  	if (entries < 0)
  		die("git-write-tree: error reading cache");


\f

             reply	other threads:[~2005-07-08 10:56 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-07-08 10:37 Bryan Larsen [this message]
2005-07-08 19:42 ` [PATCH] add --no-check option to git-write-tree Linus Torvalds

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=42CE577C.1070404@gmail.com \
    --to=bryan.larsen@gmail.com \
    --cc=git@vger.kernel.org \
    /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).