Skip to content

Commit

Permalink
Add stash and other reference types
Browse files Browse the repository at this point in the history
This makes it possible to filter refs created by tools such as git-branchless
with `set reference-format = hide:other`.

Closes #1160
  • Loading branch information
koutcher committed Nov 27, 2021
1 parent 15aab28 commit 62d5484
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 6 deletions.
8 changes: 5 additions & 3 deletions doc/tigrc.5.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -185,12 +185,14 @@ The following variables can be set:
Prefix with `hide:` to not show that reference type, e.g. `hide:remote`.
Supported reference types are:
- head : The current HEAD.
- tag : A signed tag.
- local-tag : An unsigned tag.
- tag : An annotated tag.
- local-tag : A lightweight tag.
- remote : A remote.
- tracked-remote : The remote tracked by current HEAD.
- replace : A replaced reference.
- branch : Any other reference.
- branch : A branch.
- stash : The stash.
- other : Any other reference.
'line-graphics' (mixed) [ascii|default|utf-8|auto|<bool>]::
Expand Down
2 changes: 2 additions & 0 deletions include/tig/types.h
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,8 @@ bool map_enum_do(const struct enum_map_entry *map, size_t map_size, int *value,
#define REFERENCE_ENUM(_) \
_(REFERENCE, HEAD), \
_(REFERENCE, BRANCH), \
_(REFERENCE, OTHER), \
_(REFERENCE, STASH), \
_(REFERENCE, TRACKED_REMOTE), \
_(REFERENCE, REMOTE), \
_(REFERENCE, TAG), \
Expand Down
6 changes: 6 additions & 0 deletions src/refdb.c
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,12 @@ add_to_refs(const char *id, size_t idlen, char *name, size_t namelen, struct ref
if (*opt->head)
return SUCCESS;
type = REFERENCE_HEAD;

} else if (!strcmp(name, "refs/stash")) {
type = REFERENCE_STASH;

} else if (!prefixcmp(name, "refs/")) {
type = REFERENCE_OTHER;
}

/* If we are reloading or it's an annotated tag, replace the
Expand Down
8 changes: 5 additions & 3 deletions tigrc
Original file line number Diff line number Diff line change
Expand Up @@ -93,12 +93,14 @@ set truncation-delimiter = ~ # Character drawn for truncations, or "utf-8"

# Format reference names based on type.
# - head : The current HEAD.
# - tag : A signed tag.
# - local-tag : An unsigned tag.
# - tag : An annotated tag.
# - local-tag : A lightweight tag.
# - remote : A remote.
# - tracked-remote : The remote tracked by current HEAD.
# - replace : A replaced reference.
# - branch : Any other reference.
# - branch : A branch.
# - stash : The stash.
# - other : Any other reference.
# If no format is defined for `local-tag` then the one for `tag` is used.
# Similarly, `remote` is used if no `tracked-remote` format exists.
# Prefix with `hide:` to not show that reference type, e.g. `hide:remote`.
Expand Down

0 comments on commit 62d5484

Please sign in to comment.