For this example, I’ll use my binoculars page to demo the basic commands I use to track changes and move code between my laptop, github and my server.

In a new project folder

$ git init
Initialized empty Git repository
$ git add .
$ git status
On branch master

No commits yet

Changes to be committed:
  (use "git rm --cached <file>..." to unstage)

        new file:   index.html

$ git init

Initialized empty Git repository

$ git add .

$ git status

On branch master

No commits yet

Changes to be committed:

(use "git rm --cached <file>..." to unstage)

new file: index.html

Make some changes and save them

$ git status
On branch master
No commits yet

Changes to be committed:
  (use "git rm --cached <file>..." to unstage)

        new file:   index.html

Untracked files:
  (use "git add <file>..." to include in what will be committed)

        binoculars.png
        hummingbird.png

$ git add -A
$ git status
On branch master

No commits yet

Changes to be committed:
 (use "git rm --cached <file>..." to unstage)

 new file: binoculars.png
 new file: hummingbird.png
 new file: index.html

$ git commit -m "initial commit"
[master (root-commit) 9fb8744] initial commit
 3 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 binoculars.png
 create mode 100644 hummingbird.png
 create mode 100644 index.html

$ git status

On branch master

No commits yet

Changes to be committed:

(use "git rm --cached <file>..." to unstage)

new file: index.html

Untracked files:

(use "git add <file>..." to include in what will be committed)

binoculars.png

hummingbird.png

$ git add -A

$ git status

On branch master

No commits yet

Changes to be committed:

(use "git rm --cached <file>..." to unstage)

new file: binoculars.png

new file: hummingbird.png

new file: index.html

$ git commit -m "initial commit"

[master (root-commit) 9fb8744] initial commit

3 files changed, 0 insertions(+), 0 deletions(-)

create mode 100644 binoculars.png

create mode 100644 hummingbird.png

create mode 100644 index.html

I went down a rabbit hole and I wanna go home

$ git add -A
$ git commit -m "Change is good"
[master 429e7e8] change is good
 1 file changed, 9 insertions(+)

// Make some bad choices
// Let's start over
$ git status
On branch master
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

        modified:   index.html
$ git checkout -- . 
$ git status
On branch master
nothing to commit, working tree clean

$ git add -A

$ git commit -m "Change is good"

[master 429e7e8] change is good

1 file changed, 9 insertions(+)

// Make some bad choices

// Let's start over

$ git status

On branch master

Changes not staged for commit:

(use "git add <file>..." to update what will be committed)

(use "git checkout -- <file>..." to discard changes in working directory)

modified: index.html

$ git checkout -- .

$ git status

On branch master

nothing to commit, working tree clean

Create a branch to track bug fix

$ git branch BigBigFix
$ git checkout BigBugFix
Switched to branch 'BigBugFix'
// fix it
$ git commit -am "Fixed Big Bug"
[BigBugFix 0989458] fixed Big Bug
 1 file changed, 1 deletion(-)
$ git checkout master
Switched to branch 'master'
$ git merge BigBugFix
Updating 2987c5a..0989458
Fast-forward
 index.html | 1 -
 1 file changed, 1 deletion(-)

$ git branch BigBigFix

$ git checkout BigBugFix

Switched to branch 'BigBugFix'

// fix it

$ git commit -am "Fixed Big Bug"

[BigBugFix 0989458] fixed Big Bug

1 file changed, 1 deletion(-)

$ git checkout master

Switched to branch 'master'

$ git merge BigBugFix

Updating 2987c5a..0989458

Fast-forward

index.html | 1 -

1 file changed, 1 deletion(-)

Put this gem in GitHub

$ git remote add origin https://github.com/BrownCasey/Binoculars.git
$ git push -u origin master
Enumerating objects: 43, done.
Counting objects: 100% (43/43), done.
Delta compression using up to 8 threads.
Compressing objects: 100% (43/43), done.
Writing objects: 100% (43/43), 6.39 MiB | 387.00 KiB/s, done.
Total 43 (delta 9), reused 0 (delta 0)
remote: Resolving deltas: 100% (9/9), done.
To https://github.com/BrownCasey/Binoculars.git
 * [new branch] master -> master
