Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan Larsen <bryanlarsen@yahoo.com>2005-07-11 07:53:44 +0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-11 21:20:53 +0400
commit9c1fa70aaa03f48fb172f9a96d57148f144bc3a9 (patch)
treea4033404b659642fea1aec200472a658c7eecbd5 /write-tree.c
parentab90ea5d6e6ef358c8ee5869307c33a939be0e66 (diff)
[PATCH] add --missing-ok option to write-tree
This option allows a write-tree even if the referenced objects are not in the database. Signed-off-by: Bryan Larsen <bryan.larsen@gmail.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'write-tree.c')
-rw-r--r--write-tree.c14
1 files changed, 13 insertions, 1 deletions
diff --git a/write-tree.c b/write-tree.c
index a794ea15b8..561a101fa9 100644
--- a/write-tree.c
+++ b/write-tree.c
@@ -5,6 +5,8 @@
*/
#include "cache.h"
+static int missing_ok = 0;
+
static int check_valid_sha1(unsigned char *sha1)
{
int ret;
@@ -61,7 +63,7 @@ static int write_tree(struct cache_entry **cachep, int maxentries, const char *b
sha1 = subdir_sha1;
}
- if (check_valid_sha1(sha1) < 0)
+ if (!missing_ok && 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], "--missing-ok"))
+ missing_ok = 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");