githug 0.2.7 → 0.2.8

data/README.md

@@ -9,7 +9,7 @@ To install Githug
 
     gem install githug
 
-After the gem is installed, you can run `githug` where you will be prompted to create a directory.  Githug should work on Linux and OS X.
+After the gem is installed, you can run `githug` where you will be prompted to create a directory.  Githug should work on Linux, OS X and Windows.
 
 ## Commands
 

data/levels/bisect/.githug/COMMIT_EDITMSG

@@ -0,0 +1 @@
+Another Commit

data/levels/bisect/.githug/ORIG_HEAD

@@ -1 +1 @@
-bfb16eec1081387b586dc8009ef422cfff60b622
+f351ca63a759f56bb26924fd566294eb23455c71

data/levels/bisect/.githug/config

@@ -3,3 +3,5 @@
 	filemode = true
 	bare = false
 	logallrefupdates = true
+[pack]
+	deltaCacheSize = 1

data/levels/bisect/.githug/gitk.cache

@@ -0,0 +1,3 @@
+1 1
+f351ca63a759f56bb26924fd566294eb23455c71 f608824888b83bbedc1f658be7496ffea467a8fb {7f8406e742c5281ec2c9bc3c6cc69dc6ba5311fd 36da01fb0571360b0e1170f0cb46e74f72927cda c1b80f5ed4995cda8e19027f0776351af6b76703 4145057e11ab90109c95882b1f40d560da408bfa 94e162b505bc2290fb67764357a625192f8a4e8a bfb16eec1081387b586dc8009ef422cfff60b622 c0a1cdff8dd63948a5fc41f5871681c5b133c053 e8dd08d5aabb62b56c80320672cd8d42e2b8954d 89d27c5f4680cd21028947be75c33a68511decb9 98d617d3bdf0b6c59d6177233acb4b9fd54b7aac 0b194f30d6867522d1666590087e6c0b5e20dc93 d406b1b8bc269c9aef9127299e83947220e7a9b0 f608824888b83bbedc1f658be7496ffea467a8fb}
+1

data/levels/bisect/.githug/info/refs

@@ -2,4 +2,8 @@
 bfb16eec1081387b586dc8009ef422cfff60b622	refs/bisect/good-bfb16eec1081387b586dc8009ef422cfff60b622
 c0a1cdff8dd63948a5fc41f5871681c5b133c053	refs/bisect/good-c0a1cdff8dd63948a5fc41f5871681c5b133c053
 f608824888b83bbedc1f658be7496ffea467a8fb	refs/bisect/good-f608824888b83bbedc1f658be7496ffea467a8fb
-f351ca63a759f56bb26924fd566294eb23455c71	refs/heads/master
+12628f463f4c722695bf0e9d603c9411287885db	refs/heads/master
+32ae79196bd49a3416264970b0cd873e26bd1824	refs/tags/graetsch
+89d27c5f4680cd21028947be75c33a68511decb9	refs/tags/graetsch^{}
+2a5197909a0a1575145e0a40bb13dd54f5d6a9f7	refs/tags/orig_head
+f351ca63a759f56bb26924fd566294eb23455c71	refs/tags/orig_head^{}

data/levels/bisect/.githug/logs/HEAD

