diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-04-06 00:43:44 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-06 00:43:44 -0700 |
| commit | fbdc05661d9b732d06c47ccb3d5836d0d1b563e5 (patch) | |
| tree | b5e7e00ca449758d6244a382a27e9b967286787a /strbuf.h | |
| parent | Merge branch 'jc/shared-literally' (diff) | |
| parent | Don't permit ref/branch names to end with ".lock" (diff) | |
| download | tgif-fbdc05661d9b732d06c47ccb3d5836d0d1b563e5.tar.xz | |
Merge branch 'jc/name-branch'
* jc/name-branch:
Don't permit ref/branch names to end with ".lock"
check_ref_format(): tighten refname rules
strbuf_check_branch_ref(): a helper to check a refname for a branch
Fix branch -m @{-1} newname
check-ref-format --branch: give Porcelain a way to grok branch shorthand
strbuf_branchname(): a wrapper for branch name shorthands
Rename interpret/substitute nth_last_branch functions
Conflicts:
Documentation/git-check-ref-format.txt
Diffstat (limited to 'strbuf.h')
| -rw-r--r-- | strbuf.h | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -131,4 +131,7 @@ extern int strbuf_getline(struct strbuf *, FILE *, int); extern void stripspace(struct strbuf *buf, int skip_comments); extern int launch_editor(const char *path, struct strbuf *buffer, const char *const *env); +extern int strbuf_branchname(struct strbuf *sb, const char *name); +extern int strbuf_check_branch_ref(struct strbuf *sb, const char *name); + #endif /* STRBUF_H */ |