diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-02-04 16:54:47 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-04 16:54:47 -0800 |
| commit | d1f289c5aa52bb77dc4959fb21cef032d954869f (patch) | |
| tree | 525c95c67c6ae06278a99f244dc5d120c45a8747 /builtin-show-branch.c | |
| parent | 6e2e1cfb81a6a6de9fc074bd26bed8a45f73251f (diff) | |
| parent | 632ac9fd12a2d4ff2c1a1fcd63492ce24315221f (diff) | |
| download | git-d1f289c5aa52bb77dc4959fb21cef032d954869f.tar.gz git-d1f289c5aa52bb77dc4959fb21cef032d954869f.tar.xz | |
Merge branch 'np/dreflog'
* np/dreflog:
show-branch -g: default to the current branch.
Let git-checkout always drop any detached head
Enable HEAD@{...} and make it independent from the current branch
scan reflogs independently from refs
add reflog when moving HEAD to a new branch
create_symref(): do not assume pathname from git_path() persists long enough
add logref support to git-symbolic-ref
move create_symref() past log_ref_write()
add reflog entries for HEAD when detached
enable separate reflog for HEAD
lock_ref_sha1_basic(): remember the original name of a ref when resolving it
make reflog filename independent from struct ref_lock
Diffstat (limited to 'builtin-show-branch.c')
| -rw-r--r-- | builtin-show-branch.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/builtin-show-branch.c b/builtin-show-branch.c index fa62e487b..0d94e40df 100644 --- a/builtin-show-branch.c +++ b/builtin-show-branch.c @@ -690,7 +690,10 @@ int cmd_show_branch(int ac, const char **av, const char *prefix) if (ac == 0) { static const char *fake_av[2]; - fake_av[0] = "HEAD"; + const char *refname; + + refname = resolve_ref("HEAD", sha1, 1, NULL); + fake_av[0] = xstrdup(refname); fake_av[1] = NULL; av = fake_av; ac = 1; |