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>
Junio C Hamano committed
Jun 7, 2007 at 00:04 UTC
a6080a0a44d5ead84db3dabbbc80e82df838533d
256 files changed
+645
-852
Documentation/RelNotes-1.5.0.4.txt
-2
@@ -20,5 +20,3 @@ Fixes since v1.5.0.3
20
* Documentation updates
21
22
* User manual updates
23
-
24
-
Documentation/RelNotes-1.5.0.5.txt
-2
@@ -24,5 +24,3 @@ Fixes since v1.5.0.3
24
* Documentation updates
25
26
* User manual updates
27
-
28
-
Documentation/RelNotes-1.5.0.6.txt
-1
@@ -19,4 +19,3 @@ Fixes since v1.5.0.5
19
- user-manual has better cross references.
20
21
- gitweb installation/deployment procedure is now documented.
22
-
Documentation/RelNotes-1.5.1.3.txt
-1
@@ -43,4 +43,3 @@ Fixes since v1.5.1.2
43
description was given by the caller.
44
45
Also contains various documentation updates.
46
-
Documentation/SubmittingPatches
+7
-7
@@ -296,15 +296,15 @@ diff --git a/pico/pico.c b/pico/pico.c
296
--- a/pico/pico.c
297
+++ b/pico/pico.c
298
@@ -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();
302
+#if 0
303
- stripwhitespace();
303
+ stripwhitespace();
304
+#endif
305
- c |= COMP_EXIT;
306
- break;
307
-
305
+ c |= COMP_EXIT;
306
+ break;
307
+
308
309
(Daniel Barkalow)
310
Documentation/asciidoc.conf
-2
@@ -54,5 +54,3 @@ ifdef::backend-xhtml11[]
54
[gitlink-inlinemacro]
55
<a href="{target}.html">{target}{0?({0})}</a>
56
endif::backend-xhtml11[]
57
-
58
-
Documentation/config.txt
-2
@@ -682,5 +682,3 @@ receive.denyNonFastForwards::
682
transfer.unpackLimit::
683
When `fetch.unpackLimit` or `receive.unpackLimit` are
684
not set, the value of this variable is used instead.
685
-
686
-
Documentation/core-tutorial.txt
+23
-23
@@ -9,11 +9,11 @@ repository, mainly because being hands-on and using explicit examples is
9
often the best way of explaining what is going on.
10
11
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.
13
Understanding the core git stuff may help some people get those scripts
14
done, though, and it may also be instructive in helping people
15
understand what it is that the higher-level helper scripts are actually
16
-doing.
16
+doing.
17
18
The core git is often called "plumbing", with the prettier user
19
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
41
out empty, and the only thing you need to do is find yourself a
42
subdirectory that you want to use as a working tree - either an empty
43
one for a totally new project, or an existing working tree that you want
44
-to import into git.
44
+to import into git.
45
46
For our first example, we're going to start a totally new repository from
47
scratch, with no pre-existing files, and we'll call it `git-tutorial`.
@@ -169,7 +169,7 @@ $ ls .git/objects/??/*
169
and see two files:
170
171
----------------
172
-.git/objects/55/7db03de997c86a4a028e1ebd3a1ceb225be238
172
+.git/objects/55/7db03de997c86a4a028e1ebd3a1ceb225be238
173
.git/objects/f2/4c74a2e500f5ee1332c86b94199f52b1d1d962
174
----------------
175
@@ -220,7 +220,7 @@ you have not actually really "checked in" your files into git so far,
220
you've only *told* git about them.
221
222
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.
224
225
In particular, let's not even check in the two files into git yet, we'll
226
start off by adding another line to `hello` first:
@@ -350,7 +350,7 @@ Making a change
350
351
Remember how we did the `git-update-index` on file `hello` and then we
352
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?
354
355
Further, remember how I said that `git-write-tree` writes the contents
356
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
370
between a committed *tree* and either the index file or the working
371
tree. In other words, `git-diff-index` wants a tree to be diffed
372
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.
374
375
But now we can do
376
@@ -379,7 +379,7 @@ $ git-diff-index -p HEAD
379
----------------
380
381
(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.
383
Now we're comparing the working tree not against the index file,
384
but against the tree we just wrote. It just so happens that those two
385
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
398
instead compare against just the index cache contents, and ignore the
399
current working tree state entirely. Since we just wrote the index
400
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.
402
403
[NOTE]
404
================
@@ -549,7 +549,7 @@ $ git-whatchanged -p --root
549
----------------
550
551
and you will see exactly what has changed in the repository over its
552
-short history.
552
+short history.
553
554
[NOTE]
555
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
637
the working tree that it describes" may not be technically 100%
638
accurate, but it's a good model for all normal use.
639
640
-This has two implications:
640
+This has two implications:
641
642
- if you grow bored with the tutorial repository you created (or you've
643
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
705
the checked out files or even an index file, and will *only* contain the
706
actual core git files. Such a repository usually doesn't even have the
707
`.git` subdirectory, but has all the git files directly in the
708
-repository.
708
+repository.
709
710
To create your own local live copy of such a "raw" git repository, you'd
711
first create your own subdirectory for the project, and then copy the
@@ -718,7 +718,7 @@ $ cd my-git
718
$ rsync -rL rsync://rsync.kernel.org/pub/scm/git/git.git/ .git
719
----------------
720
721
-followed by
721
+followed by
722
723
----------------
724
$ git-read-tree HEAD
@@ -738,7 +738,7 @@ up-to-date (so that you don't have to refresh it afterward), and the
738
`-a` flag means "check out all files" (if you have a stale copy or an
739
older version of a checked out tree you may also need to add the `-f`
740
flag first, to tell git-checkout-index to *force* overwriting of any old
741
-files).
741
+files).
742
743
Again, this can all be simplified with
744
@@ -751,7 +751,7 @@ $ git checkout
751
which will end up doing all of the above for you.
752
753
You have now successfully copied somebody else's (mine) remote
754
-repository, and checked it out.
754
+repository, and checked it out.
755
756
757
Creating a new branch
@@ -760,14 +760,14 @@ Creating a new branch
760
Branches in git are really nothing more than pointers into the git
761
object database from within the `.git/refs/` subdirectory, and as we
762
already discussed, the `HEAD` branch is nothing but a symlink to one of
763
-these object pointers.
763
+these object pointers.
764
765
You can at any time create a new branch by just picking an arbitrary
766
point in the project history, and just writing the SHA1 name of that
767
object into a file under `.git/refs/heads/`. You can use any filename you
768
want (and indeed, subdirectories), but the convention is that the
769
"normal" branch is called `master`. That's just a convention, though,
770
-and nothing enforces it.
770
+and nothing enforces it.
771
772
To show that as an example, let's go back to the git-tutorial repository we
773
used earlier, and create a branch in it. You do that by simply just
@@ -778,7 +778,7 @@ $ git checkout -b mybranch
778
------------
779
780
will create a new branch based at the current `HEAD` position, and switch
781
-to it.
781
+to it.
782
783
[NOTE]
784
================================================
@@ -825,7 +825,7 @@ checking it out and switching to it. If so, just use the command
825
$ git branch <branchname> [startingpoint]
826
------------
827
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.
829
You can then later -- once you decide that you want to actually develop
830
on that branch -- switch to that branch with a regular `git checkout`
831
with the branchname as the argument.
@@ -884,7 +884,7 @@ $ gitk --all
884
will show you graphically both of your branches (that's what the `\--all`
885
means: normally it will just show you your current `HEAD`) and their
886
histories. You can also see exactly how they came to be from a common
887
-source.
887
+source.
888
889
Anyway, let's exit `gitk` (`^Q` or the File menu), and decide that we want
890
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`
905
file, which had no differences in the `mybranch` branch), and say:
906
907
----------------
908
- Auto-merging hello
909
- CONFLICT (content): Merge conflict in hello
908
+ Auto-merging hello
909
+ CONFLICT (content): Merge conflict in hello
910
Automatic merge failed; fix up by hand
911
----------------
912
@@ -1387,7 +1387,7 @@ repository. Kernel.org mirror network takes care of the
1387
propagation to other publicly visible machines:
1388
1389
------------
1390
-$ git push master.kernel.org:/pub/scm/git/git.git/
1390
+$ git push master.kernel.org:/pub/scm/git/git.git/
1391
------------
1392
1393
Documentation/diff-format.txt
+10
-11
@@ -1,7 +1,7 @@
1
The output format from "git-diff-index", "git-diff-tree" and
2
"git-diff-files" are very similar.
3
4
-These commands all compare two sets of things; what is
4
+These commands all compare two sets of things; what is
5
compared differs:
6
7
git-diff-index <tree-ish>::
@@ -139,28 +139,28 @@ index fabadb8,cc95eb0..4866510
139
--- a/describe.c
140
+++ b/describe.c
141
@@@ -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;
143
}
144
-
144
+
145
- static void describe(char *arg)
146
-static void describe(struct commit *cmit, int last_one)
147
++static void describe(char *arg, int last_one)
148
{
149
+ unsigned char sha1[20];
150
+ 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
+
155
+ if (get_sha1(arg, sha1) < 0)
156
+ usage(describe_usage);
157
+ cmit = lookup_commit_reference(sha1);
158
+ if (!cmit)
159
+ usage(describe_usage);
160
+
161
- if (!initialized) {
162
- initialized = 1;
163
- for_each_ref(get_name);
161
+ if (!initialized) {
162
+ initialized = 1;
163
+ for_each_ref(get_name);
164
------------
165
166
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
233
two unresolved merge parents with the working tree file
234
(i.e. file1 is stage 2 aka "our version", file2 is stage 3 aka
235
"their version").
236
-
Documentation/diff-options.txt
+2
-2
@@ -100,8 +100,8 @@
100
that matches other criteria, nothing is selected.
101
102
--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
105
changeset. This flag makes the command
106
inspect unmodified files as candidates for the source of
107
copy. This is a very expensive operation for large
Documentation/diffcore.txt
+1
-2
@@ -71,7 +71,7 @@ The first transformation in the chain is diffcore-pathspec, and
71
is controlled by giving the pathname parameters to the
72
git-diff-* commands on the command line. The pathspec is used
73
to limit the world diff operates in. It removes the filepairs
74
-outside the specified set of pathnames. E.g. If the input set
74
+outside the specified set of pathnames. E.g. If the input set
75
of filepairs included:
76
77
------------------------------------------------
@@ -269,4 +269,3 @@ Documentation
269
*.c
270
t
271
------------------------------------------------
272
-
Documentation/docbook-xsl.css
+286
-286
@@ -1,286 +1,286 @@
1
-/*
2
- CSS stylesheet for XHTML produced by DocBook XSL stylesheets.
3
- Tested with XSL stylesheets 1.61.2, 1.67.2
4
-*/
5
-
6
-span.strong {
7
- font-weight: bold;
8
-}
9
-
10
-body blockquote {
11
- margin-top: .75em;
12
- line-height: 1.5;
13
- margin-bottom: .75em;
14
-}
15
-
16
-html body {
17
- margin: 1em 5% 1em 5%;
18
- line-height: 1.2;
19
-}
20
-
21
-body div {
22
- margin: 0;
23
-}
24
-
25
-h1, h2, h3, h4, h5, h6,
26
-div.toc p b,
27
-div.list-of-figures p b,
28
-div.list-of-tables p b,
29
-div.abstract p.title
30
-{
31
- color: #527bbd;
32
- font-family: tahoma, verdana, sans-serif;
33
-}
34
-
35
-div.toc p:first-child,
36
-div.list-of-figures p:first-child,
37
-div.list-of-tables p:first-child,
38
-div.example p.title
39
-{
40
- margin-bottom: 0.2em;
41
-}
42
-
43
-body h1 {
44
- margin: .0em 0 0 -4%;
45
- line-height: 1.3;
46
- border-bottom: 2px solid silver;
47
-}
48
-
49
-body h2 {
50
- margin: 0.5em 0 0 -4%;
51
- line-height: 1.3;
52
- border-bottom: 2px solid silver;
53
-}
54
-
55
-body h3 {
56
- margin: .8em 0 0 -3%;
57
- line-height: 1.3;
58
-}
59
-
60
-body h4 {
61
- margin: .8em 0 0 -3%;
62
- line-height: 1.3;
63
-}
64
-
65
-body h5 {
66
- margin: .8em 0 0 -2%;
67
- line-height: 1.3;
68
-}
69
-
70
-body h6 {
71
- margin: .8em 0 0 -1%;
72
- line-height: 1.3;
73
-}
74
-
75
-body hr {
76
- border: none; /* Broken on IE6 */
77
-}
78
-div.footnotes hr {
79
- border: 1px solid silver;
80
-}
81
-
82
-div.navheader th, div.navheader td, div.navfooter td {
83
- font-family: sans-serif;
84
- font-size: 0.9em;
85
- font-weight: bold;
86
- color: #527bbd;
87
-}
88
-div.navheader img, div.navfooter img {
89
- border-style: none;
90
-}
91
-div.navheader a, div.navfooter a {
92
- font-weight: normal;
93
-}
94
-div.navfooter hr {
95
- border: 1px solid silver;
96
-}
97
-
98
-body td {
99
- line-height: 1.2
100
-}
101
-
102
-body th {
103
- line-height: 1.2;
104
-}
105
-
106
-ol {
107
- line-height: 1.2;
108
-}
109
-
110
-ul, body dir, body menu {
111
- line-height: 1.2;
112
-}
113
-
114
-html {
115
- margin: 0;
116
- padding: 0;
117
-}
118
-
119
-body h1, body h2, body h3, body h4, body h5, body h6 {
120
- margin-left: 0
121
-}
122
-
123
-body pre {
124
- margin: 0.5em 10% 0.5em 1em;
125
- line-height: 1.0;
126
- color: navy;
127
-}
128
-
129
-tt.literal, code.literal {
130
- color: navy;
131
-}
132
-
133
-div.literallayout p {
134
- padding: 0em;
135
- margin: 0em;
136
-}
137
-
138
-div.literallayout {
139
- font-family: monospace;
140
-# margin: 0.5em 10% 0.5em 1em;
141
- margin: 0em;
142
- color: navy;
143
- border: 1px solid silver;
144
- background: #f4f4f4;
145
- padding: 0.5em;
146
-}
147
-
148
-.programlisting, .screen {
149
- border: 1px solid silver;
150
- background: #f4f4f4;
151
- margin: 0.5em 10% 0.5em 0;
152
- padding: 0.5em 1em;
153
-}
154
-
155
-div.sidebar {
156
- background: #ffffee;
157
- margin: 1.0em 10% 0.5em 0;
158
- padding: 0.5em 1em;
159
- border: 1px solid silver;
160
-}
161
-div.sidebar * { padding: 0; }
162
-div.sidebar div { margin: 0; }
163
-div.sidebar p.title {
164
- font-family: sans-serif;
165
- margin-top: 0.5em;
166
- margin-bottom: 0.2em;
167
-}
168
-
169
-div.bibliomixed {
170
- margin: 0.5em 5% 0.5em 1em;
171
-}
172
-
173
-div.glossary dt {
174
- font-weight: bold;
175
-}
176
-div.glossary dd p {
177
- margin-top: 0.2em;
178
-}
179
-
180
-dl {
181
- margin: .8em 0;
182
- line-height: 1.2;
183
-}
184
-
185
-dt {
186
- margin-top: 0.5em;
187
-}
188
-
189
-dt span.term {
190
- font-style: italic;
191
-}
192
-
193
-div.variablelist dd p {
194
- margin-top: 0;
195
-}
196
-
197
-div.itemizedlist li, div.orderedlist li {
198
- margin-left: -0.8em;
199
- margin-top: 0.5em;
200
-}
201
-
202
-ul, ol {
203
- list-style-position: outside;
204
-}
205
-
206
-div.sidebar ul, div.sidebar ol {
207
- margin-left: 2.8em;
208
-}
209
-
210
-div.itemizedlist p.title,
211
-div.orderedlist p.title,
212
-div.variablelist p.title
213
-{
214
- margin-bottom: -0.8em;
215
-}
216
-
217
-div.revhistory table {
218
- border-collapse: collapse;
219
- border: none;
220
-}
221
-div.revhistory th {
222
- border: none;
223
- color: #527bbd;
224
- font-family: tahoma, verdana, sans-serif;
225
-}
226
-div.revhistory td {
227
- border: 1px solid silver;
228
-}
229
-
230
-/* Keep TOC and index lines close together. */
231
-div.toc dl, div.toc dt,
232
-div.list-of-figures dl, div.list-of-figures dt,
233
-div.list-of-tables dl, div.list-of-tables dt,
234
-div.indexdiv dl, div.indexdiv dt
235
-{
236
- line-height: normal;
237
- margin-top: 0;
238
- margin-bottom: 0;
239
-}
240
-
241
-/*
242
- Table styling does not work because of overriding attributes in
243
- generated HTML.
244
-*/
245
-div.table table,
246
-div.informaltable table
247
-{
248
- margin-left: 0;
249
- margin-right: 5%;
250
- margin-bottom: 0.8em;
251
-}
252
-div.informaltable table
253
-{
254
- margin-top: 0.4em
255
-}
256
-div.table thead,
257
-div.table tfoot,
258
-div.table tbody,
259
-div.informaltable thead,
260
-div.informaltable tfoot,
261
-div.informaltable tbody
262
-{
263
- /* No effect in IE6. */
264
- border-top: 2px solid #527bbd;
265
- border-bottom: 2px solid #527bbd;
266
-}
267
-div.table thead, div.table tfoot,
268
-div.informaltable thead, div.informaltable tfoot
269
-{
270
- font-weight: bold;
271
-}
272
-
273
-div.mediaobject img {
274
- border: 1px solid silver;
275
- margin-bottom: 0.8em;
276
-}
277
-div.figure p.title,
278
-div.table p.title
279
-{
280
- margin-top: 1em;
281
- margin-bottom: 0.4em;
282
-}
283
-
284
-@media print {
285
- div.navheader, div.navfooter { display: none; }
286
-}
1
+/*
2
+ CSS stylesheet for XHTML produced by DocBook XSL stylesheets.
3
+ Tested with XSL stylesheets 1.61.2, 1.67.2
4
+*/
5
+
6
+span.strong {
7
+ font-weight: bold;
8
+}
9
+
10
+body blockquote {
11
+ margin-top: .75em;
12
+ line-height: 1.5;
13
+ margin-bottom: .75em;
14
+}
15
+
16
+html body {
17
+ margin: 1em 5% 1em 5%;
18
+ line-height: 1.2;
19
+}
20
+
21
+body div {
22
+ margin: 0;
23
+}
24
+
25
+h1, h2, h3, h4, h5, h6,
26
+div.toc p b,
27
+div.list-of-figures p b,
28
+div.list-of-tables p b,
29
+div.abstract p.title
30
+{
31
+ color: #527bbd;
32
+ font-family: tahoma, verdana, sans-serif;
33
+}
34
+
35
+div.toc p:first-child,
36
+div.list-of-figures p:first-child,
37
+div.list-of-tables p:first-child,
38
+div.example p.title
39
+{
40
+ margin-bottom: 0.2em;
41
+}
42
+
43
+body h1 {
44
+ margin: .0em 0 0 -4%;
45
+ line-height: 1.3;
46
+ border-bottom: 2px solid silver;
47
+}
48
+
49
+body h2 {
50
+ margin: 0.5em 0 0 -4%;
51
+ line-height: 1.3;
52
+ border-bottom: 2px solid silver;
53
+}
54
+
55
+body h3 {
56
+ margin: .8em 0 0 -3%;
57
+ line-height: 1.3;
58
+}
59
+
60
+body h4 {
61
+ margin: .8em 0 0 -3%;
62
+ line-height: 1.3;
63
+}
64
+
65
+body h5 {
66
+ margin: .8em 0 0 -2%;
67
+ line-height: 1.3;
68
+}
69
+
70
+body h6 {
71
+ margin: .8em 0 0 -1%;
72
+ line-height: 1.3;
73
+}
74
+
75
+body hr {
76
+ border: none; /* Broken on IE6 */
77
+}
78
+div.footnotes hr {
79
+ border: 1px solid silver;
80
+}
81
+
82
+div.navheader th, div.navheader td, div.navfooter td {
83
+ font-family: sans-serif;
84
+ font-size: 0.9em;
85
+ font-weight: bold;
86
+ color: #527bbd;
87
+}
88
+div.navheader img, div.navfooter img {
89
+ border-style: none;
90
+}
91
+div.navheader a, div.navfooter a {
92
+ font-weight: normal;
93
+}
94
+div.navfooter hr {
95
+ border: 1px solid silver;
96
+}
97
+
98
+body td {
99
+ line-height: 1.2
100
+}
101
+
102
+body th {
103
+ line-height: 1.2;
104
+}
105
+
106
+ol {
107
+ line-height: 1.2;
108
+}
109
+
110
+ul, body dir, body menu {
111
+ line-height: 1.2;
112
+}
113
+
114
+html {
115
+ margin: 0;
116
+ padding: 0;
117
+}
118
+
119
+body h1, body h2, body h3, body h4, body h5, body h6 {
120
+ margin-left: 0
121
+}
122
+
123
+body pre {
124
+ margin: 0.5em 10% 0.5em 1em;
125
+ line-height: 1.0;
126
+ color: navy;
127
+}
128
+
129
+tt.literal, code.literal {
130
+ color: navy;
131
+}
132
+
133
+div.literallayout p {
134
+ padding: 0em;
135
+ margin: 0em;
136
+}
137
+
138
+div.literallayout {
139
+ font-family: monospace;
140
+# margin: 0.5em 10% 0.5em 1em;
141
+ margin: 0em;
142
+ color: navy;
143
+ border: 1px solid silver;
144
+ background: #f4f4f4;
145
+ padding: 0.5em;
146
+}
147
+
148
+.programlisting, .screen {
149
+ border: 1px solid silver;
150
+ background: #f4f4f4;
151
+ margin: 0.5em 10% 0.5em 0;
152
+ padding: 0.5em 1em;
153
+}
154
+
155
+div.sidebar {
156
+ background: #ffffee;
157
+ margin: 1.0em 10% 0.5em 0;
158
+ padding: 0.5em 1em;
159
+ border: 1px solid silver;
160
+}
161
+div.sidebar * { padding: 0; }
162
+div.sidebar div { margin: 0; }
163
+div.sidebar p.title {
164
+ font-family: sans-serif;
165
+ margin-top: 0.5em;
166
+ margin-bottom: 0.2em;
167
+}
168
+
169
+div.bibliomixed {
170
+ margin: 0.5em 5% 0.5em 1em;
171
+}
172
+
173
+div.glossary dt {
174
+ font-weight: bold;
175
+}
176
+div.glossary dd p {
177
+ margin-top: 0.2em;
178
+}
179
+
180
+dl {
181
+ margin: .8em 0;
182
+ line-height: 1.2;
183
+}
184
+
185
+dt {
186
+ margin-top: 0.5em;
187
+}
188
+
189
+dt span.term {
190
+ font-style: italic;
191
+}
192
+
193
+div.variablelist dd p {
194
+ margin-top: 0;
195
+}
196
+
197
+div.itemizedlist li, div.orderedlist li {
198
+ margin-left: -0.8em;
199
+ margin-top: 0.5em;
200
+}
201
+
202
+ul, ol {
203
+ list-style-position: outside;
204
+}
205
+
206
+div.sidebar ul, div.sidebar ol {
207
+ margin-left: 2.8em;
208
+}
209
+
210
+div.itemizedlist p.title,
211
+div.orderedlist p.title,
212
+div.variablelist p.title
213
+{
214
+ margin-bottom: -0.8em;
215
+}
216
+
217
+div.revhistory table {
218
+ border-collapse: collapse;
219
+ border: none;
220
+}
221
+div.revhistory th {
222
+ border: none;
223
+ color: #527bbd;
224
+ font-family: tahoma, verdana, sans-serif;
225
+}
226
+div.revhistory td {
227
+ border: 1px solid silver;
228
+}
229
+
230
+/* Keep TOC and index lines close together. */
231
+div.toc dl, div.toc dt,
232
+div.list-of-figures dl, div.list-of-figures dt,
233
+div.list-of-tables dl, div.list-of-tables dt,
234
+div.indexdiv dl, div.indexdiv dt
235
+{
236
+ line-height: normal;
237
+ margin-top: 0;
238
+ margin-bottom: 0;
239
+}
240
+
241
+/*
242
+ Table styling does not work because of overriding attributes in
243
+ generated HTML.
244
+*/
245
+div.table table,
246
+div.informaltable table
247
+{
248
+ margin-left: 0;
249
+ margin-right: 5%;
250
+ margin-bottom: 0.8em;
251
+}
252
+div.informaltable table
253
+{
254
+ margin-top: 0.4em
255
+}
256
+div.table thead,
257
+div.table tfoot,
258
+div.table tbody,
259
+div.informaltable thead,
260
+div.informaltable tfoot,
261
+div.informaltable tbody
262
+{
263
+ /* No effect in IE6. */
264
+ border-top: 2px solid #527bbd;
265
+ border-bottom: 2px solid #527bbd;
266
+}
267
+div.table thead, div.table tfoot,
268
+div.informaltable thead, div.informaltable tfoot
269
+{
270
+ font-weight: bold;
271
+}
272
+
273
+div.mediaobject img {
274
+ border: 1px solid silver;
275
+ margin-bottom: 0.8em;
276
+}
277
+div.figure p.title,
278
+div.table p.title
279
+{
280
+ margin-top: 1em;
281
+ margin-bottom: 0.4em;
282
+}
283
+
284
+@media print {
285
+ div.navheader, div.navfooter { display: none; }
286
+}
Documentation/fetch-options.txt
-1
@@ -52,4 +52,3 @@
52
Deepen the history of a 'shallow' repository created by
53
`git clone` with `--depth=<depth>` option (see gitlink:git-clone[1])
54
by the specified number of commits.
55
-
Documentation/git-add.txt
-1
@@ -228,4 +228,3 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
228
GIT
229
---
230
Part of the gitlink:git[7] suite
231
-
Documentation/git-am.txt
-1
@@ -158,4 +158,3 @@ Documentation by Petr Baudis, Junio C Hamano and the git-list <git@vger.kernel.o
158
GIT
159
---
160
Part of the gitlink:git[7] suite
161
-
Documentation/git-apply.txt
-1
@@ -183,4 +183,3 @@ Documentation by Junio C Hamano
183
GIT
184
---
185
Part of the gitlink:git[7] suite
186
-
Documentation/git-archimport.txt
+22
-23
@@ -17,26 +17,26 @@ DESCRIPTION
17
Imports a project from one or more Arch repositories. It will follow branches
18
and repositories within the namespaces defined by the <archive/branch>
19
parameters supplied. If it cannot find the remote branch a merge comes from
20
-it will just import it as a regular commit. If it can find it, it will mark it
21
-as a merge whenever possible (see discussion below).
20
+it will just import it as a regular commit. If it can find it, it will mark it
21
+as a merge whenever possible (see discussion below).
22
23
-The script expects you to provide the key roots where it can start the import
24
-from an 'initial import' or 'tag' type of Arch commit. It will follow and
25
-import new branches within the provided roots.
23
+The script expects you to provide the key roots where it can start the import
24
+from an 'initial import' or 'tag' type of Arch commit. It will follow and
25
+import new branches within the provided roots.
26
27
-It expects to be dealing with one project only. If it sees
28
-branches that have different roots, it will refuse to run. In that case,
29
-edit your <archive/branch> parameters to define clearly the scope of the
30
-import.
27
+It expects to be dealing with one project only. If it sees
28
+branches that have different roots, it will refuse to run. In that case,
29
+edit your <archive/branch> parameters to define clearly the scope of the
30
+import.
31
32
-`git-archimport` uses `tla` extensively in the background to access the
32
+`git-archimport` uses `tla` extensively in the background to access the
33
Arch repository.
34
Make sure you have a recent version of `tla` available in the path. `tla` must
35
-know about the repositories you pass to `git-archimport`.
35
+know about the repositories you pass to `git-archimport`.
36
37
-For the initial import `git-archimport` expects to find itself in an empty
38
-directory. To follow the development of a project that uses Arch, rerun
39
-`git-archimport` with the same parameters as the initial import to perform
37
+For the initial import `git-archimport` expects to find itself in an empty
38
+directory. To follow the development of a project that uses Arch, rerun
39
+`git-archimport` with the same parameters as the initial import to perform
40
incremental imports.
41
42
While git-archimport will try to create sensible branch names for the
@@ -54,15 +54,15 @@ convert Arch repositories that had been rotated periodically.
54
55
MERGES
56
------
57
-Patch merge data from Arch is used to mark merges in git as well. git
57
+Patch merge data from Arch is used to mark merges in git as well. git
58
does not care much about tracking patches, and only considers a merge when a
59
branch incorporates all the commits since the point they forked. The end result
60
-is that git will have a good idea of how far branches have diverged. So the
60
+is that git will have a good idea of how far branches have diverged. So the
61
import process does lose some patch-trading metadata.
62
63
-Fortunately, when you try and merge branches imported from Arch,
64
-git will find a good merge base, and it has a good chance of identifying
65
-patches that have been traded out-of-sequence between the branches.
63
+Fortunately, when you try and merge branches imported from Arch,
64
+git will find a good merge base, and it has a good chance of identifying
65
+patches that have been traded out-of-sequence between the branches.
66
67
OPTIONS
68
-------
@@ -71,10 +71,10 @@ OPTIONS
71
Display usage.
72
73
-v::
74
- Verbose output.
74
+ Verbose output.
75
76
-T::
77
- Many tags. Will create a tag for every commit, reflecting the commit
77
+ Many tags. Will create a tag for every commit, reflecting the commit
78
name in the Arch repository.
79
80
-f::
@@ -104,7 +104,7 @@ OPTIONS
104
105
106
<archive/branch>::
107
- Archive/branch identifier in a format that `tla log` understands.
107
+ Archive/branch identifier in a format that `tla log` understands.
108
109
110
Author
@@ -118,4 +118,3 @@ Documentation by Junio C Hamano, Martin Langhoff and the git-list <git@vger.kern
118
GIT
119
---
120
Part of the gitlink:git[7] suite
121
-
Documentation/git-bisect.txt
+1
-2
@@ -8,7 +8,7 @@ git-bisect - Find the change that introduced a bug by binary search
8
9
SYNOPSIS
10
--------
11
-'git bisect' <subcommand> <options>
11
+'git bisect' <subcommand> <options>
12
13
DESCRIPTION
14
-----------
@@ -200,4 +200,3 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
200
GIT
201
---
202
Part of the gitlink:git[7] suite
203
-
Documentation/git-branch.txt
-1
@@ -158,4 +158,3 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
158
GIT
159
---
160
Part of the gitlink:git[7] suite
161
-
Documentation/git-cat-file.txt
-1
@@ -71,4 +71,3 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
71
GIT
72
---
73
Part of the gitlink:git[7] suite
74
-
Documentation/git-check-attr.txt
-1
@@ -34,4 +34,3 @@ Documentation by James Bowes.
34
GIT
35
---
36
Part of the gitlink:git[7] suite
37
-
Documentation/git-checkout-index.txt
-1
@@ -182,4 +182,3 @@ Junio C Hamano and the git-list <git@vger.kernel.org>.
182
GIT
183
---
184
Part of the gitlink:git[7] suite
185
-
Documentation/git-checkout.txt
-1
@@ -215,4 +215,3 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
215
GIT
216
---
217
Part of the gitlink:git[7] suite
218
-
Documentation/git-cherry-pick.txt
-1
@@ -68,4 +68,3 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
68
GIT
69
---
70
Part of the gitlink:git[7] suite
71
-
Documentation/git-cherry.txt
-1
@@ -64,4 +64,3 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
64
GIT
65
---
66
Part of the gitlink:git[7] suite
67
-
Documentation/git-clone.txt
-1
@@ -175,4 +175,3 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
175
GIT
176
---
177
Part of the gitlink:git[7] suite
178
-
Documentation/git-commit-tree.txt
+1
-2
@@ -40,7 +40,7 @@ OPTIONS
40
41
-p <parent commit>::
42
Each '-p' indicates the id of a parent commit object.
43
-
43
+
44
45
Commit Information
46
------------------
@@ -107,4 +107,3 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
107
GIT
108
---
109
Part of the gitlink:git[7] suite
110
-
Documentation/git-config.txt
-1
@@ -291,4 +291,3 @@ Documentation by Johannes Schindelin, Petr Baudis and the git-list <git@vger.ker
291
GIT
292
---
293
Part of the gitlink:git[7] suite
294
-
Documentation/git-convert-objects.txt
-1
@@ -26,4 +26,3 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
26
GIT
27
---
28
Part of the gitlink:git[7] suite
29
-
Documentation/git-count-objects.txt
-1
@@ -35,4 +35,3 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
35
GIT
36
---
37
Part of the gitlink:git[7] suite
38
-
Documentation/git-cvsexportcommit.txt
+7
-8
@@ -14,19 +14,19 @@ SYNOPSIS
14
DESCRIPTION
15
-----------
16
Exports a commit from GIT to a CVS checkout, making it easier
17
-to merge patches from a git repository into a CVS repository.
17
+to merge patches from a git repository into a CVS repository.
18
19
-Execute it from the root of the CVS working copy. GIT_DIR must be defined.
19
+Execute it from the root of the CVS working copy. GIT_DIR must be defined.
20
See examples below.
21
22
-It does its best to do the safe thing, it will check that the files are
23
-unchanged and up to date in the CVS checkout, and it will not autocommit
22
+It does its best to do the safe thing, it will check that the files are
23
+unchanged and up to date in the CVS checkout, and it will not autocommit
24
by default.
25
26
Supports file additions, removals, and commits that affect binary files.
27
28
If the commit is a merge commit, you must tell git-cvsexportcommit what parent
29
-should the changeset be done against.
29
+should the changeset be done against.
30
31
OPTIONS
32
-------
@@ -55,7 +55,7 @@ OPTIONS
55
Force the parent commit, even if it is not a direct parent.
56
57
-m::
58
- Prepend the commit message with the provided prefix.
58
+ Prepend the commit message with the provided prefix.
59
Useful for patch series and the like.
60
61
-u::
@@ -73,7 +73,7 @@ Merge one patch into CVS::
73
$ export GIT_DIR=~/project/.git
74
$ cd ~/project_cvs_checkout
75
$ git-cvsexportcommit -v <commit-sha1>
76
-$ cvs commit -F .mgs <files>
76
+$ cvs commit -F .mgs <files>
77
------------
78
79
Merge pending patches into CVS automatically -- only if you really know what you are doing ::
@@ -95,4 +95,3 @@ Documentation by Martin Langhoff <martin@catalyst.net.nz>
95
GIT
96
---
97
Part of the gitlink:git[7] suite
98
-
Documentation/git-cvsimport.txt
+6
-7
@@ -37,7 +37,7 @@ OPTIONS
37
38
-d <CVSROOT>::
39
The root of the CVS archive. May be local (a simple path) or remote;
40
- currently, only the :local:, :ext: and :pserver: access methods
40
+ currently, only the :local:, :ext: and :pserver: access methods
41
are supported. If not given, git-cvsimport will try to read it
42
from `CVS/Root`. If no such file exists, it checks for the
43
`CVSROOT` environment variable.
@@ -67,7 +67,7 @@ the old cvs2git tool.
67
-k::
68
Kill keywords: will extract files with '-kk' from the CVS archive
69
to avoid noisy changesets. Highly recommended, but off by default
70
- to preserve compatibility with early imported trees.
70
+ to preserve compatibility with early imported trees.
71
72
-u::
73
Convert underscores in tag and branch names to dots.
@@ -89,15 +89,15 @@ If you need to pass multiple options, separate them with a comma.
89
Instead of calling cvsps, read the provided cvsps output file. Useful
90
for debugging or when cvsps is being handled outside cvsimport.
91
92
--m::
92
+-m::
93
Attempt to detect merges based on the commit message. This option
94
- will enable default regexes that try to capture the name source
95
- branch name from the commit message.
94
+ will enable default regexes that try to capture the name source
95
+ branch name from the commit message.
96
97
-M <regex>::
98
Attempt to detect merges based on the commit message with a custom
99
regex. It can be used with '-m' to also see the default regexes.
100
- You must escape forward slashes.
100
+ You must escape forward slashes.
101
102
-S <regex>::
103
Skip paths matching the regex.
@@ -156,4 +156,3 @@ Documentation by Matthias Urlichs <smurf@smurf.noris.de>.
156
GIT
157
---
158
Part of the gitlink:git[7] suite
159
-
Documentation/git-daemon.txt
-1
@@ -235,4 +235,3 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
235
GIT
236
---
237
Part of the gitlink:git[7] suite
238
-
Documentation/git-describe.txt
-1
@@ -124,4 +124,3 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
124
GIT
125
---
126
Part of the gitlink:git[7] suite
127
-
Documentation/git-diff-files.txt
+1
-2
@@ -26,7 +26,7 @@ include::diff-options.txt[]
26
branch" respectively. With these options, diffs for
27
merged entries are not shown.
28
+
29
-The default is to diff against our branch (-2) and the
29
+The default is to diff against our branch (-2) and the
30
cleanly resolved paths. The option -0 can be given to
31
omit diff output for unmerged entries and just show "Unmerged".
32
@@ -58,4 +58,3 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
58
GIT
59
---
60
Part of the gitlink:git[7] suite
61
-
Documentation/git-diff-index.txt
+1
-2
@@ -75,7 +75,7 @@ actually doing a "git-write-tree" and comparing that. Except this one is much
75
nicer for the case where you just want to check where you are.
76
77
So doing a "git-diff-index --cached" is basically very useful when you are
78
-asking yourself "what have I already marked for being committed, and
78
+asking yourself "what have I already marked for being committed, and
79
what's the difference to a previous tree".
80
81
Non-cached Mode
@@ -130,4 +130,3 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
130
GIT
131
---
132
Part of the gitlink:git[7] suite
133
-
Documentation/git-diff-tree.txt
-1
@@ -166,4 +166,3 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
166
GIT
167
---
168
Part of the gitlink:git[7] suite
169
-
Documentation/git-diff.txt
-1
@@ -138,4 +138,3 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
138
GIT
139
---
140
Part of the gitlink:git[7] suite
141
-
Documentation/git-fast-import.txt
-1
@@ -908,4 +908,3 @@ Documentation by Shawn O. Pearce <spearce@spearce.org>.
908
GIT
909
---
910
Part of the gitlink:git[7] suite
911
-
Documentation/git-fmt-merge-msg.txt
-1
@@ -60,4 +60,3 @@ Documentation by Petr Baudis, Junio C Hamano and the git-list <git@vger.kernel.o
60
GIT
61
---
62
Part of the gitlink:git[7] suite
63
-
Documentation/git-format-patch.txt
-1
@@ -178,4 +178,3 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
178
GIT
179
---
180
Part of the gitlink:git[7] suite
181
-
Documentation/git-fsck.txt
-1
@@ -145,4 +145,3 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
145
GIT
146
---
147
Part of the gitlink:git[7] suite
148
-
Documentation/git-get-tar-commit-id.txt
-1
@@ -34,4 +34,3 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
34
GIT
35
---
36
Part of the gitlink:git[7] suite
37
-
Documentation/git-grep.txt
-1
@@ -144,4 +144,3 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
144
GIT
145
---
146
Part of the gitlink:git[7] suite
147
-
Documentation/git-hash-object.txt
+1
-2
@@ -18,7 +18,7 @@ work tree), and optionally writes the resulting object into the
18
object database. Reports its object ID to its standard output.
19
This is used by "git-cvsimport" to update the index
20
without modifying files in the work tree. When <type> is not
21
-specified, it defaults to "blob".
21
+specified, it defaults to "blob".
22
23
OPTIONS
24
-------
@@ -43,4 +43,3 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
43
GIT
44
---
45
Part of the gitlink:git[7] suite
46
-
Documentation/git-http-fetch.txt
-1
@@ -54,4 +54,3 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
54
GIT
55
---
56
Part of the gitlink:git[7] suite
57
-
Documentation/git-http-push.txt
+1
-1
@@ -52,7 +52,7 @@ Specifying the Refs
52
53
A '<ref>' specification can be either a single pattern, or a pair
54
of such patterns separated by a colon ":" (this means that a ref name
55
-cannot have a colon in it). A single pattern '<name>' is just a
55
+cannot have a colon in it). A single pattern '<name>' is just a
56
shorthand for '<name>:<name>'.
57
58
Each pattern pair consists of the source side (before the colon)
Documentation/git-index-pack.txt
-1
@@ -98,4 +98,3 @@ Documentation by Sergey Vlasov
98
GIT
99
---
100
Part of the gitlink:git[7] suite
101
-
Documentation/git-init-db.txt
-1
@@ -16,4 +16,3 @@ DESCRIPTION
16
17
This is a synonym for gitlink:git-init[1]. Please refer to the
18
documentation of that command.
19
-
Documentation/git-init.txt
-1
@@ -108,4 +108,3 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
108
GIT
109
---
110
Part of the gitlink:git[7] suite
111
-
Documentation/git-instaweb.txt
-1
@@ -82,4 +82,3 @@ Documentation by Eric Wong <normalperson@yhbt.net>.
82
GIT
83
---
84
Part of the gitlink:git[7] suite
85
-
Documentation/git-local-fetch.txt
-1
@@ -62,4 +62,3 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
62
GIT
63
---
64
Part of the gitlink:git[7] suite
65
-
Documentation/git-log.txt
-1
@@ -101,4 +101,3 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
101
GIT
102
---
103
Part of the gitlink:git[7] suite
104
-
Documentation/git-ls-files.txt
-1
@@ -180,4 +180,3 @@ Documentation by David Greaves, Junio C Hamano, Josh Triplett, and the git-list
180
GIT
181
---
182
Part of the gitlink:git[7] suite
183
-
Documentation/git-ls-remote.txt
-1
@@ -70,4 +70,3 @@ Written by Junio C Hamano <junkio@cox.net>
70
GIT
71
---
72
Part of the gitlink:git[7] suite
73
-
Documentation/git-ls-tree.txt
-1
@@ -92,4 +92,3 @@ Documentation by David Greaves, Junio C Hamano and the git-list
92
GIT
93
---
94
Part of the gitlink:git[7] suite
95
-
Documentation/git-mailinfo.txt
-1
@@ -67,4 +67,3 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
67
GIT
68
---
69
Part of the gitlink:git[7] suite
70
-
Documentation/git-mailsplit.txt
-1
@@ -56,4 +56,3 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
56
GIT
57
---
58
Part of the gitlink:git[7] suite
59
-
Documentation/git-merge-base.txt
-1
@@ -40,4 +40,3 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
40
GIT
41
---
42
Part of the gitlink:git[7] suite
43
-
Documentation/git-merge-index.txt
+1
-2
@@ -59,7 +59,7 @@ Examples:
59
This is modified MM in the branch B. # merge2
60
This is modified MM in the branch B. # current contents
61
62
-or
62
+or
63
64
torvalds@ppc970:~/merge-test> git-merge-index cat AA MM
65
cat: : No such file or directory
@@ -85,4 +85,3 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
85
GIT
86
---
87
Part of the gitlink:git[7] suite
88
-
Documentation/git-merge-one-file.txt
-1
@@ -27,4 +27,3 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
27
GIT
28
---
29
Part of the gitlink:git[7] suite
30
-
Documentation/git-merge-tree.txt
-1
@@ -34,4 +34,3 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
34
GIT
35
---
36
Part of the gitlink:git[7] suite
37
-
Documentation/git-merge.txt
+1
-1
@@ -95,7 +95,7 @@ When things cleanly merge, these things happen:
95
1. the results are updated both in the index file and in your
96
working tree,
97
2. index file is written out as a tree,
98
-3. the tree gets committed, and
98
+3. the tree gets committed, and
99
4. the `HEAD` pointer gets advanced.
100
101
Because of 2., we require that the original state of the index
Documentation/git-mergetool.txt
-1
@@ -43,4 +43,3 @@ Documentation by Theodore Y Ts'o.
43
GIT
44
---
45
Part of the gitlink:git[7] suite
46
-
Documentation/git-mktag.txt
-1
@@ -44,4 +44,3 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
44
GIT
45
---
46
Part of the gitlink:git[7] suite
47
-
Documentation/git-mktree.txt
-1
@@ -32,4 +32,3 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
32
GIT
33
---
34
Part of the gitlink:git[7] suite
35
-
Documentation/git-mv.txt
-1
@@ -51,4 +51,3 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
51
GIT
52
---
53
Part of the gitlink:git[7] suite
54
-
Documentation/git-name-rev.txt
-1
@@ -76,4 +76,3 @@ Documentation by Johannes Schindelin.
76
GIT
77
---
78
Part of the gitlink:git[7] suite
79
-
Documentation/git-p4import.txt
-1
@@ -165,4 +165,3 @@ Written by Sean Estabrooks <seanlkml@sympatico.ca>
165
GIT
166
---
167
Part of the gitlink:git[7] suite
168
-
Documentation/git-pack-objects.txt
-1
@@ -185,4 +185,3 @@ gitlink:git-prune-packed[1]
185
GIT
186
---
187
Part of the gitlink:git[7] suite
188
-
Documentation/git-pack-redundant.txt
+1
-2
@@ -17,7 +17,7 @@ are redundant. The output is suitable for piping to
17
'xargs rm' if you are in the root of the repository.
18
19
git-pack-redundant accepts a list of objects on standard input. Any objects
20
-given will be ignored when checking which packs are required. This makes the
20
+given will be ignored when checking which packs are required. This makes the
21
following command useful when wanting to remove packs which contain unreachable
22
objects.
23
@@ -55,4 +55,3 @@ gitlink:git-prune-packed[1]
55
GIT
56
---
57
Part of the gitlink:git[7] suite
58
-
Documentation/git-patch-id.txt
-1
@@ -40,4 +40,3 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
40
GIT
41
---
42
Part of the gitlink:git[7] suite
43
-
Documentation/git-peek-remote.txt
-1
@@ -52,4 +52,3 @@ Documentation by Junio C Hamano.
52
GIT
53
---
54
Part of the gitlink:git[7] suite
55
-
Documentation/git-prune-packed.txt
-1
@@ -50,4 +50,3 @@ gitlink:git-repack[1]
50
GIT
51
---
52
Part of the gitlink:git[7] suite
53
-
Documentation/git-prune.txt
-1
@@ -58,4 +58,3 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
58
GIT
59
---
60
Part of the gitlink:git[7] suite
61
-
Documentation/git-pull.txt
-1
@@ -165,4 +165,3 @@ Junio C Hamano and the git-list <git@vger.kernel.org>.
165
GIT
166
---
167
Part of the gitlink:git[7] suite
168
-
Documentation/git-push.txt
-1
@@ -110,4 +110,3 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
110
GIT
111
---
112
Part of the gitlink:git[7] suite
113
-
Documentation/git-quiltimport.txt
-1
@@ -58,4 +58,3 @@ Documentation by Eric Biederman <ebiederm@lnxi.com>
58
GIT
59
---
60
Part of the gitlink:git[7] suite
61
-
Documentation/git-read-tree.txt
-1
@@ -356,4 +356,3 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
356
GIT
357
---
358
Part of the gitlink:git[7] suite
359
-
Documentation/git-rebase.txt
-1
@@ -237,4 +237,3 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
237
GIT
238
---
239
Part of the gitlink:git[7] suite
240
-
Documentation/git-reflog.txt
-1
@@ -65,4 +65,3 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
65
GIT
66
---
67
Part of the gitlink:git[7] suite
68
-
Documentation/git-relink.txt
-1
@@ -34,4 +34,3 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
34
GIT
35
---
36
Part of the gitlink:git[7] suite
37
-
Documentation/git-remote.txt
-1
@@ -128,4 +128,3 @@ Documentation by J. Bruce Fields and the git-list <git@vger.kernel.org>.
128
GIT
129
---
130
Part of the gitlink:git[7] suite
131
-
Documentation/git-repack.txt
-1
@@ -101,4 +101,3 @@ gitlink:git-prune-packed[1]
101
GIT
102
---
103
Part of the gitlink:git[7] suite
104
-
Documentation/git-request-pull.txt
-1
@@ -37,4 +37,3 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
37
GIT
38
---
39
Part of the gitlink:git[7] suite
40
-
Documentation/git-rev-parse.txt
-1
@@ -286,4 +286,3 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
286
GIT
287
---
288
Part of the gitlink:git[7] suite
289
-
Documentation/git-revert.txt
-1
@@ -56,4 +56,3 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
56
GIT
57
---
58
Part of the gitlink:git[7] suite
59
-
Documentation/git-rm.txt
-1
@@ -95,4 +95,3 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
95
GIT
96
---
97
Part of the gitlink:git[7] suite
98
-
Documentation/git-runstatus.txt
-1
@@ -66,4 +66,3 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
66
GIT
67
---
68
Part of the gitlink:git[7] suite
69
-
Documentation/git-send-email.txt
+1
-2
@@ -78,7 +78,7 @@ The --cc option must be repeated for each user you want on the cc list.
78
`localhost` otherwise.
79
80
--subject::
81
- Specify the initial subject of the email thread.
81
+ Specify the initial subject of the email thread.
82
Only necessary if --compose is also set. If --compose
83
is not set, this will be prompted for.
84
@@ -137,4 +137,3 @@ Documentation by Ryan Anderson
137
GIT
138
---
139
Part of the gitlink:git[7] suite
140
-
Documentation/git-sh-setup.txt
-1
@@ -69,4 +69,3 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
69
GIT
70
---
71
Part of the gitlink:git[7] suite
72
-
Documentation/git-shell.txt
-1
@@ -32,4 +32,3 @@ Documentation by Petr Baudis and the git-list <git@vger.kernel.org>.
32
GIT
33
---
34
Part of the gitlink:git[7] suite
35
-
Documentation/git-shortlog.txt
-1
@@ -56,4 +56,3 @@ Documentation by Junio C Hamano.
56
GIT
57
---
58
Part of the gitlink:git[7] suite
59
-
Documentation/git-show-index.txt
-1
@@ -32,4 +32,3 @@ Documentation by Junio C Hamano
32
GIT
33
---
34
Part of the gitlink:git[7] suite
35
-
Documentation/git-show.txt
-1
@@ -84,4 +84,3 @@ This manual page is a stub. You can help the git documentation by expanding it.
84
GIT
85
---
86
Part of the gitlink:git[7] suite
87
-
Documentation/git-ssh-fetch.txt
-1
@@ -48,4 +48,3 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
48
GIT
49
---
50
Part of the gitlink:git[7] suite
51
-
Documentation/git-ssh-upload.txt
-1
@@ -44,4 +44,3 @@ Documentation by Daniel Barkalow
44
GIT
45
---
46
Part of the gitlink:git[7] suite
47
-
Documentation/git-status.txt
-1
@@ -58,4 +58,3 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
58
GIT
59
---
60
Part of the gitlink:git[7] suite
61
-
Documentation/git-stripspace.txt
-1
@@ -30,4 +30,3 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
30
GIT
31
---
32
Part of the gitlink:git[7] suite
33
-
Documentation/git-svnimport.txt
-1
@@ -174,4 +174,3 @@ Documentation by Matthias Urlichs <smurf@smurf.noris.de>.
174
GIT
175
---
176
Part of the gitlink:git[7] suite
177
-
Documentation/git-tar-tree.txt
-1
@@ -90,4 +90,3 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
90
GIT
91
---
92
Part of the gitlink:git[7] suite
93
-
Documentation/git-unpack-file.txt
-1
@@ -33,4 +33,3 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
33
GIT
34
---
35
Part of the gitlink:git[7] suite
36
-
Documentation/git-unpack-objects.txt
-1
@@ -52,4 +52,3 @@ Documentation by Junio C Hamano
52
GIT
53
---
54
Part of the gitlink:git[7] suite
55
-
Documentation/git-update-index.txt
+4
-5
@@ -56,7 +56,7 @@ OPTIONS
56
57
--unmerged::
58
If --refresh finds unmerged changes in the index, the default
59
- behavior is to error out. This option makes git-update-index
59
+ behavior is to error out. This option makes git-update-index
60
continue anyway.
61
62
--ignore-missing::
@@ -64,12 +64,12 @@ OPTIONS
64
65
--cacheinfo <mode> <object> <path>::
66
Directly insert the specified info into the index.
67
-
67
+
68
--index-info::
69
Read index information from stdin.
70
71
--chmod=(+|-)x::
72
- Set the execute permissions on the updated files.
72
+ Set the execute permissions on the updated files.
73
74
--assume-unchanged, --no-assume-unchanged::
75
When these flags are specified, the object name recorded
@@ -126,7 +126,7 @@ OPTIONS
126
<file>::
127
Files to act on.
128
Note that files beginning with '.' are discarded. This includes
129
- `./file` and `dir/./file`. If you don't want this, then use
129
+ `./file` and `dir/./file`. If you don't want this, then use
130
cleaner names.
131
The same applies to directories ending '/' and paths with '//'
132
@@ -324,4 +324,3 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
324
GIT
325
---
326
Part of the gitlink:git[7] suite
327
-
Documentation/git-update-server-info.txt
-1
@@ -55,4 +55,3 @@ Documentation by Junio C Hamano.
55
GIT
56
---
57
Part of the gitlink:git[7] suite
58
-
Documentation/git-var.txt
-1
@@ -62,4 +62,3 @@ Documentation by Eric Biederman and the git-list <git@vger.kernel.org>.
62
GIT
63
---
64
Part of the gitlink:git[7] suite
65
-
Documentation/git-verify-pack.txt
-1
@@ -51,4 +51,3 @@ Documentation by Junio C Hamano
51
GIT
52
---
53
Part of the gitlink:git[7] suite
54
-
Documentation/git-verify-tag.txt
-1
@@ -29,4 +29,3 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
29
GIT
30
---
31
Part of the gitlink:git[7] suite
32
-
Documentation/git-whatchanged.txt
-1
@@ -78,4 +78,3 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
78
GIT
79
---
80
Part of the gitlink:git[7] suite
81
-
Documentation/git-write-tree.txt
-1
@@ -47,4 +47,3 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
47
GIT
48
---
49
Part of the gitlink:git[7] suite
50
-
Documentation/git.txt
-1
@@ -428,4 +428,3 @@ contributors on the git-list <git@vger.kernel.org>.
428
GIT
429
---
430
Part of the gitlink:git[7] suite
431
-
Documentation/gitk.txt
-1
@@ -99,4 +99,3 @@ Documentation by Junio C Hamano, Jonas Fonseca, and the git-list
99
GIT
100
---
101
Part of the gitlink:git[7] suite
102
-
Documentation/howto/rebase-and-edit.txt
+9
-11
@@ -9,16 +9,16 @@ Abstract: In this article, Linus demonstrates how a broken commit
9
10
On Sat, 13 Aug 2005, Linus Torvalds wrote:
11
12
-> That's correct. Same things apply: you can move a patch over, and create a
13
-> new one with a modified comment, but basically the _old_ commit will be
12
+> That's correct. Same things apply: you can move a patch over, and create a
13
+> new one with a modified comment, but basically the _old_ commit will be
14
> immutable.
15
16
Let me clarify.
17
18
You can entirely _drop_ old branches, so commits may be immutable, but
19
-nothing forces you to keep them. Of course, when you drop a commit, you'll
20
-always end up dropping all the commits that depended on it, and if you
21
-actually got somebody else to pull that commit you can't drop it from
19
+nothing forces you to keep them. Of course, when you drop a commit, you'll
20
+always end up dropping all the commits that depended on it, and if you
21
+actually got somebody else to pull that commit you can't drop it from
22
_their_ repository, but undoing things is not impossible.
23
24
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
29
# for reference
30
git branch broken
31
32
- # Reset the main branch to three parents back: this
32
+ # Reset the main branch to three parents back: this
33
# effectively undoes the three top commits
34
git reset HEAD^^^
35
git checkout -f
@@ -59,7 +59,7 @@ Finally, check out the end result again:
59
60
to see that everything looks sensible.
61
62
-And then, you can just remove the broken branch if you decide you really
62
+And then, you can just remove the broken branch if you decide you really
63
don't want it:
64
65
# remove 'broken' branch
@@ -68,8 +68,8 @@ don't want it:
68
# Prune old objects if you're really really sure
69
git prune
70
71
-And yeah, I'm sure there are other ways of doing this. And as usual, the
72
-above is totally untested, and I just wrote it down in this email, so if
71
+And yeah, I'm sure there are other ways of doing this. And as usual, the
72
+above is totally untested, and I just wrote it down in this email, so if
73
I've done something wrong, you'll have to figure it out on your own ;)
74
75
Linus
@@ -77,5 +77,3 @@ I've done something wrong, you'll have to figure it out on your own ;)
77
To unsubscribe from this list: send the line "unsubscribe git" in
78
the body of a message to majordomo@vger.kernel.org
79
More majordomo info at http://vger.kernel.org/majordomo-info.html
80
-
81
-
Documentation/howto/rebase-from-internal-branch.txt
+5
-7
@@ -14,10 +14,10 @@ Petr Baudis <pasky@suse.cz> writes:
14
> Dear diary, on Sun, Aug 14, 2005 at 09:57:13AM CEST, I got a letter
15
> where Junio C Hamano <junkio@cox.net> told me that...
16
>> Linus Torvalds <torvalds@osdl.org> writes:
17
->>
18
->> > Junio, maybe you want to talk about how you move patches from your "pu"
17
+>>
18
+>> > Junio, maybe you want to talk about how you move patches from your "pu"
19
>> > branch to the real branches.
20
->>
20
+>>
21
> Actually, wouldn't this be also precisely for what StGIT is intended to?
22
23
Exactly my feeling. I was sort of waiting for Catalin to speak
@@ -118,7 +118,7 @@ up your changes, along with other changes.
118
119
where *your "master" head
120
upstream --> #1 --> #2 --> #3
121
- used \
121
+ used \
122
to be \--> #A --> #2' --> #3' --> #B --> #C
123
*upstream head
124
@@ -133,7 +133,7 @@ You fetch from upstream, but not merge.
133
$ git fetch upstream
134
135
This leaves the updated upstream head in .git/FETCH_HEAD but
136
-does not touch your .git/HEAD nor .git/refs/heads/master.
136
+does not touch your .git/HEAD nor .git/refs/heads/master.
137
You run "git rebase" now.
138
139
$ git rebase FETCH_HEAD master
@@ -161,5 +161,3 @@ the #1' commit.
161
To unsubscribe from this list: send the line "unsubscribe git" in
162
the body of a message to majordomo@vger.kernel.org
163
More majordomo info at http://vger.kernel.org/majordomo-info.html
164
-
165
-
Documentation/howto/rebuild-from-update-hook.txt
-1
@@ -84,4 +84,3 @@ There are four things worth mentioning:
84
- This is still crude and does not protect against simultaneous
85
make invocations stomping on each other. I would need to add
86
some locking mechanism for this.
87
-
Documentation/howto/revert-branch-rebase.txt
+1
-1
@@ -146,7 +146,7 @@ Everything is in the good order. I do not need the temporary branch
146
nor tag anymore, so remove them:
147
148
------------------------------------------------
149
-$ rm -f .git/refs/tags/pu-anchor
149
+$ rm -f .git/refs/tags/pu-anchor
150
$ git branch -d revert-c99
151
------------------------------------------------
152
Documentation/howto/separating-topic-branches.txt
+6
-7
@@ -12,7 +12,7 @@ up with a history like this:
12
13
"master"
14
o---o
15
- \ "topic"
15
+ \ "topic"
16
o---o---o---o---o---o
17
18
At this point, "topic" contains something I know I want, but it
@@ -29,11 +29,11 @@ start building on top of "master":
29
$ git checkout -b topicA master
30
... pick and apply pieces from P.diff to build
31
... commits on topicA branch.
32
-
32
+
33
o---o---o
34
/ "topicA"
35
o---o"master"
36
- \ "topic"
36
+ \ "topic"
37
o---o---o---o---o---o
38
39
Before doing each commit on "topicA" HEAD, I run "diff HEAD"
@@ -59,7 +59,7 @@ other topic:
59
/o---o---o
60
|/ "topicA"
61
o---o"master"
62
- \ "topic"
62
+ \ "topic"
63
o---o---o---o---o---o
64
65
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
73
/o---o---o----------'
74
|/ "topicA"
75
o---o"master"
76
- \ "topic"
76
+ \ "topic"
77
o---o---o---o---o---o
78
79
The last diff better not to show anything other than cleanups
@@ -84,8 +84,7 @@ for crufts. Then I can finally clean things up:
84
85
"topicB"
86
o---o---o---o---o
87
- /
87
+ /
88
/o---o---o
89
|/ "topicA"
90
o---o"master"
91
-
Documentation/howto/use-git-daemon.txt
-1
@@ -49,4 +49,3 @@ Now, test your daemon with
49
$ git ls-remote git://127.0.0.1/rule-the-world.git
50
51
If this does not work, find out why, and submit a patch to this document.
52
-
Documentation/merge-options.txt
-1
@@ -25,4 +25,3 @@
25
If there is no `-s` option, a built-in list of strategies
26
is used instead (`git-merge-recursive` when merging a single
27
head, `git-merge-octopus` otherwise).
28
-
Documentation/pretty-formats.txt
-1
@@ -121,4 +121,3 @@ The placeholders are:
121
- '%Creset': reset color
122
- '%m': left, right or boundary mark
123
- '%n': newline
124
-
Documentation/pretty-options.txt
-1
@@ -11,4 +11,3 @@
11
command to re-code the commit log message in the encoding
12
preferred by the user. For non plumbing commands this
13
defaults to UTF-8.
14
-
Documentation/pull-fetch-param.txt
+1
-1
@@ -58,7 +58,7 @@ is often useful.
58
+
59
Some short-cut notations are also supported.
60
+
61
-* `tag <tag>` means the same as `refs/tags/<tag>:refs/tags/<tag>`;
61
+* `tag <tag>` means the same as `refs/tags/<tag>:refs/tags/<tag>`;
62
it requests fetching everything up to the given tag.
63
* A parameter <ref> without a colon is equivalent to
64
<ref>: when pulling/fetching, so it merges <ref> into the current
Documentation/repository-layout.txt
-1
@@ -177,4 +177,3 @@ shallow::
177
This is similar to `info/grafts` but is internally used
178
and maintained by shallow clone mechanism. See `--depth`
179
option to gitlink:git-clone[1] and gitlink:git-fetch[1].
180
-
Documentation/technical/pack-format.txt
+4
-4
@@ -80,7 +80,7 @@ Pack Idx file:
80
+--------------------------------+ |
81
main | offset | |
82
index | object name 00XXXXXXXXXXXXXXXX | |
83
-table +--------------------------------+ |
83
+table +--------------------------------+ |
84
| offset | |
85
| object name 00XXXXXXXXXXXXXXXX | |
86
+--------------------------------+ |
@@ -97,14 +97,14 @@ trailer | | packfile checksum |
97
| +--------------------------------+
98
| | idxfile checksum |
99
| +--------------------------------+
100
- .-------.
100
+ .-------.
101
|
102
Pack file entry: <+
103
104
packed object header:
105
1-byte size extension bit (MSB)
106
type (next 3 bit)
107
- size0 (lower 4-bit)
107
+ size0 (lower 4-bit)
108
n-byte sizeN (as long as MSB is set, each 7-bit)
109
size0..sizeN form 4+7+7+..+7 bit integer, size0
110
is the least significant part, and sizeN is the
@@ -114,5 +114,5 @@ Pack file entry: <+
114
is the size before compression).
115
If it is DELTA, then
116
20-byte base object name SHA1 (the size above is the
117
- size of the delta data that follows).
117
+ size of the delta data that follows).
118
delta data, deflated.
Documentation/user-manual.txt
+19
-19
@@ -154,11 +154,11 @@ Author: Jamal Hadi Salim <hadi@cyberus.ca>
154
Date: Sat Dec 2 22:22:25 2006 -0800
155
156
[XFRM]: Fix aevent structuring to be more complete.
157
-
157
+
158
aevents can not uniquely identify an SA. We break the ABI with this
159
patch, but consensus is that since it is not yet utilized by any
160
(known) application then it is fine (better do it now than later).
161
-
161
+
162
Signed-off-by: Jamal Hadi Salim <hadi@cyberus.ca>
163
Signed-off-by: David S. Miller <davem@davemloft.net>
164
@@ -167,7 +167,7 @@ index 8be626f..d7aac9d 100644
167
--- a/Documentation/networking/xfrm_sync.txt
168
+++ b/Documentation/networking/xfrm_sync.txt
169
@@ -47,10 +47,13 @@ aevent_id structure looks like:
170
-
170
+
171
struct xfrm_aevent_id {
172
struct xfrm_usersa_id sa_id;
173
+ xfrm_address_t saddr;
@@ -1056,7 +1056,7 @@ $ git show
1056
-------------------------------------------------
1057
1058
As a special shortcut,
1059
-
1059
+
1060
-------------------------------------------------
1061
$ git commit -a
1062
-------------------------------------------------
@@ -1554,7 +1554,7 @@ history.
1554
1555
Fortunately, git also keeps a log, called a "reflog", of all the
1556
previous values of each branch. So in this case you can still find the
1557
-old history using, for example,
1557
+old history using, for example,
1558
1559
-------------------------------------------------
1560
$ git log master@{1}
@@ -1630,7 +1630,7 @@ If you decide you want the history back, you can always create a new
1630
reference pointing to it, for example, a new branch:
1631
1632
------------------------------------------------
1633
-$ git branch recovered-branch 7281251ddd
1633
+$ git branch recovered-branch 7281251ddd
1634
------------------------------------------------
1635
1636
Other types of dangling objects (blobs and trees) are also possible, and
@@ -1793,7 +1793,7 @@ like this:
1793
1794
you push
1795
your personal repo ------------------> your public repo
1796
- ^ |
1796
+ ^ |
1797
| |
1798
| you pull | they pull
1799
| |
@@ -2359,7 +2359,7 @@ the result would create a new merge commit, like this:
2359
\ \
2360
a--b--c--m <-- mywork
2361
................................................
2362
-
2362
+
2363
However, if you prefer to keep the history in mywork a simple series of
2364
commits without any merges, you may instead choose to use
2365
gitlink:git-rebase[1]:
@@ -2735,7 +2735,7 @@ must have at least one root, and while you can tie several different
2735
root objects together into one project by creating a commit object which
2736
has two or more separate roots as its ultimate parents, that's probably
2737
just going to confuse people. So aim for the notion of "one root object
2738
-per project", even if git itself does not enforce that.
2738
+per project", even if git itself does not enforce that.
2739
2740
A <<def_tag_object,"tag" object>> symbolically identifies and can be
2741
used to sign other objects. It contains the identifier and type of
@@ -2757,7 +2757,7 @@ independently of the contents or the type of the object: all objects can
2757
be validated by verifying that (a) their hashes match the content of the
2758
file and (b) the object successfully inflates to a stream of bytes that
2759
forms a sequence of <ascii type without space> + <space> + <ascii decimal
2760
-size> + <byte\0> + <binary object data>.
2760
+size> + <byte\0> + <binary object data>.
2761
2762
The structured objects can further have their structure and
2763
connectivity to other objects verified. This is generally done with
@@ -2954,7 +2954,7 @@ cache, and the normal operation is to re-generate it completely from a
2954
known tree object, or update/compare it with a live tree that is being
2955
developed. If you blow the directory cache away entirely, you generally
2956
haven't lost any information as long as you have the name of the tree
2957
-that it described.
2957
+that it described.
2958
2959
At the same time, the index is at the same time also the
2960
staging area for creating new trees, and creating a new tree always
@@ -2974,7 +2974,7 @@ Generally, all "git" operations work on the index file. Some operations
2974
work *purely* on the index file (showing the current state of the
2975
index), but most operations move data to and from the index file. Either
2976
from the database or from the working directory. Thus there are four
2977
-main combinations:
2977
+main combinations:
2978
2979
[[working-directory-to-index]]
2980
working directory -> index
@@ -3437,7 +3437,7 @@ because you interrupted a "git fetch" with ^C or something like that,
3437
leaving _some_ of the new objects in the object database, but just
3438
dangling and useless.
3439
3440
-Anyway, once you are sure that you're not interested in any dangling
3440
+Anyway, once you are sure that you're not interested in any dangling
3441
state, you can just prune all unreachable objects:
3442
3443
------------------------------------------------
@@ -3448,12 +3448,12 @@ and they'll be gone. But you should only run "git prune" on a quiescent
3448
repository - it's kind of like doing a filesystem fsck recovery: you
3449
don't want to do that while the filesystem is mounted.
3450
3451
-(The same is true of "git-fsck" itself, btw - but since
3452
-git-fsck never actually *changes* the repository, it just reports
3453
-on what it found, git-fsck itself is never "dangerous" to run.
3454
-Running it while somebody is actually changing the repository can cause
3455
-confusing and scary messages, but it won't actually do anything bad. In
3456
-contrast, running "git prune" while somebody is actively changing the
3451
+(The same is true of "git-fsck" itself, btw - but since
3452
+git-fsck never actually *changes* the repository, it just reports
3453
+on what it found, git-fsck itself is never "dangerous" to run.
3454
+Running it while somebody is actually changing the repository can cause
3455
+confusing and scary messages, but it won't actually do anything bad. In
3456
+contrast, running "git prune" while somebody is actively changing the
3457
repository is a *BAD* idea).
3458
3459
[[birdview-on-the-source-code]]
GIT-VERSION-GEN
-2
@@ -43,5 +43,3 @@ test "$VN" = "$VC" || {
43
echo >&2 "GIT_VERSION = $VN"
44
echo "GIT_VERSION = $VN" >$GVF
45
}
46
-
47
-
INSTALL
+1
-2
@@ -31,7 +31,7 @@ Issues of note:
31
interactive tools. None of the core git stuff needs the wrapper,
32
it's just a convenient shorthand and while it is documented in some
33
places, you can always replace "git commit" with "git-commit"
34
- instead.
34
+ instead.
35
36
But let's face it, most of us don't have GNU interactive tools, and
37
even if we had it, we wouldn't know what it does. I don't think it
@@ -111,4 +111,3 @@ Issues of note:
111
would instead give you a copy of what you see at:
112
113
http://www.kernel.org/pub/software/scm/git/docs/
114
-
arm/sha1.c
+2
-2
@@ -49,7 +49,7 @@ void SHA1_Update(SHA_CTX *c, const void *p, unsigned long n)
49
void SHA1_Final(unsigned char *hash, SHA_CTX *c)
50
{
51
uint64_t bitlen;
52
- uint32_t bitlen_hi, bitlen_lo;
52
+ uint32_t bitlen_hi, bitlen_lo;
53
unsigned int i, offset, padlen;
54
unsigned char bits[8];
55
static const unsigned char padding[64] = { 0x80, };
@@ -69,7 +69,7 @@ void SHA1_Final(unsigned char *hash, SHA_CTX *c)
69
bits[5] = bitlen_lo >> 16;
70
bits[6] = bitlen_lo >> 8;
71
bits[7] = bitlen_lo;
72
- SHA1_Update(c, bits, 8);
72
+ SHA1_Update(c, bits, 8);
73
74
for (i = 0; i < 5; i++) {
75
uint32_t v = c->hash[i];
arm/sha1_arm.S
-1
@@ -181,4 +181,3 @@ sha_transform:
181
182
.L_sha_K:
183
.word 0x5a827999, 0x6ed9eba1, 0x8f1bbcdc, 0xca62c1d6
184
-
builtin-annotate.c
-1
@@ -22,4 +22,3 @@ int cmd_annotate(int argc, const char **argv, const char *prefix)
22
23
return cmd_blame(argc + 1, nargv, prefix);
24
}
25
-
builtin-diff-index.c
+1
-1
@@ -23,7 +23,7 @@ int cmd_diff_index(int argc, const char **argv, const char *prefix)
23
argc = setup_revisions(argc, argv, &rev, NULL);
24
for (i = 1; i < argc; i++) {
25
const char *arg = argv[i];
26
-
26
+
27
if (!strcmp(arg, "--cached"))
28
cached = 1;
29
else
builtin-fmt-merge-msg.c
-1
@@ -357,4 +357,3 @@ int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix)
357
358
return 0;
359
}
360
-
builtin-fsck.c
+2
-2
@@ -351,7 +351,7 @@ static int fsck_commit(struct commit *commit)
351
if (!commit->parents && show_root)
352
printf("root %s\n", sha1_to_hex(commit->object.sha1));
353
if (!commit->date)
354
- printf("bad commit date in %s\n",
354
+ printf("bad commit date in %s\n",
355
sha1_to_hex(commit->object.sha1));
356
return 0;
357
}
@@ -719,7 +719,7 @@ int cmd_fsck(int argc, char **argv, const char *prefix)
719
720
heads = 0;
721
for (i = 1; i < argc; i++) {
722
- const char *arg = argv[i];
722
+ const char *arg = argv[i];
723
724
if (*arg == '-')
725
continue;
builtin-ls-files.c
+1
-1
@@ -117,7 +117,7 @@ static void show_other_files(struct dir_struct *dir)
117
if (0 <= pos)
118
continue; /* exact match */
119
pos = -pos - 1;
120
- if (pos < active_nr) {
120
+ if (pos < active_nr) {
121
ce = active_cache[pos];
122
if (ce_namelen(ce) == len &&
123
!memcmp(ce->name, ent->name, len))
builtin-name-rev.c
-1
@@ -290,4 +290,3 @@ int cmd_name_rev(int argc, const char **argv, const char *prefix)
290
291
return 0;
292
}
293
-
builtin-pack-objects.c
+1
-1
@@ -252,7 +252,7 @@ static void *delta_against(void *buf, unsigned long size, struct object_entry *e
252
delta_buf = diff_delta(otherbuf, othersize,
253
buf, size, &delta_size, 0);
254
if (!delta_buf || delta_size != entry->delta_size)
255
- die("delta size changed");
255
+ die("delta size changed");
256
free(buf);
257
free(otherbuf);
258
return delta_buf;
builtin-rerere.c
-1
@@ -434,4 +434,3 @@ int cmd_rerere(int argc, const char **argv, const char *prefix)
434
path_list_clear(&merge_rr, 1);
435
return 0;
436
}
437
-
builtin-shortlog.c
-1
@@ -331,4 +331,3 @@ int cmd_shortlog(int argc, const char **argv, const char *prefix)
331
332
return 0;
333
}
334
-
cache.h
+1
-1
@@ -479,7 +479,7 @@ extern void prepare_packed_git(void);
479
extern void reprepare_packed_git(void);
480
extern void install_packed_git(struct packed_git *pack);
481
482
-extern struct packed_git *find_sha1_pack(const unsigned char *sha1,
482
+extern struct packed_git *find_sha1_pack(const unsigned char *sha1,
483
struct packed_git *packs);
484
485
extern void pack_report(void);
commit.c
+7
-7
@@ -148,7 +148,7 @@ static int commit_graft_pos(const unsigned char *sha1)
148
int register_commit_graft(struct commit_graft *graft, int ignore_dups)
149
{
150
int pos = commit_graft_pos(graft->sha1);
151
-
151
+
152
if (0 <= pos) {
153
if (ignore_dups)
154
free(graft);
@@ -406,7 +406,7 @@ struct commit_list * insert_by_date(struct commit *item, struct commit_list **li
406
return commit_list_insert(item, pp);
407
}
408
409
-
409
+
410
void sort_by_date(struct commit_list **list)
411
{
412
struct commit_list *ret = NULL;
@@ -1160,7 +1160,7 @@ void sort_in_topological_order_fn(struct commit_list ** list, int lifo,
1160
next = next->next;
1161
count++;
1162
}
1163
-
1163
+
1164
if (!count)
1165
return;
1166
/* allocate an array to help sort the list */
@@ -1188,11 +1188,11 @@ void sort_in_topological_order_fn(struct commit_list ** list, int lifo,
1188
}
1189
next=next->next;
1190
}
1191
- /*
1191
+ /*
1192
* find the tips
1193
*
1194
- * tips are nodes not reachable from any other node in the list
1195
- *
1194
+ * tips are nodes not reachable from any other node in the list
1195
+ *
1196
* the tips serve as a starting set for the work queue.
1197
*/
1198
next=*list;
@@ -1220,7 +1220,7 @@ void sort_in_topological_order_fn(struct commit_list ** list, int lifo,
1220
1221
if (pn) {
1222
/*
1223
- * parents are only enqueued for emission
1223
+ * parents are only enqueued for emission
1224
* when all their children have been emitted thereby
1225
* guaranteeing topological order.
1226
*/
commit.h
+1
-1
@@ -66,7 +66,7 @@ extern unsigned long pretty_print_commit(enum cmit_fmt fmt, const struct commit
66
/** Removes the first commit from a list sorted by date, and adds all
67
* of its parents.
68
**/
69
-struct commit *pop_most_recent_commit(struct commit_list **list,
69
+struct commit *pop_most_recent_commit(struct commit_list **list,
70
unsigned int mark);
71
72
struct commit *pop_commit(struct commit_list **stack);
compat/mmap.c
-1
@@ -40,4 +40,3 @@ int git_munmap(void *start, size_t length)
40
free(start);
41
return 0;
42
}
43
-
config.c
+1
-2
@@ -621,7 +621,7 @@ static ssize_t find_beginning_of_line(const char* contents, size_t size,
621
size_t equal_offset = size, bracket_offset = size;
622
ssize_t offset;
623
624
- for (offset = offset_-2; offset > 0
624
+ for (offset = offset_-2; offset > 0
625
&& contents[offset] != '\n'; offset--)
626
switch (contents[offset]) {
627
case '=': equal_offset = offset; break;
@@ -989,4 +989,3 @@ int git_config_rename_section(const char *old_name, const char *new_name)
989
free(config_filename);
990
return ret;
991
}
992
-
config.mak.in
-1
@@ -38,4 +38,3 @@ NO_STRCASESTR=@NO_STRCASESTR@
38
NO_STRLCPY=@NO_STRLCPY@
39
NO_SETENV=@NO_SETENV@
40
NO_ICONV=@NO_ICONV@
41
-
connect.c
+1
-1
@@ -390,7 +390,7 @@ static int git_proxy_command_options(const char *var, const char *value)
390
}
391
if (0 <= matchlen) {
392
/* core.gitproxy = none for kernel.org */
393
- if (matchlen == 4 &&
393
+ if (matchlen == 4 &&
394
!memcmp(value, "none", 4))
395
matchlen = 0;
396
git_proxy_command = xmalloc(matchlen + 1);
contrib/README
-1
@@ -41,4 +41,3 @@ submit a patch to create a subdirectory of contrib/ and put your
41
stuff there.
42
43
-jc
44
-
contrib/blameview/README
-1
@@ -7,4 +7,3 @@ To: Linus Torvalds <torvalds@linux-foundation.org>
7
Cc: git@vger.kernel.org
8
Date: Sat, 27 Jan 2007 18:52:38 -0500
9
Message-ID: <20070127235238.GA28706@coredump.intra.peff.net>
10
-
contrib/gitview/gitview
-2
@@ -1277,5 +1277,3 @@ if __name__ == "__main__":
1277
1278
view = GitView( without_diff != 1)
1279
view.run(sys.argv[without_diff:])
1280
-
1281
-
contrib/hooks/post-receive-email
+1
-1
@@ -199,7 +199,7 @@ generate_email_footer()
199
200
201
hooks/post-receive
202
- --
202
+ --
203
$projectdesc
204
EOF
205
}
contrib/remotes2config.sh
-2
@@ -31,5 +31,3 @@ if [ -d "$GIT_DIR"/remotes ]; then
31
esac
32
done
33
fi
34
-
35
-
convert-objects.c
+1
-1
@@ -194,7 +194,7 @@ static unsigned long parse_oldstyle_date(const char *buf)
194
fmt++;
195
} while (*buf && *fmt);
196
printf("left: %s\n", buf);
197
- return mktime(&tm);
197
+ return mktime(&tm);
198
}
199
200
static int convert_date_line(char *dst, void **buf, unsigned long *sp)
copy.c
-1
@@ -34,4 +34,3 @@ int copy_fd(int ifd, int ofd)
34
close(ifd);
35
return 0;
36
}
37
-
ctype.c
-1
@@ -20,4 +20,3 @@ unsigned char sane_ctype[256] = {
20
AA, AA, AA, AA, AA, AA, AA, AA, AA, AA, AA, 0, 0, 0, 0, 0, /* 112-15 */
21
/* Nothing in the 128.. range */
22
};
23
-
daemon.c
+2
-2
@@ -133,7 +133,7 @@ static int avoid_alias(char *p)
133
{
134
int sl, ndot;
135
136
- /*
136
+ /*
137
* This resurrects the belts and suspenders paranoia check by HPA
138
* done in <435560F7.4080006@zytor.com> thread, now enter_repo()
139
* does not do getcwd() based path canonicalizations.
@@ -247,7 +247,7 @@ static char *path_ok(struct interp *itable)
247
int pathlen = strlen(path);
248
249
/* The validation is done on the paths after enter_repo
250
- * appends optional {.git,.git/.git} and friends, but
250
+ * appends optional {.git,.git/.git} and friends, but
251
* it does not use getcwd(). So if your /pub is
252
* a symlink to /mnt/pub, you can whitelist /pub and
253
* do not have to say /mnt/pub.
date.c
+5
-5
@@ -403,7 +403,7 @@ static int match_multi_number(unsigned long num, char c, const char *date, char
403
}
404
405
/*
406
- * We've seen a digit. Time? Year? Date?
406
+ * We've seen a digit. Time? Year? Date?
407
*/
408
static int match_digit(const char *date, struct tm *tm, int *offset, int *tm_gmt)
409
{
@@ -495,7 +495,7 @@ static int match_digit(const char *date, struct tm *tm, int *offset, int *tm_gmt
495
} else if (num > 0 && num < 13) {
496
tm->tm_mon = num-1;
497
}
498
-
498
+
499
return n;
500
}
501
@@ -569,13 +569,13 @@ int parse_date(const char *date, char *result, int maxlen)
569
if (!match) {
570
/* BAD CRAP */
571
match = 1;
572
- }
572
+ }
573
574
date += match;
575
}
576
577
/* mktime uses local timezone */
578
- then = my_mktime(&tm);
578
+ then = my_mktime(&tm);
579
if (offset == -1)
580
offset = (then - mktime(&tm)) / 60;
581
@@ -691,7 +691,7 @@ static const struct typelen {
691
{ "days", 24*60*60 },
692
{ "weeks", 7*24*60*60 },
693
{ NULL }
694
-};
694
+};
695
696
static const char *approxidate_alpha(const char *date, struct tm *tm, int *num)
697
{
diff-lib.c
+1
-1
@@ -664,7 +664,7 @@ int run_diff_index(struct rev_info *revs, int cached)
664
const char *tree_name;
665
int match_missing = 0;
666
667
- /*
667
+ /*
668
* Backward compatibility wart - "diff-index -m" does
669
* not mean "do not ignore merges", but totally different.
670
*/
diff.c
+2
-2
@@ -3031,7 +3031,7 @@ void diff_addremove(struct diff_options *options,
3031
* entries to the diff-core. They will be prefixed
3032
* with something like '=' or '*' (I haven't decided
3033
* which but should not make any difference).
3034
- * Feeding the same new and old to diff_change()
3034
+ * Feeding the same new and old to diff_change()
3035
* also has the same effect.
3036
* Before the final output happens, they are pruned after
3037
* merged into rename/copy pairs as appropriate.
@@ -3058,7 +3058,7 @@ void diff_change(struct diff_options *options,
3058
unsigned old_mode, unsigned new_mode,
3059
const unsigned char *old_sha1,
3060
const unsigned char *new_sha1,
3061
- const char *base, const char *path)
3061
+ const char *base, const char *path)
3062
{
3063
char concatpath[PATH_MAX];
3064
struct diff_filespec *one, *two;
diffcore-pickaxe.c
+1
-1
@@ -102,7 +102,7 @@ void diffcore_pickaxe(const char *needle, int opts)
102
for (i = 0; i < q->nr; i++)
103
diff_free_filepair(q->queue[i]);
104
}
105
- else
105
+ else
106
/* Showing only the filepairs that has the needle */
107
for (i = 0; i < q->nr; i++) {
108
struct diff_filepair *p = q->queue[i];
entry.c
+1
-1
@@ -31,7 +31,7 @@ static void remove_subtree(const char *path)
31
struct dirent *de;
32
char pathbuf[PATH_MAX];
33
char *name;
34
-
34
+
35
if (!dir)
36
die("cannot opendir %s (%s)", path, strerror(errno));
37
strcpy(pathbuf, path);
environment.c
-2
@@ -105,5 +105,3 @@ char *get_graft_file(void)
105
setup_git_env();
106
return git_graft_file;
107
}
108
-
109
-
fetch-pack.c
+1
-1
@@ -114,7 +114,7 @@ static const unsigned char* get_rev(void)
114
commit->object.flags |= POPPED;
115
if (!(commit->object.flags & COMMON))
116
non_common_revs--;
117
-
117
+
118
parents = commit->parents;
119
120
if (commit->object.flags & COMMON) {
fetch.c
+2
-2
@@ -15,7 +15,7 @@ int get_verbosely = 0;
15
int get_recover = 0;
16
static unsigned char current_commit_sha1[20];
17
18
-void pull_say(const char *fmt, const char *hex)
18
+void pull_say(const char *fmt, const char *hex)
19
{
20
if (get_verbosely)
21
fprintf(stderr, fmt, hex);
@@ -153,7 +153,7 @@ static int process(struct object *obj)
153
return 0;
154
prefetch(obj->sha1);
155
}
156
-
156
+
157
object_list_insert(obj, process_queue_end);
158
process_queue_end = &(*process_queue_end)->next;
159
return 0;
git-archimport.perl
+87
-88
@@ -3,19 +3,19 @@
3
# This tool is copyright (c) 2005, Martin Langhoff.
4
# It is released under the Gnu Public License, version 2.
5
#
6
-# The basic idea is to walk the output of tla abrowse,
7
-# fetch the changesets and apply them.
6
+# The basic idea is to walk the output of tla abrowse,
7
+# fetch the changesets and apply them.
8
#
9
10
=head1 Invocation
11
12
- git-archimport [ -h ] [ -v ] [ -o ] [ -a ] [ -f ] [ -T ]
13
- [ -D depth] [ -t tempdir ] <archive>/<branch> [ <archive>/<branch> ]
12
+ git-archimport [ -h ] [ -v ] [ -o ] [ -a ] [ -f ] [ -T ]
13
+ [ -D depth] [ -t tempdir ] <archive>/<branch> [ <archive>/<branch> ]
14
15
Imports a project from one or more Arch repositories. It will follow branches
16
and repositories within the namespaces defined by the <archive/branch>
17
parameters supplied. If it cannot find the remote branch a merge comes from
18
-it will just import it as a regular commit. If it can find it, it will mark it
18
+it will just import it as a regular commit. If it can find it, it will mark it
19
as a merge whenever possible.
20
21
See man (1) git-archimport for more details.
@@ -25,14 +25,14 @@ See man (1) git-archimport for more details.
25
- create tag objects instead of ref tags
26
- audit shell-escaping of filenames
27
- hide our private tags somewhere smarter
28
- - find a way to make "cat *patches | patch" safe even when patchfiles are missing newlines
28
+ - find a way to make "cat *patches | patch" safe even when patchfiles are missing newlines
29
- sort and apply patches by graphing ancestry relations instead of just
30
relying in dates supplied in the changeset itself.
31
tla ancestry-graph -m could be helpful here...
32
33
=head1 Devel tricks
34
35
-Add print in front of the shell commands invoked via backticks.
35
+Add print in front of the shell commands invoked via backticks.
36
37
=head1 Devel Notes
38
@@ -126,16 +126,16 @@ sub do_abrowse {
126
my $stage = shift;
127
while (my ($limit, $level) = each %arch_branches) {
128
next unless $level == $stage;
129
-
130
- open ABROWSE, "$TLA abrowse -fkD --merges $limit |"
129
+
130
+ open ABROWSE, "$TLA abrowse -fkD --merges $limit |"
131
or die "Problems with tla abrowse: $!";
132
-
132
+
133
my %ps = (); # the current one
134
my $lastseen = '';
135
-
135
+
136
while (<ABROWSE>) {
137
chomp;
138
-
138
+
139
# first record padded w 8 spaces
140
if (s/^\s{8}\b//) {
141
my ($id, $type) = split(m/\s+/, $_, 2);
@@ -147,13 +147,13 @@ sub do_abrowse {
147
push (@psets, \%last_ps);
148
$psets{ $last_ps{id} } = \%last_ps;
149
}
150
-
150
+
151
my $branch = extract_versionname($id);
152
%ps = ( id => $id, branch => $branch );
153
if (%last_ps && ($last_ps{branch} eq $branch)) {
154
$ps{parent_id} = $last_ps{id};
155
}
156
-
156
+
157
$arch_branches{$branch} = 1;
158
$lastseen = 'id';
159
@@ -166,16 +166,16 @@ sub do_abrowse {
166
$ps{type} = 't';
167
# read which revision we've tagged when we parse the log
168
$ps{tag} = $1;
169
- } else {
169
+ } else {
170
warn "Unknown type $type";
171
}
172
173
$arch_branches{$branch} = 1;
174
$lastseen = 'id';
175
- } elsif (s/^\s{10}//) {
176
- # 10 leading spaces or more
175
+ } elsif (s/^\s{10}//) {
176
+ # 10 leading spaces or more
177
# indicate commit metadata
178
-
178
+
179
# date
180
if ($lastseen eq 'id' && m/^(\d{4}-\d\d-\d\d \d\d:\d\d:\d\d)/){
181
$ps{date} = $1;
@@ -186,12 +186,12 @@ sub do_abrowse {
186
} elsif ($lastseen eq 'merges' && s/^\s{2}//) {
187
my $id = $_;
188
push (@{$ps{merges}}, $id);
189
-
189
+
190
# aggressive branch finding:
191
if ($opt_D) {
192
my $branch = extract_versionname($id);
193
my $repo = extract_reponame($branch);
194
-
194
+
195
if (archive_reachable($repo) &&
196
!defined $arch_branches{$branch}) {
197
$arch_branches{$branch} = $stage + 1;
@@ -208,10 +208,10 @@ sub do_abrowse {
208
if (@psets && $psets[$#psets]{branch} eq $ps{branch}) {
209
$temp{parent_id} = $psets[$#psets]{id};
210
}
211
- push (@psets, \%temp);
211
+ push (@psets, \%temp);
212
$psets{ $temp{id} } = \%temp;
213
- }
214
-
213
+ }
214
+
215
close ABROWSE or die "$TLA abrowse failed on $limit\n";
216
}
217
} # end foreach $root
@@ -253,7 +253,7 @@ unless (-d $git_dir) { # initial import
253
while (my $file = readdir(DIR)) {
254
# skip non-interesting-files
255
next unless -f "$ptag_dir/$file";
256
-
256
+
257
# convert first '--' to '/' from old git-archimport to use
258
# as an archivename/c--b--v private tag
259
if ($file !~ m!,!) {
@@ -275,7 +275,7 @@ sub extract_reponame {
275
my $fq_cvbr = shift; # archivename/[[[[category]branch]version]revision]
276
return (split(/\//, $fq_cvbr))[0];
277
}
278
-
278
+
279
sub extract_versionname {
280
my $name = shift;
281
$name =~ s/--(?:patch|version(?:fix)?|base)-\d+$//;
@@ -283,7 +283,7 @@ sub extract_versionname {
283
}
284
285
# convert a fully-qualified revision or version to a unique dirname:
286
-# normalperson@yhbt.net-05/mpd--uclinux--1--patch-2
286
+# normalperson@yhbt.net-05/mpd--uclinux--1--patch-2
287
# becomes: normalperson@yhbt.net-05,mpd--uclinux--1
288
#
289
# the git notion of a branch is closer to
@@ -339,7 +339,7 @@ sub git_branchname {
339
340
sub process_patchset_accurate {
341
my $ps = shift;
342
-
342
+
343
# switch to that branch if we're not already in that branch:
344
if (-e "$git_dir/refs/heads/$ps->{branch}") {
345
system('git-checkout','-f',$ps->{branch}) == 0 or die "$! $?\n";
@@ -348,7 +348,7 @@ sub process_patchset_accurate {
348
my $rm = safe_pipe_capture('git-ls-files','--others','-z');
349
rmtree(split(/\0/,$rm)) if $rm;
350
}
351
-
351
+
352
# Apply the import/changeset/merge into the working tree
353
my $dir = sync_to_ps($ps);
354
# read the new log entry:
@@ -361,9 +361,9 @@ sub process_patchset_accurate {
361
parselog($ps, \@commitlog);
362
363
if ($ps->{id} =~ /--base-0$/ && $ps->{id} ne $psets[0]{id}) {
364
- # this should work when importing continuations
364
+ # this should work when importing continuations
365
if ($ps->{tag} && (my $branchpoint = eval { ptag($ps->{tag}) })) {
366
-
366
+
367
# find where we are supposed to branch from
368
if (! -e "$git_dir/refs/heads/$ps->{branch}") {
369
system('git-branch',$ps->{branch},$branchpoint) == 0 or die "$! $?\n";
@@ -388,8 +388,8 @@ sub process_patchset_accurate {
388
}
389
# allow multiple bases/imports here since Arch supports cherry-picks
390
# from unrelated trees
391
- }
392
-
391
+ }
392
+
393
# update the index with all the changes we got
394
system('git-diff-files --name-only -z | '.
395
'git-update-index --remove -z --stdin') == 0 or die "$! $?\n";
@@ -402,7 +402,7 @@ sub process_patchset_accurate {
402
# does not handle permissions or any renames involving directories
403
sub process_patchset_fast {
404
my $ps = shift;
405
- #
405
+ #
406
# create the branch if needed
407
#
408
if ($ps->{type} eq 'i' && !$import) {
@@ -417,9 +417,9 @@ sub process_patchset_fast {
417
# new branch! we need to verify a few things
418
die "Branch on a non-tag!" unless $ps->{type} eq 't';
419
my $branchpoint = ptag($ps->{tag});
420
- die "Tagging from unknown id unsupported: $ps->{tag}"
420
+ die "Tagging from unknown id unsupported: $ps->{tag}"
421
unless $branchpoint;
422
-
422
+
423
# find where we are supposed to branch from
424
if (! -e "$git_dir/refs/heads/$ps->{branch}") {
425
system('git-branch',$ps->{branch},$branchpoint) == 0 or die "$! $?\n";
@@ -435,13 +435,13 @@ sub process_patchset_fast {
435
}
436
system('git-checkout',$ps->{branch}) == 0 or die "$! $?\n";
437
return 0;
438
- }
438
+ }
439
die $! if $?;
440
- }
440
+ }
441
442
#
443
# Apply the import/changeset/merge into the working tree
444
- #
444
+ #
445
if ($ps->{type} eq 'i' || $ps->{type} eq 't') {
446
apply_import($ps) or die $!;
447
$stats{import_or_tag}++;
@@ -455,10 +455,10 @@ sub process_patchset_fast {
455
# prepare update git's index, based on what arch knows
456
# about the pset, resolve parents, etc
457
#
458
-
459
- my @commitlog = safe_pipe_capture($TLA,'cat-archive-log',$ps->{id});
458
+
459
+ my @commitlog = safe_pipe_capture($TLA,'cat-archive-log',$ps->{id});
460
die "Error in cat-archive-log: $!" if $?;
461
-
461
+
462
parselog($ps,\@commitlog);
463
464
# imports don't give us good info
@@ -485,10 +485,10 @@ sub process_patchset_fast {
485
if (@$ren % 2) {
486
die "Odd number of entries in rename!?";
487
}
488
-
488
+
489
while (@$ren) {
490
my $from = shift @$ren;
491
- my $to = shift @$ren;
491
+ my $to = shift @$ren;
492
493
unless (-d dirname($to)) {
494
mkpath(dirname($to)); # will die on err
@@ -529,20 +529,20 @@ if ($opt_f) {
529
"Things may be a bit slow\n";
530
*process_patchset = *process_patchset_accurate;
531
}
532
-
532
+
533
foreach my $ps (@psets) {
534
# process patchsets
535
$ps->{branch} = git_branchname($ps->{id});
536
537
#
538
- # ensure we have a clean state
539
- #
538
+ # ensure we have a clean state
539
+ #
540
if (my $dirty = `git-diff-files`) {
541
die "Unclean tree when about to process $ps->{id} " .
542
" - did we fail to commit cleanly before?\n$dirty";
543
}
544
die $! if $?;
545
-
545
+
546
#
547
# skip commits already in repo
548
#
@@ -559,7 +559,7 @@ foreach my $ps (@psets) {
559
my $tree = `git-write-tree`;
560
die "cannot write tree $!" if $?;
561
chomp $tree;
562
-
562
+
563
#
564
# Who's your daddy?
565
#
@@ -570,18 +570,18 @@ foreach my $ps (@psets) {
570
close HEAD;
571
chomp $p;
572
push @par, '-p', $p;
573
- } else {
573
+ } else {
574
if ($ps->{type} eq 's') {
575
warn "Could not find the right head for the branch $ps->{branch}";
576
}
577
}
578
}
579
-
579
+
580
if ($ps->{merges}) {
581
push @par, find_parents($ps);
582
}
583
584
- #
584
+ #
585
# Commit, tag and clean state
586
#
587
$ENV{TZ} = 'GMT';
@@ -592,14 +592,14 @@ foreach my $ps (@psets) {
592
$ENV{GIT_COMMITTER_EMAIL} = $ps->{email};
593
$ENV{GIT_COMMITTER_DATE} = $ps->{date};
594
595
- my $pid = open2(*READER, *WRITER,'git-commit-tree',$tree,@par)
595
+ my $pid = open2(*READER, *WRITER,'git-commit-tree',$tree,@par)
596
or die $!;
597
print WRITER $ps->{summary},"\n\n";
598
print WRITER $ps->{message},"\n";
599
-
599
+
600
# make it easy to backtrack and figure out which Arch revision this was:
601
print WRITER 'git-archimport-id: ',$ps->{id},"\n";
602
-
602
+
603
close WRITER;
604
my $commitid = <READER>; # read
605
chomp $commitid;
@@ -611,7 +611,7 @@ foreach my $ps (@psets) {
611
}
612
#
613
# Update the branch
614
- #
614
+ #
615
open HEAD, ">","$git_dir/refs/heads/$ps->{branch}";
616
print HEAD $commitid;
617
close HEAD;
@@ -640,7 +640,7 @@ exit 0;
640
sub sync_to_ps {
641
my $ps = shift;
642
my $tree_dir = $tmp.'/'.tree_dirname($ps->{id});
643
-
643
+
644
$opt_v && print "sync_to_ps($ps->{id}) method: ";
645
646
if (-d $tree_dir) {
@@ -674,7 +674,7 @@ sub sync_to_ps {
674
safe_pipe_capture($TLA,'get','--no-pristine',$ps->{id},$tree_dir);
675
$stats{get_new}++;
676
}
677
-
677
+
678
# added -I flag to rsync since we're going to fast! AIEEEEE!!!!
679
system('rsync','-aI','--delete','--exclude',$git_dir,
680
# '--exclude','.arch-inventory',
@@ -691,15 +691,15 @@ sub apply_import {
691
mkpath($tmp);
692
693
safe_pipe_capture($TLA,'get','-s','--no-pristine',$ps->{id},"$tmp/import");
694
- die "Cannot get import: $!" if $?;
694
+ die "Cannot get import: $!" if $?;
695
system('rsync','-aI','--delete', '--exclude',$git_dir,
696
'--exclude','.arch-ids','--exclude','{arch}',
697
"$tmp/import/", './');
698
die "Cannot rsync import:$!" if $?;
699
-
699
+
700
rmtree("$tmp/import");
701
die "Cannot remove tempdir: $!" if $?;
702
-
702
+
703
704
return 1;
705
}
@@ -712,13 +712,13 @@ sub apply_cset {
712
# get the changeset
713
safe_pipe_capture($TLA,'get-changeset',$ps->{id},"$tmp/changeset");
714
die "Cannot get changeset: $!" if $?;
715
-
715
+
716
# apply patches
717
if (`find $tmp/changeset/patches -type f -name '*.patch'`) {
718
# this can be sped up considerably by doing
719
# (find | xargs cat) | patch
720
# but that can get mucked up by patches
721
- # with missing trailing newlines or the standard
721
+ # with missing trailing newlines or the standard
722
# 'missing newline' flag in the patch - possibly
723
# produced with an old/buggy diff.
724
# slow and safe, we invoke patch once per patchfile
@@ -741,7 +741,7 @@ sub apply_cset {
741
742
# bring in new files
743
system('rsync','-aI','--exclude',$git_dir,
744
- '--exclude','.arch-ids',
744
+ '--exclude','.arch-ids',
745
'--exclude', '{arch}',
746
"$tmp/changeset/new-files-archive/",'./');
747
@@ -789,7 +789,7 @@ sub parselog {
789
removed_files => 1,
790
removed_directories => 1,
791
);
792
-
792
+
793
chomp (@$log);
794
while ($_ = shift @$log) {
795
if (/^Continuation-of:\s*(.*)/) {
@@ -828,7 +828,7 @@ sub parselog {
828
}
829
}
830
}
831
-
831
+
832
# drop leading empty lines from the log message
833
while (@$log && $log->[0] eq '') {
834
shift @$log;
@@ -842,7 +842,7 @@ sub parselog {
842
$ps->{summary} = $log->[0] . '...';
843
}
844
$ps->{message} = join("\n",@$log);
845
-
845
+
846
# skip Arch control files, unescape pika-escaped files
847
foreach my $k (keys %want_headers) {
848
next unless (defined $ps->{$k});
@@ -867,7 +867,7 @@ sub parselog {
867
# write/read a tag
868
sub tag {
869
my ($tag, $commit) = @_;
870
-
870
+
871
if ($opt_o) {
872
$tag =~ s|/|--|g;
873
} else {
@@ -875,7 +875,7 @@ sub tag {
875
$patchname =~ s/.*--//;
876
$tag = git_branchname ($tag) . '--' . $patchname;
877
}
878
-
878
+
879
if ($commit) {
880
open(C,">","$git_dir/refs/tags/$tag")
881
or die "Cannot create tag $tag: $!\n";
@@ -902,8 +902,8 @@ sub ptag {
902
my ($tag, $commit) = @_;
903
904
# don't use subdirs for tags yet, it could screw up other porcelains
905
- $tag =~ s|/|,|g;
906
-
905
+ $tag =~ s|/|,|g;
906
+
907
my $tag_file = "$ptag_dir/$tag";
908
my $tag_branch_dir = dirname($tag_file);
909
mkpath($tag_branch_dir) unless (-d $tag_branch_dir);
@@ -915,7 +915,7 @@ sub ptag {
915
or die "Cannot write tag $tag: $!\n";
916
close(C)
917
or die "Cannot write tag $tag: $!\n";
918
- $rptags{$commit} = $tag
918
+ $rptags{$commit} = $tag
919
unless $tag =~ m/--base-0$/;
920
} else { # read
921
# if the tag isn't there, return 0
@@ -941,7 +941,7 @@ sub find_parents {
941
# Identify what branches are merging into me
942
# and whether we are fully merged
943
# git-merge-base <headsha> <headsha> should tell
944
- # me what the base of the merge should be
944
+ # me what the base of the merge should be
945
#
946
my $ps = shift;
947
@@ -963,14 +963,14 @@ sub find_parents {
963
}
964
965
#
966
- # foreach branch find a merge base and walk it to the
966
+ # foreach branch find a merge base and walk it to the
967
# head where we are, collecting the merged patchsets that
968
# Arch has recorded. Keep that in @have
969
# Compare that with the commits on the other branch
970
# between merge-base and the tip of the branch (@need)
971
# and see if we have a series of consecutive patches
972
# starting from the merge base. The tip of the series
973
- # of consecutive patches merged is our new parent for
973
+ # of consecutive patches merged is our new parent for
974
# that branch.
975
#
976
foreach my $branch (keys %branches) {
@@ -979,13 +979,13 @@ sub find_parents {
979
next unless -e "$git_dir/refs/heads/$branch";
980
981
my $mergebase = `git-merge-base $branch $ps->{branch}`;
982
- if ($?) {
983
- # Don't die here, Arch supports one-way cherry-picking
984
- # between branches with no common base (or any relationship
985
- # at all beforehand)
986
- warn "Cannot find merge base for $branch and $ps->{branch}";
987
- next;
988
- }
982
+ if ($?) {
983
+ # Don't die here, Arch supports one-way cherry-picking
984
+ # between branches with no common base (or any relationship
985
+ # at all beforehand)
986
+ warn "Cannot find merge base for $branch and $ps->{branch}";
987
+ next;
988
+ }
989
chomp $mergebase;
990
991
# now walk up to the mergepoint collecting what patches we have
@@ -1010,7 +1010,7 @@ sub find_parents {
1010
# merge what we have with what ancestors have
1011
%have = (%have, %ancestorshave);
1012
1013
- # see what the remote branch has - these are the merges we
1013
+ # see what the remote branch has - these are the merges we
1014
# will want to have in a consecutive series from the mergebase
1015
my $otherbranchtip = git_rev_parse($branch);
1016
my @needraw = `git-rev-list --topo-order $otherbranchtip ^$mergebase`;
@@ -1018,7 +1018,7 @@ sub find_parents {
1018
foreach my $needps (@needraw) { # get the psets
1019
$needps = commitid2pset($needps);
1020
# git-rev-list will also
1021
- # list commits merged in via earlier
1021
+ # list commits merged in via earlier
1022
# merges. we are only interested in commits
1023
# from the branch we're looking at
1024
if ($branch eq $needps->{branch}) {
@@ -1054,7 +1054,7 @@ sub find_parents {
1054
next unless ref $psets{$p}{merges};
1055
my @merges = @{$psets{$p}{merges}};
1056
foreach my $merge (@merges) {
1057
- if ($parents{$merge}) {
1057
+ if ($parents{$merge}) {
1058
delete $parents{$merge};
1059
}
1060
}
@@ -1079,10 +1079,10 @@ sub git_rev_parse {
1079
sub commitid2pset {
1080
my $commitid = shift;
1081
chomp $commitid;
1082
- my $name = $rptags{$commitid}
1082
+ my $name = $rptags{$commitid}
1083
|| die "Cannot find reverse tag mapping for $commitid";
1084
$name =~ s|,|/|;
1085
- my $ps = $psets{$name}
1085
+ my $ps = $psets{$name}
1086
|| (print Dumper(sort keys %psets)) && die "Cannot find patchset for $name";
1087
return $ps;
1088
}
@@ -1112,7 +1112,7 @@ sub archive_reachable {
1112
my $archive = shift;
1113
return 1 if $reachable{$archive};
1114
return 0 if $unreachable{$archive};
1115
-
1115
+
1116
if (system "$TLA whereis-archive $archive >/dev/null") {
1117
if ($opt_a && (system($TLA,'register-archive',
1118
"http://mirrors.sourcecontrol.net/$archive") == 0)) {
@@ -1127,4 +1127,3 @@ sub archive_reachable {
1127
return 1;
1128
}
1129
}
1130
-
git-checkout.sh
+2
-2
@@ -210,7 +210,7 @@ else
210
esac
211
212
# Match the index to the working tree, and do a three-way.
213
- git diff-files --name-only | git update-index --remove --stdin &&
213
+ git diff-files --name-only | git update-index --remove --stdin &&
214
work=`git write-tree` &&
215
git read-tree $v --reset -u $new || exit
216
@@ -245,7 +245,7 @@ else
245
(exit $saved_err)
246
fi
247
248
-#
248
+#
249
# Switch the HEAD pointer to the new branch if we
250
# checked out a branch head, and remove any potential
251
# old MERGE_HEAD's (subsequent commits will clearly not
git-clone.sh
+2
-3
@@ -2,7 +2,7 @@
2
#
3
# Copyright (c) 2005, Linus Torvalds
4
# Copyright (c) 2005, Junio C Hamano
5
-#
5
+#
6
# Clone a repository into a different directory that does not yet exist.
7
8
# See git-sh-setup why.
@@ -98,7 +98,7 @@ while
98
*,--na|*,--nak|*,--nake|*,--naked|\
99
*,-b|*,--b|*,--ba|*,--bar|*,--bare) bare=yes ;;
100
*,-l|*,--l|*,--lo|*,--loc|*,--loca|*,--local) use_local=yes ;;
101
- *,-s|*,--s|*,--sh|*,--sha|*,--shar|*,--share|*,--shared)
101
+ *,-s|*,--s|*,--sh|*,--sha|*,--shar|*,--share|*,--shared)
102
local_shared=yes; use_local=yes ;;
103
1,--template) usage ;;
104
*,--template)
@@ -410,4 +410,3 @@ fi
410
rm -f "$GIT_DIR/CLONE_HEAD" "$GIT_DIR/REMOTE_HEAD"
411
412
trap - 0
413
-
git-commit.sh
+1
-1
@@ -557,7 +557,7 @@ then
557
} >>"$GIT_DIR"/COMMIT_EDITMSG
558
else
559
# we need to check if there is anything to commit
560
- run_status >/dev/null
560
+ run_status >/dev/null
561
fi
562
if [ "$?" != "0" -a ! -f "$GIT_DIR/MERGE_HEAD" -a -z "$amend" ]
563
then
git-cvsexportcommit.perl
+1
-1
@@ -197,7 +197,7 @@ if (@canstatusfiles) {
197
# ... validate new files,
198
foreach my $f (@afiles) {
199
if (defined ($cvsstat{$f}) and $cvsstat{$f} ne "Unknown") {
200
- $dirty = 1;
200
+ $dirty = 1;
201
warn "File $f is already known in your CVS checkout -- perhaps it has been added by another user. Or this may indicate that it exists on a different branch. If this is the case, use -f to force the merge.\n";
202
warn "Status was: $cvsstat{$f}\n";
203
}
git-cvsimport.perl
+6
-6
@@ -145,7 +145,7 @@ my $cvs_tree;
145
if ($#ARGV == 0) {
146
$cvs_tree = $ARGV[0];
147
} elsif (-f 'CVS/Repository') {
148
- open my $f, '<', 'CVS/Repository' or
148
+ open my $f, '<', 'CVS/Repository' or
149
die 'Failed to open CVS/Repository';
150
$cvs_tree = <$f>;
151
chomp $cvs_tree;
@@ -434,7 +434,7 @@ sub file {
434
my ($self,$fn,$rev) = @_;
435
my $res;
436
437
- my ($fh, $name) = tempfile('gitcvs.XXXXXX',
437
+ my ($fh, $name) = tempfile('gitcvs.XXXXXX',
438
DIR => File::Spec->tmpdir(), UNLINK => 1);
439
440
$self->_file($fn,$rev) and $res = $self->_line($fh);
@@ -520,8 +520,8 @@ sub is_sha1 {
520
521
sub get_headref ($$) {
522
my $name = shift;
523
- my $git_dir = shift;
524
-
523
+ my $git_dir = shift;
524
+
525
my $f = "$git_dir/refs/heads/$name";
526
if (open(my $fh, $f)) {
527
chomp(my $r = <$fh>);
@@ -771,7 +771,7 @@ sub commit {
771
$xtag =~ s/\s+\*\*.*$//; # Remove stuff like ** INVALID ** and ** FUNKY **
772
$xtag =~ tr/_/\./ if ( $opt_u );
773
$xtag =~ s/[\/]/$opt_s/g;
774
-
774
+
775
my $pid = open2($in, $out, 'git-mktag');
776
print $out "object $cid\n".
777
"type commit\n".
@@ -788,7 +788,7 @@ sub commit {
788
$? != 0 or $tagobj !~ /^[0123456789abcdef]{40}$/ ) {
789
die "Cannot create tag object $xtag: $!\n";
790
}
791
-
791
+
792
793
open(C,">$git_dir/refs/tags/$xtag")
794
or die "Cannot create tag $xtag: $!\n";
git-gui/GIT-VERSION-GEN
-2
@@ -78,5 +78,3 @@ test "$VN" = "$VC" || {
78
echo >&2 "GITGUI_VERSION = $VN"
79
echo "GITGUI_VERSION = $VN" >$GVF
80
}
81
-
82
-
git-gui/lib/class.tcl
-1
@@ -151,4 +151,3 @@ auto_mkindex_parser::command constructor {name args} {
151
[format { [list source [file join $dir %s]]} \
152
[file split $scriptFile]] "\n"
153
}
154
-
git-merge-one-file.sh
+1
-1
@@ -88,7 +88,7 @@ case "${1:-.}${2:-.}${3:-.}" in
88
# remove lines that are unique to ours.
89
orig=`git-unpack-file $2`
90
sz0=`wc -c <"$orig"`
91
- diff -u -La/$orig -Lb/$orig $orig $src2 | git-apply --no-add
91
+ diff -u -La/$orig -Lb/$orig $orig $src2 | git-apply --no-add
92
sz1=`wc -c <"$orig"`
93
94
# If we do not have enough common material, it is not
git-p4import.py
-1
@@ -358,4 +358,3 @@ for id in changes:
358
if stitch == 1:
359
git.clean_directories()
360
stitch = 0
361
-
git-svnimport.perl
+2
-2
@@ -542,7 +542,7 @@ sub copy_path($$$$$$$$) {
542
if ($node_kind eq $SVN::Node::dir) {
543
$srcpath =~ s#/*$#/#;
544
}
545
-
545
+
546
my $pid = open my $f,'-|';
547
die $! unless defined $pid;
548
if (!$pid) {
@@ -560,7 +560,7 @@ sub copy_path($$$$$$$$) {
560
} else {
561
$p = $path;
562
}
563
- push(@$new,[$mode,$sha1,$p]);
563
+ push(@$new,[$mode,$sha1,$p]);
564
}
565
close($f) or
566
print STDERR "$newrev:$newbranch: could not list files in $oldpath \@ $rev\n";
git-tag.sh
+2
-3
@@ -64,7 +64,7 @@ do
64
done
65
;;
66
-m)
67
- annotate=1
67
+ annotate=1
68
shift
69
message="$1"
70
if test "$#" = "0"; then
@@ -90,7 +90,7 @@ do
90
username="$1"
91
;;
92
-d)
93
- shift
93
+ shift
94
had_error=0
95
for tag
96
do
@@ -180,4 +180,3 @@ if [ "$annotate" ]; then
180
fi
181
182
git update-ref "refs/tags/$name" "$object" "$prev"
183
-
git-verify-tag.sh
-1
@@ -42,4 +42,3 @@ cat "$GIT_DIR/.tmp-vtag" |
42
sed '/-----BEGIN PGP/Q' |
43
gpg --verify "$GIT_DIR/.tmp-vtag" - || exit 1
44
rm -f "$GIT_DIR/.tmp-vtag"
45
-
git.spec.in
+1
-1
@@ -63,7 +63,7 @@ Git tools for importing Perforce repositories.
63
%package email
64
Summary: Git tools for sending email
65
Group: Development/Tools
66
-Requires: git-core = %{version}-%{release}
66
+Requires: git-core = %{version}-%{release}
67
%description email
68
Git tools for sending email.
69
gitk
+1
-1
@@ -337,7 +337,7 @@ proc readrefs {} {
337
set tagids($name) $commit
338
lappend idtags($commit) $name
339
}
340
- }
340
+ }
341
catch {
342
set tagcontents($name) [exec git cat-file tag $id]
343
}
gitweb/README
-1
@@ -79,4 +79,3 @@ Originally written by:
79
80
Any comment/question/concern to:
81
Git mailing list <git@vger.kernel.org>
82
-
help.c
-2
@@ -219,5 +219,3 @@ int cmd_help(int argc, const char **argv, const char *prefix)
219
220
return 0;
221
}
222
-
223
-
http-fetch.c
+1
-1
@@ -828,7 +828,7 @@ static void abort_object_request(struct object_request *obj_req)
828
}
829
unlink(obj_req->tmpfile);
830
if (obj_req->slot) {
831
- release_active_slot(obj_req->slot);
831
+ release_active_slot(obj_req->slot);
832
obj_req->slot = NULL;
833
}
834
release_object_request(obj_req);
http-push.c
+1
-1
@@ -518,7 +518,7 @@ static void start_put(struct transfer_request *request)
518
request->buffer.size = stream.total_out;
519
request->buffer.posn = 0;
520
521
- request->url = xmalloc(strlen(remote->url) +
521
+ request->url = xmalloc(strlen(remote->url) +
522
strlen(request->lock->token) + 51);
523
strcpy(request->url, remote->url);
524
posn = request->url + strlen(remote->url);
http.c
+1
-1
@@ -137,7 +137,7 @@ static int http_options(const char *var, const char *value)
137
return 0;
138
}
139
140
-#ifdef USE_CURL_MULTI
140
+#ifdef USE_CURL_MULTI
141
if (!strcmp("http.maxrequests", var)) {
142
if (max_requests == -1)
143
max_requests = git_config_int(var, value);
imap-send.c
+1
-1
@@ -1239,7 +1239,7 @@ split_msg( msg_data_t *all_msgs, msg_data_t *msg, int *ofs )
1239
msg->data[ msg->len ] = 0;
1240
1241
*ofs += msg->len;
1242
- return 1;
1242
+ return 1;
1243
}
1244
1245
static imap_server_conf_t server =
local-fetch.c
+4
-4
@@ -114,7 +114,7 @@ static int fetch_pack(const unsigned char *sha1)
114
return -1;
115
target = find_sha1_pack(sha1, packs);
116
if (!target)
117
- return error("Couldn't find %s: not separate or in any pack",
117
+ return error("Couldn't find %s: not separate or in any pack",
118
sha1_to_hex(sha1));
119
if (get_verbosely) {
120
fprintf(stderr, "Getting pack %s\n",
@@ -122,11 +122,11 @@ static int fetch_pack(const unsigned char *sha1)
122
fprintf(stderr, " which contains %s\n",
123
sha1_to_hex(sha1));
124
}
125
- sprintf(filename, "%s/objects/pack/pack-%s.pack",
125
+ sprintf(filename, "%s/objects/pack/pack-%s.pack",
126
path, sha1_to_hex(target->sha1));
127
copy_file(filename, sha1_pack_name(target->sha1),
128
sha1_to_hex(target->sha1), 1);
129
- sprintf(filename, "%s/objects/pack/pack-%s.idx",
129
+ sprintf(filename, "%s/objects/pack/pack-%s.idx",
130
path, sha1_to_hex(target->sha1));
131
copy_file(filename, sha1_pack_index_name(target->sha1),
132
sha1_to_hex(target->sha1), 1);
@@ -141,7 +141,7 @@ static int fetch_file(const unsigned char *sha1)
141
char *hex = sha1_to_hex(sha1);
142
char *dest_filename = sha1_file_name(sha1);
143
144
- if (object_name_start < 0) {
144
+ if (object_name_start < 0) {
145
strcpy(filename, path); /* e.g. git.git */
146
strcat(filename, "/objects/");
147
object_name_start = strlen(filename);
lockfile.c
-1
@@ -97,4 +97,3 @@ void rollback_lock_file(struct lock_file *lk)
97
unlink(lk->filename);
98
lk->filename[0] = 0;
99
}
100
-
mailmap.c
-1
@@ -89,4 +89,3 @@ int map_email(struct path_list *map, const char *email, char *name, int maxlen)
89
}
90
return 0;
91
}
92
-
match-trees.c
-1
@@ -301,4 +301,3 @@ void shift_tree(const unsigned char *hash1,
301
302
splice_tree(hash1, add_prefix, hash2, shifted);
303
}
304
-
merge-index.c
+1
-1
@@ -25,7 +25,7 @@ static void run_program(void)
25
static int merge_entry(int pos, const char *path)
26
{
27
int found;
28
-
28
+
29
if (pos >= active_nr)
30
die("git-merge-index: %s not in the cache", path);
31
arguments[0] = pgm;
mktag.c
+1
-1
@@ -11,7 +11,7 @@
11
* The first three lines are guaranteed to be at least 63 bytes:
12
* "object <sha1>\n" is 48 bytes, "type tag\n" at 9 bytes is the
13
* shortest possible type-line, and "tag .\n" at 6 bytes is the
14
- * shortest single-character-tag line.
14
+ * shortest single-character-tag line.
15
*
16
* We also artificially limit the size of the full object to 8kB.
17
* Just because I'm a lazy bastard, and if you can't fit a signature
mozilla-sha1/sha1.c
+9
-10
@@ -1,29 +1,29 @@
1
-/*
1
+/*
2
* The contents of this file are subject to the Mozilla Public
3
* License Version 1.1 (the "License"); you may not use this file
4
* except in compliance with the License. You may obtain a copy of
5
* the License at http://www.mozilla.org/MPL/
6
- *
6
+ *
7
* Software distributed under the License is distributed on an "AS
8
* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
9
* implied. See the License for the specific language governing
10
* rights and limitations under the License.
11
- *
11
+ *
12
* The Original Code is SHA 180-1 Reference Implementation (Compact version)
13
- *
13
+ *
14
* The Initial Developer of the Original Code is Paul Kocher of
15
- * Cryptography Research. Portions created by Paul Kocher are
15
+ * Cryptography Research. Portions created by Paul Kocher are
16
* Copyright (C) 1995-9 by Cryptography Research, Inc. All
17
* Rights Reserved.
18
- *
18
+ *
19
* Contributor(s):
20
*
21
* Paul Kocher
22
- *
22
+ *
23
* Alternatively, the contents of this file may be used under the
24
* terms of the GNU General Public License Version 2 or later (the
25
- * "GPL"), in which case the provisions of the GPL are applicable
26
- * instead of those above. If you wish to allow use of your
25
+ * "GPL"), in which case the provisions of the GPL are applicable
26
+ * instead of those above. If you wish to allow use of your
27
* version of this file only under the terms of the GPL and not to
28
* allow others to use your version of this file under the MPL,
29
* indicate your decision by deleting the provisions above and
@@ -149,4 +149,3 @@ static void shaHashBlock(SHA_CTX *ctx) {
149
ctx->H[3] += D;
150
ctx->H[4] += E;
151
}
152
-
mozilla-sha1/sha1.h
+9
-9
@@ -1,29 +1,29 @@
1
-/*
1
+/*
2
* The contents of this file are subject to the Mozilla Public
3
* License Version 1.1 (the "License"); you may not use this file
4
* except in compliance with the License. You may obtain a copy of
5
* the License at http://www.mozilla.org/MPL/
6
- *
6
+ *
7
* Software distributed under the License is distributed on an "AS
8
* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
9
* implied. See the License for the specific language governing
10
* rights and limitations under the License.
11
- *
11
+ *
12
* The Original Code is SHA 180-1 Header File
13
- *
13
+ *
14
* The Initial Developer of the Original Code is Paul Kocher of
15
- * Cryptography Research. Portions created by Paul Kocher are
15
+ * Cryptography Research. Portions created by Paul Kocher are
16
* Copyright (C) 1995-9 by Cryptography Research, Inc. All
17
* Rights Reserved.
18
- *
18
+ *
19
* Contributor(s):
20
*
21
* Paul Kocher
22
- *
22
+ *
23
* Alternatively, the contents of this file may be used under the
24
* terms of the GNU General Public License Version 2 or later (the
25
- * "GPL"), in which case the provisions of the GPL are applicable
26
- * instead of those above. If you wish to allow use of your
25
+ * "GPL"), in which case the provisions of the GPL are applicable
26
+ * instead of those above. If you wish to allow use of your
27
* version of this file only under the terms of the GPL and not to
28
* allow others to use your version of this file under the MPL,
29
* indicate your decision by deleting the provisions above and
object-refs.c
-2
@@ -85,5 +85,3 @@ void mark_reachable(struct object *obj, unsigned int mask)
85
mark_reachable(refs->ref[i], mask);
86
}
87
}
88
-
89
-
object.h
+1
-1
@@ -66,7 +66,7 @@ void set_object_refs(struct object *obj, struct object_refs *refs);
66
67
void mark_reachable(struct object *obj, unsigned int mask);
68
69
-struct object_list *object_list_insert(struct object *item,
69
+struct object_list *object_list_insert(struct object *item,
70
struct object_list **list_p);
71
72
void object_list_append(struct object *item,
pack-redundant.c
+2
-2
@@ -81,7 +81,7 @@ static struct llist * llist_copy(struct llist *list)
81
{
82
struct llist *ret;
83
struct llist_item *new, *old, *prev;
84
-
84
+
85
llist_init(&ret);
86
87
if ((ret->size = list->size) == 0)
@@ -100,7 +100,7 @@ static struct llist * llist_copy(struct llist *list)
100
}
101
new->next = NULL;
102
ret->back = new;
103
-
103
+
104
return ret;
105
}
106
patch-id.c
+1
-1
@@ -81,4 +81,4 @@ int main(int argc, char **argv)
81
82
generate_id_list();
83
return 0;
84
-}
84
+}
path-list.c
-1
@@ -100,4 +100,3 @@ void print_path_list(const char *text, const struct path_list *p)
100
for (i = 0; i < p->nr; i++)
101
printf("%s:%p\n", p->items[i].path, p->items[i].util);
102
}
103
-
perl/Makefile
-1
@@ -40,4 +40,3 @@ endif
40
# (even though GIT-CFLAGS aren't used yet. If ever)
41
../GIT-CFLAGS:
42
$(MAKE) -C .. GIT-CFLAGS
43
-
pkt-line.c
+1
-1
@@ -5,7 +5,7 @@
5
* Write a packetized stream, where each line is preceded by
6
* its length (including the header) as a 4-byte hex number.
7
* A length of 'zero' means end of stream (and a length of 1-3
8
- * would be an error).
8
+ * would be an error).
9
*
10
* This is all pretty stupid, but we use this packetized line
11
* format to make a streaming format possible without ever
ppc/sha1.c
+1
-1
@@ -50,7 +50,7 @@ int SHA1_Update(SHA_CTX *c, const void *ptr, unsigned long n)
50
p += nb;
51
}
52
return 0;
53
-}
53
+}
54
55
int SHA1_Final(unsigned char *hash, SHA_CTX *c)
56
{
read-cache.c
+5
-5
@@ -166,7 +166,7 @@ static int ce_match_stat_basic(struct cache_entry *ce, struct stat *st)
166
changed |= MTIME_CHANGED;
167
if (ce->ce_ctime.nsec != htonl(st->st_ctim.tv_nsec))
168
changed |= CTIME_CHANGED;
169
-#endif
169
+#endif
170
171
if (ce->ce_uid != htonl(st->st_uid) ||
172
ce->ce_gid != htonl(st->st_gid))
@@ -597,7 +597,7 @@ static int has_dir_name(struct index_state *istate,
597
* is being added, or we already have path and path/file is being
598
* added. Either one would result in a nonsense tree that has path
599
* twice when git-write-tree tries to write it out. Prevent it.
600
- *
600
+ *
601
* If ok-to-replace is specified, we remove the conflicting entries
602
* from the cache so the caller should recompute the insert position.
603
* When this happens, we return non-zero.
@@ -970,8 +970,8 @@ static int ce_write(SHA_CTX *context, int fd, void *data, unsigned int len)
970
write_buffer_len = buffered;
971
len -= partial;
972
data = (char *) data + partial;
973
- }
974
- return 0;
973
+ }
974
+ return 0;
975
}
976
977
static int write_index_ext_header(SHA_CTX *context, int fd,
@@ -1037,7 +1037,7 @@ static void ce_smudge_racily_clean_entry(struct cache_entry *ce)
1037
* size to zero here, then the object name recorded
1038
* in index is the 6-byte file but the cached stat information
1039
* becomes zero --- which would then match what we would
1040
- * obtain from the filesystem next time we stat("frotz").
1040
+ * obtain from the filesystem next time we stat("frotz").
1041
*
1042
* However, the second update-index, before calling
1043
* this function, notices that the cached size is 6
rsh.h
+1
-1
@@ -1,7 +1,7 @@
1
#ifndef RSH_H
2
#define RSH_H
3
4
-int setup_connection(int *fd_in, int *fd_out, const char *remote_prog,
4
+int setup_connection(int *fd_in, int *fd_out, const char *remote_prog,
5
char *url, int rmt_argc, char **rmt_argv);
6
7
#endif
setup.c
+2
-2
@@ -39,7 +39,7 @@ const char *prefix_path(const char *prefix, int len, const char *path)
39
if (len) {
40
int speclen = strlen(path);
41
char *n = xmalloc(speclen + len + 1);
42
-
42
+
43
memcpy(n, prefix, len);
44
memcpy(n + len, path, speclen+1);
45
path = n;
@@ -47,7 +47,7 @@ const char *prefix_path(const char *prefix, int len, const char *path)
47
return path;
48
}
49
50
-/*
50
+/*
51
* Unlike prefix_path, this should be used if the named file does
52
* not have to interact with index entry; i.e. name of a random file
53
* on the filesystem.
sha1_file.c
+4
-4
@@ -193,7 +193,7 @@ char *sha1_pack_name(const unsigned char *sha1)
193
*buf++ = hex[val >> 4];
194
*buf++ = hex[val & 0xf];
195
}
196
-
196
+
197
return base;
198
}
199
@@ -218,7 +218,7 @@ char *sha1_pack_index_name(const unsigned char *sha1)
218
*buf++ = hex[val >> 4];
219
*buf++ = hex[val & 0xf];
220
}
221
-
221
+
222
return base;
223
}
224
@@ -1139,7 +1139,7 @@ static int parse_sha1_header(const char *hdr, unsigned long *sizep)
1139
unsigned long size;
1140
1141
/*
1142
- * The type can be at most ten bytes (including the
1142
+ * The type can be at most ten bytes (including the
1143
* terminating '\0' that we add), and is followed by
1144
* a space.
1145
*/
@@ -1738,7 +1738,7 @@ static int find_pack_entry(const unsigned char *sha1, struct pack_entry *e, cons
1738
return 0;
1739
}
1740
1741
-struct packed_git *find_sha1_pack(const unsigned char *sha1,
1741
+struct packed_git *find_sha1_pack(const unsigned char *sha1,
1742
struct packed_git *packs)
1743
{
1744
struct packed_git *p;
shallow.c
-1
@@ -101,4 +101,3 @@ struct commit_list *get_shallow_commits(struct object_array *heads, int depth,
101
102
return result;
103
}
104
-
ssh-upload.c
+5
-5
@@ -29,24 +29,24 @@ static int serve_object(int fd_in, int fd_out) {
29
}
30
if (!size)
31
return -1;
32
-
32
+
33
if (verbose)
34
fprintf(stderr, "Serving %s\n", sha1_to_hex(sha1));
35
36
remote = 0;
37
-
37
+
38
if (!has_sha1_file(sha1)) {
39
fprintf(stderr, "git-ssh-upload: could not find %s\n",
40
sha1_to_hex(sha1));
41
remote = -1;
42
}
43
-
43
+
44
if (write_in_full(fd_out, &remote, 1) != 1)
45
return 0;
46
-
46
+
47
if (remote < 0)
48
return 0;
49
-
49
+
50
return write_sha1_to_fd(fd_out, sha1);
51
}
52
strbuf.c
-1
@@ -39,4 +39,3 @@ void read_line(struct strbuf *sb, FILE *fp, int term) {
39
sb->eof = 1;
40
strbuf_end(sb);
41
}
42
-
t/Makefile
-1
@@ -28,4 +28,3 @@ full-svn-test:
28
29
.PHONY: $(T) clean
30
.NOTPARALLEL:
31
-
t/lib-read-tree-m-3way.sh
+1
-1
@@ -87,7 +87,7 @@ test_expect_success \
87
test_expect_success \
88
'recording branch A tree' \
89
'tree_A=$(git-write-tree)'
90
-
90
+
91
################################################################
92
# Branch B
93
# Start from O
t/t0000-basic.sh
+1
-1
@@ -37,7 +37,7 @@ fi
37
find .git/objects -type f -print >should-be-empty
38
test_expect_success \
39
'.git/objects should be empty after git-init in an empty repo.' \
40
- 'cmp -s /dev/null should-be-empty'
40
+ 'cmp -s /dev/null should-be-empty'
41
42
# also it should have 2 subdirectories; no fan-out anymore, pack, and info.
43
# 3 is counting "objects" itself
t/t1200-tutorial.sh
-1
@@ -159,4 +159,3 @@ test_expect_success 'git prune-packed' 'git prune-packed'
159
test_expect_failure '-> only packed objects' 'find -type f .git/objects/[0-9a-f][0-9a-f]'
160
161
test_done
162
-
t/t1300-repo-config.sh
-1
@@ -514,4 +514,3 @@ git config --list > result
514
test_expect_success 'value continued on next line' 'cmp result expect'
515
516
test_done
517
-
t/t2000-checkout-cache-clash.sh
-2
@@ -49,5 +49,3 @@ test_expect_success \
49
'test -f path0 && test -d path1 && test -f path1/file1'
50
51
test_done
52
-
53
-
t/t2001-checkout-cache-clash.sh
-1
@@ -84,4 +84,3 @@ test_expect_success \
84
test ! -h path1/file1 && test -f path1/file1'
85
86
test_done
87
-
t/t3030-merge-recursive.sh
-1
@@ -525,4 +525,3 @@ test_expect_success 'reset and bind merge' '
525
'
526
527
test_done
528
-
t/t3403-rebase-skip.sh
-1
@@ -54,4 +54,3 @@ test_expect_success 'merge and reference trees equal' \
54
test_debug 'gitk --all & sleep 1'
55
56
test_done
57
-
t/t4006-diff-mode.sh
-1
@@ -41,4 +41,3 @@ test_expect_success \
41
'git diff expected check'
42
43
test_done
44
-
t/t4100-apply-stat.sh
-1
@@ -44,4 +44,3 @@ test_expect_success \
44
git diff ../t4100/t-apply-7.expect current'
45
46
test_done
47
-
t/t4110-apply-scan.sh
-1
@@ -98,4 +98,3 @@ test_expect_success "S = cmp" \
98
'cmp apply.txt patch.txt'
99
100
test_done
101
-
t/t4112-apply-renames.sh
+8
-8
@@ -49,10 +49,10 @@ copy to include/arch/cris/klibc/archsetjmp.h
49
- * arch/x86_64/include/klibc/archsetjmp.h
50
+ * arch/cris/include/klibc/archsetjmp.h
51
*/
52
-
52
+
53
#ifndef _KLIBC_ARCHSETJMP_H
54
#define _KLIBC_ARCHSETJMP_H
55
-
55
+
56
struct __jmp_buf {
57
- unsigned long __rbx;
58
- unsigned long __rsp;
@@ -74,9 +74,9 @@ copy to include/arch/cris/klibc/archsetjmp.h
74
+ unsigned long __sp;
75
+ unsigned long __srp;
76
};
77
-
77
+
78
typedef struct __jmp_buf jmp_buf[1];
79
-
79
+
80
-#endif /* _SETJMP_H */
81
+#endif /* _KLIBC_ARCHSETJMP_H */
82
diff --git a/klibc/arch/x86_64/include/klibc/archsetjmp.h b/include/arch/m32r/klibc/archsetjmp.h
@@ -90,10 +90,10 @@ rename to include/arch/m32r/klibc/archsetjmp.h
90
- * arch/x86_64/include/klibc/archsetjmp.h
91
+ * arch/m32r/include/klibc/archsetjmp.h
92
*/
93
-
93
+
94
#ifndef _KLIBC_ARCHSETJMP_H
95
#define _KLIBC_ARCHSETJMP_H
96
-
96
+
97
struct __jmp_buf {
98
- unsigned long __rbx;
99
- unsigned long __rsp;
@@ -108,9 +108,9 @@ rename to include/arch/m32r/klibc/archsetjmp.h
108
unsigned long __r15;
109
- unsigned long __rip;
110
};
111
-
111
+
112
typedef struct __jmp_buf jmp_buf[1];
113
-
113
+
114
-#endif /* _SETJMP_H */
115
+#endif /* _KLIBC_ARCHSETJMP_H */
116
EOF
t/t4118-apply-empty-context.sh
-1
@@ -53,4 +53,3 @@ test_expect_success 'apply --apply' '
53
'
54
55
test_done
56
-
t/t4119-apply-config.sh
+1
-1
@@ -24,7 +24,7 @@ cat >gpatch.file <<\EOF &&
24
+++ file1+ 2007-02-21 01:07:44.000000000 -0800
25
@@ -1 +1 @@
26
-A
27
-+B
27
++B
28
EOF
29
30
sed -e 's|file1|sub/&|' gpatch.file >gpatch-sub.file &&
t/t4121-apply-diffs.sh
-1
@@ -30,4 +30,3 @@ test_expect_success \
30
'( git diff test~2 test~1; git diff test~1 test~0 )| git apply'
31
32
test_done
33
-
t/t4122-apply-symlink-inside.sh
-1
@@ -53,4 +53,3 @@ test_expect_success 'check result' '
53
'
54
55
test_done
56
-
t/t4200-rerere.sh
-2
@@ -148,5 +148,3 @@ test_expect_success 'old records rest in peace' \
148
"test ! -f $rr/preimage && test ! -f $rr2/preimage"
149
150
test_done
151
-
152
-
t/t5400-send-pack.sh
+1
-1
@@ -66,7 +66,7 @@ test_expect_success 'pack the destination repository' '
66
'
67
68
test_expect_success \
69
- 'pushing rewound head should not barf but require --force' '
69
+ 'pushing rewound head should not barf but require --force' '
70
# should not fail but refuse to update.
71
if git-send-pack ./victim/.git/ master
72
then
t/t5520-pull.sh
-1
@@ -54,4 +54,3 @@ test_expect_success 'the default remote . should not break explicit pull' '
54
'
55
56
test_done
57
-
t/t5710-info-alternate.sh
-1
@@ -104,4 +104,3 @@ test_valid_repo'
104
cd "$base_dir"
105
106
test_done
107
-
t/t6000lib.sh
+8
-8
@@ -17,17 +17,17 @@ unique_commit()
17
_text=$1
18
_tree=$2
19
shift 2
20
- echo $_text | git-commit-tree $(tag $_tree) "$@"
20
+ echo $_text | git-commit-tree $(tag $_tree) "$@"
21
}
22
23
# Save the output of a command into the tag specified. Prepend
24
# a substitution script for the tag onto the front of sed.script
25
save_tag()
26
{
27
- _tag=$1
27
+ _tag=$1
28
[ -n "$_tag" ] || error "usage: save_tag tag commit-args ..."
29
shift 1
30
- "$@" >.git/refs/tags/$_tag
30
+ "$@" >.git/refs/tags/$_tag
31
32
echo "s/$(tag $_tag)/$_tag/g" > sed.script.tmp
33
cat sed.script >> sed.script.tmp
@@ -35,7 +35,7 @@ save_tag()
35
mv sed.script.tmp sed.script
36
}
37
38
-# Replace unhelpful sha1 hashses with their symbolic equivalents
38
+# Replace unhelpful sha1 hashses with their symbolic equivalents
39
entag()
40
{
41
sed -f sed.script
@@ -62,7 +62,7 @@ as_author()
62
commit_date()
63
{
64
_commit=$1
65
- git-cat-file commit $_commit | sed -n "s/^committer .*> \([0-9]*\) .*/\1/p"
65
+ git-cat-file commit $_commit | sed -n "s/^committer .*> \([0-9]*\) .*/\1/p"
66
}
67
68
on_committer_date()
@@ -103,14 +103,14 @@ name_from_description()
103
104
# Execute the test described by the first argument, by eval'ing
105
# command line specified in the 2nd argument. Check the status code
106
-# is zero and that the output matches the stream read from
106
+# is zero and that the output matches the stream read from
107
# stdin.
108
test_output_expect_success()
109
-{
109
+{
110
_description=$1
111
_test=$2
112
[ $# -eq 2 ] || error "usage: test_output_expect_success description test <<EOF ... EOF"
113
_name=$(echo $_description | name_from_description)
114
cat > $_name.expected
115
- test_expect_success "$_description" "check_output $_name \"$_test\""
115
+ test_expect_success "$_description" "check_output $_name \"$_test\""
116
}
t/t6002-rev-list-bisect.sh
+4
-4
@@ -26,7 +26,7 @@ test_bisection_diff()
26
27
# Test if bisection size is close to half of list size within
28
# tolerance.
29
- #
29
+ #
30
_bisect_err=`expr $_list_size - $_bisection_size \* 2`
31
test "$_bisect_err" -lt 0 && _bisect_err=`expr 0 - $_bisect_err`
32
_bisect_err=`expr $_bisect_err / 2` ; # floor
@@ -116,8 +116,8 @@ on_committer_date "1971-08-16 00:00:06" save_tag V unique_commit V tree -p u1 -p
116
117
test_sequence()
118
{
119
- _bisect_option=$1
120
-
119
+ _bisect_option=$1
120
+
121
test_bisection_diff 0 $_bisect_option l0 ^root
122
test_bisection_diff 0 $_bisect_option l1 ^root
123
test_bisection_diff 0 $_bisect_option l2 ^root
@@ -152,7 +152,7 @@ test_sequence()
152
test_bisection_diff 0 $_bisect_option u3 ^U
153
test_bisection_diff 0 $_bisect_option u4 ^U
154
test_bisection_diff 0 $_bisect_option u5 ^U
155
-
155
+
156
#
157
# the following illustrates Linus' binary bug blatt idea.
158
#
t/t6021-merge-criss-cross.sh
+1
-1
@@ -20,7 +20,7 @@ test_expect_success 'prepare repository' \
20
7
21
8
22
9" > file &&
23
-git add file &&
23
+git add file &&
24
git commit -m "Initial commit" file &&
25
git branch A &&
26
git branch B &&
t/t6023-merge-file.sh
-1
@@ -135,4 +135,3 @@ EOF
135
test_expect_success "expected conflict markers" "git diff expect out"
136
137
test_done
138
-
t/t6030-bisect-porcelain.sh
-1
@@ -102,4 +102,3 @@ test_expect_success \
102
#
103
#
104
test_done
105
-
t/t6101-rev-parse-parents.sh
-1
@@ -40,4 +40,3 @@ test_expect_success 'short SHA-1 works' '
40
test $start = $abbrv'
41
42
test_done
43
-
t/t9107-git-svn-migrate.sh
-1
@@ -109,4 +109,3 @@ test_expect_success ".rev_db auto-converted to .rev_db.UUID" "
109
"
110
111
test_done
112
-
t/t9111/svnsync.dump
-2
@@ -558,5 +558,3 @@ Text-content-md5: 7abb78de7f2756ca8b511cbc879fd5e7
558
Content-length: 4
559
560
cba
561
-
562
-
t/test-lib.sh
+1
-1
@@ -232,7 +232,7 @@ test_create_repo () {
232
mv .git/hooks .git/hooks-disabled
233
cd "$owd"
234
}
235
-
235
+
236
test_done () {
237
trap - exit
238
case "$test_failure" in
templates/hooks--commit-msg
-1
@@ -19,4 +19,3 @@ test "" = "$(grep '^Signed-off-by: ' "$1" |
19
echo >&2 Duplicate Signed-off-by lines.
20
exit 1
21
}
22
-
templates/hooks--post-receive
-1
@@ -14,4 +14,3 @@
14
15
16
#. /usr/share/doc/git-core/contrib/hooks/post-receive-email
17
-
templates/hooks--pre-applypatch
-1
@@ -12,4 +12,3 @@
12
test -x "$GIT_DIR/hooks/pre-commit" &&
13
exec "$GIT_DIR/hooks/pre-commit" ${1+"$@"}
14
:
15
-
templates/hooks--pre-commit
-1
@@ -68,4 +68,3 @@ perl -e '
68
}
69
exit($found_bad);
70
'
71
-
tree-walk.c
-1
@@ -206,4 +206,3 @@ int get_tree_entry(const unsigned char *tree_sha1, const char *name, unsigned ch
206
free(tree);
207
return retval;
208
}
209
-
upload-pack.c
+1
-1
@@ -678,7 +678,7 @@ int main(int argc, char **argv)
678
break;
679
}
680
}
681
-
681
+
682
if (i != argc-1)
683
usage(upload_pack_usage);
684
dir = argv[i];
var.c
+2
-2
@@ -67,8 +67,8 @@ int main(int argc, char **argv)
67
val = read_var(argv[1]);
68
if (!val)
69
usage(var_usage);
70
-
70
+
71
printf("%s\n", val);
72
-
72
+
73
return 0;
74
}
xdiff-interface.c
-2
@@ -129,5 +129,3 @@ int buffer_is_binary(const char *ptr, unsigned long size)
129
size = FIRST_FEW_BYTES;
130
return !!memchr(ptr, 0, size);
131
}
132
-
133
-
xdiff/xdiff.h
-1
@@ -103,4 +103,3 @@ int xdl_merge(mmfile_t *orig, mmfile_t *mf1, const char *name1,
103
#endif /* #ifdef __cplusplus */
104
105
#endif /* #if !defined(XDIFF_H) */
106
-
xdiff/xdiffi.c
-1
@@ -565,4 +565,3 @@ int xdl_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp,
565
566
return 0;
567
}
568
-
xdiff/xdiffi.h
-1
@@ -57,4 +57,3 @@ int xdl_emit_diff(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb,
57
xdemitconf_t const *xecfg);
58
59
#endif /* #if !defined(XDIFFI_H) */
60
-
xdiff/xemit.c
-1
@@ -194,4 +194,3 @@ int xdl_emit_diff(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb,
194
195
return 0;
196
}
197
-
xdiff/xemit.h
-1
@@ -31,4 +31,3 @@ int xdl_emit_diff(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb,
31
32
33
#endif /* #if !defined(XEMIT_H) */
34
-
xdiff/xinclude.h
-1
@@ -40,4 +40,3 @@
40
41
42
#endif /* #if !defined(XINCLUDE_H) */
43
-
xdiff/xmacros.h
-1
@@ -51,4 +51,3 @@ do { \
51
52
53
#endif /* #if !defined(XMACROS_H) */
54
-
xdiff/xprepare.c
-1
@@ -466,4 +466,3 @@ static int xdl_optimize_ctxs(xdfile_t *xdf1, xdfile_t *xdf2) {
466
467
return 0;
468
}
469
-
xdiff/xprepare.h
-1
@@ -32,4 +32,3 @@ void xdl_free_env(xdfenv_t *xe);
32
33
34
#endif /* #if !defined(XPREPARE_H) */
35
-
xdiff/xtypes.h
-1
@@ -65,4 +65,3 @@ typedef struct s_xdfenv {
65
66
67
#endif /* #if !defined(XTYPES_H) */
68
-
xdiff/xutils.c
-1
@@ -380,4 +380,3 @@ int xdl_emit_hunk_hdr(long s1, long c1, long s2, long c2,
380
381
return 0;
382
}
383
-
xdiff/xutils.h
-1
@@ -45,4 +45,3 @@ int xdl_emit_hunk_hdr(long s1, long c1, long s2, long c2,
45
46
47
#endif /* #if !defined(XUTILS_H) */
48
-