mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not allow ".lock" at the end of any refname component

Browse Source 
Allowing any refname component to end with ".lock" is looking for
trouble; for example,

    $ git br foo.lock/bar
    $ git br foo
    fatal: Unable to create '[...]/.git/refs/heads/foo.lock': File exists.

Therefore, do not allow any refname component to end with ".lock".

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Michael Haggerty
2011-09-15 23:10:27 +02:00
committed by Junio C Hamano
parent 49295d4e3f
commit 7e9d2fe960
3 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
refs.c
View File

@ -898,6 +898,8 @@ static int check_refname_component(const char *ref)
return -1; /* Component has zero length. */
if (ref[0] == '.')
return -1; /* Component starts with '.'. */
if (cp - ref >= 5 && !memcmp(cp - 5, ".lock", 5))
return -1; /* Refname ends with ".lock". */
return cp - ref;
}
@ -931,8 +933,6 @@ int check_refname_format(const char *ref, int flags)
if (ref[component_len - 1] == '.')
return -1; /* Refname ends with '.'. */
if (component_len >= 5 && !memcmp(&ref[component_len - 5], ".lock", 5))
return -1; /* Refname ends with ".lock". */
if (!(flags & REFNAME_ALLOW_ONELEVEL) && component_count < 2)
return -1; /* Refname has only one component. */
return 0;