@@ -1,25 +1,21 @@
-0000000000000000000000000000000000000000 b066349076e2b71e3b71cfeb1ba88af99cc036f6 Robert Bittle <guywithnose@gmail.com> 1335144302 -0400	commit (initial): First commit
-b066349076e2b71e3b71cfeb1ba88af99cc036f6 15c915b17ee502c80df64aff04da024c17ac9da0 Robert Bittle <guywithnose@gmail.com> 1335144302 -0400	commit: Bad commit
-15c915b17ee502c80df64aff04da024c17ac9da0 d9882afd25595d7d6dc8ead68c68e4f00c94c9b2 Robert Bittle <guywithnose@gmail.com> 1335144302 -0400	commit: Second commit
-d9882afd25595d7d6dc8ead68c68e4f00c94c9b2 b066349076e2b71e3b71cfeb1ba88af99cc036f6 Robert Bittle <guywithnose@gmail.com> 1335144309 -0400	checkout: moving from master to b066349076e2b71e3b71cfeb1ba88af99cc036f6
-b066349076e2b71e3b71cfeb1ba88af99cc036f6 bed2d266fa44b56968a17f1e2d409b306032bd6d Robert Bittle <guywithnose@gmail.com> 1335144309 -0400	rebase -i (pick): Second commit
-bed2d266fa44b56968a17f1e2d409b306032bd6d b066349076e2b71e3b71cfeb1ba88af99cc036f6 Robert Bittle <guywithnose@gmail.com> 1335175555 -0400	HEAD~1: updating HEAD
-b066349076e2b71e3b71cfeb1ba88af99cc036f6 f608824888b83bbedc1f658be7496ffea467a8fb Robert Bittle <guywithnose@gmail.com> 1335177947 -0400	commit (amend): First commit
-f608824888b83bbedc1f658be7496ffea467a8fb d406b1b8bc269c9aef9127299e83947220e7a9b0 Robert Bittle <guywithnose@gmail.com> 1335178003 -0400	commit: Another Commit
-d406b1b8bc269c9aef9127299e83947220e7a9b0 0b194f30d6867522d1666590087e6c0b5e20dc93 Robert Bittle <guywithnose@gmail.com> 1335178095 -0400	commit: Another Commit
-0b194f30d6867522d1666590087e6c0b5e20dc93 98d617d3bdf0b6c59d6177233acb4b9fd54b7aac Robert Bittle <guywithnose@gmail.com> 1335178214 -0400	commit: Another Commit
-98d617d3bdf0b6c59d6177233acb4b9fd54b7aac 89d27c5f4680cd21028947be75c33a68511decb9 Robert Bittle <guywithnose@gmail.com> 1335178242 -0400	commit: Another Commit
-89d27c5f4680cd21028947be75c33a68511decb9 e8dd08d5aabb62b56c80320672cd8d42e2b8954d Robert Bittle <guywithnose@gmail.com> 1335178263 -0400	commit: Another Commit
-e8dd08d5aabb62b56c80320672cd8d42e2b8954d c0a1cdff8dd63948a5fc41f5871681c5b133c053 Robert Bittle <guywithnose@gmail.com> 1335178286 -0400	commit: Another Commit
-c0a1cdff8dd63948a5fc41f5871681c5b133c053 bfb16eec1081387b586dc8009ef422cfff60b622 Robert Bittle <guywithnose@gmail.com> 1335178306 -0400	commit: Another Commit
-bfb16eec1081387b586dc8009ef422cfff60b622 94e162b505bc2290fb67764357a625192f8a4e8a Robert Bittle <guywithnose@gmail.com> 1335178330 -0400	commit: Another Commit
-94e162b505bc2290fb67764357a625192f8a4e8a 4145057e11ab90109c95882b1f40d560da408bfa Robert Bittle <guywithnose@gmail.com> 1335178341 -0400	commit: Another Commit
-4145057e11ab90109c95882b1f40d560da408bfa c1b80f5ed4995cda8e19027f0776351af6b76703 Robert Bittle <guywithnose@gmail.com> 1335178357 -0400	commit: Another Commit
-c1b80f5ed4995cda8e19027f0776351af6b76703 36da01fb0571360b0e1170f0cb46e74f72927cda Robert Bittle <guywithnose@gmail.com> 1335178376 -0400	commit: Another Commit
-36da01fb0571360b0e1170f0cb46e74f72927cda 7f8406e742c5281ec2c9bc3c6cc69dc6ba5311fd Robert Bittle <guywithnose@gmail.com> 1335178390 -0400	commit: Another Commit
-7f8406e742c5281ec2c9bc3c6cc69dc6ba5311fd f351ca63a759f56bb26924fd566294eb23455c71 Robert Bittle <guywithnose@gmail.com> 1335178407 -0400	commit: Another Commit
-f351ca63a759f56bb26924fd566294eb23455c71 c0a1cdff8dd63948a5fc41f5871681c5b133c053 Robert Bittle <guywithnose@gmail.com> 1335178499 -0400	checkout: moving from master to c0a1cdff8dd63948a5fc41f5871681c5b133c053
-c0a1cdff8dd63948a5fc41f5871681c5b133c053 4145057e11ab90109c95882b1f40d560da408bfa Robert Bittle <guywithnose@gmail.com> 1335178506 -0400	checkout: moving from c0a1cdff8dd63948a5fc41f5871681c5b133c053 to 4145057e11ab90109c95882b1f40d560da408bfa
-4145057e11ab90109c95882b1f40d560da408bfa 94e162b505bc2290fb67764357a625192f8a4e8a Robert Bittle <guywithnose@gmail.com> 1335178506 -0400	checkout: moving from 4145057e11ab90109c95882b1f40d560da408bfa to 94e162b505bc2290fb67764357a625192f8a4e8a
-94e162b505bc2290fb67764357a625192f8a4e8a bfb16eec1081387b586dc8009ef422cfff60b622 Robert Bittle <guywithnose@gmail.com> 1335178506 -0400	checkout: moving from 94e162b505bc2290fb67764357a625192f8a4e8a to bfb16eec1081387b586dc8009ef422cfff60b622
-bfb16eec1081387b586dc8009ef422cfff60b622 f351ca63a759f56bb26924fd566294eb23455c71 Robert Bittle <guywithnose@gmail.com> 1335182458 -0400	reset: moving to master
+f351ca63a759f56bb26924fd566294eb23455c71 f608824888b83bbedc1f658be7496ffea467a8fb Florian Sesser <fs@it-agenten.com> 1348697815 +0200	reset: moving to f608824888b83bbedc1f658be7496ffea467a8fb
+f608824888b83bbedc1f658be7496ffea467a8fb f608824888b83bbedc1f658be7496ffea467a8fb Florian Sesser <fs@it-agenten.com> 1348697842 +0200	checkout: moving from master to hacklschorsch
+f608824888b83bbedc1f658be7496ffea467a8fb 80a9b3d94237f982b6c9052e6d56b930f18a4ef5 Florian Sesser <fs@it-agenten.com> 1348697952 +0200	cherry-pick: Another Commit
+80a9b3d94237f982b6c9052e6d56b930f18a4ef5 8c992afff5e16c97f4ef82d58671a3403d734086 Florian Sesser <fs@it-agenten.com> 1348697967 +0200	cherry-pick: Another Commit
+8c992afff5e16c97f4ef82d58671a3403d734086 49774ea84ae3723cc4fac75521435cc04d56b657 Florian Sesser <fs@it-agenten.com> 1348698291 +0200	cherry-pick: Another Commit
+49774ea84ae3723cc4fac75521435cc04d56b657 e060c0d789288fda946f91254672295230b2de9d Florian Sesser <fs@it-agenten.com> 1348698316 +0200	cherry-pick: Another Commit
+e060c0d789288fda946f91254672295230b2de9d ffb097e3edfa828afa565eeceee6b506b3f2a131 Florian Sesser <fs@it-agenten.com> 1348698720 +0200	commit: Another Commit
+ffb097e3edfa828afa565eeceee6b506b3f2a131 2e1735d5bef6db0f3e325051a179af280f05573a Florian Sesser <fs@it-agenten.com> 1348698824 +0200	commit: Another Commit
+2e1735d5bef6db0f3e325051a179af280f05573a ccddb96f824a0e929f5fecf55c0f4479552246f3 Florian Sesser <fs@it-agenten.com> 1348698884 +0200	commit: Another Commit
+ccddb96f824a0e929f5fecf55c0f4479552246f3 a530e7ed25173d0800cfe33cc8915e5929209b8e Florian Sesser <fs@it-agenten.com> 1348698911 +0200	commit: Another Commit
+a530e7ed25173d0800cfe33cc8915e5929209b8e fdbfc0d403e5ac0b2659cbfa2cbb061fcca0dc2a Florian Sesser <fs@it-agenten.com> 1348699468 +0200	commit: Another Commit
+fdbfc0d403e5ac0b2659cbfa2cbb061fcca0dc2a 5d1eb75377072c5c6e5a1b0ac4159181ecc4edff Florian Sesser <fs@it-agenten.com> 1348699592 +0200	commit: Another Commit
+5d1eb75377072c5c6e5a1b0ac4159181ecc4edff 9f54462abbb991b167532929b34118113aa6c52e Florian Sesser <fs@it-agenten.com> 1348699604 +0200	cherry-pick: Another Commit
+9f54462abbb991b167532929b34118113aa6c52e 7c03a99ba384572c216769f0273b5baf3ba83694 Florian Sesser <fs@it-agenten.com> 1348699614 +0200	cherry-pick: Another Commit
+7c03a99ba384572c216769f0273b5baf3ba83694 5db7a7cb90e745e2c9dbdd84810ccc7d91d92e72 Florian Sesser <fs@it-agenten.com> 1348699625 +0200	cherry-pick: Another Commit
+5db7a7cb90e745e2c9dbdd84810ccc7d91d92e72 18ed2ac1522a014412d4303ce7c8db39becab076 Florian Sesser <fs@it-agenten.com> 1348699635 +0200	cherry-pick: Another Commit
+18ed2ac1522a014412d4303ce7c8db39becab076 bb736ddd9b83d6296d23444a2ab3b0d2fa6dfb81 Florian Sesser <fs@it-agenten.com> 1348699648 +0200	cherry-pick: Another Commit
+bb736ddd9b83d6296d23444a2ab3b0d2fa6dfb81 888386c77c957dc52f3113f2483663e3132559d4 Florian Sesser <fs@it-agenten.com> 1348699657 +0200	cherry-pick: Another Commit
+888386c77c957dc52f3113f2483663e3132559d4 028763b396121e035f672ef5af75d2dcb1cc8146 Florian Sesser <fs@it-agenten.com> 1348699668 +0200	cherry-pick: Another Commit
+028763b396121e035f672ef5af75d2dcb1cc8146 979576184c5ec9667cf7593cf550c420378e960f Florian Sesser <fs@it-agenten.com> 1348699679 +0200	cherry-pick: Another Commit
+979576184c5ec9667cf7593cf550c420378e960f 12628f463f4c722695bf0e9d603c9411287885db Florian Sesser <fs@it-agenten.com> 1348699693 +0200	cherry-pick: Another Commit

