Skip to content

refdb: catch additional per-worktree refs #4124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pks-t merged 1 commit into from
Feb 17, 2017
Merged

refdb: catch additional per-worktree refs #4124

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions src/refdb_fs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,12 +365,17 @@ static const char *loose_parse_symbolic(git_buf *file_content)
return refname_start;
}

/*
* Returns whether a reference is stored per worktree or not.
* Per-worktree references are:
*
* - all pseudorefs, e.g. HEAD and MERGE_HEAD
* - all references stored inside of "refs/bisect/"
*/
static bool is_per_worktree_ref(const char *ref_name)
{
return strcmp("HEAD", ref_name) == 0 ||
strcmp("FETCH_HEAD", ref_name) == 0 ||
strcmp("MERGE_HEAD", ref_name) == 0 ||
strcmp("ORIG_HEAD", ref_name) == 0;
return git__prefixcmp(ref_name, "refs/") != 0 ||
git__prefixcmp(ref_name, "refs/bisect/") == 0;
}

static int loose_lookup(
Expand Down