War on whitespace
This uses "git-apply --whitespace=strip" to fix whitespace errors that have crept in to our source files over time. There are a few files that need to have trailing whitespaces (most notably, test vectors). The results still passes the test, and build result in Documentation/ area is unchanged. Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano
@ -9,16 +9,16 @@ Abstract: In this article, Linus demonstrates how a broken commit
|
||||
|
||||
On Sat, 13 Aug 2005, Linus Torvalds wrote:
|
||||
|
||||
> That's correct. Same things apply: you can move a patch over, and create a
|
||||
> new one with a modified comment, but basically the _old_ commit will be
|
||||
> That's correct. Same things apply: you can move a patch over, and create a
|
||||
> new one with a modified comment, but basically the _old_ commit will be
|
||||
> immutable.
|
||||
|
||||
Let me clarify.
|
||||
|
||||
You can entirely _drop_ old branches, so commits may be immutable, but
|
||||
nothing forces you to keep them. Of course, when you drop a commit, you'll
|
||||
always end up dropping all the commits that depended on it, and if you
|
||||
actually got somebody else to pull that commit you can't drop it from
|
||||
nothing forces you to keep them. Of course, when you drop a commit, you'll
|
||||
always end up dropping all the commits that depended on it, and if you
|
||||
actually got somebody else to pull that commit you can't drop it from
|
||||
_their_ repository, but undoing things is not impossible.
|
||||
|
||||
For example, let's say that you've made a mess of things: you've committed
|
||||
@ -29,7 +29,7 @@ want to save "b" and "c". What you can do is
|
||||
# for reference
|
||||
git branch broken
|
||||
|
||||
# Reset the main branch to three parents back: this
|
||||
# Reset the main branch to three parents back: this
|
||||
# effectively undoes the three top commits
|
||||
git reset HEAD^^^
|
||||
git checkout -f
|
||||
@ -59,7 +59,7 @@ Finally, check out the end result again:
|
||||
|
||||
to see that everything looks sensible.
|
||||
|
||||
And then, you can just remove the broken branch if you decide you really
|
||||
And then, you can just remove the broken branch if you decide you really
|
||||
don't want it:
|
||||
|
||||
# remove 'broken' branch
|
||||
@ -68,8 +68,8 @@ don't want it:
|
||||
# Prune old objects if you're really really sure
|
||||
git prune
|
||||
|
||||
And yeah, I'm sure there are other ways of doing this. And as usual, the
|
||||
above is totally untested, and I just wrote it down in this email, so if
|
||||
And yeah, I'm sure there are other ways of doing this. And as usual, the
|
||||
above is totally untested, and I just wrote it down in this email, so if
|
||||
I've done something wrong, you'll have to figure it out on your own ;)
|
||||
|
||||
Linus
|
||||
@ -77,5 +77,3 @@ I've done something wrong, you'll have to figure it out on your own ;)
|
||||
To unsubscribe from this list: send the line "unsubscribe git" in
|
||||
the body of a message to majordomo@vger.kernel.org
|
||||
More majordomo info at http://vger.kernel.org/majordomo-info.html
|
||||
|
||||
|
||||
|
||||
@ -14,10 +14,10 @@ Petr Baudis <pasky@suse.cz> writes:
|
||||
> Dear diary, on Sun, Aug 14, 2005 at 09:57:13AM CEST, I got a letter
|
||||
> where Junio C Hamano <junkio@cox.net> told me that...
|
||||
>> Linus Torvalds <torvalds@osdl.org> writes:
|
||||
>>
|
||||
>> > Junio, maybe you want to talk about how you move patches from your "pu"
|
||||
>>
|
||||
>> > Junio, maybe you want to talk about how you move patches from your "pu"
|
||||
>> > branch to the real branches.
|
||||
>>
|
||||
>>
|
||||
> Actually, wouldn't this be also precisely for what StGIT is intended to?
|
||||
|
||||
Exactly my feeling. I was sort of waiting for Catalin to speak
|
||||
@ -118,7 +118,7 @@ up your changes, along with other changes.
|
||||
|
||||
where *your "master" head
|
||||
upstream --> #1 --> #2 --> #3
|
||||
used \
|
||||
used \
|
||||
to be \--> #A --> #2' --> #3' --> #B --> #C
|
||||
*upstream head
|
||||
|
||||
@ -133,7 +133,7 @@ You fetch from upstream, but not merge.
|
||||
$ git fetch upstream
|
||||
|
||||
This leaves the updated upstream head in .git/FETCH_HEAD but
|
||||
does not touch your .git/HEAD nor .git/refs/heads/master.
|
||||
does not touch your .git/HEAD nor .git/refs/heads/master.
|
||||
You run "git rebase" now.
|
||||
|
||||
$ git rebase FETCH_HEAD master
|
||||
@ -161,5 +161,3 @@ the #1' commit.
|
||||
To unsubscribe from this list: send the line "unsubscribe git" in
|
||||
the body of a message to majordomo@vger.kernel.org
|
||||
More majordomo info at http://vger.kernel.org/majordomo-info.html
|
||||
|
||||
|
||||
|
||||
@ -84,4 +84,3 @@ There are four things worth mentioning:
|
||||
- This is still crude and does not protect against simultaneous
|
||||
make invocations stomping on each other. I would need to add
|
||||
some locking mechanism for this.
|
||||
|
||||
|
||||
@ -146,7 +146,7 @@ Everything is in the good order. I do not need the temporary branch
|
||||
nor tag anymore, so remove them:
|
||||
|
||||
------------------------------------------------
|
||||
$ rm -f .git/refs/tags/pu-anchor
|
||||
$ rm -f .git/refs/tags/pu-anchor
|
||||
$ git branch -d revert-c99
|
||||
------------------------------------------------
|
||||
|
||||
|
||||
@ -12,7 +12,7 @@ up with a history like this:
|
||||
|
||||
"master"
|
||||
o---o
|
||||
\ "topic"
|
||||
\ "topic"
|
||||
o---o---o---o---o---o
|
||||
|
||||
At this point, "topic" contains something I know I want, but it
|
||||
@ -29,11 +29,11 @@ start building on top of "master":
|
||||
$ git checkout -b topicA master
|
||||
... pick and apply pieces from P.diff to build
|
||||
... commits on topicA branch.
|
||||
|
||||
|
||||
o---o---o
|
||||
/ "topicA"
|
||||
o---o"master"
|
||||
\ "topic"
|
||||
\ "topic"
|
||||
o---o---o---o---o---o
|
||||
|
||||
Before doing each commit on "topicA" HEAD, I run "diff HEAD"
|
||||
@ -59,7 +59,7 @@ other topic:
|
||||
/o---o---o
|
||||
|/ "topicA"
|
||||
o---o"master"
|
||||
\ "topic"
|
||||
\ "topic"
|
||||
o---o---o---o---o---o
|
||||
|
||||
After I am done, I'd try a pretend-merge between "topicA" and
|
||||
@ -73,7 +73,7 @@ After I am done, I'd try a pretend-merge between "topicA" and
|
||||
/o---o---o----------'
|
||||
|/ "topicA"
|
||||
o---o"master"
|
||||
\ "topic"
|
||||
\ "topic"
|
||||
o---o---o---o---o---o
|
||||
|
||||
The last diff better not to show anything other than cleanups
|
||||
@ -84,8 +84,7 @@ for crufts. Then I can finally clean things up:
|
||||
|
||||
"topicB"
|
||||
o---o---o---o---o
|
||||
/
|
||||
/
|
||||
/o---o---o
|
||||
|/ "topicA"
|
||||
o---o"master"
|
||||
|
||||
|
||||
@ -49,4 +49,3 @@ Now, test your daemon with
|
||||
$ git ls-remote git://127.0.0.1/rule-the-world.git
|
||||
|
||||
If this does not work, find out why, and submit a patch to this document.
|
||||
|
||||
|
||||
Reference in New Issue
Block a user