kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

object-name: turn INTERPRET_BRANCH_* constants into enum values 

Replace the INTERPRET_BRANCH_* preprocessor constants with enum
values and use that type where these flags are stored or passed
around.

These flags describe which kinds of branches may be considered during
branch-name interpretation, so represent them as an enum describing
branch kinds while keeping the existing bitmask semantics and
INTERPRET_BRANCH_* element names.

Signed-off-by: Jialong Wang <jerrywang183@yahoo.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Jialong Wang 2026-03-18 15:09:42 -04:00 committed by Junio C Hamano
parent ca1db8a0f7
commit c5fc44f545
5 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/branch.c
View File

@ -228,7 +228,7 @@ static int delete_branches(int argc, const char **argv, int force, int kinds,
int ret = 0; int ret = 0;
int remote_branch = 0; int remote_branch = 0;
struct strbuf bname = STRBUF_INIT; struct strbuf bname = STRBUF_INIT;
unsigned allowed_interpret; enum interpret_branch_kind allowed_interpret;
struct string_list refs_to_delete = STRING_LIST_INIT_DUP; struct string_list refs_to_delete = STRING_LIST_INIT_DUP;
struct string_list_item *item; struct string_list_item *item;
int branch_name_pos; int branch_name_pos;

6
object-name.c
View File

@ -1660,7 +1660,8 @@ static int interpret_empty_at(const char *name, int namelen, int len, struct str


static int reinterpret(struct repository *r, static int reinterpret(struct repository *r,
const char *name, int namelen, int len, const char *name, int namelen, int len,
struct strbuf *buf, unsigned allowed) struct strbuf *buf,
enum interpret_branch_kind allowed)
{ {
/* we have extra data, which might need further processing */ /* we have extra data, which might need further processing */
struct strbuf tmp = STRBUF_INIT; struct strbuf tmp = STRBUF_INIT;
@ -1692,7 +1693,8 @@ static void set_shortened_ref(struct repository *r, struct strbuf *buf, const ch
free(s); free(s);
} }


static int branch_interpret_allowed(const char *refname, unsigned allowed) static int branch_interpret_allowed(const char *refname,
enum interpret_branch_kind allowed)
{ {
if (!allowed) if (!allowed)
return 1; return 1;

11
object-name.h
View File

@ -101,9 +101,12 @@ int set_disambiguate_hint_config(const char *var, const char *value);
* If the input was ok but there are not N branch switches in the * If the input was ok but there are not N branch switches in the
* reflog, it returns 0. * reflog, it returns 0.
*/ */
#define INTERPRET_BRANCH_LOCAL (1<<0) enum interpret_branch_kind {
#define INTERPRET_BRANCH_REMOTE (1<<1) INTERPRET_BRANCH_LOCAL = (1 << 0),
#define INTERPRET_BRANCH_HEAD (1<<2) INTERPRET_BRANCH_REMOTE = (1 << 1),
INTERPRET_BRANCH_HEAD = (1 << 2),
};

struct interpret_branch_name_options { struct interpret_branch_name_options {
/* /*
* If "allowed" is non-zero, it is a treated as a bitfield of allowable * If "allowed" is non-zero, it is a treated as a bitfield of allowable
@ -111,7 +114,7 @@ struct interpret_branch_name_options {
* ("refs/remotes/"), or "HEAD". If no "allowed" bits are set, any expansion is * ("refs/remotes/"), or "HEAD". If no "allowed" bits are set, any expansion is
* allowed, even ones to refs outside of those namespaces. * allowed, even ones to refs outside of those namespaces.
*/ */
unsigned allowed; enum interpret_branch_kind allowed;


/* /*
* If ^{upstream} or ^{push} (or equivalent) is requested, and the * If ^{upstream} or ^{push} (or equivalent) is requested, and the

3
refs.c
View File

@ -740,7 +740,8 @@ static char *substitute_branch_name(struct repository *r,
return NULL; return NULL;
} }


void copy_branchname(struct strbuf *sb, const char *name, unsigned allowed) void copy_branchname(struct strbuf *sb, const char *name,
enum interpret_branch_kind allowed)
{ {
int len = strlen(name); int len = strlen(name);
struct interpret_branch_name_options options = { struct interpret_branch_name_options options = {

3
refs.h
View File

@ -1,6 +1,7 @@
#ifndef REFS_H #ifndef REFS_H
#define REFS_H #define REFS_H


#include "object-name.h"
#include "commit.h" #include "commit.h"
#include "repository.h" #include "repository.h"
#include "repo-settings.h" #include "repo-settings.h"
@ -225,7 +226,7 @@ char *repo_default_branch_name(struct repository *r, int quiet);
* repo_interpret_branch_name() for details. * repo_interpret_branch_name() for details.
*/ */
void copy_branchname(struct strbuf *sb, const char *name, void copy_branchname(struct strbuf *sb, const char *name,
unsigned allowed); enum interpret_branch_kind allowed);


/* /*
* Like copy_branchname() above, but confirm that the result is * Like copy_branchname() above, but confirm that the result is