data/levels/bisect/.githug/logs/refs/heads/master

@@ -1,19 +1,21 @@
-0000000000000000000000000000000000000000 b066349076e2b71e3b71cfeb1ba88af99cc036f6 Robert Bittle <guywithnose@gmail.com> 1335144302 -0400	commit (initial): First commit
-b066349076e2b71e3b71cfeb1ba88af99cc036f6 15c915b17ee502c80df64aff04da024c17ac9da0 Robert Bittle <guywithnose@gmail.com> 1335144302 -0400	commit: Bad commit
-15c915b17ee502c80df64aff04da024c17ac9da0 d9882afd25595d7d6dc8ead68c68e4f00c94c9b2 Robert Bittle <guywithnose@gmail.com> 1335144302 -0400	commit: Second commit
-d9882afd25595d7d6dc8ead68c68e4f00c94c9b2 bed2d266fa44b56968a17f1e2d409b306032bd6d Robert Bittle <guywithnose@gmail.com> 1335144309 -0400	rebase -i (finish): refs/heads/master onto b066349
-bed2d266fa44b56968a17f1e2d409b306032bd6d b066349076e2b71e3b71cfeb1ba88af99cc036f6 Robert Bittle <guywithnose@gmail.com> 1335175555 -0400	HEAD~1: updating HEAD
-b066349076e2b71e3b71cfeb1ba88af99cc036f6 f608824888b83bbedc1f658be7496ffea467a8fb Robert Bittle <guywithnose@gmail.com> 1335177947 -0400	commit (amend): First commit
-f608824888b83bbedc1f658be7496ffea467a8fb d406b1b8bc269c9aef9127299e83947220e7a9b0 Robert Bittle <guywithnose@gmail.com> 1335178003 -0400	commit: Another Commit
-d406b1b8bc269c9aef9127299e83947220e7a9b0 0b194f30d6867522d1666590087e6c0b5e20dc93 Robert Bittle <guywithnose@gmail.com> 1335178095 -0400	commit: Another Commit
-0b194f30d6867522d1666590087e6c0b5e20dc93 98d617d3bdf0b6c59d6177233acb4b9fd54b7aac Robert Bittle <guywithnose@gmail.com> 1335178214 -0400	commit: Another Commit
-98d617d3bdf0b6c59d6177233acb4b9fd54b7aac 89d27c5f4680cd21028947be75c33a68511decb9 Robert Bittle <guywithnose@gmail.com> 1335178242 -0400	commit: Another Commit
-89d27c5f4680cd21028947be75c33a68511decb9 e8dd08d5aabb62b56c80320672cd8d42e2b8954d Robert Bittle <guywithnose@gmail.com> 1335178263 -0400	commit: Another Commit
-e8dd08d5aabb62b56c80320672cd8d42e2b8954d c0a1cdff8dd63948a5fc41f5871681c5b133c053 Robert Bittle <guywithnose@gmail.com> 1335178286 -0400	commit: Another Commit
-c0a1cdff8dd63948a5fc41f5871681c5b133c053 bfb16eec1081387b586dc8009ef422cfff60b622 Robert Bittle <guywithnose@gmail.com> 1335178306 -0400	commit: Another Commit
-bfb16eec1081387b586dc8009ef422cfff60b622 94e162b505bc2290fb67764357a625192f8a4e8a Robert Bittle <guywithnose@gmail.com> 1335178330 -0400	commit: Another Commit
-94e162b505bc2290fb67764357a625192f8a4e8a 4145057e11ab90109c95882b1f40d560da408bfa Robert Bittle <guywithnose@gmail.com> 1335178341 -0400	commit: Another Commit
-4145057e11ab90109c95882b1f40d560da408bfa c1b80f5ed4995cda8e19027f0776351af6b76703 Robert Bittle <guywithnose@gmail.com> 1335178357 -0400	commit: Another Commit
-c1b80f5ed4995cda8e19027f0776351af6b76703 36da01fb0571360b0e1170f0cb46e74f72927cda Robert Bittle <guywithnose@gmail.com> 1335178376 -0400	commit: Another Commit
-36da01fb0571360b0e1170f0cb46e74f72927cda 7f8406e742c5281ec2c9bc3c6cc69dc6ba5311fd Robert Bittle <guywithnose@gmail.com> 1335178390 -0400	commit: Another Commit
-7f8406e742c5281ec2c9bc3c6cc69dc6ba5311fd f351ca63a759f56bb26924fd566294eb23455c71 Robert Bittle <guywithnose@gmail.com> 1335178407 -0400	commit: Another Commit
+0000000000000000000000000000000000000000 f608824888b83bbedc1f658be7496ffea467a8fb Florian Sesser <fs@it-agenten.com> 1348697842 +0200	branch: Created from HEAD
+f608824888b83bbedc1f658be7496ffea467a8fb 80a9b3d94237f982b6c9052e6d56b930f18a4ef5 Florian Sesser <fs@it-agenten.com> 1348697952 +0200	cherry-pick: Another Commit
+80a9b3d94237f982b6c9052e6d56b930f18a4ef5 8c992afff5e16c97f4ef82d58671a3403d734086 Florian Sesser <fs@it-agenten.com> 1348697967 +0200	cherry-pick: Another Commit
+8c992afff5e16c97f4ef82d58671a3403d734086 49774ea84ae3723cc4fac75521435cc04d56b657 Florian Sesser <fs@it-agenten.com> 1348698291 +0200	cherry-pick: Another Commit
+49774ea84ae3723cc4fac75521435cc04d56b657 e060c0d789288fda946f91254672295230b2de9d Florian Sesser <fs@it-agenten.com> 1348698316 +0200	cherry-pick: Another Commit
+e060c0d789288fda946f91254672295230b2de9d ffb097e3edfa828afa565eeceee6b506b3f2a131 Florian Sesser <fs@it-agenten.com> 1348698720 +0200	commit: Another Commit
+ffb097e3edfa828afa565eeceee6b506b3f2a131 2e1735d5bef6db0f3e325051a179af280f05573a Florian Sesser <fs@it-agenten.com> 1348698824 +0200	commit: Another Commit
+2e1735d5bef6db0f3e325051a179af280f05573a ccddb96f824a0e929f5fecf55c0f4479552246f3 Florian Sesser <fs@it-agenten.com> 1348698884 +0200	commit: Another Commit
+ccddb96f824a0e929f5fecf55c0f4479552246f3 a530e7ed25173d0800cfe33cc8915e5929209b8e Florian Sesser <fs@it-agenten.com> 1348698911 +0200	commit: Another Commit
+a530e7ed25173d0800cfe33cc8915e5929209b8e fdbfc0d403e5ac0b2659cbfa2cbb061fcca0dc2a Florian Sesser <fs@it-agenten.com> 1348699468 +0200	commit: Another Commit
+fdbfc0d403e5ac0b2659cbfa2cbb061fcca0dc2a 5d1eb75377072c5c6e5a1b0ac4159181ecc4edff Florian Sesser <fs@it-agenten.com> 1348699592 +0200	commit: Another Commit
+5d1eb75377072c5c6e5a1b0ac4159181ecc4edff 9f54462abbb991b167532929b34118113aa6c52e Florian Sesser <fs@it-agenten.com> 1348699604 +0200	cherry-pick: Another Commit
+9f54462abbb991b167532929b34118113aa6c52e 7c03a99ba384572c216769f0273b5baf3ba83694 Florian Sesser <fs@it-agenten.com> 1348699614 +0200	cherry-pick: Another Commit
+7c03a99ba384572c216769f0273b5baf3ba83694 5db7a7cb90e745e2c9dbdd84810ccc7d91d92e72 Florian Sesser <fs@it-agenten.com> 1348699625 +0200	cherry-pick: Another Commit
+5db7a7cb90e745e2c9dbdd84810ccc7d91d92e72 18ed2ac1522a014412d4303ce7c8db39becab076 Florian Sesser <fs@it-agenten.com> 1348699635 +0200	cherry-pick: Another Commit
+18ed2ac1522a014412d4303ce7c8db39becab076 bb736ddd9b83d6296d23444a2ab3b0d2fa6dfb81 Florian Sesser <fs@it-agenten.com> 1348699648 +0200	cherry-pick: Another Commit
+bb736ddd9b83d6296d23444a2ab3b0d2fa6dfb81 888386c77c957dc52f3113f2483663e3132559d4 Florian Sesser <fs@it-agenten.com> 1348699657 +0200	cherry-pick: Another Commit
+888386c77c957dc52f3113f2483663e3132559d4 028763b396121e035f672ef5af75d2dcb1cc8146 Florian Sesser <fs@it-agenten.com> 1348699668 +0200	cherry-pick: Another Commit
+028763b396121e035f672ef5af75d2dcb1cc8146 979576184c5ec9667cf7593cf550c420378e960f Florian Sesser <fs@it-agenten.com> 1348699679 +0200	cherry-pick: Another Commit
+979576184c5ec9667cf7593cf550c420378e960f 12628f463f4c722695bf0e9d603c9411287885db Florian Sesser <fs@it-agenten.com> 1348699693 +0200	cherry-pick: Another Commit
+12628f463f4c722695bf0e9d603c9411287885db 12628f463f4c722695bf0e9d603c9411287885db Florian Sesser <fs@it-agenten.com> 1348701064 +0200	Branch: renamed refs/heads/hacklschorsch to refs/heads/master