Branch 'master' set up to track remote branch 'master' from 'origin'.
// If your repo added a LICENSE (or other) file not in the project
// you'll need to pull --rebase first, then git push
// i.e. git pull --rebase origin master

$ git remote add origin https://github.com/BrownCasey/Binoculars.git

$ git push -u origin master

Enumerating objects: 43, done.

Counting objects: 100% (43/43), done.

Delta compression using up to 8 threads.

Compressing objects: 100% (43/43), done.

Writing objects: 100% (43/43), 6.39 MiB | 387.00 KiB/s, done.

Total 43 (delta 9), reused 0 (delta 0)

remote: Resolving deltas: 100% (9/9), done.

To https://github.com/BrownCasey/Binoculars.git

* [new branch] master -> master

Branch 'master' set up to track remote branch 'master' from 'origin'.

// If your repo added a LICENSE (or other) file not in the project

// you'll need to pull --rebase first, then git push

// i.e. git pull --rebase origin master

Make Dolly proud

Sheep

Clone repo to web server

$ cd www/html
$ sudo mkdir binoculars
$ cd binoculars
$ sudo git clone https://github.com/BrownCasey/Binoculars .
Cloning into '.'...
remote: Enumerating objects: 43, done.
remote: Counting objects: 100% (43/43), done.
remote: Compressing objects: 100% (34/34), done.
remote: Total 43 (delta 9), reused 43 (delta 9), pack-reused 0
Unpacking objects: 100% (43/43), done.
Checking connectivity... done.
// after some changes
$ sudo git pull origin master
From https://github.com/BrownCasey/Binoculars
 * branch master -> FETCH_HEAD

$ cd www/html

$ sudo mkdir binoculars

$ cd binoculars

$ sudo git clone https://github.com/BrownCasey/Binoculars .

Cloning into '.'...

remote: Enumerating objects: 43, done.

remote: Counting objects: 100% (43/43), done.

remote: Compressing objects: 100% (34/34), done.

remote: Total 43 (delta 9), reused 43 (delta 9), pack-reused 0

Unpacking objects: 100% (43/43), done.

Checking connectivity... done.

// after some changes

$ sudo git pull origin master

From https://github.com/BrownCasey/Binoculars

* branch master -> FETCH_HEAD

This book store really needs a search function. One notable difference is whether to return a single value, e.g. one person matching a phone number, or multiple values, e.g. a list of books.

A little modification to the Home Controller and the Index View will get us an input field and an output field for displaying results. For now, this will involve a full postback, reloading the page. In the single result example, it will send the user to the detail page for that item. In the list example, it will refresh the index page with the result. In case there are no results, I’ll provide some feedback that nothing was found.

Index page with form for input. The name should match the action’s parameter in the controller.

<label class="control-label">Search Author by ID</label>
<span class="alert-danger">@ViewBag.Message</span>

@using (Html.BeginForm())
{
    <input type="text" name="AuthorId" />
    <input type="submit" />
}

<label class="control-label">Search Author by ID</label>

<span class="alert-danger">@ViewBag.Message</span>

@using (Html.BeginForm())

{

}

Home Controller returning a single result. The Index action with [HttpPost] will be used on a form submit.

public class HomeController : Controller
{
    private BookStoreDb db = new BookStoreDb();

    public ActionResult Index()
    {
        return View();
    }

    [HttpPost]
    public ActionResult Index(string AuthorId)
    {
        //single
        int intId = Int32.Parse(AuthorId);
        var result = db.Authors.Where(a => a.AuthorId == intId).Single();
        if (result != null)
        {
            return RedirectToAction("Details", "Authors", new { id = result.AuthorId});
        }
        
        ViewBag.Message = "I couldn't find " + AuthorId;
        return View();
    }
}

