[PATCH 2/2] branch: don't fail listing branches if one of the commits wasn't found
From: Simo Melenius <hidden>
Date: 2016-06-15 22:48:54
Subsystem:
the rest · Maintainer:
Linus Torvalds
When listing branches with ref lookups, if one of the known raw refs doesn't point to a commit then "git branch" would return error(), terminating the whole for_each_rawref() iteration and possibly hiding any remaining refs. Signed-off-by: Simo Melenius <redacted> --- builtin/branch.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/builtin/branch.c b/builtin/branch.c
index 46ca59c..2242743 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c@@ -303,7 +303,7 @@ static int append_ref(const char *refname, const unsigned char *sha1, int flags, if (!commit) { cb->ret = error("branch '%s' does not point at a commit", refname); - return cb->ret; + return 0; } /* Filter with with_commit if specified */
@@ -541,6 +541,9 @@ static int print_ref_list(int kinds, int detached, int verbose, int abbrev, stru free_ref_list(&ref_list); + if (cb.ret) + error("some refs could not be read, review stderr"); + return cb.ret; }
--
1.7.0.4