data/levels/bisect/.githug/objects/info/packs

@@ -1,2 +1,2 @@
-P pack-34f18db272b06cca4ff6cbbdbc96d496f6b28995.pack
+P pack-59fab357f3158a9640633de6a3326ed79a2b4fe6.pack
 

data/levels/bisect/.githug/packed-refs

@@ -3,4 +3,8 @@
 bfb16eec1081387b586dc8009ef422cfff60b622 refs/bisect/good-bfb16eec1081387b586dc8009ef422cfff60b622
 c0a1cdff8dd63948a5fc41f5871681c5b133c053 refs/bisect/good-c0a1cdff8dd63948a5fc41f5871681c5b133c053
 f608824888b83bbedc1f658be7496ffea467a8fb refs/bisect/good-f608824888b83bbedc1f658be7496ffea467a8fb
-f351ca63a759f56bb26924fd566294eb23455c71 refs/heads/master
+12628f463f4c722695bf0e9d603c9411287885db refs/heads/master
+32ae79196bd49a3416264970b0cd873e26bd1824 refs/tags/graetsch
+^89d27c5f4680cd21028947be75c33a68511decb9
+2a5197909a0a1575145e0a40bb13dd54f5d6a9f7 refs/tags/orig_head
+^f351ca63a759f56bb26924fd566294eb23455c71

