Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(localgit): Remove and then add git remote #818

Merged
merged 1 commit into from
Jan 23, 2018

Conversation

davidxia
Copy link
Contributor

@davidxia davidxia commented Jan 23, 2018

If we run git remote add upstream when upstream already
exists, we get the annoying output fatal: remote upstream already exists.
for every component.

Run git remote remove upstream first to avoid printing this error.
This also mimics the behavior of the newer git command git remote set-url that we use when git is above a certain version.

If we run `git remote add upstream` when `upstream` already
exists, we get the annoying output `fatal: remote upstream already exists.`
for every component.

Run `git remote remove upstream` first to avoid printing this error.
This also mimics the behavior of the newer git command `git remote
set-url` that we use when git is above a certain version.
@davidxia
Copy link
Contributor Author

Example of current output of hal deploy apply.

+ Preperation complete... deploying Spinnaker
23:26:49.495 [main] INFO com.netflix.spinnaker.halyard.core.job.v1.JobExecutorLocal - Scheduling job [/home/dxia/.hal/default/prep.sh] with id e6749641-032b-490f-9503-71e32f1c7264
23:26:49.507 [main] DEBUG com.netflix.spinnaker.halyard.core.job.v1.JobExecutorLocal - Polling state for e6749641-032b-490f-9503-71e32f1c7264...
23:26:49.508 [RxComputationThreadPool-1] INFO com.netflix.spinnaker.halyard.core.job.v1.JobExecutorLocal - Executing e6749641-032b-490f-9503-71e32f1c7264with tokenized command: [/home/dxia/.hal/default/prep.sh]
~/dev/spinnaker ~
~/dev/spinnaker/clouddriver ~/dev/spinnaker ~
fatal: remote upstream already exists.
23:26:49.609 [main] DEBUG com.netflix.spinnaker.halyard.core.job.v1.JobExecutorLocal - Polling state for e6749641-032b-490f-9503-71e32f1c7264...
23:26:49.810 [main] DEBUG com.netflix.spinnaker.halyard.core.job.v1.JobExecutorLocal - Polling state for e6749641-032b-490f-9503-71e32f1c7264...
23:26:50.210 [main] DEBUG com.netflix.spinnaker.halyard.core.job.v1.JobExecutorLocal - Polling state for e6749641-032b-490f-9503-71e32f1c7264...
No changes to stash in clouddriver
HEAD is now at efff92e... Added EcsCloudMetricProvider and EcsCloudMetricController. (#2294)
~/dev/spinnaker ~
~
~/dev/spinnaker ~
~/dev/spinnaker/deck ~/dev/spinnaker ~
fatal: remote upstream already exists.
23:26:51.012 [main] DEBUG com.netflix.spinnaker.halyard.core.job.v1.JobExecutorLocal - Polling state for e6749641-032b-490f-9503-71e32f1c7264...
23:26:52.012 [main] DEBUG com.netflix.spinnaker.halyard.core.job.v1.JobExecutorLocal - Polling state for e6749641-032b-490f-9503-71e32f1c7264...
No changes to stash in deck
HEAD is now at 43385be... chore(core): bump package to 0.0.131
~/dev/spinnaker ~
~
~/dev/spinnaker ~
~/dev/spinnaker/echo ~/dev/spinnaker ~
fatal: remote upstream already exists.
23:26:53.012 [main] DEBUG com.netflix.spinnaker.halyard.core.job.v1.JobExecutorLocal - Polling state for e6749641-032b-490f-9503-71e32f1c7264...
No changes to stash in echo
HEAD is now at d2ca66b... fix(pubsub): Add payload to pubsub triggers. (#221)
~/dev/spinnaker ~
~
~/dev/spinnaker ~
~/dev/spinnaker/fiat ~/dev/spinnaker ~
fatal: remote upstream already exists.
23:26:54.012 [main] DEBUG com.netflix.spinnaker.halyard.core.job.v1.JobExecutorLocal - Polling state for e6749641-032b-490f-9503-71e32f1c7264...
No changes to stash in fiat
HEAD is now at 032c78a... fix(roles): ensure UserRolesSyncer always refreshes anonymous user
~/dev/spinnaker ~
~
~/dev/spinnaker ~
~/dev/spinnaker/front50 ~/dev/spinnaker ~
fatal: remote upstream already exists.
23:26:55.013 [main] DEBUG com.netflix.spinnaker.halyard.core.job.v1.JobExecutorLocal - Polling state for e6749641-032b-490f-9503-71e32f1c7264...
No changes to stash in front50
HEAD is now at ed0eb92... feat(migration): Adds migrator for trigger constraints. (#299)
~/dev/spinnaker ~

Copy link
Member

@lwander lwander left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@lwander lwander merged commit 244e875 into spinnaker:master Jan 23, 2018
@davidxia davidxia deleted the patch1 branch January 23, 2018 14:40
davidxia added a commit to davidxia/halyard that referenced this pull request Jan 24, 2018
The remote "upstream" might not exist. Do not fail if so.

fixes bug introduced in spinnaker#818
lwander pushed a commit that referenced this pull request Jan 24, 2018
The remote "upstream" might not exist. Do not fail if so.

fixes bug introduced in #818
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants