diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-08-03 11:01:31 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-08-03 11:01:31 -0700 |
| commit | 0baebca51eba05dd3c3e9edf18fc49c67b55503f (patch) | |
| tree | 0b73980dac06af9d2eaf5f377e1a8ca1ab1db841 | |
| parent | 0c5470652861da01d0cff99d5bcd15cefba693f2 (diff) | |
| parent | b112b14d7869bf3c000abb84cd22e57dd811d031 (diff) | |
| download | git-0baebca51eba05dd3c3e9edf18fc49c67b55503f.tar.gz | |
Merge branch 'jx/do-not-crash-receive-pack-wo-head'
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
| -rw-r--r-- | builtin/receive-pack.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c index 4ced2eba3c..e6b93d0264 100644 --- 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; |