data/levels/checkout_file.rb

@@ -1,6 +1,6 @@
 difficulty 3
 
-description "A file has been modified, but you don't want to keep the files.  Checkout the `config.rb` file from the last commit."
+description "A file has been modified, but you don't want to keep the modification.  Checkout the `config.rb` file from the last commit."
 
 setup do
   repo.init

data/levels/push.rb

@@ -0,0 +1,64 @@
+difficulty 3
+description "Your local master branch has diverged from " +
+  "the remote origin/master branch. Rebase your commit onto " +
+  "origin/master and push it to remote."
+
+setup do
+  # remember the working directory so we can come back to it later
+  cwd = Dir.pwd
+  # initialize another git repo to be used as a "remote"
+  tmpdir = Dir.mktmpdir
+
+  # local repo
+  repo.init
+
+  FileUtils.touch "file1"
+  repo.add        "file1"
+  repo.commit_all "First commit"
+
+  FileUtils.touch "file2"
+  repo.add        "file2"
+  repo.commit_all "Second commit"
+
+  # copy the repo to remote
+  FileUtils.cp_r ".", tmpdir
+  # add another file
+  FileUtils.touch "file3"
+  repo.add        "file3"
+  repo.commit_all "Third commit"
+
+  # remote repo
+  Dir.chdir tmpdir
+  repo.init
+  # make a 'non-bare' repo accept pushes
+  `git config receive.denyCurrentBranch ignore`
+
+  # add a different file and commit so remote and local would diverge
+  FileUtils.touch "file4"
+  repo.add        "file4"
+  repo.commit_all "Fourth commit"
+
+  # change back to original repo to set up a remote
+  Dir.chdir cwd
+  `git remote add origin #{tmpdir}/.git`
+  `git fetch origin`
+end
+
+solution do
+  repo.init
+  result = true
+
+  # Check the commits of the local branch and the branch are the same.
+  local_commits = repo.commits("master")
+  remote_commits = repo.commits("origin/master")
+  result = false unless local_commits.size == 4
+  local_commits.each_with_index do |commit, idx|
+    result &&= (commit.id == remote_commits[idx].id)
+  end
+
+  result
+end
+
+hint do
+  puts "Take a look at 'git fetch', 'git pull', and 'git push'"
+end

data/levels/rm_cached.rb

@@ -3,7 +3,7 @@ difficulty 2
 description "A file (deleteme.rb) has accidentally been added to your staging area, find out which file and remove it from the staging area.  *NOTE* Do not remove the file system, only from git."
 
 setup do
-  repo.init(false)
+  repo.init
   FileUtils.touch("deleteme.rb")
   repo.add(".gitignore")
   repo.add("deleteme.rb")

data/levels/stage_lines.rb

@@ -21,7 +21,7 @@ setup do
 end
 
 solution do
-  `git diff --no-color --staged` =~ /\+This change belongs to the first feature/ && `git diff --no-color` =~ /\+This change belongs to the second feature/
+  `git diff --no-ext-diff --no-color --staged` =~ /\+This change belongs to the first feature/ && `git diff --no-ext-diff --no-color` =~ /\+This change belongs to the second feature/
 end
 
 hint do

data/lib/githug/level.rb

@@ -4,9 +4,9 @@ module Githug
 
     LEVELS = [nil, "init", "add", "commit", "config", "clone",
               "clone_to_folder", "ignore", "status", "rm", "rm_cached",
-              "rename", "log", "tag",  "commit_ammend", "reset",
+              "rename", "log", "tag",  "commit_amend", "reset",
               "checkout_file", "remote", "remote_url", "pull", "remote_add",
-              "diff", "blame", "branch", "checkout", "branch_at", "merge",
+              "push", "diff", "blame", "branch", "checkout", "branch_at", "merge",
               "cherry-pick", "rename_commit", "squash", "merge_squash", "reorder",
               "bisect", "stage_lines", "find_old_branch", "revert", "restore",
               "contribute"]

