dco 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4042d36b9143f9362c730993c832d62ca63eaa4
-  data.tar.gz: 96077d5e9ba80c887785f2b48ae3e3200e9f5a12
+  metadata.gz: f839540539866426b2c722e80c2a72c907a9cb38
+  data.tar.gz: c8f73facb60d4e5c0afc3ecdbf3032e99aa35b4f
 SHA512:
-  metadata.gz: 2d5bf65726338dfe996282d97fe321a1e2b7b63bdc24d96ffe38771db1d053f422fe98ff68e5d0b095bfa7fe0edcc20e2eb72bc66dcb4f4cac5a675d01bc862f
-  data.tar.gz: 94aca9b9c75faa86b99f046d063da9a63343f28fb13d65a5af83bb2add7cfb1ef5b4f29abceafc2814d35d30c0affb8f350046b462e51f3f27864cfdf7a63d59
+  metadata.gz: f77eb6ce065e377e3a426d2561894d7c683fff67589f31f83d80d08a3451280e905d0d8bc4ec08cbc8f36efc0be003166ad037a94a184e86791ae128397d0c3e
+  data.tar.gz: a00efa56e1b0447ec1f75c6113fe2691d89740fcd0e13da05a23995cce43e543536bf377869852f3efd3e17bbf737e26ace767ff63ba037453adad2c88a6daa5

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # DCO Changelog
 
+## v1.0.1
+
+* Fix `dco sign` when there is a backup ref from a different branch than the
+  current one.
+
 ## v1.0.0
 
 * Initial release!

data/lib/dco/cli.rb

@@ -196,16 +196,17 @@ EOH
       end
 
       # First check for a stored ref under refs/original/.
-      begin
-        repo.show("refs/original/refs/heads/#{branch}")
-        # If this doesn't error, a backup ref is present.
-        unless confirm?("An existing backup of branch #{branch} is present from a previous filter-branch. Do you want to remove this backup and continue? [yes/no]")
-          raise Thor::Error.new('Backup ref present, not continuing')
-        end
-        # Clear the backup.
-        File.unlink(".git/refs/original/refs/heads/#{branch}")
-      rescue Git::GitExecuteError
-        # This means there was no backup, keep going.
+      backup_refs = Dir[File.join(repo.repo.path, 'refs/original/refs/heads/*')]
+      backup_refs_label = if backup_refs.size > 1
+        "branches #{backup_refs.map {|p| File.basename(p) }.join(', ')} are"
+      else
+        "branch #{backup_refs.first} is"
+      end
+      unless backup_refs.empty? || confirm?("An existing backup of #{backup_refs_label} present from a previous filter-branch. Do you want to remove this backup and continue? [yes/no]")
+        raise Thor::Error.new('Backup ref present, not continuing')
+      end
+      backup_refs.each do |ref|
+        File.unlink(ref)
       end
 
       # Next examine all the commits we will be touching.

data/lib/dco/version.rb

@@ -17,5 +17,5 @@
 
 module Dco
   # dco gem version.
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/spec/sign_spec.rb

@@ -201,6 +201,25 @@ describe 'dco sign' do
     end
   end # /context with an existing backup pointer
 
+  context 'with an existing backup pointer from a different branch' do
+    before do
+      command 'echo three > testing && git commit -a -m "first branch commit"'
+      dco_command 'sign -y mybranch'
+      command 'git checkout -b mybranch2 && echo four > testing && git commit -a -m "second branch commit"'
+    end
+    dco_command 'sign -y mybranch2'
+
+    it do
+      expect(subject.exitstatus).to eq 0
+      expect(subject.stdout).to match /^Developer's Certificate of Origin 1\.1$/
+      expect(subject.stdout).to match /^Going to sign-off the following commits:\n\* \h{7} Alan Smithee <asmithee@example\.com> second branch commit$/
+      expect(repo.log[0].message).to eq "second branch commit\n\nSigned-off-by: Alan Smithee <asmithee@example.com>"
+      expect(repo.log[1].message).to eq "first branch commit\n\nSigned-off-by: Alan Smithee <asmithee@example.com>"
+      expect(repo.log[2].message).to eq "second commit"
+      expect(repo.log[3].message).to eq "first commit"
+    end
+  end # /context with an existing backup pointer from a different branch
+
   context 'with an existing backup pointer without -y' do
     before do
       command 'echo three > testing && git commit -a -m "first branch commit"'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dco
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Noah Kantrowitz