Skip to content

Instantly share code, notes, and snippets.

@sebbdk
Created April 3, 2012 14:12
Show Gist options
  • Select an option

  • Save sebbdk/2292300 to your computer and use it in GitHub Desktop.

Select an option

Save sebbdk/2292300 to your computer and use it in GitHub Desktop.
www-data @ access.office.nodesnoc.net [ /home/kj/www/slimbooth/htdocs/app ] (master=)
-> pico app_controller.php
www-data @ access.office.nodesnoc.net [ /home/kj/www/slimbooth/htdocs/app ] (master *=)
-> git add . && git commit -m "bumb"
[master c83b165] bumb
1 files changed, 1 insertions(+), 1 deletions(-)
www-data @ access.office.nodesnoc.net [ /home/kj/www/slimbooth/htdocs/app ] (master>)
-> git push
Counting objects: 7, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (4/4), done.
Writing objects: 100% (4/4), 337 bytes, done.
Total 4 (delta 3), reused 0 (delta 0)
To git@git.nodesnoc.net:2011/slimbooth.git
02630f9..c83b165 master -> master
! [rejected] production -> production (non-fast-forward)
error: failed to push some refs to 'git@git.nodesnoc.net:2011/slimbooth.git'
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes (e.g. 'git pull') before pushing again. See the
'Note about fast-forwards' section of 'git push --help' for details.
www-data @ access.office.nodesnoc.net [ /home/kj/www/slimbooth/htdocs/app ] (master=)
-> git pull
Already up-to-date.
www-data @ access.office.nodesnoc.net [ /home/kj/www/slimbooth/htdocs/app ] (master=)
-> git push
To git@git.nodesnoc.net:2011/slimbooth.git
! [rejected] production -> production (non-fast-forward)
error: failed to push some refs to 'git@git.nodesnoc.net:2011/slimbooth.git'
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes (e.g. 'git pull') before pushing again. See the
'Note about fast-forwards' section of 'git push --help' for details.
www-data @ access.office.nodesnoc.net [ /home/kj/www/slimbooth/htdocs/app ] (master=)
-> git push origin master
Everything up-to-date
www-data @ access.office.nodesnoc.net [ /home/kj/www/slimbooth/htdocs/app ] (master=)
-> git branch
* master
production
www-data @ access.office.nodesnoc.net [ /home/kj/www/slimbooth/htdocs/app ] (master=)
-> git pull origin master
From git.nodesnoc.net:2011/slimbooth
* branch master -> FETCH_HEAD
Already up-to-date.
www-data @ access.office.nodesnoc.net [ /home/kj/www/slimbooth/htdocs/app ] (master=)
-> git pull origin master:production
From git.nodesnoc.net:2011/slimbooth
c83d393..c83b165 master -> production
Already up-to-date.
www-data @ access.office.nodesnoc.net [ /home/kj/www/slimbooth/htdocs/app ] (master=)
-> git push origin master:production
Total 0 (delta 0), reused 0 (delta 0)
To git@git.nodesnoc.net:2011/slimbooth.git
02630f9..c83b165 master -> production
www-data @ access.office.nodesnoc.net [ /home/kj/www/slimbooth/htdocs/app ] (master=)
-> git config -l
user.email=kj@nodes.dk
user.name=Kasper Jensen
core.repositoryformatversion=0
core.filemode=true
core.bare=false
core.logallrefupdates=true
remote.origin.fetch=+refs/heads/*:refs/remotes/origin/*
remote.origin.url=git@git.nodesnoc.net:2011/slimbooth.git
branch.master.remote=origin
branch.master.merge=refs/heads/master
submodule.cake.url=git@github.com:nodesagency/cakephp.git
submodule.core.url=git@github.com:nodesagency/core.git
remote.backend.url=git@git.nodesnoc.net:2011/backend.git
remote.backend.fetch=+refs/heads/*:refs/remotes/backend/*
www-data @ access.office.nodesnoc.net [ /home/kj/www/slimbooth/htdocs/app ] (master=)
-> git remote rm origin
www-data @ access.office.nodesnoc.net [ /home/kj/www/slimbooth/htdocs/app ] (master)
-> git remote add git@git.ournodes.com:projects/slimbooth.git
usage: git remote add [<options>] <name> <url>
-f, --fetch fetch the remote branches
--tags import all tags and associated objects when fetching
or do not fetch any tag at all (--no-tags)
-t, --track <branch> branch(es) to track
-m, --master <branch>
master branch
--mirror no separate remotes
www-data @ access.office.nodesnoc.net [ /home/kj/www/slimbooth/htdocs/app ] (master)
-> git remote add origin git@git.ournodes.com:projects/slimbooth.git
www-data @ access.office.nodesnoc.net [ /home/kj/www/slimbooth/htdocs/app ] (master)
-> git config -l
user.email=kj@nodes.dk
user.name=Kasper Jensen
core.repositoryformatversion=0
core.filemode=true
core.bare=false
core.logallrefupdates=true
submodule.cake.url=git@github.com:nodesagency/cakephp.git
submodule.core.url=git@github.com:nodesagency/core.git
remote.backend.url=git@git.nodesnoc.net:2011/backend.git
remote.backend.fetch=+refs/heads/*:refs/remotes/backend/*
remote.origin.url=git@git.ournodes.com:projects/slimbooth.git
remote.origin.fetch=+refs/heads/*:refs/remotes/origin/*
www-data @ access.office.nodesnoc.net [ /home/kj/www/slimbooth/htdocs/app ] (master)
-> git push origin master:produciton
Initialized empty Git repository in /home/git/repositories/projects/slimbooth.git/
Counting objects: 693, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (476/476), done.
Writing objects: 100% (693/693), 11.42 MiB | 4.63 MiB/s, done.
Total 693 (delta 205), reused 615 (delta 177)
remote: ---------------------------------------------------------------
remote: Nodes awesome git shell
remote:
remote: Pushing to refs/heads/produciton
remote:
remote: Not pushing to production.... doing nothing
remote:
remote: ---------------------------------------------------------------
remote: done
To git@git.ournodes.com:projects/slimbooth.git
* [new branch] master -> produciton
www-data @ access.office.nodesnoc.net [ /home/kj/www/slimbooth/htdocs/app ] (master)
-> git push origin master:production
Total 0 (delta 0), reused 0 (delta 0)
remote: ---------------------------------------------------------------
remote: Nodes awesome git shell
remote:
remote: Pushing to refs/heads/production
remote:
remote: Deploying version 0 for project slimbooth
remote: --> Bundle file does not exist
remote: --> Checking out commit c83b165a73da459127783d89e1e9b4a0845f79f8
remote: ----> git clone
remote: --> stdout: Cloning into ....
remote: --> stdout: done.
remote: ----> git fetch
remote: ----> git reset
remote: --> stdout: HEAD is now at c83b165 bumb
remote: ----> git submodules update
remote: --> stdout: Submodule 'cake' (git@git.nodesnoc.net:core/cakephp.git) registered for path 'cake'
remote: --> stdout: Submodule 'core' (git@git.nodesnoc.net:core/backend.git) registered for path 'core'
remote: --> stdout: Cloning into cake...
remote: --> Error: --> stderr: Host key verification failed.
remote: --> Error: --> stderr: fatal: The remote end hung up unexpectedly
remote: --> Error: --> stderr: Clone of 'git@git.nodesnoc.net:core/cakephp.git' into submodule path 'cake' failed
remote: --> Error: Failed to initialize submodules!
remote: Array
remote: (
remote: [stdout] => Submodule 'cake' (git@git.nodesnoc.net:core/cakephp.git) registered for path 'cake'
remote: Submodule 'core' (git@git.nodesnoc.net:core/backend.git) registered for path 'core'
remote: Cloning into cake...
remote:
remote: [stderr] => Host key verification failed.
remote: fatal: The remote end hung up unexpectedly
remote: Clone of 'git@git.nodesnoc.net:core/cakephp.git' into submodule path 'cake' failed
remote:
remote: [exit_code] => 1
remote: [command] => git submodule update --init --recursive
remote: [cwd] => /opt/nodes/checkouts/slimbooth/htdocs
remote: [env] => Array
remote: (
remote: [GIT_DIR] => /opt/nodes/checkouts/slimbooth/htdocs/.git
remote: )
remote:
remote: )
remote: --> Error: 1
remote: PHP Fatal error: Uncaught exception 'nodes\checkout\Exception' in /var/www/manager/htdocs/app/libs/nodes/checkout/builder.php:92
remote: Stack trace:
remote: #0 /var/www/manager/htdocs/app/libs/nodes/deploy/manager.php(80): nodes\checkout\Builder->build()
remote: #1 /var/www/manager/htdocs/app/vendors/shells/git.php(170): nodes\deploy\Manager->deploy(false, false)
remote: #2 /var/www/manager/htdocs/app/vendors/shells/git.php(149): GitShell->_deploy(Object(nodes\site\Configuration))
remote: #3 /var/www/manager/htdocs/cake/console/cake.php(373): GitShell->post_receive()
remote: #4 /var/www/manager/htdocs/cake/console/cake.php(139): ShellDispatcher->dispatch()
remote: #5 /var/www/manager/htdocs/cake/console/cake.php(666): ShellDispatcher->ShellDispatcher(Array)
remote: #6 {main}
remote: thrown in /var/www/manager/htdocs/app/libs/nodes/checkout/builder.php on line 92
remote: done
To git@git.ournodes.com:projects/slimbooth.git
* [new branch] master -> production
www-data @ access.office.nodesnoc.net [ /home/kj/www/slimbooth/htdocs/app ] (master)
-> git pull
You asked me to pull without telling me which branch you
want to merge with, and 'branch.master.merge' in
your configuration file does not tell me, either. Please
specify which branch you want to use on the command line and
try again (e.g. 'git pull <repository> <refspec>').
See git-pull(1) for details.
If you often merge with the same branch, you may want to
use something like the following in your configuration file:
[branch "master"]
remote = <nickname>
merge = <remote-ref>
[remote "<nickname>"]
url = <url>
fetch = <refspec>
See git-config(1) for details.
www-data @ access.office.nodesnoc.net [ /home/kj/www/slimbooth/htdocs/app ] (master)
-> git pull oriing master
fatal: 'oriing' does not appear to be a git repository
fatal: The remote end hung up unexpectedly
www-data @ access.office.nodesnoc.net [ /home/kj/www/slimbooth/htdocs/app ] (master)
-> git pull origin master
fatal: Couldn't find remote ref master
fatal: The remote end hung up unexpectedly
www-data @ access.office.nodesnoc.net [ /home/kj/www/slimbooth/htdocs/app ] (master)
-> git branch
* master
production
www-data @ access.office.nodesnoc.net [ /home/kj/www/slimbooth/htdocs/app ] (master)
-> git pull origin
You asked to pull from the remote 'origin', but did not specify
a branch. Because this is not the default configured remote
for your current branch, you must specify a branch on the command line.
www-data @ access.office.nodesnoc.net [ /home/kj/www/slimbooth/htdocs/app ] (master)
-> git pull origin master
fatal: Couldn't find remote ref master
fatal: The remote end hung up unexpectedly
www-
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment