an introduction to s tacked git
play

An Introduction to S tacked Git Myron F. Stowe Kernel: Platform - PDF document

May 31, 2023 •303 likes •521 views

An Introduction to S tacked Git Myron F. Stowe Kernel: Platform Enablement Team Red Hat, Inc. Westford, Massachusetts myron.stowe@gmail.com Technical Presentation/Tutorial August 18, 2015 Abstract: Software development is rarely a

  1. An Introduction to S tacked Git Myron F. Stowe Kernel: Platform Enablement Team Red Hat, Inc. Westford, Massachusetts myron.stowe@gmail.com Technical Presentation/Tutorial August 18, 2015 Abstract: Software development is rarely a straightforward, sequential process. More often than not, it's a disordered, iterative undertaking with an end result in mind. Stacked Git (StGit) lends itself well towards this type of environment, helping control a potentially chaotic process by providing a set of commands that help manage both patch series and their individual components. With StGit, one can easily develop and manage patch series that consist of hundreds of individual patches. This paper provides an introduction to StGit, demonstrating its use and capabilities by recreating a past kernel development effort that produced a four patch series. This approach provides a concrete example that can be presented as a technical talk and also read individually - optionally working through the demonstration - as a self-paced tutorial. Keywords: Git, git, Linux, patch, patches, patch development, patch series, software development, Stacked Git, StGit, stg. This technical presentation/tutorial will be presented during the 2015 LinuxCon North America event. All materials necessary to work through the demonstration’s example are included in a tar archive that is available at https://goo.gl/pAKeqe

  2. Table of Contents Introduction ........................................................................................................................................................................... 1 ¡ Overview ............................................................................................................................................................................... 1 ¡ ............................................................................................................................................................................... 2 ¡ Workflow Creating a Topic Branch ........................................................................................................................................................................ 2 ¡ Creating Patches ..................................................................................................................................................................................... 3 ¡ ............................................................................................................................................ 4 ¡ Manipulating Patch Ordering on the Stack ........................................................................................................................................................... 5 ¡ Exporting and Importing Patches Splitting a Patch into Multiple Patches .................................................................................................................................................. 6 ¡ ...................................................................................................................................... 7 ¡ Cleaning Up the Series for Public Submission .......................................................................................................................................................................... 7 ¡ Rebasing a Patch Series Submitting Patches Upstream ................................................................................................................................................................ 7 ¡ Removing the Topic Branch .................................................................................................................................................................. 7 ¡ Reference Material ................................................................................................................................................................ 8 ¡ .......................................................................................................................................................................... 8 ¡ Bibliography .................................................................................................................................... 9 ¡ Appendix A Example’s Patch Series A.1 commit 8546713 ..................................................................................................................................................................... 10 ¡ A.2 commit fff0ee3 ..................................................................................................................................................................... 11 ¡ A.3 commit c5081cd ..................................................................................................................................................................... 12 ¡ A.4 commit 6f2729b ..................................................................................................................................................................... 16 ¡ ii

  3. An Introduction to Stacked Git Introduction “StGit is a Python application 1 providing similar functionality to Quilt (i.e. pushing/popping patches to/from a stack) on top of Git. These operations are performed using Git commands and the patches are stored as Git commit objects, allowing easy merging of the StGit patches into other repositories using standard Git functionality. StGit is licensed under the GNU General Public License.”[1] “Note that StGit is not a source configuration management (SCM) interface on top of Git and it expects a previously initialized Git repository.”[1] As such, this tutorial assumes pre-requisite knowledge of Git's basics. StGit uses the same configuration mechanisms as Git. Reference man pages git(1) and git-config(1) for more details. For a full list of StGit commands: $ stg help For quick help on individual subcommands: $ stg help <cmd> For more extensive help on a subcommand: $ man stg-<cmd> Overview For demonstration purposes we'll utilize an existing patch series that Shuah Khan produced and submitted to the " linux- pci " mail list on 02.17.2013. [PATCH v2 0/4] pci: Add PCI_BUS() and PCI_DEVID() interfaces to return bus number and device id [PATCH v2 1/4] pci: Add PCI_BUS_NUM() and PCI_DEVID() interfaces to return bus number and … [PATCH v2 2/4] pci/aer: Remove local PCI_BUS() define and use PCI_BUS() from pci [PATCH v2 3/4] iommu/amd: Remove local PCI_BUS() define and use PCI_BUS() from pci [PATCH v2 4/4] iommu/amd: Remove calc_devid() and use PCI_DEVID() from pci The objective of the series was to re-factor multiple, private, instances of PCI_BUS() , along with a private instance of calc_devid() , into PCI_BUS_NUM() and PCI_DEVID() interfaces for use globally within the kernel ( see Appendix A ). Using this series, we'll re-enact a typical development workflow, including mistakes and moments of insight, acting as if we were developing the series ourselves from scratch. 2 As mentioned, StGit is not a stand-alone program; it operates on an existing Git repository that has already been created, using git init or git clone . As the series of interest was developed for the Linux kernel, we'll use a local kernel repository cloned from the kernel.org site. $ cd ~/temp/linux/ $ git remote -v origin git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git (fetch) origin git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git (push) 1 $ which stg /usr/bin/stg $ file /usr/bin/stg /usr/bin/stg: Python script, ASCII text executable 2 While the example comes from development efforts within the Linux Kernel project, StGit is applicable to any project that utilizes Git - including non-software related projects. 1

Download Presentation
Download Policy: The content available on the website is offered to you 'AS IS' for your personal information and use only. It cannot be commercialized, licensed, or distributed on other websites without prior consent from the author. To download a presentation, simply click this link. If you encounter any difficulties during the download process, it's possible that the publisher has removed the file from their server.

Recommend

INTRODUCTION INTRODUCTION INTRODUCTION INTRODUCTION INTRODUCTION INTRODUCTION INTRODUCTION

INTRODUCTION INTRODUCTION INTRODUCTION INTRODUCTION INTRODUCTION INTRODUCTION INTRODUCTION

TRAINING COURSE ON SOCIAL PROTECTION &amp; FORMALIZATION TRINIDAD AND TOBAGO MARCH 15, 2017 INTRODUCTION INTRODUCTION INTRODUCTION INTRODUCTION INTRODUCTION INTRODUCTION INTRODUCTION INTRODUCTION Design of the NIS Assistance from the

547 views • 23 slides
INTRODUCTION Introduction 2/42 INTRODUCTION Alternations I am giving bread to the

INTRODUCTION Introduction 2/42 INTRODUCTION Alternations I am giving bread to the

Patterns of variation in the expression of case and agreement Andrs Brny Leiden University Centre for Linguistics 9 November 2019, BaSIS Workshop a.barany@hum.leidenuniv.nl INTRODUCTION Introduction 2/42 INTRODUCTION

1.37k views • 42 slides
Introduction Introduction Introduction Introduction Outline Motivation Failures

Introduction Introduction Introduction Introduction Outline Motivation Failures

Introduction Introduction Introduction Introduction Outline Motivation Failures Definition and concepts Process and product properties Principles SE Approaches Motivation Software and the economy The economies of

1.03k views • 49 slides
Introduction Introduction Introduction Nationwide Cause for Concern 1

Introduction Introduction Introduction Nationwide Cause for Concern 1

Introduction Introduction Introduction Nationwide Cause for Concern 1 https://www.cdc.gov/std/stats17/infographic.htm Introduction Epidemiology in Western Colorado CPHE Surveillance Data Report, May 2018 Chlamydia Epidemiology in Western

977 views • 39 slides
DAQ introduction Purpose of this talk : (1) Introduction for those who have not been in every

DAQ introduction Purpose of this talk : (1) Introduction for those who have not been in every

DAQ introduction Purpose of this talk : (1) Introduction for those who have not been in every meeting (2) Some ideas of diagrams for section 7.1 (Introduction) of TP. Giles Barr 25 Jan 2018, Pembroke College On DUNE, the reality is there is a

474 views • 10 slides
INTRODUCTION cf. Schneider, Chapter 1 INTRODUCTION THEY ARE OUT TO GET YOU INTRODUCTION WHAT

INTRODUCTION cf. Schneider, Chapter 1 INTRODUCTION THEY ARE OUT TO GET YOU INTRODUCTION WHAT

ADVANCED COMPUTER SECURITY INTRODUCTION cf. Schneider, Chapter 1 INTRODUCTION THEY ARE OUT TO GET YOU INTRODUCTION WHAT IS SECURITY? A systems security policies describe What the system is supposed to do Store and provide access

479 views • 16 slides
Overview Introduction to SMIL Introduction to W3C and XML Introduction to SMIL

Overview Introduction to SMIL Introduction to W3C and XML Introduction to SMIL

Overview Introduction to SMIL Introduction to W3C and XML Introduction to SMIL Writing a SMIL file Adding Media Objects Martin Halvey Clipping media files January 2008 Timing and Synchronising Layout World Wide

387 views • 14 slides
14 Introduction Introduction Bad guys can put malware into Example: hosts

14 Introduction Introduction Bad guys can put malware into Example: hosts

Introduction Introduction source Encapsulation ISO/OSI reference model message M application segment H t H t M transport network datagram H n H n H t M presentation: allow applications to frame link H l H n H t M interpret

583 views • 4 slides
Previous Lecture Introduction to SMIL 2 Introduction to W3C and XML Introduction to SMIL

Previous Lecture Introduction to SMIL 2 Introduction to W3C and XML Introduction to SMIL

Previous Lecture Introduction to SMIL 2 Introduction to W3C and XML Introduction to SMIL Writing a SMIL file Adding Media Objects Martin Halvey Clipping media files January 2008 Timing and Synchronising Layout

322 views • 8 slides
Lecture 1 Andreas Habegger Introduction Zynq Introduction Zynq Introduction Zynq PS vs. PL

Lecture 1 Andreas Habegger Introduction Zynq Introduction Zynq Introduction Zynq PS vs. PL

Introduction Zynq Lecture 1 Andreas Habegger Introduction Zynq Introduction Zynq Introduction Zynq PS vs. PL Processing System Processor Peripherals Data Buses AXI Bus Conclusion BTE5380 - Embedded Systems Octobre 2014 Andreas Habegger

1.81k views • 30 slides
2018.06 01 SMILE5 Introduction S E 5 02 Alpha Cloud M I L 03 Company Introduction 04

2018.06 01 SMILE5 Introduction S E 5 02 Alpha Cloud M I L 03 Company Introduction 04

2018.06 01 SMILE5 Introduction S E 5 02 Alpha Cloud M I L 03 Company Introduction 04 Project References S E 5 PART.1 SMILE5 Introduction M I L Introduction STORION-SMILE5 Residential Energy Storage System Inverter 5kW Output Input

1.06k views • 25 slides
Introduction to CICS Course introduction Course introduction What is CICS? What is an

Introduction to CICS Course introduction Course introduction What is CICS? What is an

Introduction to CICS Course introduction Course introduction What is CICS? What is an application server? Why use an application server? Course introduction Services provided by CICS How CICS applications are defined Scaling CICS to meet

1.84k views • 146 slides
Network Visualization Introduction Presented by Shahed Introduction Introduction Basic

Network Visualization Introduction Presented by Shahed Introduction Introduction Basic

Network Visualization Introduction Presented by Shahed Introduction Introduction Basic building blocks Node Links (relationship between nodes) Spatial information Network data

584 views • 9 slides
Introduction Introduction (1) Main argument of the paper: universities are not only

Introduction Introduction (1) Main argument of the paper: universities are not only

Le jugement des pairs comme outil de management des universits Peer-review as a management tool Christine Musselin (CSO, Sciences Po et CNRS) Avril 2013, Lirrsistible ascension du capitalisme acadmique Introduction Introduction (1)

590 views • 28 slides
JABLOTRON JA-100 introduction November 2011 Introduction Todays goals First introduction of

JABLOTRON JA-100 introduction November 2011 Introduction Todays goals First introduction of

JABLOTRON JA-100 introduction November 2011 Introduction Todays goals First introduction of the brand new JA-100 alarm system Visions Basic architecture System components Setting Help us with final validations You are the FIRST ones

1.69k views • 111 slides
Introduction Introduction to storage and to storage and filesystems filesystems Introduction

Introduction Introduction to storage and to storage and filesystems filesystems Introduction

Moreno Baricevic Gilberto Daz Axel Kohlmeyer Stefano Cozzini ULA ICTP CNR-IOM DEMOCRITOS Merida, VENEZUELA Trieste, ITALY Trieste, ITALY Introduction Introduction to storage and to storage and filesystems filesystems Introduction

1.19k views • 51 slides
Some thoughts on security after ten years of qmail 1.0 D. J. Bernstein University of Illinois at

Some thoughts on security after ten years of qmail 1.0 D. J. Bernstein University of Illinois at

Some thoughts on security after ten years of qmail 1.0 D. J. Bernstein University of Illinois at Chicago The bug-of-the-month club Every few months CERT announces Yet Another Security Hole In Sendmailsomething that lets local or even

592 views • 31 slides
Utility Accounts: Billing, Collection and Lien Mechanics April 13, 2017 Lee Marchisio Brad

Utility Accounts: Billing, Collection and Lien Mechanics April 13, 2017 Lee Marchisio Brad

Utility Accounts: Billing, Collection and Lien Mechanics April 13, 2017 Lee Marchisio Brad Nelson, Finance Manager 206.447.6264 | lee.marchisio@foster.com 425.337.3647 | bnelson@slwsd.com Overview Billing and Collection Basics Lien

723 views • 39 slides
Documentation &amp; Verification Why do we document? Transparency - we want end users to know:

Documentation &amp; Verification Why do we document? Transparency - we want end users to know:

Documentation &amp; Verification Why do we document? Transparency - we want end users to know: What we modified e.g. merged precinct x with precinct y Why we modified e.g. there were no matches for precinct x in the results, so we

586 views • 16 slides
Collection sponsoring : keeping track of tree adoptions Gerda van Uffelen, Hortus Botanicus Leiden

Collection sponsoring : keeping track of tree adoptions Gerda van Uffelen, Hortus Botanicus Leiden

Collection sponsoring : keeping track of tree adoptions Gerda van Uffelen, Hortus Botanicus Leiden Collection sponsoring : keeping track of tree adoptions Stichting Vrienden van de Leidse Hortus since 2005, &gt;2000 members Possible results?

201 views • 18 slides
OPENDAYLIGHT CONTRIBUTIONS: PROJECT PROPOSAL TO RELEASE Deepthi V V, Ericsson Vishal Thapar,

OPENDAYLIGHT CONTRIBUTIONS: PROJECT PROPOSAL TO RELEASE Deepthi V V, Ericsson Vishal Thapar,

OPENDAYLIGHT CONTRIBUTIONS: PROJECT PROPOSAL TO RELEASE Deepthi V V, Ericsson Vishal Thapar, Ericsson [Inputs From Prem Sankar G, Ericsson] A GENDA Introduction Project Lifecycle Project Proposal Project Release Schedule

599 views • 26 slides
REALITY CHECK: MANAGING MEMBERSHIP IN A DIGITAL WORLD Presented by: Virginia Dambach Dambach

REALITY CHECK: MANAGING MEMBERSHIP IN A DIGITAL WORLD Presented by: Virginia Dambach Dambach

Proven Practices in Fundraising Webinar Proven Practices in Fundraising Webinar Proven Practices in Fundraising Webinar REALITY CHECK: MANAGING MEMBERSHIP IN A DIGITAL WORLD Presented by: Virginia Dambach Dambach &amp; more

568 views • 24 slides
802 1 Plenary - 11/2010 802.1 Plenary 11/2010 Dallas, Tx Closing Agenda Closing Agenda 802 1

802 1 Plenary - 11/2010 802.1 Plenary 11/2010 Dallas, Tx Closing Agenda Closing Agenda 802 1

802 1 Plenary - 11/2010 802.1 Plenary 11/2010 Dallas, Tx Closing Agenda Closing Agenda 802 1 ffi 802.1 officers etc Officers Officers Chair: Tony Jeffree Vice Chair: Paul Congdon Recording Secretary: Eric Gray

794 views • 68 slides
Solving large scale eigenvalue problems Lecture 4, March 14, 2018: The QR algorithm

Solving large scale eigenvalue problems Lecture 4, March 14, 2018: The QR algorithm

Solving large scale eigenvalue problems Solving large scale eigenvalue problems Lecture 4, March 14, 2018: The QR algorithm http://people.inf.ethz.ch/arbenz/ewp/ Peter Arbenz Computer Science Department, ETH Z urich E-mail:

995 views • 41 slides

More recommend