summaryrefslogtreecommitdiff
path: root/commit.c
diff options
context:
space:
mode:
authorJonathan Tan <jonathantanmy@google.com>2020-09-01 22:28:09 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-09-02 21:39:25 (GMT)
commitf24c30e0b6b13078d8fc7cd71b9989d28fd76610 (patch)
tree9b013a5a9bede34aacc64ccdb958ecb6505d826c /commit.c
parentec06b05568bb9dbb7333a5974b4512db18395674 (diff)
downloadgit-f24c30e0b6b13078d8fc7cd71b9989d28fd76610.zip
git-f24c30e0b6b13078d8fc7cd71b9989d28fd76610.tar.gz
git-f24c30e0b6b13078d8fc7cd71b9989d28fd76610.tar.bz2
wt-status: tolerate dangling marks
When a user checks out the upstream branch of HEAD, the upstream branch not being a local branch, and then runs "git status", like this: git clone $URL client cd client git checkout @{u} git status no status is printed, but instead an error message: fatal: HEAD does not point to a branch (This error message when running "git branch" persists even after checking out other things - it only stops after checking out a branch.) This is because "git status" reads the reflog when determining the "HEAD detached" message, and thus attempts to DWIM "@{u}", but that doesn't work because HEAD no longer points to a branch. Therefore, when calculating the status of a worktree, tolerate dangling marks. This is done by adding an additional parameter to dwim_ref() and repo_dwim_ref(). Signed-off-by: Jonathan Tan <jonathantanmy@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'commit.c')
-rw-r--r--commit.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/commit.c b/commit.c
index 7128895..9b5a34c 100644
--- a/commit.c
+++ b/commit.c
@@ -921,7 +921,7 @@ struct commit *get_fork_point(const char *refname, struct commit *commit)
struct commit *ret = NULL;
char *full_refname;
- switch (dwim_ref(refname, strlen(refname), &oid, &full_refname)) {
+ switch (dwim_ref(refname, strlen(refname), &oid, &full_refname, 0)) {
case 0:
die("No such ref: '%s'", refname);
case 1: