Scribd Logo
Upload

Welcome to Scribd!

  • 30 views

    Verifying and Publishing A Backported Change: Homework 4

    Uploaded by

    leish
    The document discusses Git concepts like tracking files, commits, branches and publishing backported changes through patches. It provides examples of initializing a Git repository, making initial and subsequent commits, creating and checking out branches, and publishing a patch from one branch to another through formatted patches. The homework asks to create a new "quote" branch off an existing version, apply a lab patch to modify it, commit the changes and generate a formatted patch file for others to apply the backport.

    Copyright:

    © All Rights Reserved
    Download as PPTX, PDF, TXT or read online from Scribd

    Verifying and Publishing A Backported Change: Homework 4

    Uploaded by

    leish
    30 views13 pages
    The document discusses Git concepts like tracking files, commits, branches and publishing backported changes through patches. It provides examples of initializing a Git repository, making initial and subsequent commits, creating and checking out branches, and publishing a patch from one branch to another through formatted patches. The homework asks to create a new "quote" branch off an existing version, apply a lab patch to modify it, commit the changes and generate a formatted patch file for others to apply the backport.

    Original Description:

    35l

    Original Title

    Week4-W

    Copyright

    © © All Rights Reserved

    Available Formats

    PPTX, PDF, TXT or read online from Scribd

    Did you find this document useful?

    Is this content inappropriate?

    The document discusses Git concepts like tracking files, commits, branches and publishing backported changes through patches. It provides examples of initializing a Git repository, making initial and subsequent commits, creating and checking out branches, and publishing a patch from one branch to another through formatted patches. The homework asks to create a new "quote" branch off an existing version, apply a lab patch to modify it, commit the changes and generate a formatted patch file for others to apply the backport.

    Copyright:

    © All Rights Reserved
    Download as PPTX, PDF, TXT or read online from Scribd
    Download as pptx, pdf, or txt
    30 views13 pages

    Verifying and Publishing A Backported Change: Homework 4

    Uploaded by

    leish
    The document discusses Git concepts like tracking files, commits, branches and publishing backported changes through patches. It provides examples of initializing a Git repository, making initial and subsequent commits, creating and checking out branches, and publishing a patch from one branch to another through formatted patches. The homework asks to create a new "quote" branch off an existing version, apply a lab patch to modify it, commit the changes and generate a formatted patch file for others to apply the backport.

    Copyright:

    © All Rights Reserved
    Download as PPTX, PDF, TXT or read online from Scribd
    Download as pptx, pdf, or txt
    You are on page 1of 13

    Verifying and Publishing a

    Backported Change
    Homework 4

    Git File Status Lifecycle


    Tracked

    Git Example
    Project
    games: pacman.c, pacman.h, README

    Create repository to track new project


    git init (creates .git dir w/ all necessary repo files)

    Is the project tracked?


    No, need to add files and do an initial commit
    git add pacman.c pacman.h README
    git commit m initial commit of my project

    Git Repo Structure


    Snapshot

    tree

    size

    blob

    5b1d3

    README

    blob

    911e7

    pacman.c

    blob

    cba0a

    pacman.h

    After 2 More Commits

    What Is a Branch?
    A pointer to one of the commits in the repo
    (head) + all ancestor commits
    When you first create a repo, are there any
    branches?
    Default branch named master

    The default master branch


    points to last commit made
    moves forward automatically, every time you
    commit

    Where Is Master?
    master

    master

    New Branch
    Creating a new branch = creating new pointer
    git branch testing
    Where is new branch created?
    Current commit

    Where is current commit?


    HEAD

    New Commit
    What happens if we make another commit?

    345f5

    Switching to New Branch


    Check out new branch
    $ git checkout <branch_name>
    $ git checkout testing

    Commit After Switch

    Why Branching?
    Experiment with code without affecting main
    branch
    Separate projects that once had a common
    code base
    2 versions of the project

    Homework 4
    Publish patch you made in lab 4
    Create a new branch quote off of version 3.0
    Branch command + checkout command (git branch quote v3.0; git checkout quote)
    git checkout v3.0 -b quote
    Use patch from lab 4 to modify this branch
    Patch command
    patch pnum < quote-3.0-patch.txt
    Commit changes to the new branch
    git add .
    git commit am <Changelog entry>
    Generate a patch that other people can use to get your changes
    git format-patch -[num] --stdout > formatted-patch.txt

    Test your partners patch


    Check out version 3.0 into a tmp branch
    Apply patch with git am command: git am < formatted-patch.txt
    Build and test with make check

    You might also like