Allow "check-ref-format --branch" from subdirectory

jrn · gitster · commit 49cc460d88f5 · 2010-08-06T10:01:45.000-07:00
check-ref-format --branch requires access to the repository
to resolve refs like @{-1}.

Noticed by Nguyễn Thái Ngọc Duy.

Cc: Nguyễn Thái Ngọc Duy &lt;pclouds@gmail.com&gt;
Signed-off-by: Jonathan Nieder &lt;jrnieder@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin/check-ref-format.c b/builtin/check-ref-format.c
@@ -36,7 +36,9 @@ static void collapse_slashes(char *dst, const char *src)
 static int check_ref_format_branch(const char *arg)
 {
 	struct strbuf sb = STRBUF_INIT;
+	int nongit;
 
+	setup_git_directory_gently(&nongit);
 	if (strbuf_check_branch_ref(&sb, arg))
 		die("'%s' is not a valid branch name", arg);
 	printf("%s\n", sb.buf + 11);
diff --git a/t/t1402-check-ref-format.sh b/t/t1402-check-ref-format.sh
@@ -41,6 +41,23 @@ test_expect_success "check-ref-format --branch @{-1}" '
 	refname2=$(git check-ref-format --branch @{-2}) &&
 	test "$refname2" = master'
 
+test_expect_success 'check-ref-format --branch from subdir' '
+	mkdir subdir &&
+
+	T=$(git write-tree) &&
+	sha1=$(echo A | git commit-tree $T) &&
+	git update-ref refs/heads/master $sha1 &&
+	git update-ref refs/remotes/origin/master $sha1
+	git checkout master &&
+	git checkout origin/master &&
+	git checkout master &&
+	refname=$(
+		cd subdir &&
+		git check-ref-format --branch @{-1}
+	) &&
+	test "$refname" = "$sha1"
+'
+
 valid_ref_normalized() {
 	test_expect_success "ref name '$1' simplifies to '$2'" "
 		refname=\$(git check-ref-format --print '$1') &&

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,9 @@ static void collapse_slashes(char dst, const char src)`
`36`	`36`	`static int check_ref_format_branch(const char *arg)`
`37`	`37`	`{`
`38`	`38`	`struct strbuf sb = STRBUF_INIT;`
	`39`	`+ int nongit;`
`39`	`40`
	`41`	`+ setup_git_directory_gently(&nongit);`
`40`	`42`	`if (strbuf_check_branch_ref(&sb, arg))`
`41`	`43`	`die("'%s' is not a valid branch name", arg);`
`42`	`44`	`printf("%s\n", sb.buf + 11);`