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>
This commit is contained in:

committed by
Junio C Hamano

parent
ec06b05568
commit
f24c30e0b6
7
cache.h
7
cache.h
@ -1567,6 +1567,13 @@ struct interpret_branch_name_options {
|
||||
* allowed, even ones to refs outside of those namespaces.
|
||||
*/
|
||||
unsigned allowed;
|
||||
|
||||
/*
|
||||
* If ^{upstream} or ^{push} (or equivalent) is requested, and the
|
||||
* branch in question does not have such a reference, return -1 instead
|
||||
* of die()-ing.
|
||||
*/
|
||||
unsigned nonfatal_dangling_mark : 1;
|
||||
};
|
||||
int repo_interpret_branch_name(struct repository *r,
|
||||
const char *str, int len,
|
||||
|
Reference in New Issue
Block a user