From: Jonas Fonseca Date: Sun, 20 May 2007 12:19:17 GMT Subject: [PATCH] branch: fix segfault when resolving an invalid HEAD Message-ID: <20070520121917.GA18850@diku.dk> Caused by return value of resolve_ref being passed directly to xstrdup whereby the sanity checking was never reached. Signed-off-by: Jonas Fonseca --- builtin-branch.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) Discovered while renaming a ref from "a/b" to "a" while redoing some changes. After a `git push --all`, `git branch` in the remote repo segfaulted, since its HEAD was still pointing to "a/b". diff --git a/builtin-branch.c b/builtin-branch.c index 6bd5843..a5b6bbe 100644 --- a/builtin-branch.c +++ b/builtin-branch.c @@ -623,9 +623,10 @@ int cmd_branch(int argc, const char **argv, const char *prefix) (rename && force_create)) usage(builtin_branch_usage); - head = xstrdup(resolve_ref("HEAD", head_sha1, 0, NULL)); + head = resolve_ref("HEAD", head_sha1, 0, NULL); if (!head) die("Failed to resolve HEAD as a valid ref."); + head = xstrdup(head); if (!strcmp(head, "HEAD")) { detached = 1; } -- 1.5.2.rc3.800.ga489e-dirty -- Jonas Fonseca