summaryrefslogtreecommitdiff
path: root/sys/src/cmd/git
diff options
context:
space:
mode:
authorOri Bernstein <ori@eigenstate.org>2022-06-11 17:48:20 +0000
committerOri Bernstein <ori@eigenstate.org>2022-06-11 17:48:20 +0000
commit3e176bd975492427b232308e37ff51e7389d08e7 (patch)
treeaf253ebfaa005123277d5352c8bc3f7c57701648 /sys/src/cmd/git
parentbb33663b402060b6664d3a1829daad0e44fa9af0 (diff)
git/pack: add support for skipping ssh signatures
ssh signatures confused our commit parsing; teach our commit parsing to skip them.
Diffstat (limited to 'sys/src/cmd/git')
-rw-r--r--sys/src/cmd/git/pack.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sys/src/cmd/git/pack.c b/sys/src/cmd/git/pack.c
index 41eac2262..05492e9f9 100644
--- a/sys/src/cmd/git/pack.c
+++ b/sys/src/cmd/git/pack.c
@@ -884,6 +884,7 @@ parsecommit(Object *o)
}else if(strcmp(buf, "gpgsig") == 0){
/* just drop it */
if((t = strstr(p, "-----END PGP SIGNATURE-----")) == nil)
+ if((t = strstr(p, "-----END SSH SIGNATURE-----")) == nil)
sysfatal("malformed gpg signature");
np -= t - p;
p = t;