From ec06b05568bb9dbb7333a5974b4512db18395674 Mon Sep 17 00:00:00 2001 From: Jonathan Tan Date: Tue, 1 Sep 2020 15:28:08 -0700 Subject: refs: move dwim_ref() to header file This makes it clear that dwim_ref() is just repo_dwim_ref() without the first parameter. Signed-off-by: Jonathan Tan Signed-off-by: Junio C Hamano --- refs.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'refs.h') diff --git a/refs.h b/refs.h index f212f8945e..04a68540c3 100644 --- a/refs.h +++ b/refs.h @@ -1,6 +1,8 @@ #ifndef REFS_H #define REFS_H +#include "cache.h" + struct object_id; struct ref_store; struct repository; @@ -151,7 +153,11 @@ void expand_ref_prefix(struct argv_array *prefixes, const char *prefix); int expand_ref(struct repository *r, const char *str, int len, struct object_id *oid, char **ref); int repo_dwim_ref(struct repository *r, const char *str, int len, struct object_id *oid, char **ref); int repo_dwim_log(struct repository *r, const char *str, int len, struct object_id *oid, char **ref); -int dwim_ref(const char *str, int len, struct object_id *oid, char **ref); +static inline int dwim_ref(const char *str, int len, struct object_id *oid, + char **ref) +{ + return repo_dwim_ref(the_repository, str, len, oid, ref); +} int dwim_log(const char *str, int len, struct object_id *oid, char **ref); /* -- cgit v1.2.3 From f24c30e0b6b13078d8fc7cd71b9989d28fd76610 Mon Sep 17 00:00:00 2001 From: Jonathan Tan Date: Tue, 1 Sep 2020 15:28:09 -0700 Subject: 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 Signed-off-by: Junio C Hamano --- refs.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'refs.h') diff --git a/refs.h b/refs.h index 04a68540c3..411a68a0e5 100644 --- a/refs.h +++ b/refs.h @@ -151,12 +151,14 @@ struct argv_array; void expand_ref_prefix(struct argv_array *prefixes, const char *prefix); int expand_ref(struct repository *r, const char *str, int len, struct object_id *oid, char **ref); -int repo_dwim_ref(struct repository *r, const char *str, int len, struct object_id *oid, char **ref); +int repo_dwim_ref(struct repository *r, const char *str, int len, + struct object_id *oid, char **ref, int nonfatal_dangling_mark); int repo_dwim_log(struct repository *r, const char *str, int len, struct object_id *oid, char **ref); static inline int dwim_ref(const char *str, int len, struct object_id *oid, - char **ref) + char **ref, int nonfatal_dangling_mark) { - return repo_dwim_ref(the_repository, str, len, oid, ref); + return repo_dwim_ref(the_repository, str, len, oid, ref, + nonfatal_dangling_mark); } int dwim_log(const char *str, int len, struct object_id *oid, char **ref); -- cgit v1.2.3