[PATCH] Permit refspec source side to parse as a sha1
From: Daniel Barkalow <hidden>
Date: 2016-06-15 22:44:24
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: Daniel Barkalow <hidden>
Date: 2016-06-15 22:44:24
Subsystem:
the rest · Maintainer:
Linus Torvalds
This fixes "git push origin HEAD~1:foo". "git fetch origin HEAD~1:foo" will report "Couldn't find remote ref HEAD~1", while "git fetch origin HEAD**1:foo" reports "Invalid refspec 'HEAD**1:foo'" That is, HEAD~1 is something you're not allowed to ask the remote for, while HEAD**1 doesn't mean anything. Signed-off-by: Daniel Barkalow <redacted> --- Note that this actually tries to look up the source side, so "git fetch origin HEAD^3:foo" usually gives a wrongish error message. But this only applies to error cases which nobody is likely to attempt anyway, and they still come out as errors regardless. remote.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/remote.c b/remote.c
index 9700a33..d737579 100644
--- a/remote.c
+++ b/remote.c@@ -434,8 +434,10 @@ struct refspec *parse_ref_spec(int nr_refspec, const char **refspec) rs[i].src = xstrndup(sp, ep - sp); if (*rs[i].src) { + unsigned char sha1[20]; st = check_ref_format(rs[i].src); - if (st && st != CHECK_REF_FORMAT_ONELEVEL) + if (st && st != CHECK_REF_FORMAT_ONELEVEL && + get_sha1(rs[i].src, sha1)) die("Invalid refspec '%s'", refspec[i]); } if (rs[i].dst && *rs[i].dst) {
--
1.5.4.3.610.gea6cd