diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-05-20 19:58:03 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-05-20 19:58:03 -0700 |
| commit | 738a1154db190c75a7454da85d85be68ad7db065 (patch) | |
| tree | 4abf7c8e14e98a6c0301cb34ad5acd8b42dcfe14 /builtin-branch.c | |
| parent | Merge branch 'dh/pack' (diff) | |
| parent | Merge branch 'maint-1.5.1' into maint (diff) | |
| download | git-738a1154db190c75a7454da85d85be68ad7db065.tar.gz git-738a1154db190c75a7454da85d85be68ad7db065.zip | |
Merge branch 'maint'
* maint:
annotate: make it work from subdirectories.
git-config: Correct asciidoc documentation for --int/--bool
t1300: Add tests for git-config --bool --get
unpack-trees.c: verify_uptodate: remove dead code
Use PATH_MAX instead of TEMPFILE_PATH_LEN
branch: fix segfault when resolving an invalid HEAD
Diffstat (limited to 'builtin-branch.c')
| -rw-r--r-- | builtin-branch.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin-branch.c b/builtin-branch.c index 6bd5843b47..a5b6bbef6e 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; } |