diff options
| author | Carlos Martín Nieto <cmn@elego.de> | 2012-02-27 16:11:53 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-27 11:35:33 -0800 |
| commit | 6c41e97557d94df7085e3c0cff247305c9401968 (patch) | |
| tree | 409b6b72b2a54f7d944bf573a29fef08356f2038 | |
| parent | c524ceb12f65e2ad4fc68c9d5b39f6e4b6b5c17b (diff) | |
| download | git-cn/maint-branch-with-bad.tar.gz | |
branch: don't assume the merge filter ref existscn/maint-branch-with-bad
print_ref_list looks up the merge_filter_ref and assumes that a valid
pointer is returned. When the object doesn't exist, it tries to
dereference a NULL pointer. This can be the case when git branch
--merged is given an argument that isn't a valid commit name.
Check whether the lookup returns a NULL pointer and die with an error
if it does. Add a test, while we're at it.
Signed-off-by: Carlos Martín Nieto <cmn@elego.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/branch.c | 4 | ||||
| -rwxr-xr-x | t/t3200-branch.sh | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/builtin/branch.c b/builtin/branch.c index df908ed8f5..d6691af0a5 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -528,6 +528,10 @@ static int print_ref_list(int kinds, int detached, int verbose, int abbrev, stru if (merge_filter != NO_FILTER) { struct commit *filter; filter = lookup_commit_reference_gently(merge_filter_ref, 0); + if (!filter) + die("object '%s' does not point to a commit", + sha1_to_hex(merge_filter_ref)); + filter->object.flags |= UNINTERESTING; add_pending_object(&ref_list.revs, (struct object *) filter, ""); diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index 76903323af..6ad1763fda 100755 --- a/t/t3200-branch.sh +++ b/t/t3200-branch.sh @@ -620,4 +620,8 @@ test_expect_success 'use set-upstream on the current branch' ' ' +test_expect_success '--merged catches invalid object names' ' + test_must_fail git branch --merged 0000000000000000000000000000000000000000 +' + test_done |