Advertisement
Shishire

Git Being Weird

Apr 30th, 2012
388
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 5.60 KB | None | 0 0
  1. Shishire@Blasphemy:~$ git clone https://github.com/Shishire/AtomForge.git
  2. Cloning into 'AtomForge'...
  3. remote: Counting objects: 57, done.
  4. remote: Compressing objects: 100% (31/31), done.
  5. remote: Total 57 (delta 19), reused 51 (delta 13)
  6. Unpacking objects: 100% (57/57), done.
  7. Shishire@Blasphemy:~$ cd AtomForge/
  8. Shishire@Blasphemy:~/AtomForge$ git pull
  9. Your configuration specifies to merge with the ref 'master'
  10. from the remote, but no such ref was fetched.
  11. Shishire@Blasphemy:~/AtomForge$ git --version
  12. git version 1.7.9
  13. Shishire@Blasphemy:~/AtomForge$ uname -a
  14. CYGWIN_NT-6.1-WOW64 Blasphemy 1.7.14(0.260/5/3) 2012-04-25 09:41 i686 Cygwin
  15. Shishire@Blasphemy:~/AtomForge$ git fetch
  16. Shishire@Blasphemy:~/AtomForge$ git branch -a
  17. * master
  18. remotes/origin/HEAD -> origin/master
  19. remotes/origin/develop
  20. remotes/origin/master
  21. Shishire@Blasphemy:~/AtomForge$ cat .git
  22. .git/ .gitignore
  23. Shishire@Blasphemy:~/AtomForge$ cat .git
  24. .git/ .gitignore
  25. Shishire@Blasphemy:~/AtomForge$ cat .git/config
  26. [core]
  27. repositoryformatversion = 0
  28. filemode = true
  29. bare = false
  30. logallrefupdates = true
  31. ignorecase = true
  32. [remote "origin"]
  33. fetch = +refs/heads/*:refs/remotes/origin/*
  34. url = https://github.com/Shishire/AtomForge.git
  35. [branch "master"]
  36. remote = origin
  37. merge = refs/heads/master
  38. Shishire@Blasphemy:~/AtomForge$ git branch -vv
  39. * master 204ef9e [origin/master] v0.2
  40. Shishire@Blasphemy:~/AtomForge$ git show @{u}
  41. commit 204ef9ea59920e6ec25d9568b78af9460fff8b1f
  42. Merge: 593ea39 42a8f35
  43. Author: Scrubbed <scrubbed@example.com>
  44. Date: Wed Apr 11 14:38:58 2012 -0400
  45.  
  46. v0.2
  47.  
  48. Merge branch 'develop'
  49.  
  50. Shishire@Blasphemy:~/AtomForge$ git pull origin master
  51. From https://github.com/Shishire/AtomForge
  52. * branch master -> FETCH_HEAD
  53. There are no candidates for merging among the refs that you just fetched.
  54. Generally this means that you provided a wildcard refspec which had no
  55. matches on the remote end.
  56. Shishire@Blasphemy:~/AtomForge$ git merge origin/master
  57. Already up-to-date.
  58. Shishire@Blasphemy:~/AtomForge$ git config --list
  59. core.excludesfile=/home/Shishire/.global_ignore
  60. user.name=Scrubbed
  61. user.email=scrubbed@example.com
  62. core.repositoryformatversion=0
  63. core.filemode=true
  64. core.bare=false
  65. core.logallrefupdates=true
  66. core.ignorecase=true
  67. remote.origin.fetch=+refs/heads/*:refs/remotes/origin/*
  68. remote.origin.url=https://github.com/Shishire/AtomForge.git
  69. branch.master.remote=origin
  70. branch.master.merge=refs/heads/master
  71. Shishire@Blasphemy:~/AtomForge$ echo $GIT_WORK_TREE; echo $GIT_DIR;
  72.  
  73.  
  74. Shishire@Blasphemy:~/AtomForge$ GIT_TRACE=1 git pull
  75. trace: exec: 'git-pull'
  76. trace: run_command: 'git-pull'
  77. trace: built-in: git 'rev-parse' '--git-dir'
  78. trace: built-in: git 'rev-parse' '--is-bare-repository'
  79. trace: built-in: git 'rev-parse' '--show-toplevel'
  80. trace: built-in: git 'ls-files' '-u'
  81. trace: built-in: git 'symbolic-ref' '-q' 'HEAD'
  82. trace: built-in: git 'config' '--bool' 'branch.master.rebase'
  83. trace: built-in: git 'config' '--bool' 'pull.rebase'
  84. trace: built-in: git 'rev-parse' '-q' '--verify' 'HEAD'
  85. trace: built-in: git 'fetch' '--update-head-ok'
  86. trace: run_command: 'git-remote-https' 'origin' 'https://github.com/Shishire/AtomForge.git'
  87. trace: run_command: 'rev-list' '--verify-objects' '--stdin' '--not' '--all' '--quiet'
  88. trace: run_command: 'rev-list' '--verify-objects' '--stdin' '--not' '--all'
  89. trace: exec: 'git' 'rev-list' '--verify-objects' '--stdin' '--not' '--all'
  90. trace: built-in: git 'rev-list' '--verify-objects' '--stdin' '--not' '--all'
  91. trace: built-in: git 'rev-parse' '-q' '--verify' 'HEAD'
  92. trace: built-in: git 'config' 'branch.master.merge'
  93. trace: built-in: git 'config' 'branch.master.remote'
  94. Your configuration specifies to merge with the ref 'master'
  95. from the remote, but no such ref was fetched.
  96. Shishire@Blasphemy:~/AtomForge$ echo $GIT_INDEX_FILE
  97.  
  98. Shishire@Blasphemy:~/AtomForge$ GIT_TRACE=1 git pull origin master
  99. trace: exec: 'git-pull' 'origin' 'master'
  100. trace: run_command: 'git-pull' 'origin' 'master'
  101. trace: built-in: git 'rev-parse' '--git-dir'
  102. trace: built-in: git 'rev-parse' '--is-bare-repository'
  103. trace: built-in: git 'rev-parse' '--show-toplevel'
  104. trace: built-in: git 'ls-files' '-u'
  105. trace: built-in: git 'symbolic-ref' '-q' 'HEAD'
  106. trace: built-in: git 'config' '--bool' 'branch.master.rebase'
  107. trace: built-in: git 'config' '--bool' 'pull.rebase'
  108. trace: built-in: git 'rev-parse' '-q' '--verify' 'HEAD'
  109. trace: built-in: git 'fetch' '--update-head-ok' 'origin' 'master'
  110. trace: run_command: 'git-remote-https' 'origin' 'https://github.com/Shishire/AtomForge.git'
  111. trace: run_command: 'rev-list' '--verify-objects' '--stdin' '--not' '--all' '--quiet'
  112. trace: run_command: 'rev-list' '--verify-objects' '--stdin' '--not' '--all'
  113. trace: exec: 'git' 'rev-list' '--verify-objects' '--stdin' '--not' '--all'
  114. trace: built-in: git 'rev-list' '--verify-objects' '--stdin' '--not' '--all'
  115. From https://github.com/Shishire/AtomForge
  116. * branch master -> FETCH_HEAD
  117. trace: built-in: git 'rev-parse' '-q' '--verify' 'HEAD'
  118. trace: built-in: git 'config' 'branch.master.merge'
  119. trace: built-in: git 'config' 'branch.master.remote'
  120. There are no candidates for merging among the refs that you just fetched.
  121. Generally this means that you provided a wildcard refspec which had no
  122. matches on the remote end.
  123. Shishire@Blasphemy:~/AtomForge$ git ls-remote
  124. From https://github.com/Shishire/AtomForge.git
  125. 204ef9ea59920e6ec25d9568b78af9460fff8b1f HEAD
  126. 42a8f35419268bebb4342db14633f0803f7e74d8 refs/heads/develop
  127. 204ef9ea59920e6ec25d9568b78af9460fff8b1f refs/heads/master
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement