@matheusbsbs / matheus-bagliano / commits / 9cc2b07a7c

add quieter versions of parse_{tree,commit}

When we call parse_commit, it will complain to stderr if the object does not exist or cannot be read. This means that we may produce useless error messages if this situation is expected (e.g., because the object is marked UNINTERESTING, or because revs->ignore_missing_links is set). We can fix this by adding a new "parse_X_gently" form that takes a flag to suppress the messages. The existing "parse_X" form is already gentle in the sense that it returns an error rather than dying, and we could in theory just add a "quiet" flag to it (with existing callers passing "0"). But doing it this way means we do not have to disturb existing callers. Note also that the new flag is "quiet_on_missing", and not just "quiet". We could add a flag to suppress _all_ errors, but besides being a more invasive change (we would have to pass the flag down to sub-functions, too), there is a good reason not to: we would never want to use it. Missing a linked object is expected in some circumstances, but it is never expected to have a malformed commit, or to get a tree when we wanted a commit. We should always complain about these corruptions. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed Jun 1, 2015 at 05:56 UTC 9cc2b07a7c95fad0bb5e3a7a8db29bebdb90d92b

4 files changed +16 -6

commit.c

+3 -2

@@ -353,7 +353,7 @@ int parse_commit_buffer(struct commit *item, const void *buffer, unsigned long s

353 return 0;

354 }

355

356 -int parse_commit(struct commit *item)

356 +int parse_commit_gently(struct commit *item, int quiet_on_missing)

357 {

358 enum object_type type;

359 void *buffer;

@@ -366,7 +366,8 @@ int parse_commit(struct commit *item)

366 return 0;

367 buffer = read_sha1_file(item->object.sha1, &type, &size);

368 if (!buffer)

369 - return error("Could not read %s",

369 + return quiet_on_missing ? -1 :

370 + error("Could not read %s",

371 sha1_to_hex(item->object.sha1));

372 if (type != OBJ_COMMIT) {

373 free(buffer);

commit.h

+5 -1

@@ -59,7 +59,11 @@ struct commit *lookup_commit_reference_by_name(const char *name);

59 struct commit *lookup_commit_or_die(const unsigned char *sha1, const char *ref_name);

61 int parse_commit_buffer(struct commit *item, const void *buffer, unsigned long size);

62 -int parse_commit(struct commit *item);

62 +int parse_commit_gently(struct commit *item, int quiet_on_missing);

63 +static inline int parse_commit(struct commit *item)

64 +{

65 + return parse_commit_gently(item, 0);

66 +}

67 void parse_commit_or_die(struct commit *item);

69 /*

tree.c

+3 -2

@@ -198,7 +198,7 @@ int parse_tree_buffer(struct tree *item, void *buffer, unsigned long size)

198 return 0;

199 }

200

201 -int parse_tree(struct tree *item)

201 +int parse_tree_gently(struct tree *item, int quiet_on_missing)

202 {

203 enum object_type type;

204 void *buffer;

@@ -208,7 +208,8 @@ int parse_tree(struct tree *item)

208 return 0;

209 buffer = read_sha1_file(item->object.sha1, &type, &size);

210 if (!buffer)

211 - return error("Could not read %s",

211 + return quiet_on_missing ? -1 :

212 + error("Could not read %s",

213 sha1_to_hex(item->object.sha1));

214 if (type != OBJ_TREE) {

215 free(buffer);

tree.h

+5 -1

@@ -15,7 +15,11 @@ struct tree *lookup_tree(const unsigned char *sha1);

16 int parse_tree_buffer(struct tree *item, void *buffer, unsigned long size);

18 -int parse_tree(struct tree *tree);

18 +int parse_tree_gently(struct tree *tree, int quiet_on_missing);

19 +static inline int parse_tree(struct tree *tree)

20 +{

21 + return parse_tree_gently(tree, 0);

22 +}

23 void free_tree_buffer(struct tree *tree);

25 /* Parses and returns the tree in the given ent, chasing tags and commits. */