Re: [PATCH v3] git-branch: add support for --merged and --no-merged

From: Lars Hjemli <hjemli@gmail.com>
Date: Apr 17, 2008, 22:59 UTC
Message-ID: <8c5c35580804171559u87f70b6j59d327ca514da714@mail.gmail.com>
In-Reply-To: <1208463890-2870-1-git-send-email-hjemli@gmail.com>

On Thu, Apr 17, 2008 at 10:24 PM, Lars Hjemli <hjemli@gmail.com> wrote:

> These options filter the output from git branch to only include branches
>  whose tip is either merged or not merged into HEAD.

Gaah, I just noticed a slight terminology slip. Could you please apply this on top of [PATCH v3]?

(hopefully not mangled by gmail...)

---

diff --git a/builtin-branch.c b/builtin-branch.c
index eecbcf2..19c508a 100644
--- a/builtin-branch.c
+++ b/builtin-branch.c
@@ -237,7 +237,7 @@ static int append_ref(const char *refname
        if (mergefilter > -1) {
                branch.item = lookup_commit_reference_gently(sha1, 1);
                if (!branch.item)
-                       die("Unable to lookup HEAD of branch %s", refname);
+                       die("Unable to lookup tip of branch %s", refname);
                if (mergefilter == 0 && has_commit(head_sha1, &branch))
                        return 0;
                if (mergefilter == 1 && !has_commit(head_sha1, &branch))