public class HomeController : Controller

{

private BookStoreDb db = new BookStoreDb();

public ActionResult Index()

{

return View();

}

[HttpPost]

public ActionResult Index(string AuthorId)

{

//single

int intId = Int32.Parse(AuthorId);

var result = db.Authors.Where(a => a.AuthorId == intId).Single();

if (result != null)

{

return RedirectToAction("Details", "Authors", new { id = result.AuthorId});

}

ViewBag.Message = "I couldn't find " + AuthorId;

return View();

}

Resulting redirect to /Authors/Details/1

Index page with updated form and table to display results, if present.

@model IEnumerable<BookStore.Models.Book>

@{
        ViewBag.Title = "Home Page";
}

<div class="jumbotron">
    <h1>BookStore.NET</h1>
</div>
<label class="control-label">Search Books by Title</label>
<span class="alert-danger">@ViewBag.Message</span>

@using (Html.BeginForm())
{
    <input type="text" name="bookTitle" />
    <input type="submit" />
}
@if (Model != null)
{
    <table class="table">
        <tr>
            <th>
                @Html.DisplayNameFor(model => model.Author.FirstName)
            </th>
            <th>
                @Html.DisplayNameFor(model => model.Title)
            </th>
            <th></th>
        </tr>

        @foreach (var item in Model)
        {
            <tr>
                <td>
                    @Html.DisplayFor(modelItem => item.Author.FirstName)
                </td>
                <td>
                    @Html.DisplayFor(modelItem => item.Title)
                </td>
                <td>
                    @Html.ActionLink("Details", "Details", new { id = item.BookId })
                </td>
            </tr>
        }
    </table>
}

@model IEnumerable<BookStore.Models.Book>

ViewBag.Title = "Home Page";

}

<h1>BookStore.NET</h1>

</div>

<label class="control-label">Search Books by Title</label>

<span class="alert-danger">@ViewBag.Message</span>

@using (Html.BeginForm())

{

}

@if (Model != null)

{

<tr>

<th>

@Html.DisplayNameFor(model => model.Author.FirstName)

</th>

<th>

@Html.DisplayNameFor(model => model.Title)

</th>

</tr>

@foreach (var item in Model)

{

<tr>

<td>

@Html.DisplayFor(modelItem => item.Author.FirstName)

</td>

<td>

@Html.DisplayFor(modelItem => item.Title)

</td>

<td>

@Html.ActionLink("Details", "Details", new { id = item.BookId })

</td>

</tr>

}

</table>

}

Home Controller returning a list of items, books.

public class HomeController : Controller
{
    private BookStoreDb db = new BookStoreDb();

    public ActionResult Index()
    {
        return View();
    }

    [HttpPost]
    public ActionResult Index(string bookTitle)
    {
        //mutiple
        var results = db.Books.Where(b => b.Title.Contains(bookTitle));
        if (results.Count() > 0)
        {
            return View(results);
        }    
        ViewBag.Message = "I couldn't find " + bookTitle;
        return View();
    }

}

public class HomeController : Controller

{

private BookStoreDb db = new BookStoreDb();

public ActionResult Index()

{

return View();

}

[HttpPost]

public ActionResult Index(string bookTitle)

{

//mutiple

var results = db.Books.Where(b => b.Title.Contains(bookTitle));

if (results.Count() > 0)

{

return View(results);

}

ViewBag.Message = "I couldn't find " + bookTitle;

return View();

}

Resulting List of Books

Users should be alerted in the event nothing is found, i.e. when results.Count == 0.

Casey Codes

Monthly Archives: February 2019

Essential Git: Clone Commit Push Pull Checkout

In a new project folder

Make some changes and save them

I went down a rabbit hole and I wanna go home

Create a branch to track bug fix

Put this gem in GitHub

Make Dolly proud

Clone repo to web server

Taking Search Input and Returning Result(s)