data/lib/githug/repository.rb

@@ -31,8 +31,9 @@ module Githug
       !@grit.nil?
     end
 
-    def init(*args)
-      @grit = Grit::Repo.init(".")
+    # Initialize a Git repo. If the repo already exists, do nothing.
+    def init(location = ".")
+      @grit = Grit::Repo.init(location)
     end
 
     def method_missing(method, *args, &block)

data/lib/githug/version.rb

@@ -1,3 +1,3 @@
 module Githug
-  VERSION = "0.2.7"
+  VERSION = "0.2.8"
 end

data/spec/githug/repository_spec.rb

@@ -77,7 +77,7 @@ describe Githug::Repository do
     it "should not add and commit gitignore if prompted" do
       @repo = mock 
       Grit::Repo.should_receive(:init).with(".").and_return(@repo)
-      @repository.init(false)
+      @repository.init
     end
   end
 

metadata

@@ -2,7 +2,7 @@
 name: githug
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors: 
 - Gary Rennie
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-19 00:00:00 Z
+date: 2012-09-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -76,10 +76,12 @@ files:
 - githug.gemspec
 - levels/add.rb
 - levels/bisect.rb
+- levels/bisect/.githug/COMMIT_EDITMSG
 - levels/bisect/.githug/HEAD
 - levels/bisect/.githug/ORIG_HEAD
 - levels/bisect/.githug/config
 - levels/bisect/.githug/description
