Ne vem, zakaj ne morem odjaviti veje, na kateri sem delal prej. Glej spodnje ukaze (opomba: co
je vzdevek za checkout
):
ramon@ramon-desktop:~/source/unstilted$ git branch -a
* develop
feature/datts_right
feature/user_controlled_menu
feature/user_controlled_site_layouts
master
remotes/origin/HEAD -> origin/master
remotes/origin/develop
remotes/origin/feature/datts_right
remotes/origin/master
ramon@ramon-desktop:~/source/unstilted$ git co feature/user_controlled_site_layouts
error: pathspec 'feature/user_controlled_site_layouts' did not match any file(s) known to git.
Nisem prepričan, kaj to pomeni, in ne morem najti ničesar, kar bi razumel, v Googlu.
Kako naj preverim to vejo in kaj sem morda storil, da sem to prekinil?
DOPOLNITEV:
Našel sem to objavo in poganjanje git show-ref
mi da:
97e2cb33914e763ff92bbe38531d3fd02408da46 refs/heads/develop
c438c439c66da3f2356d2449505c073549b221c1 refs/heads/feature/datts_right
11a90dae8897ceed318700b9af3019f4b4dceb1e refs/heads/feature/user_controlled_menu
c889b37a5ee690986935c9c74b71999e2cf3c6d7 refs/heads/master
c889b37a5ee690986935c9c74b71999e2cf3c6d7 refs/remotes/origin/HEAD
e7c17eb40610505eea4e6687e4572191216ad4c6 refs/remotes/origin/develop
c438c439c66da3f2356d2449505c073549b221c1 refs/remotes/origin/feature/datts_right
c889b37a5ee690986935c9c74b71999e2cf3c6d7 refs/remotes/origin/master
23768aa5425cbf29d10ff24274adad42d90d15cc refs/stash
e572cf91e95da03f04a5e51820f58a7306ce01de refs/tags/menu_shows_published_only
429ebaa895d9d41d835a34da72676caa75902e3d refs/tags/slow_dev
DODATEK o imeniku .git
(mapa user_controlled_site_layouts
je v mapi refs/heads/feature
):
$ ls .git/refs/heads/feature/
datts_right user_controlled_menu user_controlled_site_layouts
$ cat .git/refs/heads/feature/user_controlled_site_layouts
3af84fcf1508c44013844dcd0998a14e61455034
DODATEK na git show 3af84fcf1508c44013844dcd0998a14e61455034
$ git show 3af84fcf1508c44013844dcd0998a14e61455034
commit 3af84fcf1508c44013844dcd0998a14e61455034
Author: Ramon Tayag <[email protected]>
Date: Thu May 12 19:00:03 2011 +0800
Removed site layouts migration
diff --git a/db/schema.rb b/db/schema.rb
index 1218fc8..2040b9f 100755
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
#
# It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20110511012647) do
+ActiveRecord::Schema.define(:version => 20110503040056) do
create_table "attachments", :force => true do |t|
t.string "name"
@@ -205,15 +205,6 @@ ActiveRecord::Schema.define(:version => 20110511012647) do
t.integer "old_id"
end
- create_table "site_layouts", :force => true do |t|
- t.string "name"
- t.text "description"
- t.text "content"
- t.integer "site_id"
- t.datetime "created_at"
- t.datetime "updated_at"
- end
-
create_table "site_styles", :force => true do |t|
t.text "published"
t.datetime "created_at"
Poskusite git fetch
, da bo vaše lokalno skladišče dobilo vse nove informacije z githuba. Prevzame samo informacije o novih vejah, ne pa tudi dejanske kode. Potem bo git checkout
deloval brez težav.
To napako sem dobil za vejo, ki je bila oddaljena in ni imela lokalne veje za sledenje. Čeprav sem prepričan, da sem oddaljene veje preveril s preprostim
git checkout feature/foo
v preteklosti, sem moral, da bi se izognil tej napaki
git checkout -t -b feature/foo origin/feature/foo
Nimam pojma, kaj sem storil, da sem se znašel v tej situaciji.
$ cat .git/refs/heads/feature/user_controlled_site_layouts
3af84fcf1508c44013844dcd0998a14e61455034
Ali lahko potrdite, da naslednje deluje:
$ git show 3af84fcf1508c44013844dcd0998a14e61455034
Lahko se zgodi, da je nekdo prepisal zgodovino in da ta oddaja ne obstaja več (ne glede na razlog).