Merge pull request libgit2#4699 from nelhage/fetch-null-dst

pks-t · web-flow · commit 8a00de0899dc · 2018-07-06T10:47:06.000Z
git_refspec_transform: Handle NULL dst
diff --git a/src/refspec.c b/src/refspec.c
@@ -277,7 +277,7 @@ int git_refspec_transform(git_buf *out, const git_refspec *spec, const char *nam
 	}
 
 	if (!spec->pattern)
-		return git_buf_puts(out, spec->dst);
+		return git_buf_puts(out, spec->dst ? spec->dst : "");
 
 	return refspec_transform(out, spec->src, spec->dst, name);
 }
diff --git a/tests/network/refspecs.c b/tests/network/refspecs.c
@@ -111,6 +111,11 @@ void test_network_refspecs__transform_mid_star(void)
 	assert_valid_transform("refs/*:refs/*", "refs/heads/master", "refs/heads/master");
 }
 
+void test_network_refspecs__no_dst(void)
+{
+	assert_valid_transform("refs/heads/master:", "refs/heads/master", "");
+}
+
 static void assert_invalid_transform(const char *refspec, const char *name)
 {
 	git_refspec spec;

Original file line number	Diff line number	Diff line change
`@@ -277,7 +277,7 @@ int git_refspec_transform(git_buf out, const git_refspec spec, const char *nam`
`277`	`277`	`}`
`278`	`278`
`279`	`279`	`if (!spec->pattern)`
`280`		`- return git_buf_puts(out, spec->dst);`
	`280`	`+ return git_buf_puts(out, spec->dst ? spec->dst : "");`
`281`	`281`
`282`	`282`	`return refspec_transform(out, spec->src, spec->dst, name);`
`283`	`283`	`}`
Original file line number	Diff line number	Diff line change
`@@ -111,6 +111,11 @@ void test_network_refspecs__transform_mid_star(void)`
`111`	`111`	`assert_valid_transform("refs/:refs/", "refs/heads/master", "refs/heads/master");`
`112`	`112`	`}`
`113`	`113`
	`114`	`+void test_network_refspecs__no_dst(void)`
	`115`	`+{`
	`116`	`+ assert_valid_transform("refs/heads/master:", "refs/heads/master", "");`
	`117`	`+}`
	`118`	`+`
`114`	`119`	`static void assert_invalid_transform(const char refspec, const char name)`
`115`	`120`	`{`
`116`	`121`	`git_refspec spec;`