EBC Exercise 16 git Workshop Version - Revision history

Popenhjc: /* Other Errors while using git */

2012-10-25T17:37:25Z

‎Other Errors while using git

Popenhjc: /* Other Errors while using git */

2012-10-25T17:11:40Z

‎Other Errors while using git

Popenhjc: /* Other Errors with using git */

2012-10-25T17:09:11Z

‎Other Errors with using git

Popenhjc at 17:08, 25 October 2012

2012-10-25T17:08:46Z

Popenhjc: /* Play with git locally */

2012-10-25T16:38:57Z

‎Play with git locally

Yoder: moved EBC Exercise 07c git Workshop Version to EBC Exercise 16 git Workshop Version

2012-07-17T19:29:06Z

moved EBC Exercise 07c git Workshop Version to EBC Exercise 16 git Workshop Version

Yoder: /* Play with git locally */

2012-06-11T14:32:59Z

‎Play with git locally

Yoder: Created new git exercise for Workshops

2012-06-11T14:25:33Z

Created new git exercise for Workshops

New page

[[Category:ECE497]]
{{YoderHead}}

'''[[git]]''' is a distributed revision control system with an emphasis on being fast. It was initially designed and developed by Linus Torvalds for Linux kernel development. The purpose of this lab is to get hands on experience with git to learn how it works and how to use it.

This is the workshop version of the exercise. It assumes git is already installed and the repository is already cloned.

Much of the material here has come from [http://progit.org/book/ Pro Git]. We'll be using [https://github.com/ github] to practice '''git'''ting.

== Update the git repository ==

Always before you start work on a git project, make sure you have the current version from github.

beagle$ '''cd ~/gitLearn'''
beagle$ '''git pull'''

== Play with git locally ==

* Edit <code>helloWorld.c</code> and add a <code>printf</code> with your name on it.
* stage and commit <code>helloWorld.c</code>. You may have to merge. Keep everyone else's name in the file.
* Push it to the repository

Here's how it is done.

beagle$ '''gedit helloWorld.c'''
beagle$ '''gcc helloWorld.c''' Make sure the file compiles and runs OK.
beagle$ '''./a.out''
beagle$ '''git status''' What's the status of helloWorld?
beagle$ '''git add'''
beagle$ '''git status''' What's the status now?
beagle$ '''git commit -m '''"''Put your own comment here''"
beagle$ '''git status''' What's the status now?
beagle$ '''git push''' This will send your repository to gethub

If the last '''git push''' give you error, it means someone else has changed the file on the repository and you need to get the new version before you can push. Do this

beagle$ '''git pull'''

git will try to merge the new version of the file with your version. It it's successful all you have to do is.

beagle$ '''gedit helloWord.c''' Do this to be sure the file looks OK.
beagle$ '''gcc helloWorld.c'''
beagle$ '''./a.out''' If it doesn't compile edit and fix it.
beagle$ '''git add'''
beagle$ '''git commit -m "''Another descriptive comment here''"'''
beagle$ ''' git push'''

If you are lucky, no one else has changed the file while you were working on it. If not, repeat the above steps.

== Moving from svn ==

[http://yehudakatz.com/2010/05/13/common-git-workflows/ Here's] a nice article on a common git workflow for those who are moving from svn.

{{YoderFoot}}

@@ Line 57: / Line 57: @@
 == Other Errors while using git ==
-If you run into a "'''fatal HTTP request failed'''" error you might have to generate a key using '''ssh-keygen''' and add it to your SSH keys on your github. To install ssh-keygen do the following:
+The BeagleBone might not be able to handle https requests so instead try using '''git@github.com:repositoryowner/repositoryname.git'''.
   beagle$ '''opkg install openssh-keygen'''

@@ Line 88: / Line 88: @@
   beagle$ '''cat ~/.ssh/id_rsa.pub'''
-You should get a long string of characters between ssh-rsa and root@beaglebone. This is what you will copy into your SSH-keys on github.com.
+You should get a long string of characters starting with ssh-rsa and ending with root@beaglebone. Excluding root@beaglebone, this is what you will copy into your SSH-keys on github.com.
 {{YoderFoot}}

@@ Line 55: / Line 55: @@
 [http://yehudakatz.com/2010/05/13/common-git-workflows/ Here's] a nice article on a common git workflow for those who are moving from svn.
-== Other Errors with using git ==
+== Other Errors while using git ==
 If you run into a "'''fatal HTTP request failed'''" error you might have to generate a key using '''ssh-keygen''' and add it to your SSH keys on your github. To install ssh-keygen do the following:

@@ Line 35: / Line 35: @@
 If the last '''git push''' give you error, it means someone else has changed the file on the repository and you need to get the new version before you can push.  Do this
   beagle$ '''git pull'''
 git will try to merge the new version of the file with your version.  It it's successful all you have to do is.
@@ Line 61: / Line 54: @@
 [http://yehudakatz.com/2010/05/13/common-git-workflows/ Here's] a nice article on a common git workflow for those who are moving from svn.
 {{YoderFoot}}

@@ Line 26: / Line 26: @@
   beagle$ '''gcc helloWorld.c'''    Make sure the file compiles and runs OK.
   beagle$ '''./a.out''
-  beagle$ '''git status'''       What's the status of helloWorld?
+  beagle$ '''git status'''           What's the status of helloWorld?
   beagle$ '''git add'''
-  beagle$ '''git status'''       What's the status now?
+  beagle$ '''git status'''           What's the status now?
   beagle$ '''git commit -m '''"''Put your own comment here''"
-  beagle$ '''git status'''      What's the status now?
+  beagle$ '''git status'''           What's the status now?
-  beagle$ '''git push'''     This will send your repository to gethub
+  beagle$ '''git push'''             This will send your repository to gethub
 If the last '''git push''' give you error, it means someone else has changed the file on the repository and you need to get the new version before you can push.  Do this
@@ Line 41: / Line 41: @@
   beagle$ '''gedit helloWord.c'''    Do this to be sure the file looks OK.
   beagle$ '''gcc helloWorld.c'''
-  beagle$ '''./a.out'''      If it doesn't compile edit and fix it.
+  beagle$ '''./a.out'''              If it doesn't compile edit and fix it.
   beagle$ '''git add'''
   beagle$ '''git commit -m "''Another descriptive comment here''"'''
-  beagle$ ''' git push'''
+  beagle$ '''git push'''
 If you are lucky, no one else has changed the file while you were working on it. If not, repeat the above steps.
 == Moving from svn ==