[PATCH 2/2] branch: don't fail listing branches if one of the commits wasn't found
- From
- Simo Melenius <simo.melenius@iki.fi>
- Date
- Jun 4, 2010, 09:50 UTC
- Message-ID
- <1275645011-28795-2-git-send-email-simo.melenius@iki.fi>
- In-Reply-To
- <AANLkTilGOtScr7AyF_Dsm5ItTm2QBv_aPdBXRUDH29Ad@mail.gmail.com>
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 <simo.melenius@iki.fi> --- builtin/branch.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/builtin/branch.c b/builtin/branch.c index 72a486c..2371ca0 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -301,7 +301,7 @@ static int append_ref(const char *refname, const unsigned char *sha1, int flags, commit = lookup_commit_reference_gently(sha1, 1); 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 */ @@ -539,6 +539,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"); + return cb.ret; }
-- 1.7.0.4