Skip to content

Commit a6080a0

Browse files
gitstergitster
committed
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>
1 parent d44c782 commit a6080a0

File tree

256 files changed

+645
-852
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

256 files changed

+645
-852
lines changed

‎Documentation/RelNotes-1.5.0.4.txt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,3 @@ Fixes since v1.5.0.3
2020
* Documentation updates
2121

2222
* User manual updates
23-
24-

‎Documentation/RelNotes-1.5.0.5.txt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,3 @@ Fixes since v1.5.0.3
2424
* Documentation updates
2525

2626
* User manual updates
27-
28-

‎Documentation/RelNotes-1.5.0.6.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,3 @@ Fixes since v1.5.0.5
1919
- user-manual has better cross references.
2020

2121
- gitweb installation/deployment procedure is now documented.
22-

‎Documentation/RelNotes-1.5.1.3.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,3 @@ Fixes since v1.5.1.2
4343
description was given by the caller.
4444

4545
Also contains various documentation updates.
46-

‎Documentation/SubmittingPatches‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -296,15 +296,15 @@ diff --git a/pico/pico.c b/pico/pico.c
296296
--- a/pico/pico.c
297297
+++ b/pico/pico.c
298298
@@ -219,7 +219,9 @@ PICO *pm;
299-
switch(pico_all_done){ /* prepare for/handle final events */
300-
case COMP_EXIT : /* already confirmed */
301-
packheader();
299+
switch(pico_all_done){ /* prepare for/handle final events */
300+
case COMP_EXIT : /* already confirmed */
301+
packheader();
302302
+#if 0
303-
stripwhitespace();
303+
stripwhitespace();
304304
+#endif
305-
c |= COMP_EXIT;
306-
break;
307-
305+
c |= COMP_EXIT;
306+
break;
307+
308308

309309
(Daniel Barkalow)
310310

‎Documentation/asciidoc.conf‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,5 +54,3 @@ ifdef::backend-xhtml11[]
5454
[gitlink-inlinemacro]
5555
<a href="{target}.html">{target}{0?({0})}</a>
5656
endif::backend-xhtml11[]
57-
58-

‎Documentation/config.txt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -682,5 +682,3 @@ receive.denyNonFastForwards::
682682
transfer.unpackLimit::
683683
When `fetch.unpackLimit` or `receive.unpackLimit` are
684684
not set, the value of this variable is used instead.
685-
686-

‎Documentation/core-tutorial.txt‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ repository, mainly because being hands-on and using explicit examples is
99
often the best way of explaining what is going on.
1010

1111
In normal life, most people wouldn't use the "core" git programs
12-
directly, but rather script around them to make them more palatable.
12+
directly, but rather script around them to make them more palatable.
1313
Understanding the core git stuff may help some people get those scripts
1414
done, though, and it may also be instructive in helping people
1515
understand what it is that the higher-level helper scripts are actually
16-
doing.
16+
doing.
1717

1818
The core git is often called "plumbing", with the prettier user
1919
interfaces on top of it called "porcelain". You may not want to use the
@@ -41,7 +41,7 @@ Creating a new git repository couldn't be easier: all git repositories start
4141
out empty, and the only thing you need to do is find yourself a
4242
subdirectory that you want to use as a working tree - either an empty
4343
one for a totally new project, or an existing working tree that you want
44-
to import into git.
44+
to import into git.
4545

4646
For our first example, we're going to start a totally new repository from
4747
scratch, with no pre-existing files, and we'll call it `git-tutorial`.
@@ -169,7 +169,7 @@ $ ls .git/objects/??/*
169169
and see two files:
170170

171171
----------------
172-
.git/objects/55/7db03de997c86a4a028e1ebd3a1ceb225be238
172+
.git/objects/55/7db03de997c86a4a028e1ebd3a1ceb225be238
173173
.git/objects/f2/4c74a2e500f5ee1332c86b94199f52b1d1d962
174174
----------------
175175

@@ -220,7 +220,7 @@ you have not actually really "checked in" your files into git so far,
220220
you've only *told* git about them.
221221

222222
However, since git knows about them, you can now start using some of the
223-
most basic git commands to manipulate the files or look at their status.
223+
most basic git commands to manipulate the files or look at their status.
224224

225225
In particular, let's not even check in the two files into git yet, we'll
226226
start off by adding another line to `hello` first:
@@ -350,7 +350,7 @@ Making a change
350350

351351
Remember how we did the `git-update-index` on file `hello` and then we
352352
changed `hello` afterward, and could compare the new state of `hello` with the
353-
state we saved in the index file?
353+
state we saved in the index file?
354354

355355
Further, remember how I said that `git-write-tree` writes the contents
356356
of the *index* file to the tree, and thus what we just committed was in
@@ -370,7 +370,7 @@ file and the working tree, `git-diff-index` shows the differences
370370
between a committed *tree* and either the index file or the working
371371
tree. In other words, `git-diff-index` wants a tree to be diffed
372372
against, and before we did the commit, we couldn't do that, because we
373-
didn't have anything to diff against.
373+
didn't have anything to diff against.
374374

375375
But now we can do
376376

@@ -379,7 +379,7 @@ $ git-diff-index -p HEAD
379379
----------------
380380

381381
(where `-p` has the same meaning as it did in `git-diff-files`), and it
382-
will show us the same difference, but for a totally different reason.
382+
will show us the same difference, but for a totally different reason.
383383
Now we're comparing the working tree not against the index file,
384384
but against the tree we just wrote. It just so happens that those two
385385
are obviously the same, so we get the same result.
@@ -398,7 +398,7 @@ working tree, but when given the `\--cached` flag, it is told to
398398
instead compare against just the index cache contents, and ignore the
399399
current working tree state entirely. Since we just wrote the index
400400
file to HEAD, doing `git-diff-index \--cached -p HEAD` should thus return
401-
an empty set of differences, and that's exactly what it does.
401+
an empty set of differences, and that's exactly what it does.
402402

403403
[NOTE]
404404
================
@@ -549,7 +549,7 @@ $ git-whatchanged -p --root
549549
----------------
550550

551551
and you will see exactly what has changed in the repository over its
552-
short history.
552+
short history.
553553

554554
[NOTE]
555555
The `\--root` flag is a flag to `git-diff-tree` to tell it to
@@ -637,7 +637,7 @@ So the mental model of "the git information is always tied directly to
637637
the working tree that it describes" may not be technically 100%
638638
accurate, but it's a good model for all normal use.
639639

640-
This has two implications:
640+
This has two implications:
641641

642642
- if you grow bored with the tutorial repository you created (or you've
643643
made a mistake and want to start all over), you can just do simple
@@ -705,7 +705,7 @@ Many (most?) public remote repositories will not contain any of
705705
the checked out files or even an index file, and will *only* contain the
706706
actual core git files. Such a repository usually doesn't even have the
707707
`.git` subdirectory, but has all the git files directly in the
708-
repository.
708+
repository.
709709

710710
To create your own local live copy of such a "raw" git repository, you'd
711711
first create your own subdirectory for the project, and then copy the
@@ -718,7 +718,7 @@ $ cd my-git
718718
$ rsync -rL rsync://rsync.kernel.org/pub/scm/git/git.git/ .git
719719
----------------
720720

721-
followed by
721+
followed by
722722

723723
----------------
724724
$ git-read-tree HEAD
@@ -738,7 +738,7 @@ up-to-date (so that you don't have to refresh it afterward), and the
738738
`-a` flag means "check out all files" (if you have a stale copy or an
739739
older version of a checked out tree you may also need to add the `-f`
740740
flag first, to tell git-checkout-index to *force* overwriting of any old
741-
files).
741+
files).
742742

743743
Again, this can all be simplified with
744744

@@ -751,7 +751,7 @@ $ git checkout
751751
which will end up doing all of the above for you.
752752

753753
You have now successfully copied somebody else's (mine) remote
754-
repository, and checked it out.
754+
repository, and checked it out.
755755

756756

757757
Creating a new branch
@@ -760,14 +760,14 @@ Creating a new branch
760760
Branches in git are really nothing more than pointers into the git
761761
object database from within the `.git/refs/` subdirectory, and as we
762762
already discussed, the `HEAD` branch is nothing but a symlink to one of
763-
these object pointers.
763+
these object pointers.
764764

765765
You can at any time create a new branch by just picking an arbitrary
766766
point in the project history, and just writing the SHA1 name of that
767767
object into a file under `.git/refs/heads/`. You can use any filename you
768768
want (and indeed, subdirectories), but the convention is that the
769769
"normal" branch is called `master`. That's just a convention, though,
770-
and nothing enforces it.
770+
and nothing enforces it.
771771

772772
To show that as an example, let's go back to the git-tutorial repository we
773773
used earlier, and create a branch in it. You do that by simply just
@@ -778,7 +778,7 @@ $ git checkout -b mybranch
778778
------------
779779

780780
will create a new branch based at the current `HEAD` position, and switch
781-
to it.
781+
to it.
782782

783783
[NOTE]
784784
================================================
@@ -825,7 +825,7 @@ checking it out and switching to it. If so, just use the command
825825
$ git branch <branchname> [startingpoint]
826826
------------
827827

828-
which will simply _create_ the branch, but will not do anything further.
828+
which will simply _create_ the branch, but will not do anything further.
829829
You can then later -- once you decide that you want to actually develop
830830
on that branch -- switch to that branch with a regular `git checkout`
831831
with the branchname as the argument.
@@ -884,7 +884,7 @@ $ gitk --all
884884
will show you graphically both of your branches (that's what the `\--all`
885885
means: normally it will just show you your current `HEAD`) and their
886886
histories. You can also see exactly how they came to be from a common
887-
source.
887+
source.
888888

889889
Anyway, let's exit `gitk` (`^Q` or the File menu), and decide that we want
890890
to merge the work we did on the `mybranch` branch into the `master`
@@ -905,8 +905,8 @@ of it as it can automatically (which in this case is just merge the `example`
905905
file, which had no differences in the `mybranch` branch), and say:
906906

907907
----------------
908-
Auto-merging hello
909-
CONFLICT (content): Merge conflict in hello
908+
Auto-merging hello
909+
CONFLICT (content): Merge conflict in hello
910910
Automatic merge failed; fix up by hand
911911
----------------
912912

@@ -1387,7 +1387,7 @@ repository. Kernel.org mirror network takes care of the
13871387
propagation to other publicly visible machines:
13881388

13891389
------------
1390-
$ git push master.kernel.org:/pub/scm/git/git.git/
1390+
$ git push master.kernel.org:/pub/scm/git/git.git/
13911391
------------
13921392

13931393

‎Documentation/diff-format.txt‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
The output format from "git-diff-index", "git-diff-tree" and
22
"git-diff-files" are very similar.
33

4-
These commands all compare two sets of things; what is
4+
These commands all compare two sets of things; what is
55
compared differs:
66

77
git-diff-index <tree-ish>::
@@ -139,28 +139,28 @@ index fabadb8,cc95eb0..4866510
139139
--- a/describe.c
140140
+++ b/describe.c
141141
@@@ -98,20 -98,12 +98,20 @@@
142-
return (a_date > b_date) ? -1 : (a_date == b_date) ? 0 : 1;
142+
return (a_date > b_date) ? -1 : (a_date == b_date) ? 0 : 1;
143143
}
144-
144+
145145
- static void describe(char *arg)
146146
-static void describe(struct commit *cmit, int last_one)
147147
++static void describe(char *arg, int last_one)
148148
{
149149
+ unsigned char sha1[20];
150150
+ struct commit *cmit;
151-
struct commit_list *list;
152-
static int initialized = 0;
153-
struct commit_name *n;
154-
151+
struct commit_list *list;
152+
static int initialized = 0;
153+
struct commit_name *n;
154+
155155
+ if (get_sha1(arg, sha1) < 0)
156156
+ usage(describe_usage);
157157
+ cmit = lookup_commit_reference(sha1);
158158
+ if (!cmit)
159159
+ usage(describe_usage);
160160
+
161-
if (!initialized) {
162-
initialized = 1;
163-
for_each_ref(get_name);
161+
if (!initialized) {
162+
initialized = 1;
163+
for_each_ref(get_name);
164164
------------
165165

166166
1. It is preceded with a "git diff" header, that looks like
@@ -233,4 +233,3 @@ parents). When shown by `git diff-files -c`, it compares the
233233
two unresolved merge parents with the working tree file
234234
(i.e. file1 is stage 2 aka "our version", file2 is stage 3 aka
235235
"their version").
236-

‎Documentation/diff-options.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@
100100
that matches other criteria, nothing is selected.
101101

102102
--find-copies-harder::
103-
For performance reasons, by default, -C option finds copies only
104-
if the original file of the copy was modified in the same
103+
For performance reasons, by default, -C option finds copies only
104+
if the original file of the copy was modified in the same
105105
changeset. This flag makes the command
106106
inspect unmodified files as candidates for the source of
107107
copy. This is a very expensive operation for large

0 commit comments

Comments
 (0)