+- levels/bisect/.githug/gitk.cache
 - levels/bisect/.githug/hooks/applypatch-msg.sample
 - levels/bisect/.githug/hooks/commit-msg.sample
 - levels/bisect/.githug/hooks/post-commit.sample
@@ -96,8 +98,8 @@ files:
 - levels/bisect/.githug/logs/HEAD
 - levels/bisect/.githug/logs/refs/heads/master
 - levels/bisect/.githug/objects/info/packs
-- levels/bisect/.githug/objects/pack/pack-34f18db272b06cca4ff6cbbdbc96d496f6b28995.idx
-- levels/bisect/.githug/objects/pack/pack-34f18db272b06cca4ff6cbbdbc96d496f6b28995.pack
+- levels/bisect/.githug/objects/pack/pack-59fab357f3158a9640633de6a3326ed79a2b4fe6.idx
+- levels/bisect/.githug/objects/pack/pack-59fab357f3158a9640633de6a3326ed79a2b4fe6.pack
 - levels/bisect/.githug/packed-refs
 - levels/bisect/makefile
 - levels/bisect/prog.rb
@@ -192,7 +194,7 @@ files:
 - levels/clone.rb
 - levels/clone_to_folder.rb
 - levels/commit.rb
-- levels/commit_ammend.rb
+- levels/commit_amend.rb
 - levels/config.rb
 - levels/contribute.rb
 - levels/diff.rb
@@ -291,6 +293,7 @@ files:
 - levels/merge/file1
 - levels/merge_squash.rb
 - levels/pull.rb
+- levels/push.rb
 - levels/remote.rb
 - levels/remote_add.rb
 - levels/remote_url.rb