[ARVADOS] updated: 95000b5d6bb4264533a1770346342c8fd3dbe61a

[Git user]

Summary of changes:
 services/api/app/models/commit.rb            | 53 +++++++++++++++++++++++-----
 services/api/test/helpers/git_test_helper.rb | 13 +++----
 services/api/test/unit/commit_test.rb        | 49 +++++++++++++++++++++++++
 3 files changed, 101 insertions(+), 14 deletions(-)

       via  95000b5d6bb4264533a1770346342c8fd3dbe61a (commit)
       via  596534ddcb185b668aa293316e0543012a4f38f2 (commit)
       via  4e85a19e6746eec88885926b87495e729f631d3a (commit)
       via  b7b42350dec7aba073df13c9cd82bafe19a9f594 (commit)
       via  ae931becad1e90bcecd47c6d51dc04eee632d1f5 (commit)
       via  b1b8942ee0190343dd815b895f49d3894d7f2702 (commit)
       via  71ad589048fec9da45253ac4480085ac5b8f5048 (commit)
       via  3854e6bfcd5344bce5ee0388248cb115e3c5e902 (commit)
       via  bd5a371cc0f57aea20c0954f532db5890dae5c59 (commit)
       via  32341a4777692a28358f2af5afa0d9e975e2da73 (commit)
      from  57e0d92cc8482ac4b88ba8ec48d53e67a5d79fbb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 95000b5d6bb4264533a1770346342c8fd3dbe61a
Merge: 57e0d92 596534d
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Wed Sep 20 09:57:31 2017 -0400

    Merge branch '12107-faster-git'
    
    closes #12107
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>


commit 596534ddcb185b668aa293316e0543012a4f38f2
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Wed Sep 20 09:54:47 2017 -0400

    12107: Add protective comment.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/services/api/app/models/commit.rb b/services/api/app/models/commit.rb
index 959a9f2..b0efbc7 100644
--- a/services/api/app/models/commit.rb
+++ b/services/api/app/models/commit.rb
@@ -173,6 +173,11 @@ class Commit < ActiveRecord::Base
         branch = m[1]
         must_git(dst_gitdir,
                  "fetch file://#{src_gitdir.shellescape} #{branch.shellescape}")
+        # Even if all of the above steps succeeded, we might still not
+        # have the right commit due to a race, in which case tag_cmd
+        # will fail, and we'll need to fall back to pack|unpack. So
+        # don't be tempted to condense this tag_cmd and the one in the
+        # rescue block into a single attempt.
         must_git(dst_gitdir, tag_cmd)
       rescue GitError
         must_pipe("echo #{sha1.shellescape}",

-----------------------------------------------------------------------


hooks/post-receive
--