[tahoe-lafs-trac-stream] [Tahoe-LAFS] #2407: Travis-CI gives error when running 'git pull --depth=1000'

[Tahoe-LAFS]

#2407: Travis-CI gives error when running 'git pull --depth=1000'
------------------------------------+--------------------------------
     Reporter:  daira               |      Owner:
         Type:  defect              |     Status:  new
     Priority:  major               |  Milestone:  soon (release n/a)
    Component:  dev-infrastructure  |    Version:  1.10.0
   Resolution:                      |   Keywords:  error travis-ci
Launchpad Bug:                      |
------------------------------------+--------------------------------

Comment (by daira):

 {{{
 1.76s$ git pull --depth=1000

 remote: Counting objects: 6586, done.

 remote: Compressing objects: 100% (2327/2327), done.

 remote: Total 6586 (delta 4656), reused 6115 (delta 4216), pack-reused 0

 Receiving objects: 100% (6586/6586), 2.44 MiB | 0 bytes/s, done.

 Resolving deltas: 100% (4656/4656), completed with 245 local objects.

 remote: Counting objects: 6, done.

 remote: Compressing objects: 100% (6/6), done.

 remote: Total 6 (delta 0), reused 6 (delta 0), pack-reused 0

 Unpacking objects: 100% (6/6), done.

 From git://github.com/tahoe-lafs/tahoe-lafs

 * [new tag] allmydata-tahoe-1.10.0 -> allmydata-tahoe-1.10.0

 * [new tag] allmydata-tahoe-1.10.0b2 -> allmydata-tahoe-1.10.0b2

 * [new tag] allmydata-tahoe-1.10.0c1 -> allmydata-tahoe-1.10.0c1

 * [new tag] allmydata-tahoe-1.10.0c2 -> allmydata-tahoe-1.10.0c2

 * [new tag] allmydata-tahoe-1.10a1 -> allmydata-tahoe-1.10a1

 * [new tag] allmydata-tahoe-1.10a2 -> allmydata-tahoe-1.10a2

 * [new tag] allmydata-tahoe-1.10b1 -> allmydata-tahoe-1.10b1

 * [new tag] allmydata-tahoe-1.8.2 -> allmydata-tahoe-1.8.2

 * [new tag] allmydata-tahoe-1.8.2b1 -> allmydata-tahoe-1.8.2b1

 * [new tag] allmydata-tahoe-1.9.0 -> allmydata-tahoe-1.9.0

 * [new tag] allmydata-tahoe-1.9.0a1 -> allmydata-tahoe-1.9.0a1

 * [new tag] allmydata-tahoe-1.9.0a2 -> allmydata-tahoe-1.9.0a2

 * [new tag] allmydata-tahoe-1.9.0b1 -> allmydata-tahoe-1.9.0b1

 * [new tag] post-393 -> post-393

 * [new tag] pre-393 -> pre-393

 * [new tag] trac-5000 -> trac-5000

 * [new tag] trac-5200 -> trac-5200

 Auto-merging misc/build_helpers/build-osx-pkg.sh

 CONFLICT (add/add): Merge conflict in misc/build_helpers/build-osx-pkg.sh

 Automatic merge failed; fix conflicts and then commit the result.

 The command "git pull --depth=1000" failed and exited with 1 during .

 Your build has been stopped.
 }}}

--
Ticket URL: <https://tahoe-lafs.org/trac/tahoe-lafs/ticket/2407#comment:1>
Tahoe-LAFS <https://Tahoe-LAFS.org>
secure decentralized storage