1 <!DOCTYPE html PUBLIC
"-//W3C//DTD XHTML 1.1//EN"
2 "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
3 <html xmlns=
"http://www.w3.org/1999/xhtml" xml:
lang=
"en">
5 <meta http-equiv=
"Content-Type" content=
"text/html; charset=UTF-8" />
6 <meta name=
"generator" content=
"AsciiDoc 8.4.5" />
7 <title>Reverting an existing commit
</title>
8 <style type=
"text/css">
10 p
, li
, dt
, dd
, div
, pre
, h1
, h2
, h3
, h4
, h5
, h6
{
12 border: 1px solid red;
17 margin: 1em 5% 1em 5%;
22 text-decoration: underline
;
42 h1
, h2
, h3
, h4
, h5
, h6
{
44 font-family: sans-serif
;
51 border-bottom: 2px solid silver
;
69 border: 1px solid silver
;
88 font-family: sans-serif
;
94 span#revnumber
, span#revdate
, span#revremark
{
95 font-family: sans-serif
;
99 font-family: sans-serif
;
101 border-top: 2px solid silver
;
107 padding-bottom: 0.5em;
111 padding-bottom: 0.5em;
116 margin-bottom: 1.5em;
118 div
.tableblock
, div
.imageblock
, div
.exampleblock
, div
.verseblock
,
119 div
.quoteblock
, div
.literalblock
, div
.listingblock
, div
.sidebarblock
,
120 div
.admonitionblock
{
122 margin-bottom: 1.5em;
124 div
.admonitionblock
{
126 margin-bottom: 2.5em;
129 div
.content
{ /* Block element content. */
133 /* Block element titles. */
134 div
.title
, caption
.title
{
136 font-family: sans-serif
;
140 margin-bottom: 0.5em;
146 td div
.title:first-child
{
149 div
.content div
.title:first-child
{
152 div
.content
+ div
.title
{
156 div
.sidebarblock
> div
.content
{
158 border: 1px solid silver
;
162 div
.listingblock
> div
.content
{
163 border: 1px solid silver
;
172 div
.quoteblock
> div
.attribution
{
181 div
.verseblock
> div
.content
{
184 div
.verseblock
> div
.attribution
{
188 /* DEPRECATED: Pre version 8.2.7 verse style literal block. */
189 div
.verseblock
+ div
.attribution
{
193 div
.admonitionblock
.icon
{
197 text-decoration: underline
;
199 padding-right: 0.5em;
201 div
.admonitionblock td
.content
{
203 border-left: 2px solid silver
;
206 div
.exampleblock
> div
.content
{
207 border-left: 2px solid silver
;
211 div
.imageblock div
.content
{ padding-left: 0; }
212 span
.image img
{ border-style: none
; }
213 a
.image:visited
{ color: white
; }
217 margin-bottom: 0.8em;
230 list-style-position: outside
;
233 list-style-type: decimal
;
236 list-style-type: lower-alpha
;
239 list-style-type: upper-alpha
;
242 list-style-type: lower-roman
;
245 list-style-type: upper-roman
;
248 div
.compact ul
, div
.compact ol
,
249 div
.compact p
, div
.compact p
,
250 div
.compact div
, div
.compact div
{
252 margin-bottom: 0.1em;
255 div
.tableblock
> table
{
256 border: 3px solid
#527bbd;
259 font-family: sans-serif
;
271 /* Because the table frame attribute is overriden by CSS in most browsers. */
272 div
.tableblock
> table
[frame
="void"] {
275 div
.tableblock
> table
[frame
="hsides"] {
276 border-left-style: none
;
277 border-right-style: none
;
279 div
.tableblock
> table
[frame
="vsides"] {
280 border-top-style: none
;
281 border-bottom-style: none
;
287 margin-bottom: 0.8em;
290 padding-bottom: 15px;
292 dt
.hdlist1
.strong
, td
.hdlist1
.strong
{
298 padding-right: 0.8em;
304 div
.hdlist
.compact tr
{
314 div#footer-badges
{ display: none
; }
319 font-family: sans-serif
;
323 margin-bottom: 0.1em;
326 div
.toclevel1
, div
.toclevel2
, div
.toclevel3
, div
.toclevel4
{
342 /* Workarounds for IE6's broken and incomplete CSS2. */
344 div
.sidebar-content
{
346 border: 1px solid silver
;
349 div
.sidebar-title
, div
.image-title
{
351 font-family: sans-serif
;
354 margin-bottom: 0.5em;
357 div
.listingblock div
.content
{
358 border: 1px solid silver
;
363 div
.quoteblock-attribution
{
368 div
.verseblock-content
{
371 div
.verseblock-attribution
{
376 div
.exampleblock-content
{
377 border-left: 2px solid silver
;
381 /* IE6 sets dynamically generated links as visited. */
382 div#toc
a:visited
{ color: blue
; }
387 <h1>Reverting an existing commit
</h1>
390 <div class=
"sectionbody">
391 <div class=
"paragraph"><p>One of the changes I pulled into the
<em>master
</em> branch turns out to
392 break building GIT with GCC
2.95. While they were well intentioned
393 portability fixes, keeping things working with gcc-
2.95 was also
394 important. Here is what I did to revert the change in the
<em>master
</em>
395 branch and to adjust the
<em>pu
</em> branch, using core GIT tools and
396 barebone Porcelain.
</p></div>
397 <div class=
"paragraph"><p>First, prepare a throw-away branch in case I screw things up.
</p></div>
398 <div class=
"listingblock">
399 <div class=
"content">
400 <pre><tt>$ git checkout -b revert-c99 master
</tt></pre>
402 <div class=
"paragraph"><p>Now I am on the
<em>revert-c99
</em> branch. Let
’s figure out which commit to
403 revert. I happen to know that the top of the
<em>master
</em> branch is a
404 merge, and its second parent (i.e. foreign commit I merged from) has
405 the change I would want to undo. Further I happen to know that that
406 merge introduced
5 commits or so:
</p></div>
407 <div class=
"listingblock">
408 <div class=
"content">
409 <pre><tt>$ git show-branch --more=
4 master master^
2 | head
410 * [master] Merge refs/heads/portable from http://www.cs.berkeley....
411 ! [master^
2] Replace C99 array initializers with code.
413 - [master] Merge refs/heads/portable from http://www.cs.berkeley....
414 *+ [master^
2] Replace C99 array initializers with code.
415 *+ [master^
2~
1] Replace unsetenv() and setenv() with older putenv().
416 *+ [master^
2~
2] Include sys/time.h in daemon.c.
417 *+ [master^
2~
3] Fix ?: statements.
418 *+ [master^
2~
4] Replace zero-length array decls with [].
419 * [master~
1] tutorial note about git branch
</tt></pre>
421 <div class=
"paragraph"><p>The
<em>--more=
4</em> above means
"after we reach the merge base of refs,
422 show until we display four more common commits". That last commit
423 would have been where the
"portable" branch was forked from the main
424 git.git repository, so this would show everything on both branches
425 since then. I just limited the output to the first handful using
426 <em>head
</em>.
</p></div>
427 <div class=
"paragraph"><p>Now I know
<em>master^
2~
4</em> (pronounce it as
"find the second parent of
428 the <em>master</em>, and then go four generations back following the first
429 parent") is the one I would want to revert. Since I also want to say
430 why I am reverting it, the
<em>-n
</em> flag is given to
<em>git revert
</em>. This
431 prevents it from actually making a commit, and instead
<em>git revert
</em>
432 leaves the commit log message it wanted to use in
<em>.msg
</em> file:
</p></div>
433 <div class=
"listingblock">
434 <div class=
"content">
435 <pre><tt>$ git revert -n master^
2~
4
437 Revert
"Replace zero-length array decls with []."
439 This reverts
6c5f9baa3bc0d63e141e0afc23110205379905a4 commit.
440 $ git diff HEAD ;# to make sure what we are reverting makes sense.
441 $ make CC=gcc-
2.95 clean test ;# make sure it fixed the breakage.
442 $ make clean test ;# make sure it did not cause other breakage.
</tt></pre>
444 <div class=
"paragraph"><p>The reverted change makes sense (from reading the
<em>diff
</em> output), does
445 fix the problem (from
<em>make CC=gcc-
2.95</em> test), and does not cause new
446 breakage (from the last
<em>make test
</em>). I
’m ready to commit:
</p></div>
447 <div class=
"listingblock">
448 <div class=
"content">
449 <pre><tt>$ git commit -a -s ;# read .msg into the log,
450 # and explain why I am reverting.
</tt></pre>
452 <div class=
"paragraph"><p>I could have screwed up in any of the above steps, but in the worst
453 case I could just have done
<em>git checkout master
</em> to start over.
454 Fortunately I did not have to; what I have in the current branch
455 <em>revert-c99
</em> is what I want. So merge that back into
<em>master
</em>:
</p></div>
456 <div class=
"listingblock">
457 <div class=
"content">
458 <pre><tt>$ git checkout master
459 $ git merge revert-c99 ;# this should be a fast-forward
460 Updating from
10d781b9caa4f71495c7b34963bef137216f86a8 to e3a693c...
464 receive-pack.c |
2 +-
466 5 files changed,
8 insertions(+),
8 deletions(-)
</tt></pre>
468 <div class=
"paragraph"><p>There is no need to redo the test at this point. We fast-forwarded
469 and we know
<em>master
</em> matches
<em>revert-c99
</em> exactly. In fact:
</p></div>
470 <div class=
"listingblock">
471 <div class=
"content">
472 <pre><tt>$ git diff master..revert-c99
</tt></pre>
474 <div class=
"paragraph"><p>says nothing.
</p></div>
475 <div class=
"paragraph"><p>Then we rebase the
<em>pu
</em> branch as usual.
</p></div>
476 <div class=
"listingblock">
477 <div class=
"content">
478 <pre><tt>$ git checkout pu
479 $ git tag pu-anchor pu
481 * Applying: Redo
"revert" using three-way merge machinery.
482 First trying simple merge strategy to cherry-pick.
483 * Applying: Remove git-apply-patch-script.
484 First trying simple merge strategy to cherry-pick.
485 Simple cherry-pick fails; trying Automatic cherry-pick.
486 Removing Documentation/git-apply-patch-script.txt
487 Removing git-apply-patch-script
488 * Applying: Document
"git cherry-pick" and
"git revert"
489 First trying simple merge strategy to cherry-pick.
490 * Applying: mailinfo and applymbox updates
491 First trying simple merge strategy to cherry-pick.
492 * Applying: Show commits in topo order and name all commits.
493 First trying simple merge strategy to cherry-pick.
494 * Applying: More documentation updates.
495 First trying simple merge strategy to cherry-pick.
</tt></pre>
497 <div class=
"paragraph"><p>The temporary tag
<em>pu-anchor
</em> is me just being careful, in case
<em>git
498 rebase
</em> screws up. After this, I can do these for sanity check:
</p></div>
499 <div class=
"listingblock">
500 <div class=
"content">
501 <pre><tt>$ git diff pu-anchor..pu ;# make sure we got the master fix.
502 $ make CC=gcc-
2.95 clean test ;# make sure it fixed the breakage.
503 $ make clean test ;# make sure it did not cause other breakage.
</tt></pre>
505 <div class=
"paragraph"><p>Everything is in the good order. I do not need the temporary branch
506 nor tag anymore, so remove them:
</p></div>
507 <div class=
"listingblock">
508 <div class=
"content">
509 <pre><tt>$ rm -f .git/refs/tags/pu-anchor
510 $ git branch -d revert-c99
</tt></pre>
512 <div class=
"paragraph"><p>It was an emergency fix, so we might as well merge it into the
513 <em>release candidate
</em> branch, although I expect the next release would
514 be some days off:
</p></div>
515 <div class=
"listingblock">
516 <div class=
"content">
517 <pre><tt>$ git checkout rc
522 * committish: e3a693c... refs/heads/master from .
523 Trying to merge e3a693c... into
8c1f5f0... using
10d781b...
524 Committed merge
7fb9b7262a1d1e0a47bbfdcbbcf50ce0635d3f8f
528 receive-pack.c |
2 +-
530 5 files changed,
8 insertions(+),
8 deletions(-)
</tt></pre>
532 <div class=
"paragraph"><p>And the final repository status looks like this:
</p></div>
533 <div class=
"listingblock">
534 <div class=
"content">
535 <pre><tt>$ git show-branch --more=
1 master pu rc
536 ! [master] Revert
"Replace zero-length array decls with []."
537 ! [pu] git-repack: Add option to repack all objects.
538 * [rc] Merge refs/heads/master from .
540 + [pu] git-repack: Add option to repack all objects.
541 + [pu~
1] More documentation updates.
542 + [pu~
2] Show commits in topo order and name all commits.
543 + [pu~
3] mailinfo and applymbox updates
544 + [pu~
4] Document
"git cherry-pick" and
"git revert"
545 + [pu~
5] Remove git-apply-patch-script.
546 + [pu~
6] Redo
"revert" using three-way merge machinery.
547 - [rc] Merge refs/heads/master from .
548 ++* [master] Revert
"Replace zero-length array decls with []."
549 - [rc~
1] Merge refs/heads/master from .
550 ... [master~
1] Merge refs/heads/portable from http://www.cs.berkeley....
</tt></pre>
555 <div id=
"footer-text">
556 Last updated
2011-
06-
26 22:
39:
29 UTC