Skip to content

Commit

Permalink
Merge branch 'connoropolous-kilnhgcopies-fix'
Browse files Browse the repository at this point in the history
* connoropolous-kilnhgcopies-fix:
  Removed redundant if guard in hg gpg garbage removal
  handle hg converted gpg lines

closes #62
  • Loading branch information
notatestuser committed Jun 30, 2015
2 parents f7bd0f1 + 6958dd5 commit 4731bbc
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion src/commit.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,17 @@ module.exports = class Commit
gpgsig.push lines.shift()
gpgsig.push lines.shift()

# if converted from mercurial gpgsig may be present with non-valid gpg lines
# e.g. "kilnhgcopies646973742F2E6874616363657373 6170702F2E6874616363657373"
# see https://github.com/notatestuser/gift/pull/62
while /^kilnhgcopies/.test lines[0]
lines.shift()

# not doing anything with this yet, but it's sometimes there
if /^encoding/.test lines[0]
encoding = _.last lines.shift().split(" ")

lines.shift()
lines.shift() if lines.length

message_lines = []
while /^ {4}/.test lines[0]
Expand Down

0 comments on commit 4731bbc

Please sign in to comment.