Travis-CI gives error when running 'git pull --depth=1000' #2407

Closed
opened 2015-04-17 16:05:51 +00:00 by daira · 2 comments
daira commented 2015-04-17 16:05:51 +00:00
Owner
(https://travis-ci.org/tahoe-lafs/tahoe-lafs/jobs/58640491) (for pull request <https://github.com/tahoe-lafs/tahoe-lafs/pull/153> ).
tahoe-lafs added the
dev-infrastructure
major
defect
1.10.0
labels 2015-04-17 16:05:51 +00:00
tahoe-lafs added this to the soon (release n/a) milestone 2015-04-17 16:05:51 +00:00
daira commented 2015-04-17 16:06:21 +00:00
Author
Owner
$ 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
* [tag]new allmydata-tahoe-1.10.0 -> allmydata-tahoe-1.10.0
[...]
* [tag]new 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.
``` $ 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 * [tag]new allmydata-tahoe-1.10.0 -> allmydata-tahoe-1.10.0 [...] * [tag]new 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. ```
exarkun commented 2020-01-17 16:14:33 +00:00
Author
Owner

No idea when or why this happens. If it happens again we can re-open. Ultimately we'll probably move away from Travis, though.

No idea when or why this happens. If it happens again we can re-open. Ultimately we'll probably move away from Travis, though.
tahoe-lafs added the
cannot reproduce
label 2020-01-17 16:14:33 +00:00
exarkun closed this issue 2020-01-17 16:14:33 +00:00
Sign in to join this conversation.
No project
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: tahoe-lafs/trac-2024-07-25#2407
No description provided.