Merge branch 'jx/do-not-crash-receive-pack-wo-head'

gitster · gitster · commit 0baebca51eba · 2015-08-03T11:01:31.000-07:00
An attempt to delete a ref by pushing into a repositorywhose HEAD
symbolic reference points at an unborn branch that cannot be
created due to ref D/F conflict (e.g. refs/heads/a/b exists, HEAD
points at refs/heads/a) failed.

* jx/do-not-crash-receive-pack-wo-head:
  receive-pack: crash when checking with non-exist HEAD
diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
@@ -933,7 +933,7 @@ static const char *update(struct command *cmd, struct shallow_info *si)
 			return "deletion prohibited";
 		}
 
-		if (!strcmp(namespaced_name, head_name)) {
+		if (head_name && !strcmp(namespaced_name, head_name)) {
 			switch (deny_delete_current) {
 			case DENY_IGNORE:
 				break;

Original file line number	Diff line number	Diff line change
`@@ -933,7 +933,7 @@ static const char update(struct command cmd, struct shallow_info *si)`
`933`	`933`	`return "deletion prohibited";`
`934`	`934`	`}`
`935`	`935`
`936`		`- if (!strcmp(namespaced_name, head_name)) {`
	`936`	`+ if (head_name && !strcmp(namespaced_name, head_name)) {`
`937`	`937`	`switch (deny_delete_current) {`
`938`	`938`	`case DENY_IGNORE:`
`939`	`939`	`break;`