summaryrefslogtreecommitdiff
path: root/git-rebase.sh
diff options
context:
space:
mode:
authorSteffen Prohaska <prohaska@zib.de>2007-11-11 14:01:46 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-11-19 02:39:00 (GMT)
commit79803322c1d8d2f74e1a53d44f363d878180e0f5 (patch)
treea0eab3ca833809dfd8f00893ca305de98038593c /git-rebase.sh
parent47d996a20c3347bb9efbb44e8ed2d615cfdffba3 (diff)
downloadgit-79803322c1d8d2f74e1a53d44f363d878180e0f5.zip
git-79803322c1d8d2f74e1a53d44f363d878180e0f5.tar.gz
git-79803322c1d8d2f74e1a53d44f363d878180e0f5.tar.bz2
add refname_match()
We use at least two rulesets for matching abbreviated refnames with full refnames (starting with 'refs/'). git-rev-parse and git-fetch use slightly different rules. This commit introduces a new function refname_match (const char *abbrev_name, const char *full_name, const char **rules). abbrev_name is expanded using the rules and matched against full_name. If a match is found the function returns true. rules is a NULL-terminate list of format patterns with "%.*s", for example: const char *ref_rev_parse_rules[] = { "%.*s", "refs/%.*s", "refs/tags/%.*s", "refs/heads/%.*s", "refs/remotes/%.*s", "refs/remotes/%.*s/HEAD", NULL }; Asterisks are included in the format strings because this is the form required in sha1_name.c. Sharing the list with the functions there is a good idea to avoid duplicating the rules. Hopefully this facilitates unified matching rules in the future. This commit makes the rules used by rev-parse for resolving refs to sha1s available for string comparison. Before this change, the rules were buried in get_sha1*() and dwim_ref(). A follow-up commit will refactor the rules used by fetch. refname_match() will be used for matching refspecs in git-send-pack. Thanks to Daniel Barkalow <barkalow@iabervon.org> for pointing out that ref_matches_abbrev in remote.c solves a similar problem and care should be taken to avoid confusion. Signed-off-by: Steffen Prohaska <prohaska@zib.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-rebase.sh')
0 files changed, 0 insertions, 0 deletions