Rename gpg to pgp

Author: darkowlzz

plumbing/object/commit.go

@@ -33,8 +33,8 @@ type Commit struct {
 	// Committer is the one performing the commit, might be different from
 	// Author.
 	Committer Signature
-	// GPGSignature is the GPG signature of the commit.
-	GPGSignature string
+	// PGPSignature is the PGP signature of the commit.
+	PGPSignature string
 	// Message is the commit message, contains arbitrary text.
 	Message string
 	// TreeHash is the hash of the root tree of the commit.
@@ -152,30 +152,30 @@ func (c *Commit) Decode(o plumbing.EncodedObject) (err error) {
 	r := bufio.NewReader(reader)
 
 	var message bool
-	var gpgsig bool
+	var pgpsig bool
 	for {
 		line, err := r.ReadBytes('\n')
 		if err != nil && err != io.EOF {
 			return err
 		}
 
-		if gpgsig {
+		if pgpsig {
 			// Check if it's the end of a PGP signature.
 			if bytes.Contains(line, []byte(endpgp)) {
-				c.GPGSignature += string(endpgp) + "\n"
-				gpgsig = false
+				c.PGPSignature += endpgp + "\n"
+				pgpsig = false
 			} else {
 				// Trim the left padding.
 				line = bytes.TrimLeft(line, " ")
-				c.GPGSignature += string(line)
+				c.PGPSignature += string(line)
 			}
 			continue
 		}
 
 		// Check if it's the beginning of a PGP signature.
 		if bytes.Contains(line, []byte(beginpgp)) {
-			c.GPGSignature += string(beginpgp) + "\n"
-			gpgsig = true
+			c.PGPSignature += beginpgp + "\n"
+			pgpsig = true
 			continue
 		}
 
@@ -243,14 +243,14 @@ func (b *Commit) Encode(o plumbing.EncodedObject) error {
 		return err
 	}
 
-	if b.GPGSignature != "" {
-		if _, err = fmt.Fprint(w, "gpgsig"); err != nil {
+	if b.PGPSignature != "" {
+		if _, err = fmt.Fprint(w, "pgpsig"); err != nil {
 			return err
 		}
 
 		// Split all the signature lines and write with a left padding and
 		// newline at the end.
-		lines := strings.Split(b.GPGSignature, "\n")
+		lines := strings.Split(b.PGPSignature, "\n")
 		for _, line := range lines {
 			if _, err = fmt.Fprintf(w, " %s\n", line); err != nil {
 				return err

plumbing/object/commit_test.go

@@ -233,12 +233,12 @@ func (s *SuiteCommit) TestLongCommitMessageSerialization(c *C) {
 	c.Assert(decoded.Message, Equals, longMessage)
 }
 
-func (s *SuiteCommit) TestGPGSignatureSerialization(c *C) {
+func (s *SuiteCommit) TestPGPSignatureSerialization(c *C) {
 	encoded := &plumbing.MemoryObject{}
 	decoded := &Commit{}
 	commit := *s.Commit
 
-	gpgsignature := `-----BEGIN PGP SIGNATURE-----
+	pgpsignature := `-----BEGIN PGP SIGNATURE-----
 
 iQEcBAABAgAGBQJTZbQlAAoJEF0+sviABDDrZbQH/09PfE51KPVPlanr6q1v4/Ut
 LQxfojUWiLQdg2ESJItkcuweYg+kc3HCyFejeDIBw9dpXt00rY26p05qrpnG+85b
@@ -249,12 +249,12 @@ RUysgqjcpT8+iQM1PblGfHR4XAhuOqN5Fx06PSaFZhqvWFezJ28/CLyX5q+oIVk=
 =EFTF
 -----END PGP SIGNATURE-----
 `
-	commit.GPGSignature = gpgsignature
+	commit.PGPSignature = pgpsignature
 
 	err := commit.Encode(encoded)
 	c.Assert(err, IsNil)
 
 	err = decoded.Decode(encoded)
 	c.Assert(err, IsNil)
-	c.Assert(decoded.GPGSignature, Equals, gpgsignature)
+	c.Assert(decoded.PGPSignature, Equals, pgpsignature)
 }