![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d44c782)
raw | patch | inline | side by side (parent: d44c782)
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 7 Jun 2007 07:04:01 +0000 (00:04 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 7 Jun 2007 07:04:01 +0000 (00:04 -0700) |
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>
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>
256 files changed:
index b727a8d1e57cf8fb5a6c591a5f35ceddbbd3f6af..feefa5dfd4eee5f493fcf3091ec0de116d414fc1 100644 (file)
* Documentation updates
* User manual updates
-
-
index aa86149d4f3649721f206b94c26854ce30dfc101..eeec3d73d01a0e9f61df666bad8a48a4f423438a 100644 (file)
* Documentation updates
* User manual updates
-
-
index e15447ffdba41ec082e249b13bc31248b6d2dbbe..c02015ad5fdb1953ad1a8cf5b0edd7ef7c04fbac 100644 (file)
- user-manual has better cross references.
- gitweb installation/deployment procedure is now documented.
-
index 2ddeabd0296848eeb6344b5487f85e9c484eaf0a..876408b65a0e0841567a2c9b97c6f6e62cb86b81 100644 (file)
description was given by the caller.
Also contains various documentation updates.
-
index b9baa1d3b4685859d6ad3530a64865cc054df7a3..01354c2bb5da56181de3b88052e1d921986f1f95 100644 (file)
--- a/pico/pico.c
+++ b/pico/pico.c
@@ -219,7 +219,9 @@ PICO *pm;
- switch(pico_all_done){ /* prepare for/handle final events */
- case COMP_EXIT : /* already confirmed */
- packheader();
+ switch(pico_all_done){ /* prepare for/handle final events */
+ case COMP_EXIT : /* already confirmed */
+ packheader();
+#if 0
- stripwhitespace();
+ stripwhitespace();
+#endif
- c |= COMP_EXIT;
- break;
-
+ c |= COMP_EXIT;
+ break;
+
(Daniel Barkalow)
index 60e15ba3494b93f2c956356d3d5fd905385d0c1f..99302c5bebb6017e34371bf12dafeab97447bda5 100644 (file)
[gitlink-inlinemacro]
<a href="{target}.html">{target}{0?({0})}</a>
endif::backend-xhtml11[]
-
-
index 5868d587a905e0aaa55194c7716f9e258a030474..de408b6571c38c508c42a96d9d622226e401258e 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
transfer.unpackLimit::
When `fetch.unpackLimit` or `receive.unpackLimit` are
not set, the value of this variable is used instead.
-
-
index 6b9b9ad7d1083ee09955ddaf46db4fad1a37834b..4fb6f4143cd849fc81f3ee5d2b8e4ee77e21137d 100644 (file)
often the best way of explaining what is going on.
In normal life, most people wouldn't use the "core" git programs
-directly, but rather script around them to make them more palatable.
+directly, but rather script around them to make them more palatable.
Understanding the core git stuff may help some people get those scripts
done, though, and it may also be instructive in helping people
understand what it is that the higher-level helper scripts are actually
-doing.
+doing.
The core git is often called "plumbing", with the prettier user
interfaces on top of it called "porcelain". You may not want to use the
out empty, and the only thing you need to do is find yourself a
subdirectory that you want to use as a working tree - either an empty
one for a totally new project, or an existing working tree that you want
-to import into git.
+to import into git.
For our first example, we're going to start a totally new repository from
scratch, with no pre-existing files, and we'll call it `git-tutorial`.
and see two files:
----------------
-.git/objects/55/7db03de997c86a4a028e1ebd3a1ceb225be238
+.git/objects/55/7db03de997c86a4a028e1ebd3a1ceb225be238
.git/objects/f2/4c74a2e500f5ee1332c86b94199f52b1d1d962
----------------
you've only *told* git about them.
However, since git knows about them, you can now start using some of the
-most basic git commands to manipulate the files or look at their status.
+most basic git commands to manipulate the files or look at their status.
In particular, let's not even check in the two files into git yet, we'll
start off by adding another line to `hello` first:
Remember how we did the `git-update-index` on file `hello` and then we
changed `hello` afterward, and could compare the new state of `hello` with the
-state we saved in the index file?
+state we saved in the index file?
Further, remember how I said that `git-write-tree` writes the contents
of the *index* file to the tree, and thus what we just committed was in
between a committed *tree* and either the index file or the working
tree. In other words, `git-diff-index` wants a tree to be diffed
against, and before we did the commit, we couldn't do that, because we
-didn't have anything to diff against.
+didn't have anything to diff against.
But now we can do
----------------
(where `-p` has the same meaning as it did in `git-diff-files`), and it
-will show us the same difference, but for a totally different reason.
+will show us the same difference, but for a totally different reason.
Now we're comparing the working tree not against the index file,
but against the tree we just wrote. It just so happens that those two
are obviously the same, so we get the same result.
instead compare against just the index cache contents, and ignore the
current working tree state entirely. Since we just wrote the index
file to HEAD, doing `git-diff-index \--cached -p HEAD` should thus return
-an empty set of differences, and that's exactly what it does.
+an empty set of differences, and that's exactly what it does.
[NOTE]
================
----------------
and you will see exactly what has changed in the repository over its
-short history.
+short history.
[NOTE]
The `\--root` flag is a flag to `git-diff-tree` to tell it to
the working tree that it describes" may not be technically 100%
accurate, but it's a good model for all normal use.
-This has two implications:
+This has two implications:
- if you grow bored with the tutorial repository you created (or you've
made a mistake and want to start all over), you can just do simple
the checked out files or even an index file, and will *only* contain the
actual core git files. Such a repository usually doesn't even have the
`.git` subdirectory, but has all the git files directly in the
-repository.
+repository.
To create your own local live copy of such a "raw" git repository, you'd
first create your own subdirectory for the project, and then copy the
$ rsync -rL rsync://rsync.kernel.org/pub/scm/git/git.git/ .git
----------------
-followed by
+followed by
----------------
$ git-read-tree HEAD
`-a` flag means "check out all files" (if you have a stale copy or an
older version of a checked out tree you may also need to add the `-f`
flag first, to tell git-checkout-index to *force* overwriting of any old
-files).
+files).
Again, this can all be simplified with
which will end up doing all of the above for you.
You have now successfully copied somebody else's (mine) remote
-repository, and checked it out.
+repository, and checked it out.
Creating a new branch
Branches in git are really nothing more than pointers into the git
object database from within the `.git/refs/` subdirectory, and as we
already discussed, the `HEAD` branch is nothing but a symlink to one of
-these object pointers.
+these object pointers.
You can at any time create a new branch by just picking an arbitrary
point in the project history, and just writing the SHA1 name of that
object into a file under `.git/refs/heads/`. You can use any filename you
want (and indeed, subdirectories), but the convention is that the
"normal" branch is called `master`. That's just a convention, though,
-and nothing enforces it.
+and nothing enforces it.
To show that as an example, let's go back to the git-tutorial repository we
used earlier, and create a branch in it. You do that by simply just
------------
will create a new branch based at the current `HEAD` position, and switch
-to it.
+to it.
[NOTE]
================================================
$ git branch <branchname> [startingpoint]
------------
-which will simply _create_ the branch, but will not do anything further.
+which will simply _create_ the branch, but will not do anything further.
You can then later -- once you decide that you want to actually develop
on that branch -- switch to that branch with a regular `git checkout`
with the branchname as the argument.
will show you graphically both of your branches (that's what the `\--all`
means: normally it will just show you your current `HEAD`) and their
histories. You can also see exactly how they came to be from a common
-source.
+source.
Anyway, let's exit `gitk` (`^Q` or the File menu), and decide that we want
to merge the work we did on the `mybranch` branch into the `master`
file, which had no differences in the `mybranch` branch), and say:
----------------
- Auto-merging hello
- CONFLICT (content): Merge conflict in hello
+ Auto-merging hello
+ CONFLICT (content): Merge conflict in hello
Automatic merge failed; fix up by hand
----------------
propagation to other publicly visible machines:
------------
-$ git push master.kernel.org:/pub/scm/git/git.git/
+$ git push master.kernel.org:/pub/scm/git/git.git/
------------
index e38a1f14056b2e3cfe3c281eb7df7e5b44d520db..18d49d2c3baa81983b19a938598eb091fb7809ef 100644 (file)
The output format from "git-diff-index", "git-diff-tree" and
"git-diff-files" are very similar.
-These commands all compare two sets of things; what is
+These commands all compare two sets of things; what is
compared differs:
git-diff-index <tree-ish>::
--- a/describe.c
+++ b/describe.c
@@@ -98,20 -98,12 +98,20 @@@
- return (a_date > b_date) ? -1 : (a_date == b_date) ? 0 : 1;
+ return (a_date > b_date) ? -1 : (a_date == b_date) ? 0 : 1;
}
-
+
- static void describe(char *arg)
-static void describe(struct commit *cmit, int last_one)
++static void describe(char *arg, int last_one)
{
+ unsigned char sha1[20];
+ struct commit *cmit;
- struct commit_list *list;
- static int initialized = 0;
- struct commit_name *n;
-
+ struct commit_list *list;
+ static int initialized = 0;
+ struct commit_name *n;
+
+ if (get_sha1(arg, sha1) < 0)
+ usage(describe_usage);
+ cmit = lookup_commit_reference(sha1);
+ if (!cmit)
+ usage(describe_usage);
+
- if (!initialized) {
- initialized = 1;
- for_each_ref(get_name);
+ if (!initialized) {
+ initialized = 1;
+ for_each_ref(get_name);
------------
1. It is preceded with a "git diff" header, that looks like
two unresolved merge parents with the working tree file
(i.e. file1 is stage 2 aka "our version", file2 is stage 3 aka
"their version").
-
index 1689c748171a8ff48395cf432aabe0130fc6b8d2..b2a05937f9c57e3a6ec70849fcc7aeca277b103b 100644 (file)
that matches other criteria, nothing is selected.
--find-copies-harder::
- For performance reasons, by default, -C option finds copies only
- if the original file of the copy was modified in the same
+ For performance reasons, by default, -C option finds copies only
+ if the original file of the copy was modified in the same
changeset. This flag makes the command
inspect unmodified files as candidates for the source of
copy. This is a very expensive operation for large
index 34cd306bb1ee6ac73986cf3371114381b4165a0d..c6a983a5d54abe2b18d155b6cba520c257da6f59 100644 (file)
is controlled by giving the pathname parameters to the
git-diff-* commands on the command line. The pathspec is used
to limit the world diff operates in. It removes the filepairs
-outside the specified set of pathnames. E.g. If the input set
+outside the specified set of pathnames. E.g. If the input set
of filepairs included:
------------------------------------------------
*.c
t
------------------------------------------------
-
index 8821e305dd6d5df919e376d2d9c3d0d5716cc074..b878b385c6967f4c64ba30bdfe8f9bd24bef91e3 100644 (file)
-/*\r
- CSS stylesheet for XHTML produced by DocBook XSL stylesheets.\r
- Tested with XSL stylesheets 1.61.2, 1.67.2\r
-*/\r
-\r
-span.strong {\r
- font-weight: bold;\r
-}\r
-\r
-body blockquote {\r
- margin-top: .75em;\r
- line-height: 1.5;\r
- margin-bottom: .75em;\r
-}\r
-\r
-html body {\r
- margin: 1em 5% 1em 5%;\r
- line-height: 1.2;\r
-}\r
-\r
-body div {\r
- margin: 0;\r
-}\r
-\r
-h1, h2, h3, h4, h5, h6,\r
-div.toc p b,\r
-div.list-of-figures p b,\r
-div.list-of-tables p b,\r
-div.abstract p.title\r
-{\r
- color: #527bbd;\r
- font-family: tahoma, verdana, sans-serif;\r
-}\r
-\r
-div.toc p:first-child,\r
-div.list-of-figures p:first-child,\r
-div.list-of-tables p:first-child,\r
-div.example p.title\r
-{\r
- margin-bottom: 0.2em;\r
-}\r
-\r
-body h1 {\r
- margin: .0em 0 0 -4%;\r
- line-height: 1.3;\r
- border-bottom: 2px solid silver;\r
-}\r
-\r
-body h2 {\r
- margin: 0.5em 0 0 -4%;\r
- line-height: 1.3;\r
- border-bottom: 2px solid silver;\r
-}\r
-\r
-body h3 {\r
- margin: .8em 0 0 -3%;\r
- line-height: 1.3;\r
-}\r
-\r
-body h4 {\r
- margin: .8em 0 0 -3%;\r
- line-height: 1.3;\r
-}\r
-\r
-body h5 {\r
- margin: .8em 0 0 -2%;\r
- line-height: 1.3;\r
-}\r
-\r
-body h6 {\r
- margin: .8em 0 0 -1%;\r
- line-height: 1.3;\r
-}\r
-\r
-body hr {\r
- border: none; /* Broken on IE6 */\r
-}\r
-div.footnotes hr {\r
- border: 1px solid silver;\r
-}\r
-\r
-div.navheader th, div.navheader td, div.navfooter td {\r
- font-family: sans-serif;\r
- font-size: 0.9em;\r
- font-weight: bold;\r
- color: #527bbd;\r
-}\r
-div.navheader img, div.navfooter img {\r
- border-style: none;\r
-}\r
-div.navheader a, div.navfooter a {\r
- font-weight: normal;\r
-}\r
-div.navfooter hr {\r
- border: 1px solid silver;\r
-}\r
-\r
-body td {\r
- line-height: 1.2\r
-}\r
-\r
-body th {\r
- line-height: 1.2;\r
-}\r
-\r
-ol {\r
- line-height: 1.2;\r
-}\r
-\r
-ul, body dir, body menu {\r
- line-height: 1.2;\r
-}\r
-\r
-html {\r
- margin: 0; \r
- padding: 0;\r
-}\r
-\r
-body h1, body h2, body h3, body h4, body h5, body h6 {\r
- margin-left: 0\r
-} \r
-\r
-body pre {\r
- margin: 0.5em 10% 0.5em 1em;\r
- line-height: 1.0;\r
- color: navy;\r
-}\r
-\r
-tt.literal, code.literal {\r
- color: navy;\r
-}\r
-\r
-div.literallayout p {\r
- padding: 0em;\r
- margin: 0em;\r
-}\r
-\r
-div.literallayout {\r
- font-family: monospace;\r
-# margin: 0.5em 10% 0.5em 1em;\r
- margin: 0em;\r
- color: navy;\r
- border: 1px solid silver;\r
- background: #f4f4f4;\r
- padding: 0.5em;\r
-}\r
-\r
-.programlisting, .screen {\r
- border: 1px solid silver;\r
- background: #f4f4f4;\r
- margin: 0.5em 10% 0.5em 0;\r
- padding: 0.5em 1em;\r
-}\r
-\r
-div.sidebar {\r
- background: #ffffee;\r
- margin: 1.0em 10% 0.5em 0;\r
- padding: 0.5em 1em;\r
- border: 1px solid silver;\r
-}\r
-div.sidebar * { padding: 0; }\r
-div.sidebar div { margin: 0; }\r
-div.sidebar p.title {\r
- font-family: sans-serif;\r
- margin-top: 0.5em;\r
- margin-bottom: 0.2em;\r
-}\r
-\r
-div.bibliomixed {\r
- margin: 0.5em 5% 0.5em 1em;\r
-}\r
-\r
-div.glossary dt {\r
- font-weight: bold;\r
-}\r
-div.glossary dd p {\r
- margin-top: 0.2em;\r
-}\r
-\r
-dl {\r
- margin: .8em 0;\r
- line-height: 1.2;\r
-}\r
-\r
-dt {\r
- margin-top: 0.5em;\r
-}\r
-\r
-dt span.term {\r
- font-style: italic;\r
-}\r
-\r
-div.variablelist dd p {\r
- margin-top: 0;\r
-}\r
-\r
-div.itemizedlist li, div.orderedlist li {\r
- margin-left: -0.8em;\r
- margin-top: 0.5em;\r
-}\r
-\r
-ul, ol {\r
- list-style-position: outside;\r
-}\r
-\r
-div.sidebar ul, div.sidebar ol {\r
- margin-left: 2.8em;\r
-}\r
-\r
-div.itemizedlist p.title,\r
-div.orderedlist p.title,\r
-div.variablelist p.title\r
-{\r
- margin-bottom: -0.8em;\r
-}\r
-\r
-div.revhistory table {\r
- border-collapse: collapse;\r
- border: none;\r
-}\r
-div.revhistory th {\r
- border: none;\r
- color: #527bbd;\r
- font-family: tahoma, verdana, sans-serif;\r
-}\r
-div.revhistory td {\r
- border: 1px solid silver;\r
-}\r
-\r
-/* Keep TOC and index lines close together. */\r
-div.toc dl, div.toc dt,\r
-div.list-of-figures dl, div.list-of-figures dt,\r
-div.list-of-tables dl, div.list-of-tables dt,\r
-div.indexdiv dl, div.indexdiv dt\r
-{\r
- line-height: normal;\r
- margin-top: 0;\r
- margin-bottom: 0;\r
-}\r
-\r
-/*\r
- Table styling does not work because of overriding attributes in\r
- generated HTML.\r
-*/\r
-div.table table,\r
-div.informaltable table\r
-{\r
- margin-left: 0;\r
- margin-right: 5%;\r
- margin-bottom: 0.8em;\r
-}\r
-div.informaltable table\r
-{\r
- margin-top: 0.4em\r
-}\r
-div.table thead,\r
-div.table tfoot,\r
-div.table tbody,\r
-div.informaltable thead,\r
-div.informaltable tfoot,\r
-div.informaltable tbody\r
-{\r
- /* No effect in IE6. */\r
- border-top: 2px solid #527bbd;\r
- border-bottom: 2px solid #527bbd;\r
-}\r
-div.table thead, div.table tfoot,\r
-div.informaltable thead, div.informaltable tfoot\r
-{\r
- font-weight: bold;\r
-}\r
-\r
-div.mediaobject img {\r
- border: 1px solid silver;\r
- margin-bottom: 0.8em;\r
-}\r
-div.figure p.title,\r
-div.table p.title\r
-{\r
- margin-top: 1em;\r
- margin-bottom: 0.4em;\r
-}\r
-\r
-@media print {\r
- div.navheader, div.navfooter { display: none; }\r
-}\r
+/*
+ CSS stylesheet for XHTML produced by DocBook XSL stylesheets.
+ Tested with XSL stylesheets 1.61.2, 1.67.2
+*/
+
+span.strong {
+ font-weight: bold;
+}
+
+body blockquote {
+ margin-top: .75em;
+ line-height: 1.5;
+ margin-bottom: .75em;
+}
+
+html body {
+ margin: 1em 5% 1em 5%;
+ line-height: 1.2;
+}
+
+body div {
+ margin: 0;
+}
+
+h1, h2, h3, h4, h5, h6,
+div.toc p b,
+div.list-of-figures p b,
+div.list-of-tables p b,
+div.abstract p.title
+{
+ color: #527bbd;
+ font-family: tahoma, verdana, sans-serif;
+}
+
+div.toc p:first-child,
+div.list-of-figures p:first-child,
+div.list-of-tables p:first-child,
+div.example p.title
+{
+ margin-bottom: 0.2em;
+}
+
+body h1 {
+ margin: .0em 0 0 -4%;
+ line-height: 1.3;
+ border-bottom: 2px solid silver;
+}
+
+body h2 {
+ margin: 0.5em 0 0 -4%;
+ line-height: 1.3;
+ border-bottom: 2px solid silver;
+}
+
+body h3 {
+ margin: .8em 0 0 -3%;
+ line-height: 1.3;
+}
+
+body h4 {
+ margin: .8em 0 0 -3%;
+ line-height: 1.3;
+}
+
+body h5 {
+ margin: .8em 0 0 -2%;
+ line-height: 1.3;
+}
+
+body h6 {
+ margin: .8em 0 0 -1%;
+ line-height: 1.3;
+}
+
+body hr {
+ border: none; /* Broken on IE6 */
+}
+div.footnotes hr {
+ border: 1px solid silver;
+}
+
+div.navheader th, div.navheader td, div.navfooter td {
+ font-family: sans-serif;
+ font-size: 0.9em;
+ font-weight: bold;
+ color: #527bbd;
+}
+div.navheader img, div.navfooter img {
+ border-style: none;
+}
+div.navheader a, div.navfooter a {
+ font-weight: normal;
+}
+div.navfooter hr {
+ border: 1px solid silver;
+}
+
+body td {
+ line-height: 1.2
+}
+
+body th {
+ line-height: 1.2;
+}
+
+ol {
+ line-height: 1.2;
+}
+
+ul, body dir, body menu {
+ line-height: 1.2;
+}
+
+html {
+ margin: 0;
+ padding: 0;
+}
+
+body h1, body h2, body h3, body h4, body h5, body h6 {
+ margin-left: 0
+}
+
+body pre {
+ margin: 0.5em 10% 0.5em 1em;
+ line-height: 1.0;
+ color: navy;
+}
+
+tt.literal, code.literal {
+ color: navy;
+}
+
+div.literallayout p {
+ padding: 0em;
+ margin: 0em;
+}
+
+div.literallayout {
+ font-family: monospace;
+# margin: 0.5em 10% 0.5em 1em;
+ margin: 0em;
+ color: navy;
+ border: 1px solid silver;
+ background: #f4f4f4;
+ padding: 0.5em;
+}
+
+.programlisting, .screen {
+ border: 1px solid silver;
+ background: #f4f4f4;
+ margin: 0.5em 10% 0.5em 0;
+ padding: 0.5em 1em;
+}
+
+div.sidebar {
+ background: #ffffee;
+ margin: 1.0em 10% 0.5em 0;
+ padding: 0.5em 1em;
+ border: 1px solid silver;
+}
+div.sidebar * { padding: 0; }
+div.sidebar div { margin: 0; }
+div.sidebar p.title {
+ font-family: sans-serif;
+ margin-top: 0.5em;
+ margin-bottom: 0.2em;
+}
+
+div.bibliomixed {
+ margin: 0.5em 5% 0.5em 1em;
+}
+
+div.glossary dt {
+ font-weight: bold;
+}
+div.glossary dd p {
+ margin-top: 0.2em;
+}
+
+dl {
+ margin: .8em 0;
+ line-height: 1.2;
+}
+
+dt {
+ margin-top: 0.5em;
+}
+
+dt span.term {
+ font-style: italic;
+}
+
+div.variablelist dd p {
+ margin-top: 0;
+}
+
+div.itemizedlist li, div.orderedlist li {
+ margin-left: -0.8em;
+ margin-top: 0.5em;
+}
+
+ul, ol {
+ list-style-position: outside;
+}
+
+div.sidebar ul, div.sidebar ol {
+ margin-left: 2.8em;
+}
+
+div.itemizedlist p.title,
+div.orderedlist p.title,
+div.variablelist p.title
+{
+ margin-bottom: -0.8em;
+}
+
+div.revhistory table {
+ border-collapse: collapse;
+ border: none;
+}
+div.revhistory th {
+ border: none;
+ color: #527bbd;
+ font-family: tahoma, verdana, sans-serif;
+}
+div.revhistory td {
+ border: 1px solid silver;
+}
+
+/* Keep TOC and index lines close together. */
+div.toc dl, div.toc dt,
+div.list-of-figures dl, div.list-of-figures dt,
+div.list-of-tables dl, div.list-of-tables dt,
+div.indexdiv dl, div.indexdiv dt
+{
+ line-height: normal;
+ margin-top: 0;
+ margin-bottom: 0;
+}
+
+/*
+ Table styling does not work because of overriding attributes in
+ generated HTML.
+*/
+div.table table,
+div.informaltable table
+{
+ margin-left: 0;
+ margin-right: 5%;
+ margin-bottom: 0.8em;
+}
+div.informaltable table
+{
+ margin-top: 0.4em
+}
+div.table thead,
+div.table tfoot,
+div.table tbody,
+div.informaltable thead,
+div.informaltable tfoot,
+div.informaltable tbody
+{
+ /* No effect in IE6. */
+ border-top: 2px solid #527bbd;
+ border-bottom: 2px solid #527bbd;
+}
+div.table thead, div.table tfoot,
+div.informaltable thead, div.informaltable tfoot
+{
+ font-weight: bold;
+}
+
+div.mediaobject img {
+ border: 1px solid silver;
+ margin-bottom: 0.8em;
+}
+div.figure p.title,
+div.table p.title
+{
+ margin-top: 1em;
+ margin-bottom: 0.4em;
+}
+
+@media print {
+ div.navheader, div.navfooter { display: none; }
+}
index bdc7332c7b11c25957ee170b0582f9fe182755eb..da034223f3a0c07bc3451814ae8d087423f1e2f5 100644 (file)
Deepen the history of a 'shallow' repository created by
`git clone` with `--depth=<depth>` option (see gitlink:git-clone[1])
by the specified number of commits.
-
index a0c9f68580594f785aaec0472ca8404701d4d86d..76d2b05854ccc742105c374fae33c676795d29f1 100644 (file)
GIT
---
Part of the gitlink:git[7] suite
-
index f3387f5d09959c1e94cb2e140d5ccc617b45ebb1..e4a6b3a6f0fc258e8a2052d1d56a71fb57667d39 100644 (file)
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -158,4 +158,3 @@ Documentation by Petr Baudis, Junio C Hamano and the git-list <git@vger.kernel.o
GIT
---
Part of the gitlink:git[7] suite
-
index 3bd2c995da7d65977481837486dc15e5e96baf91..f03f661652814d0900f3564c1914b217dc465a01 100644 (file)
GIT
---
Part of the gitlink:git[7] suite
-
index 82cb41d2791abbd32bd8209660e9879b9f2b8f32..7091b8d61cf4871e2cecc7b18bc6997ea42b4ef9 100644 (file)
Imports a project from one or more Arch repositories. It will follow branches
and repositories within the namespaces defined by the <archive/branch>
parameters supplied. If it cannot find the remote branch a merge comes from
-it will just import it as a regular commit. If it can find it, it will mark it
-as a merge whenever possible (see discussion below).
+it will just import it as a regular commit. If it can find it, it will mark it
+as a merge whenever possible (see discussion below).
-The script expects you to provide the key roots where it can start the import
-from an 'initial import' or 'tag' type of Arch commit. It will follow and
-import new branches within the provided roots.
+The script expects you to provide the key roots where it can start the import
+from an 'initial import' or 'tag' type of Arch commit. It will follow and
+import new branches within the provided roots.
-It expects to be dealing with one project only. If it sees
-branches that have different roots, it will refuse to run. In that case,
-edit your <archive/branch> parameters to define clearly the scope of the
-import.
+It expects to be dealing with one project only. If it sees
+branches that have different roots, it will refuse to run. In that case,
+edit your <archive/branch> parameters to define clearly the scope of the
+import.
-`git-archimport` uses `tla` extensively in the background to access the
+`git-archimport` uses `tla` extensively in the background to access the
Arch repository.
Make sure you have a recent version of `tla` available in the path. `tla` must
-know about the repositories you pass to `git-archimport`.
+know about the repositories you pass to `git-archimport`.
-For the initial import `git-archimport` expects to find itself in an empty
-directory. To follow the development of a project that uses Arch, rerun
-`git-archimport` with the same parameters as the initial import to perform
+For the initial import `git-archimport` expects to find itself in an empty
+directory. To follow the development of a project that uses Arch, rerun
+`git-archimport` with the same parameters as the initial import to perform
incremental imports.
While git-archimport will try to create sensible branch names for the
MERGES
------
-Patch merge data from Arch is used to mark merges in git as well. git
+Patch merge data from Arch is used to mark merges in git as well. git
does not care much about tracking patches, and only considers a merge when a
branch incorporates all the commits since the point they forked. The end result
-is that git will have a good idea of how far branches have diverged. So the
+is that git will have a good idea of how far branches have diverged. So the
import process does lose some patch-trading metadata.
-Fortunately, when you try and merge branches imported from Arch,
-git will find a good merge base, and it has a good chance of identifying
-patches that have been traded out-of-sequence between the branches.
+Fortunately, when you try and merge branches imported from Arch,
+git will find a good merge base, and it has a good chance of identifying
+patches that have been traded out-of-sequence between the branches.
OPTIONS
-------
Display usage.
-v::
- Verbose output.
+ Verbose output.
-T::
- Many tags. Will create a tag for every commit, reflecting the commit
+ Many tags. Will create a tag for every commit, reflecting the commit
name in the Arch repository.
-f::
<archive/branch>::
- Archive/branch identifier in a format that `tla log` understands.
+ Archive/branch identifier in a format that `tla log` understands.
Author
@@ -118,4 +118,3 @@ Documentation by Junio C Hamano, Martin Langhoff and the git-list <git@vger.kern
GIT
---
Part of the gitlink:git[7] suite
-
index 5f68ee1584b294a9395f2a3d4f29e0b1208f5913..1072fb87d1fe38a74dc38e2d6886acfb44d9262b 100644 (file)
SYNOPSIS
--------
-'git bisect' <subcommand> <options>
+'git bisect' <subcommand> <options>
DESCRIPTION
-----------
GIT
---
Part of the gitlink:git[7] suite
-
index 8dc5171f5e685ab18d466751710f44e8aba104b7..8d72bb93680332da560b5b1e55a3d42c4755247c 100644 (file)
GIT
---
Part of the gitlink:git[7] suite
-
index 075c0d05efca85c2357e09aa640aa4b7f0305419..afa095c79529dc92d5db6c54effd435c57f5eb7a 100644 (file)
GIT
---
Part of the gitlink:git[7] suite
-
index ceb51959b1d28a7298ddd42b0e3e968c568195a7..856d2af2ed9c1ccfcd819191060447b62e49b8b6 100644 (file)
GIT
---
Part of the gitlink:git[7] suite
-
index 6dd6db04bb91ae97472ce40d6b76ff8d409b99f7..b1a8ce110cd3caa641a53e7944479bb8f84bec44 100644 (file)
GIT
---
Part of the gitlink:git[7] suite
-
index 918d8ee720a573f91ec6efa654da5c2cdc05d7b0..ea26da8e21030883e3655dcbc28ad06a4e3816f5 100644 (file)
GIT
---
Part of the gitlink:git[7] suite
-
index 68bba982606b5e17b730f0e5d4d201923231c235..47b1e8c2fcd567b7e9d673f2d3ff30c9c32a1b83 100644 (file)
GIT
---
Part of the gitlink:git[7] suite
-
index 27b67b81a58956c48452b7aee46b9742ca02e31a..b62c97097f1d66a26767a304a59b83bca7b727ee 100644 (file)
GIT
---
Part of the gitlink:git[7] suite
-
index 644bf126fb8766fb1825f0688089b213b4326977..2461c0ec2da6482530458dd33d62c68a4939225d 100644 (file)
GIT
---
Part of the gitlink:git[7] suite
-
index 504a3aa1b460ffac9308bec4ff72cf657f8fec30..9586b9729151efd64b3cf5f5d511dd39b664e08e 100644 (file)
-p <parent commit>::
Each '-p' indicates the id of a parent commit object.
-
+
Commit Information
------------------
@@ -107,4 +107,3 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
GIT
---
Part of the gitlink:git[7] suite
-
index 056b14724c4058ce7443264303713bbdc899f04c..f2c67176f451483abdbe862fd5d1cc8fe6b67aac 100644 (file)
@@ -291,4 +291,3 @@ Documentation by Johannes Schindelin, Petr Baudis and the git-list <git@vger.ker
GIT
---
Part of the gitlink:git[7] suite
-
index b1220c06e193ddf3942da6e5e0faf91368d0886a..9718abf86d8cd36ddae1eae8cf2337e35b927959 100644 (file)
GIT
---
Part of the gitlink:git[7] suite
-
index 91c8c92c76648ed5bfdaab6b991e7cb1ce519733..81614111a4bb3bf8ab62650876189ceee5bd6c9e 100644 (file)
GIT
---
Part of the gitlink:git[7] suite
-
index da5c242241c01d6d7e7a5d648ff58263cc3e01dd..827711c3c9b8ad8c7ecb074c5ec1a9b887992526 100644 (file)
DESCRIPTION
-----------
Exports a commit from GIT to a CVS checkout, making it easier
-to merge patches from a git repository into a CVS repository.
+to merge patches from a git repository into a CVS repository.
-Execute it from the root of the CVS working copy. GIT_DIR must be defined.
+Execute it from the root of the CVS working copy. GIT_DIR must be defined.
See examples below.
-It does its best to do the safe thing, it will check that the files are
-unchanged and up to date in the CVS checkout, and it will not autocommit
+It does its best to do the safe thing, it will check that the files are
+unchanged and up to date in the CVS checkout, and it will not autocommit
by default.
Supports file additions, removals, and commits that affect binary files.
If the commit is a merge commit, you must tell git-cvsexportcommit what parent
-should the changeset be done against.
+should the changeset be done against.
OPTIONS
-------
Force the parent commit, even if it is not a direct parent.
-m::
- Prepend the commit message with the provided prefix.
+ Prepend the commit message with the provided prefix.
Useful for patch series and the like.
-u::
$ export GIT_DIR=~/project/.git
$ cd ~/project_cvs_checkout
$ git-cvsexportcommit -v <commit-sha1>
-$ cvs commit -F .mgs <files>
+$ cvs commit -F .mgs <files>
------------
Merge pending patches into CVS automatically -- only if you really know what you are doing ::
GIT
---
Part of the gitlink:git[7] suite
-
index e0be8565468c0b278147abc3e83eb7d19f481a40..3985e0164b3f320258a5f6b2699a9145a30e5e43 100644 (file)
-d <CVSROOT>::
The root of the CVS archive. May be local (a simple path) or remote;
- currently, only the :local:, :ext: and :pserver: access methods
+ currently, only the :local:, :ext: and :pserver: access methods
are supported. If not given, git-cvsimport will try to read it
from `CVS/Root`. If no such file exists, it checks for the
`CVSROOT` environment variable.
-k::
Kill keywords: will extract files with '-kk' from the CVS archive
to avoid noisy changesets. Highly recommended, but off by default
- to preserve compatibility with early imported trees.
+ to preserve compatibility with early imported trees.
-u::
Convert underscores in tag and branch names to dots.
Instead of calling cvsps, read the provided cvsps output file. Useful
for debugging or when cvsps is being handled outside cvsimport.
--m::
+-m::
Attempt to detect merges based on the commit message. This option
- will enable default regexes that try to capture the name source
- branch name from the commit message.
+ will enable default regexes that try to capture the name source
+ branch name from the commit message.
-M <regex>::
Attempt to detect merges based on the commit message with a custom
regex. It can be used with '-m' to also see the default regexes.
- You must escape forward slashes.
+ You must escape forward slashes.
-S <regex>::
Skip paths matching the regex.
GIT
---
Part of the gitlink:git[7] suite
-
index 9ddab712031cc2b71ccfc83dd5b6b475b5bfc809..4b30b18b427c6f4922ce44eee68042c036a6e806 100644 (file)
GIT
---
Part of the gitlink:git[7] suite
-
index dc47b65ced36ac856ad23e2bebd3f3342b50471a..ac23e28f2759222bb67fcf2445c229e918d96211 100644 (file)
@@ -124,4 +124,3 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
GIT
---
Part of the gitlink:git[7] suite
-
index 2e1e29ef5ae633a005e35f656f30ce66e343de7a..d8a0a86022b805eabe3516fe980d6c626abfa68e 100644 (file)
branch" respectively. With these options, diffs for
merged entries are not shown.
+
-The default is to diff against our branch (-2) and the
+The default is to diff against our branch (-2) and the
cleanly resolved paths. The option -0 can be given to
omit diff output for unmerged entries and just show "Unmerged".
GIT
---
Part of the gitlink:git[7] suite
-
index 2df581c2c9e598c676fcb95c35c91209d15562ca..7bd262cefd68efe84ff0c405af5eabcdc6f01be8 100644 (file)
nicer for the case where you just want to check where you are.
So doing a "git-diff-index --cached" is basically very useful when you are
-asking yourself "what have I already marked for being committed, and
+asking yourself "what have I already marked for being committed, and
what's the difference to a previous tree".
Non-cached Mode
@@ -130,4 +130,3 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
GIT
---
Part of the gitlink:git[7] suite
-
index 6e660e2d08c2d9d795b5ccfb91f755160cf58930..6b3f74efe7405b2b1c2d92a975aadb4363a67be0 100644 (file)
@@ -166,4 +166,3 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
GIT
---
Part of the gitlink:git[7] suite
-
index 044cee9b425bedc7addd9a4418b553557902711b..639b969315d4c9c6ece95cdeb10c2f92bd17adab 100644 (file)
GIT
---
Part of the gitlink:git[7] suite
-
index 8d06775a6bd5f4ac8bd5a20fba67f76c121380ee..5eacab08dc2141360209534bc38a5fc8b7a05b75 100644 (file)
GIT
---
Part of the gitlink:git[7] suite
-
index 4913c2552f9a092dbd982b55c7e7cb2ffc986570..6affc5bb4d1730805e1704af1045bb71ca896dbb 100644 (file)
GIT
---
Part of the gitlink:git[7] suite
-
index 363edb0fcfd140188507baa93cd2be9b6923d00a..647de90361b30aeb39b4b2707a295e21863510ee 100644 (file)
GIT
---
Part of the gitlink:git[7] suite
-
index ed6413a3c75625ea63a5ea140ae15b120997c9b4..234c22f57f49181e847d5ccc4f0d71998ce29787 100644 (file)
@@ -145,4 +145,3 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
GIT
---
Part of the gitlink:git[7] suite
-
index 48805b651ca8161a87448f307b45c9e9d4df3c0f..9b5f86fc30aecc5e1183e514d5d0f81d14a751c3 100644 (file)
GIT
---
Part of the gitlink:git[7] suite
-
index c5a5dad1ce27dde6c3846beaf7ab2f7aa8ed81c8..97faaa1d3a9d8c7025ab33c3126ba10e4c5ed708 100644 (file)
GIT
---
Part of the gitlink:git[7] suite
-
index 5edc36f060f7cf6444dd016cbb7e073af923f5db..616f196d81ca54595dc67f4846bace5880b9b90d 100644 (file)
object database. Reports its object ID to its standard output.
This is used by "git-cvsimport" to update the index
without modifying files in the work tree. When <type> is not
-specified, it defaults to "blob".
+specified, it defaults to "blob".
OPTIONS
-------
GIT
---
Part of the gitlink:git[7] suite
-
index 4deabc376c6698408bee032409434bd7e32740a4..45e48453a17d70c559cbc65477cad6610abc5928 100644 (file)
GIT
---
Part of the gitlink:git[7] suite
-
index a15cf5b2a30a6ed2c207622c767d131346936a06..9afb860381369767a0a3f5295f588b75f559ff22 100644 (file)
A '<ref>' specification can be either a single pattern, or a pair
of such patterns separated by a colon ":" (this means that a ref name
-cannot have a colon in it). A single pattern '<name>' is just a
+cannot have a colon in it). A single pattern '<name>' is just a
shorthand for '<name>:<name>'.
Each pattern pair consists of the source side (before the colon)
index 226926964e5f3e6620f20b23b74c0299a168d07f..a8a7f6f04bf5b95a5b325dc2df0adf9d94532bc5 100644 (file)
GIT
---
Part of the gitlink:git[7] suite
-
index 5412135d763af3a8c68e18441b774654f07eadfd..ab0201aec2131d48b535cf6307fc446dffd89a9b 100644 (file)
This is a synonym for gitlink:git-init[1]. Please refer to the
documentation of that command.
-
index 1b64d3ab03c2e13807e24833823193021559d947..413ed65143d90b32a9b77301953f45bc26465e7d 100644 (file)
@@ -108,4 +108,3 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
GIT
---
Part of the gitlink:git[7] suite
-
index 9df0ab2d76f6f024a138a84a7fd3c442342c1b88..cec60ee78075aa4411cd637aece93fc38080b0c5 100644 (file)
GIT
---
Part of the gitlink:git[7] suite
-
index 51389ef37da443c981f3bb5d46f819e90c3d2980..19b5f8895c329877167a4f625f33971d498185ae 100644 (file)
GIT
---
Part of the gitlink:git[7] suite
-
index 0f353f6558e5843b1534f4cb9acd75746c313510..6157edb404db3ff0db0bb21e826e140037acb6af 100644 (file)
@@ -101,4 +101,3 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
GIT
---
Part of the gitlink:git[7] suite
-
index a78a9ff1b85d1c8cf003ddab63b8412cf3083657..997594549fbf5a1e50a7d187c3cebcbe93461455 100644 (file)
GIT
---
Part of the gitlink:git[7] suite
-
index c254005ca39e6872b8ec7b729246d18757df31d1..93e9a60330797070fc50c0df6c0767b7b81f79c0 100644 (file)
GIT
---
Part of the gitlink:git[7] suite
-
index ad7f1b9202c414a47573864a320ca766a147753e..7b7859967326acaff157eab01da16b83c1342fcc 100644 (file)
GIT
---
Part of the gitlink:git[7] suite
-
index 16956951dd122698f7602b78c91be999348b61e4..64aa6a1ea6bca248e7078efcecb3d582cf8a0f5f 100644 (file)
GIT
---
Part of the gitlink:git[7] suite
-
index abb0903696c1239299807951e7d1d75ee094a7ed..c4f4cabbdcdaae18491c301d44fd68ae89b18352 100644 (file)
GIT
---
Part of the gitlink:git[7] suite
-
index 3190aed10885b5f3471dfc30922c141835d6c4f1..6b71880ec45455b1e62c3e1582d4cf78f2ed4852 100644 (file)
GIT
---
Part of the gitlink:git[7] suite
-
index b8ee1ff2b0681ea9fbc83618b1d09d95f3a902ff..17e9f10c659844e55e56b0d3a005e5f250f43c20 100644 (file)
This is modified MM in the branch B. # merge2
This is modified MM in the branch B. # current contents
-or
+or
torvalds@ppc970:~/merge-test> git-merge-index cat AA MM
cat: : No such file or directory
GIT
---
Part of the gitlink:git[7] suite
-
index f80ab3b8c479d787e116298f5446d1ff57ff2774..f35d0e1b4560a4970e7423011b585e1ff7d538c1 100644 (file)
GIT
---
Part of the gitlink:git[7] suite
-
index 35fb4fb713bac225c665b6d7701efc9f105b9c16..6892fdac3df054e87019318c524185109ea16200 100644 (file)
GIT
---
Part of the gitlink:git[7] suite
-
index 912ef29efce71d944af59588c6493591efc96bfc..d285cba033325f8652996ea71a06d53c22424dae 100644 (file)
1. the results are updated both in the index file and in your
working tree,
2. index file is written out as a tree,
-3. the tree gets committed, and
+3. the tree gets committed, and
4. the `HEAD` pointer gets advanced.
Because of 2., we require that the original state of the index
index add01e855a09c34b6aa9c83af6efcd17f24f3c9d..b89c51c65b78e38c99a29f8e0b330039d1421ec2 100644 (file)
GIT
---
Part of the gitlink:git[7] suite
-
index 2860a3d1ba54c712bb30febfa37693f3efbdb7bf..0ac3be10c7cc4649f8b059241db18ca9592fe69d 100644 (file)
GIT
---
Part of the gitlink:git[7] suite
-
index 5f9ee603b758ea251a438399a642fa60d364aca2..638abc7d0f7425749339b1519cab5c0586e96138 100644 (file)
GIT
---
Part of the gitlink:git[7] suite
-
index 6756b76bb11bc17279c3f20c16d7b4ba131f5832..2c9cf743c7a097ab955938d023e347e866fbc13e 100644 (file)
--- a/Documentation/git-mv.txt
+++ b/Documentation/git-mv.txt
GIT
---
Part of the gitlink:git[7] suite
-
index 9a1645d29272d86a4b66cd96e7312e8380850891..91eede120e5e192ac8ce3a483dd6a88dce414333 100644 (file)
GIT
---
Part of the gitlink:git[7] suite
-
index 714abbe28ecfef592d0a7892dccbe88c8f66967c..9967587fe6bef0cf7cc3e93467bd179f6f58b032 100644 (file)
GIT
---
Part of the gitlink:git[7] suite
-
index cfe127ad9ea560ac3354a92d91ff5064ce37e1df..e3549b50442bea1734812ec40331adb7e3d41ef7 100644 (file)
GIT
---
Part of the gitlink:git[7] suite
-
index 94bbea0db2caf32635cfa8fc199e8150b1cd05f2..f2ceebac4ba57a07d2d9bf2ae1e9f54d003b2d7f 100644 (file)
'xargs rm' if you are in the root of the repository.
git-pack-redundant accepts a list of objects on standard input. Any objects
-given will be ignored when checking which packs are required. This makes the
+given will be ignored when checking which packs are required. This makes the
following command useful when wanting to remove packs which contain unreachable
objects.
GIT
---
Part of the gitlink:git[7] suite
-
index a7e9fd021a4cc1e467b2df7dd7e06d79a5182c7a..ad528a922487be06207bdcc38a03fe55fd0f2a5d 100644 (file)
GIT
---
Part of the gitlink:git[7] suite
-
index 74f37bd9040200c0dbc82c67b45540e873d4649e..abc171266a35299159308d0653bb0c659b8bdc77 100644 (file)
GIT
---
Part of the gitlink:git[7] suite
-
index 310033e4605d20b99c21a769e79b25b64abbb618..3800edb7bb7d9062dddb3393eaf1a80e5a44596d 100644 (file)
GIT
---
Part of the gitlink:git[7] suite
-
index 0b44f3015d1ce8c600eb274a0f74c53868949658..50ee5bddd013d493cb235e289db0880f0ddf6661 100644 (file)
GIT
---
Part of the gitlink:git[7] suite
-
index 94478ed94d70c597c8a024afe79b456a66d40a35..84693f8b10619dca8b615d30fbbcd950c9319d16 100644 (file)
GIT
---
Part of the gitlink:git[7] suite
-
index e9ad10672a7f045f25937ca85caec548fcb4327f..366c5dbdce69854e7cc1e085cdf53e0e88f7bcb2 100644 (file)
GIT
---
Part of the gitlink:git[7] suite
-
index 296937a4167dc2e4c93cfcafca9fea14090cb108..1c3ef4c59362a1ccc8e44a54738c788f710201be 100644 (file)
GIT
---
Part of the gitlink:git[7] suite
-
index acb57447a864a54b3b531b7ef7403563fd20f886..84184d6294df83c3229a8035d934b23c598578d1 100644 (file)
@@ -356,4 +356,3 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
GIT
---
Part of the gitlink:git[7] suite
-
index 753b275a0f79d88ef439a4c235452bd17f81ce2e..0c00090a6b95662fff38baafaaa892ab65e25609 100644 (file)
GIT
---
Part of the gitlink:git[7] suite
-
index 1e343bcdcdd4c1998b9887866507639bb31d030c..f717e1e30c1b2a99d1d32b86d7d3eedfe6d88d40 100644 (file)
GIT
---
Part of the gitlink:git[7] suite
-
index aca60120c8a671465bb83127bde080b94c0bb782..fe631bb3dd9096e831087511202e2771ebb85df4 100644 (file)
GIT
---
Part of the gitlink:git[7] suite
-
index 3dde7134a5cedc6d58a934e1dd61db26d5e459ae..ab232c2f68e1c4bf47977ea3be4fc2ae525fb67b 100644 (file)
GIT
---
Part of the gitlink:git[7] suite
-
index 2847c9b8d7038f0010e26f61091552cb600f728b..c33a512ffb0bfaef8c920ecff7c2630d2eabf0b9 100644 (file)
GIT
---
Part of the gitlink:git[7] suite
-
index 478a5fd6b74ddbcbf279339a5c3ae5eefb039cb4..087eeb7cc22552b8903e54fc52f08eeb56fb1a0d 100644 (file)
GIT
---
Part of the gitlink:git[7] suite
-
index 7757abe62190a066b6ad8b57214b70ff3fa0f12a..e1cb4ef8568d05ad7bacfb391227bb88560fd448 100644 (file)
GIT
---
Part of the gitlink:git[7] suite
-
index 8081bbaffa8d3710b644c744b9f81d459938a20e..69db4984473fae7928797bcfb13baf1f0e39d851 100644 (file)
GIT
---
Part of the gitlink:git[7] suite
-
index a65f24a0f698eb801ac43bba5aa7dc746e96edc0..78f45dca2e37415cbeafb02db559edc6ca511d51 100644 (file)
--- a/Documentation/git-rm.txt
+++ b/Documentation/git-rm.txt
GIT
---
Part of the gitlink:git[7] suite
-
index 8bb52f46872194783148851ca2fe81dfb9d13bf7..dee5d0da9db0e8e88f7f2f237fcfe3ca7f5c28ec 100644 (file)
GIT
---
Part of the gitlink:git[7] suite
-
index 7ae39fd5a20a869db8c2be101d7001c1c48ff198..946bd76afc5bf9de22917bb4f4c1d8b44c745503 100644 (file)
`localhost` otherwise.
--subject::
- Specify the initial subject of the email thread.
+ Specify the initial subject of the email thread.
Only necessary if --compose is also set. If --compose
is not set, this will be prompted for.
GIT
---
Part of the gitlink:git[7] suite
-
index 2b2abebd608be337db35a3de4b83d37d43061acb..1ea1faa1b57adecea4269fa6d0c2c4afdee9b3da 100644 (file)
GIT
---
Part of the gitlink:git[7] suite
-
index 228b9f14f3530b9ec28e603a3ef2327c7039c440..48f2d57b7b48fa9c8fb0cbc5fcb547d6aed32cbb 100644 (file)
GIT
---
Part of the gitlink:git[7] suite
-
index 15cc6f77c1e9b8a77c8396fab99cf9d9fda98ef3..2220ef6ea8d3bfa58f3c1279dfcf4f735c2dae0a 100644 (file)
GIT
---
Part of the gitlink:git[7] suite
-
index be09b62bebb2b98fa8b0f39e47d29267126fa2a6..764d99356bcefb40a16d3c27bc41e881f87b396a 100644 (file)
GIT
---
Part of the gitlink:git[7] suite
-
index 34c5caf2d08324cc1595013cbdcd40d89d7a1968..a42e1211500a6a6ecdf1d9e1ddbf6712869ceb79 100644 (file)
GIT
---
Part of the gitlink:git[7] suite
-
index 192b1f15a9ca75351623d32e4373d65c6501b465..aaf3db06dacfacfc093672c44cfe265b6de36c24 100644 (file)
GIT
---
Part of the gitlink:git[7] suite
-
index a9b7e9f974c13252456309c7053537853dc7ea9b..4796224244d6025554a8f1f2cf47b92529f7898c 100644 (file)
GIT
---
Part of the gitlink:git[7] suite
-
index 1fd1af102ae948ca008bbd35675d859340e46dbd..6f16eb0328f754b5f5019ff5dac51604de7d535f 100644 (file)
GIT
---
Part of the gitlink:git[7] suite
-
index 3a03dd04106d45cc3c233230d1773874f3ca1cef..1306d7bab70efb57cba62a98ebd2d67b06677c97 100644 (file)
GIT
---
Part of the gitlink:git[7] suite
-
index bdae7d87dce5d07d0d31b45f127fa43a239a6632..e97d15e8f237e969b76cdda9a90f6740aab77f13 100644 (file)
GIT
---
Part of the gitlink:git[7] suite
-
index 7bde73b1b85df03893fa15b99b17c5aff09ae574..2d01d9666fd2ab5f53ab2265ca701d56ea370f8b 100644 (file)
GIT
---
Part of the gitlink:git[7] suite
-
index 213dc8196b90170cc14e35f7c637815b39a7ff8d..20bb6a7800c43c6613aaeda2a86cd3311213bfbe 100644 (file)
GIT
---
Part of the gitlink:git[7] suite
-
index b1b3ec9772b7e689a4a3d42e78be68df34de40ac..d529a43f55ed6356f88fc6410f3fe00dfc01359d 100644 (file)
GIT
---
Part of the gitlink:git[7] suite
-
index 6cfbd9a842f0601cf81f8780ecf6b7939b25dccb..0a1953803e48947f6eeae385550ac2cd4e838411 100644 (file)
--unmerged::
If --refresh finds unmerged changes in the index, the default
- behavior is to error out. This option makes git-update-index
+ behavior is to error out. This option makes git-update-index
continue anyway.
--ignore-missing::
--cacheinfo <mode> <object> <path>::
Directly insert the specified info into the index.
-
+
--index-info::
Read index information from stdin.
--chmod=(+|-)x::
- Set the execute permissions on the updated files.
+ Set the execute permissions on the updated files.
--assume-unchanged, --no-assume-unchanged::
When these flags are specified, the object name recorded
<file>::
Files to act on.
Note that files beginning with '.' are discarded. This includes
- `./file` and `dir/./file`. If you don't want this, then use
+ `./file` and `dir/./file`. If you don't want this, then use
cleaner names.
The same applies to directories ending '/' and paths with '//'
@@ -324,4 +324,3 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
GIT
---
Part of the gitlink:git[7] suite
-
index 88a03c7c5ed4935fc10764d0f56326f0436a6f26..e7e82a31ea58a0515ed3a294140fd361577c07ce 100644 (file)
GIT
---
Part of the gitlink:git[7] suite
-
index 9b0de1c111d7b58cb8d431d90814d1f1530f5e0d..813942368b31a9eccb1c06b67e1a4303d3b62ede 100644 (file)
GIT
---
Part of the gitlink:git[7] suite
-
index 7a6132b016903801fd1070e062381a41ec52536a..f4c540f39bffe5bda536445dc1556ff4c6bfa60a 100644 (file)
GIT
---
Part of the gitlink:git[7] suite
-
index 0f9bdb58dcc3cf7ee549f483164a708f536d2bd5..48d17fd9c44acc3192987d818f3505c56d2eddb4 100644 (file)
GIT
---
Part of the gitlink:git[7] suite
-
index 399bff3bbcab89be96039c373cf1120dcab0efe1..607df48f09254f2c93ad41e75ed976b092711dff 100644 (file)
GIT
---
Part of the gitlink:git[7] suite
-
index 96d5e07b112aa2a87eb6433f7cbeb8ce5f10205a..cb8d6aadeb3fc3b55c58bd40b96461a07a124260 100644 (file)
GIT
---
Part of the gitlink:git[7] suite
-
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 98860af0455ebb5290e7225e6ac677dc7ab3268c..ba077c39c6a34584da306cce51da34537b0d1e0f 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
GIT
---
Part of the gitlink:git[7] suite
-
diff --git a/Documentation/gitk.txt b/Documentation/gitk.txt
index 48c5894736ac3065e80a36e1a5230d86004bee2e..e9f82b97b91b92785b76a224e176b695593cdbe7 100644 (file)
--- a/Documentation/gitk.txt
+++ b/Documentation/gitk.txt
GIT
---
Part of the gitlink:git[7] suite
-
index 646c55cc6954fbf36a11fbe22cb2c1acb64dfd43..554909fe08de380aa02f2bf37f0f3b43b0233f4b 100644 (file)
On Sat, 13 Aug 2005, Linus Torvalds wrote:
-> That's correct. Same things apply: you can move a patch over, and create a
-> new one with a modified comment, but basically the _old_ commit will be
+> That's correct. Same things apply: you can move a patch over, and create a
+> new one with a modified comment, but basically the _old_ commit will be
> immutable.
Let me clarify.
You can entirely _drop_ old branches, so commits may be immutable, but
-nothing forces you to keep them. Of course, when you drop a commit, you'll
-always end up dropping all the commits that depended on it, and if you
-actually got somebody else to pull that commit you can't drop it from
+nothing forces you to keep them. Of course, when you drop a commit, you'll
+always end up dropping all the commits that depended on it, and if you
+actually got somebody else to pull that commit you can't drop it from
_their_ repository, but undoing things is not impossible.
For example, let's say that you've made a mess of things: you've committed
# for reference
git branch broken
- # Reset the main branch to three parents back: this
+ # Reset the main branch to three parents back: this
# effectively undoes the three top commits
git reset HEAD^^^
git checkout -f
to see that everything looks sensible.
-And then, you can just remove the broken branch if you decide you really
+And then, you can just remove the broken branch if you decide you really
don't want it:
# remove 'broken' branch
# Prune old objects if you're really really sure
git prune
-And yeah, I'm sure there are other ways of doing this. And as usual, the
-above is totally untested, and I just wrote it down in this email, so if
+And yeah, I'm sure there are other ways of doing this. And as usual, the
+above is totally untested, and I just wrote it down in this email, so if
I've done something wrong, you'll have to figure it out on your own ;)
Linus
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
-
-
diff --git a/Documentation/howto/rebase-from-internal-branch.txt b/Documentation/howto/rebase-from-internal-branch.txt
index 3b3a5c2e69e59d4708171ba745d7d4009788102b..7a76045eb742b38e726e15491db2bf4315cb8f6a 100644 (file)
> Dear diary, on Sun, Aug 14, 2005 at 09:57:13AM CEST, I got a letter
> where Junio C Hamano <junkio@cox.net> told me that...
>> Linus Torvalds <torvalds@osdl.org> writes:
->>
->> > Junio, maybe you want to talk about how you move patches from your "pu"
+>>
+>> > Junio, maybe you want to talk about how you move patches from your "pu"
>> > branch to the real branches.
->>
+>>
> Actually, wouldn't this be also precisely for what StGIT is intended to?
Exactly my feeling. I was sort of waiting for Catalin to speak
where *your "master" head
upstream --> #1 --> #2 --> #3
- used \
+ used \
to be \--> #A --> #2' --> #3' --> #B --> #C
*upstream head
$ git fetch upstream
This leaves the updated upstream head in .git/FETCH_HEAD but
-does not touch your .git/HEAD nor .git/refs/heads/master.
+does not touch your .git/HEAD nor .git/refs/heads/master.
You run "git rebase" now.
$ git rebase FETCH_HEAD master
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
-
-
diff --git a/Documentation/howto/rebuild-from-update-hook.txt b/Documentation/howto/rebuild-from-update-hook.txt
index 02621b54a03ce5771eab1c49d121a07ba31cbf16..8d55dfbfaef7ef6bb30b65ea52c7825b099b50d8 100644 (file)
- This is still crude and does not protect against simultaneous
make invocations stomping on each other. I would need to add
some locking mechanism for this.
-
diff --git a/Documentation/howto/revert-branch-rebase.txt b/Documentation/howto/revert-branch-rebase.txt
index d88ec23a97bc59f29a5f9734fc5ba0ef5a9ae6cf..865a6663240f744d448b0a125ebc123afb72ede2 100644 (file)
nor tag anymore, so remove them:
------------------------------------------------
-$ rm -f .git/refs/tags/pu-anchor
+$ rm -f .git/refs/tags/pu-anchor
$ git branch -d revert-c99
------------------------------------------------
diff --git a/Documentation/howto/separating-topic-branches.txt b/Documentation/howto/separating-topic-branches.txt
index 090e2c9b018c7ea16b98094746d4e005abd27eec..0d73b31224c881eb83f30ec3c5421a81288f6502 100644 (file)
"master"
o---o
- \ "topic"
+ \ "topic"
o---o---o---o---o---o
At this point, "topic" contains something I know I want, but it
$ git checkout -b topicA master
... pick and apply pieces from P.diff to build
... commits on topicA branch.
-
+
o---o---o
/ "topicA"
o---o"master"
- \ "topic"
+ \ "topic"
o---o---o---o---o---o
Before doing each commit on "topicA" HEAD, I run "diff HEAD"
/o---o---o
|/ "topicA"
o---o"master"
- \ "topic"
+ \ "topic"
o---o---o---o---o---o
After I am done, I'd try a pretend-merge between "topicA" and
/o---o---o----------'
|/ "topicA"
o---o"master"
- \ "topic"
+ \ "topic"
o---o---o---o---o---o
The last diff better not to show anything other than cleanups
"topicB"
o---o---o---o---o
- /
+ /
/o---o---o
|/ "topicA"
o---o"master"
-
index 1a1eb246bf5b5ff5f67edea306371604159762ae..4e2f75cb6167633c97ec1981d2b6659368cc0170 100644 (file)
$ git ls-remote git://127.0.0.1/rule-the-world.git
If this does not work, find out why, and submit a patch to this document.
-
index 56f1d8d69d05bb4aa26d0dad6e576332588090e8..d64c259bb35d3140b371e8717a2553146d3f92f5 100644 (file)
If there is no `-s` option, a built-in list of strategies
is used instead (`git-merge-recursive` when merging a single
head, `git-merge-octopus` otherwise).
-
index d922e8e86c173491fc492d3060bf92f4ee7b6c2d..c551ea61d2870e6e4d5471ec4fcbca4fbd802b09 100644 (file)
- '%Creset': reset color
- '%m': left, right or boundary mark
- '%n': newline
-
index 7d515be0fd3b89d602ac2919fd2ea3dd4bc84131..6338def5a795a8171286626752a96f8ac88842c8 100644 (file)
command to re-code the commit log message in the encoding
preferred by the user. For non plumbing commands this
defaults to UTF-8.
-
index 8d4e950abc65c233268d785dcbfee67ab0522f4c..b6eb7fc6189daece1a200293dc767b6bc064620a 100644 (file)
+
Some short-cut notations are also supported.
+
-* `tag <tag>` means the same as `refs/tags/<tag>:refs/tags/<tag>`;
+* `tag <tag>` means the same as `refs/tags/<tag>:refs/tags/<tag>`;
it requests fetching everything up to the given tag.
* A parameter <ref> without a colon is equivalent to
<ref>: when pulling/fetching, so it merges <ref> into the current
index 15221b53206eb65072f147ac72f556d0a1ee55e4..4c92e375fed4592f7190086dd40ef6dd1241d238 100644 (file)
This is similar to `info/grafts` but is internally used
and maintained by shallow clone mechanism. See `--depth`
option to gitlink:git-clone[1] and gitlink:git-fetch[1].
-
index 9ce3c473ae1a9b5fd0b3a909fb264d8e0fff27a5..e5b31c81fa3b5268c6d1bc0afcaec967f401ac28 100644 (file)
+--------------------------------+ |
main | offset | |
index | object name 00XXXXXXXXXXXXXXXX | |
-table +--------------------------------+ |
+table +--------------------------------+ |
| offset | |
| object name 00XXXXXXXXXXXXXXXX | |
+--------------------------------+ |
| +--------------------------------+
| | idxfile checksum |
| +--------------------------------+
- .-------.
+ .-------.
|
Pack file entry: <+
packed object header:
1-byte size extension bit (MSB)
type (next 3 bit)
- size0 (lower 4-bit)
+ size0 (lower 4-bit)
n-byte sizeN (as long as MSB is set, each 7-bit)
size0..sizeN form 4+7+7+..+7 bit integer, size0
is the least significant part, and sizeN is the
is the size before compression).
If it is DELTA, then
20-byte base object name SHA1 (the size above is the
- size of the delta data that follows).
+ size of the delta data that follows).
delta data, deflated.
index 7eaafa80e9dde9d90c1eca1f760c7ade599f8250..957cd0076116690ab324d8789e40c7b3474985a9 100644 (file)
Date: Sat Dec 2 22:22:25 2006 -0800
[XFRM]: Fix aevent structuring to be more complete.
-
+
aevents can not uniquely identify an SA. We break the ABI with this
patch, but consensus is that since it is not yet utilized by any
(known) application then it is fine (better do it now than later).
-
+
Signed-off-by: Jamal Hadi Salim <hadi@cyberus.ca>
Signed-off-by: David S. Miller <davem@davemloft.net>
--- a/Documentation/networking/xfrm_sync.txt
+++ b/Documentation/networking/xfrm_sync.txt
@@ -47,10 +47,13 @@ aevent_id structure looks like:
-
+
struct xfrm_aevent_id {
struct xfrm_usersa_id sa_id;
+ xfrm_address_t saddr;
-------------------------------------------------
As a special shortcut,
-
+
-------------------------------------------------
$ git commit -a
-------------------------------------------------
Fortunately, git also keeps a log, called a "reflog", of all the
previous values of each branch. So in this case you can still find the
-old history using, for example,
+old history using, for example,
-------------------------------------------------
$ git log master@{1}
reference pointing to it, for example, a new branch:
------------------------------------------------
-$ git branch recovered-branch 7281251ddd
+$ git branch recovered-branch 7281251ddd
------------------------------------------------
Other types of dangling objects (blobs and trees) are also possible, and
you push
your personal repo ------------------> your public repo
- ^ |
+ ^ |
| |
| you pull | they pull
| |
\ \
a--b--c--m <-- mywork
................................................
-
+
However, if you prefer to keep the history in mywork a simple series of
commits without any merges, you may instead choose to use
gitlink:git-rebase[1]:
root objects together into one project by creating a commit object which
has two or more separate roots as its ultimate parents, that's probably
just going to confuse people. So aim for the notion of "one root object
-per project", even if git itself does not enforce that.
+per project", even if git itself does not enforce that.
A <<def_tag_object,"tag" object>> symbolically identifies and can be
used to sign other objects. It contains the identifier and type of
be validated by verifying that (a) their hashes match the content of the
file and (b) the object successfully inflates to a stream of bytes that
forms a sequence of <ascii type without space> + <space> + <ascii decimal
-size> + <byte\0> + <binary object data>.
+size> + <byte\0> + <binary object data>.
The structured objects can further have their structure and
connectivity to other objects verified. This is generally done with
known tree object, or update/compare it with a live tree that is being
developed. If you blow the directory cache away entirely, you generally
haven't lost any information as long as you have the name of the tree
-that it described.
+that it described.
At the same time, the index is at the same time also the
staging area for creating new trees, and creating a new tree always
work *purely* on the index file (showing the current state of the
index), but most operations move data to and from the index file. Either
from the database or from the working directory. Thus there are four
-main combinations:
+main combinations:
[[working-directory-to-index]]
working directory -> index
leaving _some_ of the new objects in the object database, but just
dangling and useless.
-Anyway, once you are sure that you're not interested in any dangling
+Anyway, once you are sure that you're not interested in any dangling
state, you can just prune all unreachable objects:
------------------------------------------------
repository - it's kind of like doing a filesystem fsck recovery: you
don't want to do that while the filesystem is mounted.
-(The same is true of "git-fsck" itself, btw - but since
-git-fsck never actually *changes* the repository, it just reports
-on what it found, git-fsck itself is never "dangerous" to run.
-Running it while somebody is actually changing the repository can cause
-confusing and scary messages, but it won't actually do anything bad. In
-contrast, running "git prune" while somebody is actively changing the
+(The same is true of "git-fsck" itself, btw - but since
+git-fsck never actually *changes* the repository, it just reports
+on what it found, git-fsck itself is never "dangerous" to run.
+Running it while somebody is actually changing the repository can cause
+confusing and scary messages, but it won't actually do anything bad. In
+contrast, running "git prune" while somebody is actively changing the
repository is a *BAD* idea).
[[birdview-on-the-source-code]]
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 06c360b267f0d9e459e44ccaa81dd16b4384c627..289c8067b507095b18fc7be60772756ff740385d 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
echo >&2 "GIT_VERSION = $VN"
echo "GIT_VERSION = $VN" >$GVF
}
-
-
index 361c65bacc50b4038cb9a32bab07c275a1ecdc76..95269cc513fab071d96a044b32aec7abb8b3fe7c 100644 (file)
--- a/INSTALL
+++ b/INSTALL
interactive tools. None of the core git stuff needs the wrapper,
it's just a convenient shorthand and while it is documented in some
places, you can always replace "git commit" with "git-commit"
- instead.
+ instead.
But let's face it, most of us don't have GNU interactive tools, and
even if we had it, we wouldn't know what it does. I don't think it
would instead give you a copy of what you see at:
http://www.kernel.org/pub/software/scm/git/docs/
-
diff --git a/arm/sha1.c b/arm/sha1.c
index 11b1a048b489fa2bb15e4b723e5fe36920f48eee..9e3ae038e818f4e21bc50f864fc5204f6fa44daa 100644 (file)
--- a/arm/sha1.c
+++ b/arm/sha1.c
void SHA1_Final(unsigned char *hash, SHA_CTX *c)
{
uint64_t bitlen;
- uint32_t bitlen_hi, bitlen_lo;
+ uint32_t bitlen_hi, bitlen_lo;
unsigned int i, offset, padlen;
unsigned char bits[8];
static const unsigned char padding[64] = { 0x80, };
bits[5] = bitlen_lo >> 16;
bits[6] = bitlen_lo >> 8;
bits[7] = bitlen_lo;
- SHA1_Update(c, bits, 8);
+ SHA1_Update(c, bits, 8);
for (i = 0; i < 5; i++) {
uint32_t v = c->hash[i];
diff --git a/arm/sha1_arm.S b/arm/sha1_arm.S
index a328b73375a318228e309419c524c8de0860ed89..8c1cb99fb403875af85e4d1524d21f7eb818f59b 100644 (file)
--- a/arm/sha1_arm.S
+++ b/arm/sha1_arm.S
.L_sha_K:
.word 0x5a827999, 0x6ed9eba1, 0x8f1bbcdc, 0xca62c1d6
-
diff --git a/builtin-annotate.c b/builtin-annotate.c
index 9db7cfe74c7a8583995e6c20c4eedebf58391fbc..fc43eed36b55e4966796490b8c0a02fae790229c 100644 (file)
--- a/builtin-annotate.c
+++ b/builtin-annotate.c
return cmd_blame(argc + 1, nargv, prefix);
}
-
diff --git a/builtin-diff-index.c b/builtin-diff-index.c
index d90eba95a6be17bd0486e0311c2657b1f69ab7d9..81e7167438ecfc25a6f9a317af663034d653588e 100644 (file)
--- a/builtin-diff-index.c
+++ b/builtin-diff-index.c
argc = setup_revisions(argc, argv, &rev, NULL);
for (i = 1; i < argc; i++) {
const char *arg = argv[i];
-
+
if (!strcmp(arg, "--cached"))
cached = 1;
else
index 5c145d2165027adc5e5d44c6dda969e1ed86be57..ae60fccea74077b4d2456919d2f911f8a257c5b4 100644 (file)
--- a/builtin-fmt-merge-msg.c
+++ b/builtin-fmt-merge-msg.c
return 0;
}
-
diff --git a/builtin-fsck.c b/builtin-fsck.c
index bacae5dfa6e09602db59df256e5496f9f14e0d89..944a496650b6e13d2684bb221ee8bc7aadd78d6f 100644 (file)
--- a/builtin-fsck.c
+++ b/builtin-fsck.c
if (!commit->parents && show_root)
printf("root %s\n", sha1_to_hex(commit->object.sha1));
if (!commit->date)
- printf("bad commit date in %s\n",
+ printf("bad commit date in %s\n",
sha1_to_hex(commit->object.sha1));
return 0;
}
heads = 0;
for (i = 1; i < argc; i++) {
- const char *arg = argv[i];
+ const char *arg = argv[i];
if (*arg == '-')
continue;
diff --git a/builtin-ls-files.c b/builtin-ls-files.c
index f7c066b24b7a6a728fd2f0bf4a92a31fb4a695dd..5398a41415372b07fa1fdb43c26b5570e9d990b8 100644 (file)
--- a/builtin-ls-files.c
+++ b/builtin-ls-files.c
if (0 <= pos)
continue; /* exact match */
pos = -pos - 1;
- if (pos < active_nr) {
+ if (pos < active_nr) {
ce = active_cache[pos];
if (ce_namelen(ce) == len &&
!memcmp(ce->name, ent->name, len))
diff --git a/builtin-name-rev.c b/builtin-name-rev.c
index d3c42ed67e1e2eed24c215c06706ab4b46fb5675..61eba343ab781341a0baf127b323508a0c2af332 100644 (file)
--- a/builtin-name-rev.c
+++ b/builtin-name-rev.c
return 0;
}
-
diff --git a/builtin-pack-objects.c b/builtin-pack-objects.c
index 8b9740c27703dbbe71eb607b35520c5967279c0d..3d396ca37ac1356c7974aaaf34af39bcd0cf6bae 100644 (file)
--- a/builtin-pack-objects.c
+++ b/builtin-pack-objects.c
@@ -252,7 +252,7 @@ static void *delta_against(void *buf, unsigned long size, struct object_entry *e
delta_buf = diff_delta(otherbuf, othersize,
buf, size, &delta_size, 0);
if (!delta_buf || delta_size != entry->delta_size)
- die("delta size changed");
+ die("delta size changed");
free(buf);
free(otherbuf);
return delta_buf;
diff --git a/builtin-rerere.c b/builtin-rerere.c
index 8c2c8bdc18a69e4dff7386548e5f7ea78a133f7b..f6409b93c19aff7f8d820e52e39f45d717e31996 100644 (file)
--- a/builtin-rerere.c
+++ b/builtin-rerere.c
path_list_clear(&merge_rr, 1);
return 0;
}
-
diff --git a/builtin-shortlog.c b/builtin-shortlog.c
index 8d3f742d432c966e5afe03e8d0628eb92a73920c..16af6199ab2bc8a663d16f78a5d461a5bee05bc7 100644 (file)
--- a/builtin-shortlog.c
+++ b/builtin-shortlog.c
return 0;
}
-
index 8a9d1f3883150fd40ac1b6c0a44fa896c3133b04..5e7381eb1ea5f5fa8f4e70b15bc50f45ca616d39 100644 (file)
--- a/cache.h
+++ b/cache.h
extern void reprepare_packed_git(void);
extern void install_packed_git(struct packed_git *pack);
-extern struct packed_git *find_sha1_pack(const unsigned char *sha1,
+extern struct packed_git *find_sha1_pack(const unsigned char *sha1,
struct packed_git *packs);
extern void pack_report(void);
diff --git a/commit.c b/commit.c
index 5632e32685478dcce34e479e8e916b0ccd3a3b13..57b69ca7fa65ccec4502a53fd48d1684cfd09685 100644 (file)
--- a/commit.c
+++ b/commit.c
int register_commit_graft(struct commit_graft *graft, int ignore_dups)
{
int pos = commit_graft_pos(graft->sha1);
-
+
if (0 <= pos) {
if (ignore_dups)
free(graft);
@@ -406,7 +406,7 @@ struct commit_list * insert_by_date(struct commit *item, struct commit_list **li
return commit_list_insert(item, pp);
}
-
+
void sort_by_date(struct commit_list **list)
{
struct commit_list *ret = NULL;
next = next->next;
count++;
}
-
+
if (!count)
return;
/* allocate an array to help sort the list */
}
next=next->next;
}
- /*
+ /*
* find the tips
*
- * tips are nodes not reachable from any other node in the list
- *
+ * tips are nodes not reachable from any other node in the list
+ *
* the tips serve as a starting set for the work queue.
*/
next=*list;
if (pn) {
/*
- * parents are only enqueued for emission
+ * parents are only enqueued for emission
* when all their children have been emitted thereby
* guaranteeing topological order.
*/
diff --git a/commit.h b/commit.h
index 86e8dca0c9dbac4d990d959296145805319b477a..75b43a53edcd082fbe148dad3ddc66e85471f0b4 100644 (file)
--- a/commit.h
+++ b/commit.h
/** Removes the first commit from a list sorted by date, and adds all
* of its parents.
**/
-struct commit *pop_most_recent_commit(struct commit_list **list,
+struct commit *pop_most_recent_commit(struct commit_list **list,
unsigned int mark);
struct commit *pop_commit(struct commit_list **stack);
diff --git a/compat/mmap.c b/compat/mmap.c
index 4cfaee31361d98d2c8f68d250609b09130335baa..c9d46d174259f42a3e2a2eb073475aba517044be 100644 (file)
--- a/compat/mmap.c
+++ b/compat/mmap.c
free(start);
return 0;
}
-
diff --git a/config.c b/config.c
index 0614c2b29fa93b66065ec6bc20712d38193aec89..58d3ed5d371b6d7548f6677e65135bd3f01851d0 100644 (file)
--- a/config.c
+++ b/config.c
size_t equal_offset = size, bracket_offset = size;
ssize_t offset;
- for (offset = offset_-2; offset > 0
+ for (offset = offset_-2; offset > 0
&& contents[offset] != '\n'; offset--)
switch (contents[offset]) {
case '=': equal_offset = offset; break;
free(config_filename);
return ret;
}
-
diff --git a/config.mak.in b/config.mak.in
index eb9d7a55496492fa021e8262f052c7f46b60ea20..a3032e389f6bf63cd46a3aa23e59b6a6cd537132 100644 (file)
--- a/config.mak.in
+++ b/config.mak.in
NO_STRLCPY=@NO_STRLCPY@
NO_SETENV=@NO_SETENV@
NO_ICONV=@NO_ICONV@
-
diff --git a/connect.c b/connect.c
index 8cbda88dda02e7de74149af1b387e537f77bc497..7fab9c0fd961af54a5758e8452391ff7a5e2e9bd 100644 (file)
--- a/connect.c
+++ b/connect.c
}
if (0 <= matchlen) {
/* core.gitproxy = none for kernel.org */
- if (matchlen == 4 &&
+ if (matchlen == 4 &&
!memcmp(value, "none", 4))
matchlen = 0;
git_proxy_command = xmalloc(matchlen + 1);
diff --git a/contrib/README b/contrib/README
index e1c0a01ff30d3756d547781f783a37c96e9b7eb9..05f291c1f1d3d1018f390618816f94d0cd58951b 100644 (file)
--- a/contrib/README
+++ b/contrib/README
stuff there.
-jc
-
index 50a6f67fd6df5c37a0e244ff5c5997131f3f0f52..fada5ce909876168f68a85c8ca9a8bc269048acb 100644 (file)
--- a/contrib/blameview/README
+++ b/contrib/blameview/README
Cc: git@vger.kernel.org
Date: Sat, 27 Jan 2007 18:52:38 -0500
Message-ID: <20070127235238.GA28706@coredump.intra.peff.net>
-
index 2d80e2bad2e6f322d7ff7e9f03a6897a11f74231..3dc1ef50c74974fbdfb0db150395e209e212b564 100755 (executable)
--- a/contrib/gitview/gitview
+++ b/contrib/gitview/gitview
view = GitView( without_diff != 1)
view.run(sys.argv[without_diff:])
-
-
index d1bef9125bca0997e0e714b3f89e9c2df307d598..c589a39a0c81818150575c74866a57619e1adf2a 100644 (file)
hooks/post-receive
- --
+ --
$projectdesc
EOF
}
index dc09eae972711496aa390cb99b3017a936ce1afc..0c8b9544908ad90c1731cbac14f9f78910abc8f8 100644 (file)
esac
done
fi
-
-
diff --git a/convert-objects.c b/convert-objects.c
index cefbcebdcaa0a085745c81b2ed1103e9575cb635..90e7900e6d7aff2fadf9ba04f8d982733493411c 100644 (file)
--- a/convert-objects.c
+++ b/convert-objects.c
fmt++;
} while (*buf && *fmt);
printf("left: %s\n", buf);
- return mktime(&tm);
+ return mktime(&tm);
}
static int convert_date_line(char *dst, void **buf, unsigned long *sp)
index d340bb253ec35af379c29e71f384e15d6822fb9a..c225d1b0ff0a67e637f7200ab5c2a917b550af4f 100644 (file)
--- a/copy.c
+++ b/copy.c
close(ifd);
return 0;
}
-
index 56bdffa636e6b4465ab8451de0351ff394182885..ee06eb7f48f1d3e818b3037369b4e056fe7e5be7 100644 (file)
--- a/ctype.c
+++ b/ctype.c
AA, AA, AA, AA, AA, AA, AA, AA, AA, AA, AA, 0, 0, 0, 0, 0, /* 112-15 */
/* Nothing in the 128.. range */
};
-
diff --git a/daemon.c b/daemon.c
index 674e30dca3d05cabc5a72e7bb0a40e64eaa4b2eb..77792509e3e9e33556555e967a207c487ab5ebf1 100644 (file)
--- a/daemon.c
+++ b/daemon.c
{
int sl, ndot;
- /*
+ /*
* This resurrects the belts and suspenders paranoia check by HPA
* done in <435560F7.4080006@zytor.com> thread, now enter_repo()
* does not do getcwd() based path canonicalizations.
int pathlen = strlen(path);
/* The validation is done on the paths after enter_repo
- * appends optional {.git,.git/.git} and friends, but
+ * appends optional {.git,.git/.git} and friends, but
* it does not use getcwd(). So if your /pub is
* a symlink to /mnt/pub, you can whitelist /pub and
* do not have to say /mnt/pub.
index 4690371e5559f72b7755b3cc92ae85843098d285..316841e8ad3705559fddb0ca4aff969fdf91b011 100644 (file)
--- a/date.c
+++ b/date.c
}
/*
- * We've seen a digit. Time? Year? Date?
+ * We've seen a digit. Time? Year? Date?
*/
static int match_digit(const char *date, struct tm *tm, int *offset, int *tm_gmt)
{
@@ -495,7 +495,7 @@ static int match_digit(const char *date, struct tm *tm, int *offset, int *tm_gmt
} else if (num > 0 && num < 13) {
tm->tm_mon = num-1;
}
-
+
return n;
}
if (!match) {
/* BAD CRAP */
match = 1;
- }
+ }
date += match;
}
/* mktime uses local timezone */
- then = my_mktime(&tm);
+ then = my_mktime(&tm);
if (offset == -1)
offset = (then - mktime(&tm)) / 60;
{ "days", 24*60*60 },
{ "weeks", 7*24*60*60 },
{ NULL }
-};
+};
static const char *approxidate_alpha(const char *date, struct tm *tm, int *num)
{
diff --git a/diff-lib.c b/diff-lib.c
index 07f4e8106a51384d2236b182438472884c300da6..7fb19c7b87fc39cc4515628e8623ccb92fbaa60e 100644 (file)
--- a/diff-lib.c
+++ b/diff-lib.c
const char *tree_name;
int match_missing = 0;
- /*
+ /*
* Backward compatibility wart - "diff-index -m" does
* not mean "do not ignore merges", but totally different.
*/
index c57ac334141186d23f669bf71c897212a2b37c30..cafa7debeb7dd1f3ecc15f24bd41959fb12448d5 100644 (file)
--- a/diff.c
+++ b/diff.c
* entries to the diff-core. They will be prefixed
* with something like '=' or '*' (I haven't decided
* which but should not make any difference).
- * Feeding the same new and old to diff_change()
+ * Feeding the same new and old to diff_change()
* also has the same effect.
* Before the final output happens, they are pruned after
* merged into rename/copy pairs as appropriate.
unsigned old_mode, unsigned new_mode,
const unsigned char *old_sha1,
const unsigned char *new_sha1,
- const char *base, const char *path)
+ const char *base, const char *path)
{
char concatpath[PATH_MAX];
struct diff_filespec *one, *two;
diff --git a/diffcore-pickaxe.c b/diffcore-pickaxe.c
index c4a77d71da5602b68c541c2487fcbecfdfff2944..af9fffe6e8e145b066157da8791c749257e7c8e9 100644 (file)
--- a/diffcore-pickaxe.c
+++ b/diffcore-pickaxe.c
for (i = 0; i < q->nr; i++)
diff_free_filepair(q->queue[i]);
}
- else
+ else
/* Showing only the filepairs that has the needle */
for (i = 0; i < q->nr; i++) {
struct diff_filepair *p = q->queue[i];
index ae6476496a81b23938569ab0e4c148ba45aba923..c540ae13e858685faa8dbbada5b064074235ae6d 100644 (file)
--- a/entry.c
+++ b/entry.c
struct dirent *de;
char pathbuf[PATH_MAX];
char *name;
-
+
if (!dir)
die("cannot opendir %s (%s)", path, strerror(errno));
strcpy(pathbuf, path);
diff --git a/environment.c b/environment.c
index 9d3e5eb72fea51eb30a201151aeffe1dfbb549d3..8b9b89d0a0c93683b522383ed56d7f464a6962cb 100644 (file)
--- a/environment.c
+++ b/environment.c
setup_git_env();
return git_graft_file;
}
-
-
diff --git a/fetch-pack.c b/fetch-pack.c
index aa59043c036e492a314c75080a61ab3d6a2b403d..9c81305be5f4c1a78794c9d5397bd828ba705fcc 100644 (file)
--- a/fetch-pack.c
+++ b/fetch-pack.c
commit->object.flags |= POPPED;
if (!(commit->object.flags & COMMON))
non_common_revs--;
-
+
parents = commit->parents;
if (commit->object.flags & COMMON) {
index 8e29d313f817981a29ebb65f2f579c9f1bd8e9b6..dda33e548b65e79e22de8a84ab4d67ef13387a05 100644 (file)
--- a/fetch.c
+++ b/fetch.c
int get_recover = 0;
static unsigned char current_commit_sha1[20];
-void pull_say(const char *fmt, const char *hex)
+void pull_say(const char *fmt, const char *hex)
{
if (get_verbosely)
fprintf(stderr, fmt, hex);
return 0;
prefetch(obj->sha1);
}
-
+
object_list_insert(obj, process_queue_end);
process_queue_end = &(*process_queue_end)->next;
return 0;
diff --git a/git-archimport.perl b/git-archimport.perl
index c1e7c1ddcbbf45995b53785a0f39314f6d499d2c..b21077206a93139fd8652d5174817e18c89ba22e 100755 (executable)
--- a/git-archimport.perl
+++ b/git-archimport.perl
# This tool is copyright (c) 2005, Martin Langhoff.
# It is released under the Gnu Public License, version 2.
#
-# The basic idea is to walk the output of tla abrowse,
-# fetch the changesets and apply them.
+# The basic idea is to walk the output of tla abrowse,
+# fetch the changesets and apply them.
#
=head1 Invocation
- git-archimport [ -h ] [ -v ] [ -o ] [ -a ] [ -f ] [ -T ]
- [ -D depth] [ -t tempdir ] <archive>/<branch> [ <archive>/<branch> ]
+ git-archimport [ -h ] [ -v ] [ -o ] [ -a ] [ -f ] [ -T ]
+ [ -D depth] [ -t tempdir ] <archive>/<branch> [ <archive>/<branch> ]
Imports a project from one or more Arch repositories. It will follow branches
and repositories within the namespaces defined by the <archive/branch>
parameters supplied. If it cannot find the remote branch a merge comes from
-it will just import it as a regular commit. If it can find it, it will mark it
+it will just import it as a regular commit. If it can find it, it will mark it
as a merge whenever possible.
See man (1) git-archimport for more details.
- create tag objects instead of ref tags
- audit shell-escaping of filenames
- hide our private tags somewhere smarter
- - find a way to make "cat *patches | patch" safe even when patchfiles are missing newlines
+ - find a way to make "cat *patches | patch" safe even when patchfiles are missing newlines
- sort and apply patches by graphing ancestry relations instead of just
relying in dates supplied in the changeset itself.
tla ancestry-graph -m could be helpful here...
=head1 Devel tricks
-Add print in front of the shell commands invoked via backticks.
+Add print in front of the shell commands invoked via backticks.
=head1 Devel Notes
my $stage = shift;
while (my ($limit, $level) = each %arch_branches) {
next unless $level == $stage;
-
- open ABROWSE, "$TLA abrowse -fkD --merges $limit |"
+
+ open ABROWSE, "$TLA abrowse -fkD --merges $limit |"
or die "Problems with tla abrowse: $!";
-
+
my %ps = (); # the current one
my $lastseen = '';
-
+
while (<ABROWSE>) {
chomp;
-
+
# first record padded w 8 spaces
if (s/^\s{8}\b//) {
my ($id, $type) = split(m/\s+/, $_, 2);
push (@psets, \%last_ps);
$psets{ $last_ps{id} } = \%last_ps;
}
-
+
my $branch = extract_versionname($id);
%ps = ( id => $id, branch => $branch );
if (%last_ps && ($last_ps{branch} eq $branch)) {
$ps{parent_id} = $last_ps{id};
}
-
+
$arch_branches{$branch} = 1;
$lastseen = 'id';
$ps{type} = 't';
# read which revision we've tagged when we parse the log
$ps{tag} = $1;
- } else {
+ } else {
warn "Unknown type $type";
}
$arch_branches{$branch} = 1;
$lastseen = 'id';
- } elsif (s/^\s{10}//) {
- # 10 leading spaces or more
+ } elsif (s/^\s{10}//) {
+ # 10 leading spaces or more
# indicate commit metadata
-
+
# date
if ($lastseen eq 'id' && m/^(\d{4}-\d\d-\d\d \d\d:\d\d:\d\d)/){
$ps{date} = $1;
} elsif ($lastseen eq 'merges' && s/^\s{2}//) {
my $id = $_;
push (@{$ps{merges}}, $id);
-
+
# aggressive branch finding:
if ($opt_D) {
my $branch = extract_versionname($id);
my $repo = extract_reponame($branch);
-
+
if (archive_reachable($repo) &&
!defined $arch_branches{$branch}) {
$arch_branches{$branch} = $stage + 1;
if (@psets && $psets[$#psets]{branch} eq $ps{branch}) {
$temp{parent_id} = $psets[$#psets]{id};
}
- push (@psets, \%temp);
+ push (@psets, \%temp);
$psets{ $temp{id} } = \%temp;
- }
-
+ }
+
close ABROWSE or die "$TLA abrowse failed on $limit\n";
}
} # end foreach $root
while (my $file = readdir(DIR)) {
# skip non-interesting-files
next unless -f "$ptag_dir/$file";
-
+
# convert first '--' to '/' from old git-archimport to use
# as an archivename/c--b--v private tag
if ($file !~ m!,!) {
my $fq_cvbr = shift; # archivename/[[[[category]branch]version]revision]
return (split(/\//, $fq_cvbr))[0];
}
-
+
sub extract_versionname {
my $name = shift;
$name =~ s/--(?:patch|version(?:fix)?|base)-\d+$//;
}
# convert a fully-qualified revision or version to a unique dirname:
-# normalperson@yhbt.net-05/mpd--uclinux--1--patch-2
+# normalperson@yhbt.net-05/mpd--uclinux--1--patch-2
# becomes: normalperson@yhbt.net-05,mpd--uclinux--1
#
# the git notion of a branch is closer to
sub process_patchset_accurate {
my $ps = shift;
-
+
# switch to that branch if we're not already in that branch:
if (-e "$git_dir/refs/heads/$ps->{branch}") {
system('git-checkout','-f',$ps->{branch}) == 0 or die "$! $?\n";
my $rm = safe_pipe_capture('git-ls-files','--others','-z');
rmtree(split(/\0/,$rm)) if $rm;
}
-
+
# Apply the import/changeset/merge into the working tree
my $dir = sync_to_ps($ps);
# read the new log entry:
parselog($ps, \@commitlog);
if ($ps->{id} =~ /--base-0$/ && $ps->{id} ne $psets[0]{id}) {
- # this should work when importing continuations
+ # this should work when importing continuations
if ($ps->{tag} && (my $branchpoint = eval { ptag($ps->{tag}) })) {
-
+
# find where we are supposed to branch from
if (! -e "$git_dir/refs/heads/$ps->{branch}") {
system('git-branch',$ps->{branch},$branchpoint) == 0 or die "$! $?\n";
}
# allow multiple bases/imports here since Arch supports cherry-picks
# from unrelated trees
- }
-
+ }
+
# update the index with all the changes we got
system('git-diff-files --name-only -z | '.
'git-update-index --remove -z --stdin') == 0 or die "$! $?\n";
# does not handle permissions or any renames involving directories
sub process_patchset_fast {
my $ps = shift;
- #
+ #
# create the branch if needed
#
if ($ps->{type} eq 'i' && !$import) {
# new branch! we need to verify a few things
die "Branch on a non-tag!" unless $ps->{type} eq 't';
my $branchpoint = ptag($ps->{tag});
- die "Tagging from unknown id unsupported: $ps->{tag}"
+ die "Tagging from unknown id unsupported: $ps->{tag}"
unless $branchpoint;
-
+
# find where we are supposed to branch from
if (! -e "$git_dir/refs/heads/$ps->{branch}") {
system('git-branch',$ps->{branch},$branchpoint) == 0 or die "$! $?\n";
}
system('git-checkout',$ps->{branch}) == 0 or die "$! $?\n";
return 0;
- }
+ }
die $! if $?;
- }
+ }
#
# Apply the import/changeset/merge into the working tree
- #
+ #
if ($ps->{type} eq 'i' || $ps->{type} eq 't') {
apply_import($ps) or die $!;
$stats{import_or_tag}++;
# prepare update git's index, based on what arch knows
# about the pset, resolve parents, etc
#
-
- my @commitlog = safe_pipe_capture($TLA,'cat-archive-log',$ps->{id});
+
+ my @commitlog = safe_pipe_capture($TLA,'cat-archive-log',$ps->{id});
die "Error in cat-archive-log: $!" if $?;
-
+
parselog($ps,\@commitlog);
# imports don't give us good info
if (@$ren % 2) {
die "Odd number of entries in rename!?";
}
-
+
while (@$ren) {
my $from = shift @$ren;
- my $to = shift @$ren;
+ my $to = shift @$ren;
unless (-d dirname($to)) {
mkpath(dirname($to)); # will die on err
"Things may be a bit slow\n";
*process_patchset = *process_patchset_accurate;
}
-
+
foreach my $ps (@psets) {
# process patchsets
$ps->{branch} = git_branchname($ps->{id});
#
- # ensure we have a clean state
- #
+ # ensure we have a clean state
+ #
if (my $dirty = `git-diff-files`) {
die "Unclean tree when about to process $ps->{id} " .
" - did we fail to commit cleanly before?\n$dirty";
}
die $! if $?;
-
+
#
# skip commits already in repo
#
my $tree = `git-write-tree`;
die "cannot write tree $!" if $?;
chomp $tree;
-
+
#
# Who's your daddy?
#
close HEAD;
chomp $p;
push @par, '-p', $p;
- } else {
+ } else {
if ($ps->{type} eq 's') {
warn "Could not find the right head for the branch $ps->{branch}";
}
}
}
-
+
if ($ps->{merges}) {
push @par, find_parents($ps);
}
- #
+ #
# Commit, tag and clean state
#
$ENV{TZ} = 'GMT';
$ENV{GIT_COMMITTER_EMAIL} = $ps->{email};
$ENV{GIT_COMMITTER_DATE} = $ps->{date};
- my $pid = open2(*READER, *WRITER,'git-commit-tree',$tree,@par)
+ my $pid = open2(*READER, *WRITER,'git-commit-tree',$tree,@par)
or die $!;
print WRITER $ps->{summary},"\n\n";
print WRITER $ps->{message},"\n";
-
+
# make it easy to backtrack and figure out which Arch revision this was:
print WRITER 'git-archimport-id: ',$ps->{id},"\n";
-
+
close WRITER;
my $commitid = <READER>; # read
chomp $commitid;
}
#
# Update the branch
- #
+ #
open HEAD, ">","$git_dir/refs/heads/$ps->{branch}";
print HEAD $commitid;
close HEAD;
sub sync_to_ps {
my $ps = shift;
my $tree_dir = $tmp.'/'.tree_dirname($ps->{id});
-
+
$opt_v && print "sync_to_ps($ps->{id}) method: ";
if (-d $tree_dir) {
safe_pipe_capture($TLA,'get','--no-pristine',$ps->{id},$tree_dir);
$stats{get_new}++;
}
-
+
# added -I flag to rsync since we're going to fast! AIEEEEE!!!!
system('rsync','-aI','--delete','--exclude',$git_dir,
# '--exclude','.arch-inventory',
mkpath($tmp);
safe_pipe_capture($TLA,'get','-s','--no-pristine',$ps->{id},"$tmp/import");
- die "Cannot get import: $!" if $?;
+ die "Cannot get import: $!" if $?;
system('rsync','-aI','--delete', '--exclude',$git_dir,
'--exclude','.arch-ids','--exclude','{arch}',
"$tmp/import/", './');
die "Cannot rsync import:$!" if $?;
-
+
rmtree("$tmp/import");
die "Cannot remove tempdir: $!" if $?;
-
+
return 1;
}
# get the changeset
safe_pipe_capture($TLA,'get-changeset',$ps->{id},"$tmp/changeset");
die "Cannot get changeset: $!" if $?;
-
+
# apply patches
if (`find $tmp/changeset/patches -type f -name '*.patch'`) {
# this can be sped up considerably by doing
# (find | xargs cat) | patch
# but that can get mucked up by patches
- # with missing trailing newlines or the standard
+ # with missing trailing newlines or the standard
# 'missing newline' flag in the patch - possibly
# produced with an old/buggy diff.
# slow and safe, we invoke patch once per patchfile
# bring in new files
system('rsync','-aI','--exclude',$git_dir,
- '--exclude','.arch-ids',
+ '--exclude','.arch-ids',
'--exclude', '{arch}',
"$tmp/changeset/new-files-archive/",'./');
removed_files => 1,
removed_directories => 1,
);
-
+
chomp (@$log);
while ($_ = shift @$log) {
if (/^Continuation-of:\s*(.*)/) {
}
}
}
-
+
# drop leading empty lines from the log message
while (@$log && $log->[0] eq '') {
shift @$log;
$ps->{summary} = $log->[0] . '...';
}
$ps->{message} = join("\n",@$log);
-
+
# skip Arch control files, unescape pika-escaped files
foreach my $k (keys %want_headers) {
next unless (defined $ps->{$k});
# write/read a tag
sub tag {
my ($tag, $commit) = @_;
-
+
if ($opt_o) {
$tag =~ s|/|--|g;
} else {
$patchname =~ s/.*--//;
$tag = git_branchname ($tag) . '--' . $patchname;
}
-
+
if ($commit) {
open(C,">","$git_dir/refs/tags/$tag")
or die "Cannot create tag $tag: $!\n";
my ($tag, $commit) = @_;
# don't use subdirs for tags yet, it could screw up other porcelains
- $tag =~ s|/|,|g;
-
+ $tag =~ s|/|,|g;
+
my $tag_file = "$ptag_dir/$tag";
my $tag_branch_dir = dirname($tag_file);
mkpath($tag_branch_dir) unless (-d $tag_branch_dir);
or die "Cannot write tag $tag: $!\n";
close(C)
or die "Cannot write tag $tag: $!\n";
- $rptags{$commit} = $tag
+ $rptags{$commit} = $tag
unless $tag =~ m/--base-0$/;
} else { # read
# if the tag isn't there, return 0
# Identify what branches are merging into me
# and whether we are fully merged
# git-merge-base <headsha> <headsha> should tell
- # me what the base of the merge should be
+ # me what the base of the merge should be
#
my $ps = shift;
}
#
- # foreach branch find a merge base and walk it to the
+ # foreach branch find a merge base and walk it to the
# head where we are, collecting the merged patchsets that
# Arch has recorded. Keep that in @have
# Compare that with the commits on the other branch
# between merge-base and the tip of the branch (@need)
# and see if we have a series of consecutive patches
# starting from the merge base. The tip of the series
- # of consecutive patches merged is our new parent for
+ # of consecutive patches merged is our new parent for
# that branch.
#
foreach my $branch (keys %branches) {
next unless -e "$git_dir/refs/heads/$branch";
my $mergebase = `git-merge-base $branch $ps->{branch}`;
- if ($?) {
- # Don't die here, Arch supports one-way cherry-picking
- # between branches with no common base (or any relationship
- # at all beforehand)
- warn "Cannot find merge base for $branch and $ps->{branch}";
- next;
- }
+ if ($?) {
+ # Don't die here, Arch supports one-way cherry-picking
+ # between branches with no common base (or any relationship
+ # at all beforehand)
+ warn "Cannot find merge base for $branch and $ps->{branch}";
+ next;
+ }
chomp $mergebase;
# now walk up to the mergepoint collecting what patches we have
# merge what we have with what ancestors have
%have = (%have, %ancestorshave);
- # see what the remote branch has - these are the merges we
+ # see what the remote branch has - these are the merges we
# will want to have in a consecutive series from the mergebase
my $otherbranchtip = git_rev_parse($branch);
my @needraw = `git-rev-list --topo-order $otherbranchtip ^$mergebase`;
foreach my $needps (@needraw) { # get the psets
$needps = commitid2pset($needps);
# git-rev-list will also
- # list commits merged in via earlier
+ # list commits merged in via earlier
# merges. we are only interested in commits
# from the branch we're looking at
if ($branch eq $needps->{branch}) {
next unless ref $psets{$p}{merges};
my @merges = @{$psets{$p}{merges}};
foreach my $merge (@merges) {
- if ($parents{$merge}) {
+ if ($parents{$merge}) {
delete $parents{$merge};
}
}
sub commitid2pset {
my $commitid = shift;
chomp $commitid;
- my $name = $rptags{$commitid}
+ my $name = $rptags{$commitid}
|| die "Cannot find reverse tag mapping for $commitid";
$name =~ s|,|/|;
- my $ps = $psets{$name}
+ my $ps = $psets{$name}
|| (print Dumper(sort keys %psets)) && die "Cannot find patchset for $name";
return $ps;
}
my $archive = shift;
return 1 if $reachable{$archive};
return 0 if $unreachable{$archive};
-
+
if (system "$TLA whereis-archive $archive >/dev/null") {
if ($opt_a && (system($TLA,'register-archive',
"http://mirrors.sourcecontrol.net/$archive") == 0)) {
return 1;
}
}
-
diff --git a/git-checkout.sh b/git-checkout.sh
index 6b6facfd5a224afca735d4693d304726f4032e6f..d561c88dcbd3d5a67b4b6725e00683e613d80b9b 100755 (executable)
--- a/git-checkout.sh
+++ b/git-checkout.sh
esac
# Match the index to the working tree, and do a three-way.
- git diff-files --name-only | git update-index --remove --stdin &&
+ git diff-files --name-only | git update-index --remove --stdin &&
work=`git write-tree` &&
git read-tree $v --reset -u $new || exit
(exit $saved_err)
fi
-#
+#
# Switch the HEAD pointer to the new branch if we
# checked out a branch head, and remove any potential
# old MERGE_HEAD's (subsequent commits will clearly not
diff --git a/git-clone.sh b/git-clone.sh
index fdd354f2da1978241a3e79a47a067496150cc1bc..5bfd8d1556bb7d0da0beaf3685b2350af20e1e15 100755 (executable)
--- a/git-clone.sh
+++ b/git-clone.sh
#
# Copyright (c) 2005, Linus Torvalds
# Copyright (c) 2005, Junio C Hamano
-#
+#
# Clone a repository into a different directory that does not yet exist.
# See git-sh-setup why.
*,--na|*,--nak|*,--nake|*,--naked|\
*,-b|*,--b|*,--ba|*,--bar|*,--bare) bare=yes ;;
*,-l|*,--l|*,--lo|*,--loc|*,--loca|*,--local) use_local=yes ;;
- *,-s|*,--s|*,--sh|*,--sha|*,--shar|*,--share|*,--shared)
+ *,-s|*,--s|*,--sh|*,--sha|*,--shar|*,--share|*,--shared)
local_shared=yes; use_local=yes ;;
1,--template) usage ;;
*,--template)
rm -f "$GIT_DIR/CLONE_HEAD" "$GIT_DIR/REMOTE_HEAD"
trap - 0
-
diff --git a/git-commit.sh b/git-commit.sh
index e8b60f70497c71bd66b96115b9bba78cee523a8c..5547a02954b23425e644d0b30ae6047afa393ac0 100755 (executable)
--- a/git-commit.sh
+++ b/git-commit.sh
} >>"$GIT_DIR"/COMMIT_EDITMSG
else
# we need to check if there is anything to commit
- run_status >/dev/null
+ run_status >/dev/null
fi
if [ "$?" != "0" -a ! -f "$GIT_DIR/MERGE_HEAD" -a -z "$amend" ]
then
index 42060ef6e165b6b39e4842138013cf264688ebd5..e9832d2bb913d61ce8a92ddf32e009ad59659d53 100755 (executable)
--- a/git-cvsexportcommit.perl
+++ b/git-cvsexportcommit.perl
# ... validate new files,
foreach my $f (@afiles) {
if (defined ($cvsstat{$f}) and $cvsstat{$f} ne "Unknown") {
- $dirty = 1;
+ $dirty = 1;
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";
warn "Status was: $cvsstat{$f}\n";
}
diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index 4e6c9c6cc7c1fbbf69c455d6095cc8d18c81de16..3225a2a25dcaabbae64754e99a550f5b210f3765 100755 (executable)
--- a/git-cvsimport.perl
+++ b/git-cvsimport.perl
if ($#ARGV == 0) {
$cvs_tree = $ARGV[0];
} elsif (-f 'CVS/Repository') {
- open my $f, '<', 'CVS/Repository' or
+ open my $f, '<', 'CVS/Repository' or
die 'Failed to open CVS/Repository';
$cvs_tree = <$f>;
chomp $cvs_tree;
my ($self,$fn,$rev) = @_;
my $res;
- my ($fh, $name) = tempfile('gitcvs.XXXXXX',
+ my ($fh, $name) = tempfile('gitcvs.XXXXXX',
DIR => File::Spec->tmpdir(), UNLINK => 1);
$self->_file($fn,$rev) and $res = $self->_line($fh);
sub get_headref ($$) {
my $name = shift;
- my $git_dir = shift;
-
+ my $git_dir = shift;
+
my $f = "$git_dir/refs/heads/$name";
if (open(my $fh, $f)) {
chomp(my $r = <$fh>);
$xtag =~ s/\s+\*\*.*$//; # Remove stuff like ** INVALID ** and ** FUNKY **
$xtag =~ tr/_/\./ if ( $opt_u );
$xtag =~ s/[\/]/$opt_s/g;
-
+
my $pid = open2($in, $out, 'git-mktag');
print $out "object $cid\n".
"type commit\n".
$? != 0 or $tagobj !~ /^[0123456789abcdef]{40}$/ ) {
die "Cannot create tag object $xtag: $!\n";
}
-
+
open(C,">$git_dir/refs/tags/$xtag")
or die "Cannot create tag $xtag: $!\n";
index 25647c8060d8e30ef48d972e487dc9b280266b88..eee495a98666094415233a7023c03db9852dfe53 100755 (executable)
--- a/git-gui/GIT-VERSION-GEN
+++ b/git-gui/GIT-VERSION-GEN
echo >&2 "GITGUI_VERSION = $VN"
echo "GITGUI_VERSION = $VN" >$GVF
}
-
-
diff --git a/git-gui/lib/class.tcl b/git-gui/lib/class.tcl
index 88b056522a866b3acc9620218ec8dfae042d62a2..72494c1a1ea51ec004a63f08f2c62db9096c2318 100644 (file)
--- a/git-gui/lib/class.tcl
+++ b/git-gui/lib/class.tcl
[format { [list source [file join $dir %s]]} \
[file split $scriptFile]] "\n"
}
-
diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh
index 7d62d7902cb1d7cd2749091b86d532306bea89b3..254d210bdca128089da453988175e2324b837a85 100755 (executable)
--- a/git-merge-one-file.sh
+++ b/git-merge-one-file.sh
# remove lines that are unique to ours.
orig=`git-unpack-file $2`
sz0=`wc -c <"$orig"`
- diff -u -La/$orig -Lb/$orig $orig $src2 | git-apply --no-add
+ diff -u -La/$orig -Lb/$orig $orig $src2 | git-apply --no-add
sz1=`wc -c <"$orig"`
# If we do not have enough common material, it is not
diff --git a/git-p4import.py b/git-p4import.py
index 60a758bfe3bf535733612d4a0843fb42055f4c80..0f3d97b67eef3108728265e26f5d79c4526d11ac 100644 (file)
--- a/git-p4import.py
+++ b/git-p4import.py
if stitch == 1:
git.clean_directories()
stitch = 0
-
diff --git a/git-svnimport.perl b/git-svnimport.perl
index 3af8c7e1106d755b1589750ff5673ff6a6cd3b14..f4597626b955252fa7cfc092d8bb041cc3887345 100755 (executable)
--- a/git-svnimport.perl
+++ b/git-svnimport.perl
if ($node_kind eq $SVN::Node::dir) {
$srcpath =~ s#/*$#/#;
}
-
+
my $pid = open my $f,'-|';
die $! unless defined $pid;
if (!$pid) {
} else {
$p = $path;
}
- push(@$new,[$mode,$sha1,$p]);
+ push(@$new,[$mode,$sha1,$p]);
}
close($f) or
print STDERR "$newrev:$newbranch: could not list files in $oldpath \@ $rev\n";
diff --git a/git-tag.sh b/git-tag.sh
index 37cee978d2b684c1f0965700bc687802ecc63851..c84043902f9fcaf7c09846b9fd68986bd7fc5108 100755 (executable)
--- a/git-tag.sh
+++ b/git-tag.sh
done
;;
-m)
- annotate=1
+ annotate=1
shift
message="$1"
if test "$#" = "0"; then
username="$1"
;;
-d)
- shift
+ shift
had_error=0
for tag
do
fi
git update-ref "refs/tags/$name" "$object" "$prev"
-
diff --git a/git-verify-tag.sh b/git-verify-tag.sh
index 8db7dd0b7d371cfeec84e70ff2a51ccf53a994e7..f2d5597dba8921c6381dfd018a97733252cc457d 100755 (executable)
--- a/git-verify-tag.sh
+++ b/git-verify-tag.sh
sed '/-----BEGIN PGP/Q' |
gpg --verify "$GIT_DIR/.tmp-vtag" - || exit 1
rm -f "$GIT_DIR/.tmp-vtag"
-
diff --git a/git.spec.in b/git.spec.in
index 3a45eb876157d9979f51fe88ecc5d5ae4a93ff1c..b9dc1d59ebc14e94d2b81bdfaf68c10d97820e83 100644 (file)
--- a/git.spec.in
+++ b/git.spec.in
%package email
Summary: Git tools for sending email
Group: Development/Tools
-Requires: git-core = %{version}-%{release}
+Requires: git-core = %{version}-%{release}
%description email
Git tools for sending email.
index a57e84cef7143839af954e2aa1fcb3d633befe41..87c3690ff3f742984ea91dcd45fb8475ae988f1e 100755 (executable)
--- a/gitk
+++ b/gitk
set tagids($name) $commit
lappend idtags($commit) $name
}
- }
+ }
catch {
set tagcontents($name) [exec git cat-file tag $id]
}
diff --git a/gitweb/README b/gitweb/README
index e02e90f0429be0d2a69b76571101f20b8f75530f..7186cede2fad816ef4d497ac2c863869d5db76a0 100644 (file)
--- a/gitweb/README
+++ b/gitweb/README
Any comment/question/concern to:
Git mailing list <git@vger.kernel.org>
-
index 6a9af4d175f2fe9724a2844df63e4011ba91f1b3..1cd33ece6bcec6f71c6749205c18c0f413034d89 100644 (file)
--- a/help.c
+++ b/help.c
return 0;
}
-
-
diff --git a/http-fetch.c b/http-fetch.c
index 09baedc18ae320a2f09fa61d9065bedb69c02a41..202fae0ba8b348aeca6ec6c61045f39aa0d1fa66 100644 (file)
--- a/http-fetch.c
+++ b/http-fetch.c
}
unlink(obj_req->tmpfile);
if (obj_req->slot) {
- release_active_slot(obj_req->slot);
+ release_active_slot(obj_req->slot);
obj_req->slot = NULL;
}
release_object_request(obj_req);
diff --git a/http-push.c b/http-push.c
index 79d2c3860825ba1e68fff555b4433731d51c1b52..7c3720f602bb8f50ed54a4f7e7a85c7e08d1c07b 100644 (file)
--- a/http-push.c
+++ b/http-push.c
request->buffer.size = stream.total_out;
request->buffer.posn = 0;
- request->url = xmalloc(strlen(remote->url) +
+ request->url = xmalloc(strlen(remote->url) +
strlen(request->lock->token) + 51);
strcpy(request->url, remote->url);
posn = request->url + strlen(remote->url);
index ae27e0c9409b93558e50318f2dd0a4fe758293b5..c6fb8ace9f9f43935f4128fc223b01e6cb9fa605 100644 (file)
--- a/http.c
+++ b/http.c
return 0;
}
-#ifdef USE_CURL_MULTI
+#ifdef USE_CURL_MULTI
if (!strcmp("http.maxrequests", var)) {
if (max_requests == -1)
max_requests = git_config_int(var, value);
diff --git a/imap-send.c b/imap-send.c
index 4283a4acdaf28a8edc2f595e6137cc396f4988dc..a5a069608419a8ecc42be63eb7998efd262f0ddc 100644 (file)
--- a/imap-send.c
+++ b/imap-send.c
msg->data[ msg->len ] = 0;
*ofs += msg->len;
- return 1;
+ return 1;
}
static imap_server_conf_t server =
diff --git a/local-fetch.c b/local-fetch.c
index 4b650efa8b19424a61566b7ec87e7808874a6721..bf7ec6c2a3e25d09d3a43047d0cf3e1e6f883178 100644 (file)
--- a/local-fetch.c
+++ b/local-fetch.c
return -1;
target = find_sha1_pack(sha1, packs);
if (!target)
- return error("Couldn't find %s: not separate or in any pack",
+ return error("Couldn't find %s: not separate or in any pack",
sha1_to_hex(sha1));
if (get_verbosely) {
fprintf(stderr, "Getting pack %s\n",
fprintf(stderr, " which contains %s\n",
sha1_to_hex(sha1));
}
- sprintf(filename, "%s/objects/pack/pack-%s.pack",
+ sprintf(filename, "%s/objects/pack/pack-%s.pack",
path, sha1_to_hex(target->sha1));
copy_file(filename, sha1_pack_name(target->sha1),
sha1_to_hex(target->sha1), 1);
- sprintf(filename, "%s/objects/pack/pack-%s.idx",
+ sprintf(filename, "%s/objects/pack/pack-%s.idx",
path, sha1_to_hex(target->sha1));
copy_file(filename, sha1_pack_index_name(target->sha1),
sha1_to_hex(target->sha1), 1);
char *hex = sha1_to_hex(sha1);
char *dest_filename = sha1_file_name(sha1);
- if (object_name_start < 0) {
+ if (object_name_start < 0) {
strcpy(filename, path); /* e.g. git.git */
strcat(filename, "/objects/");
object_name_start = strlen(filename);
diff --git a/lockfile.c b/lockfile.c
index 23db35aff21d7c33197726128e2f120291e6e9f0..5ad2858b4885022141d915fa0555c51f80d11c1c 100644 (file)
--- a/lockfile.c
+++ b/lockfile.c
unlink(lk->filename);
lk->filename[0] = 0;
}
-
diff --git a/mailmap.c b/mailmap.c
index cb567a2832d9f8c784aea388af9144c12eddc7d5..87141670595c50a4fa7b87a12b85ff0e2b7da8af 100644 (file)
--- a/mailmap.c
+++ b/mailmap.c
}
return 0;
}
-
diff --git a/match-trees.c b/match-trees.c
index 23cafe47b495ba40fbdd46eb35943be5f722a1d7..d7e29c4d1d3e44c85e0eeb28040e8ea945090594 100644 (file)
--- a/match-trees.c
+++ b/match-trees.c
splice_tree(hash1, add_prefix, hash2, shifted);
}
-
diff --git a/merge-index.c b/merge-index.c
index 5599fd321bb4c09c1c0ce4fc62dfb9ecf5531c2b..fa719cb0b1bd227423587c9e41eed77c755465a4 100644 (file)
--- a/merge-index.c
+++ b/merge-index.c
static int merge_entry(int pos, const char *path)
{
int found;
-
+
if (pos >= active_nr)
die("git-merge-index: %s not in the cache", path);
arguments[0] = pgm;
index 931011121e7276513b55fc41691c65a0d924119d..070bc96c0dcfd30bc19069729ee5ec308c33083f 100644 (file)
--- a/mktag.c
+++ b/mktag.c
* The first three lines are guaranteed to be at least 63 bytes:
* "object <sha1>\n" is 48 bytes, "type tag\n" at 9 bytes is the
* shortest possible type-line, and "tag .\n" at 6 bytes is the
- * shortest single-character-tag line.
+ * shortest single-character-tag line.
*
* We also artificially limit the size of the full object to 8kB.
* Just because I'm a lazy bastard, and if you can't fit a signature
diff --git a/mozilla-sha1/sha1.c b/mozilla-sha1/sha1.c
index 847531d19f88e420ad68f95f11ab2f1f77876d08..3f06b835675206912777a774d91c3ba611fa5a06 100644 (file)
--- a/mozilla-sha1/sha1.c
+++ b/mozilla-sha1/sha1.c
-/*
+/*
* The contents of this file are subject to the Mozilla Public
* License Version 1.1 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.mozilla.org/MPL/
- *
+ *
* Software distributed under the License is distributed on an "AS
* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
* implied. See the License for the specific language governing
* rights and limitations under the License.
- *
+ *
* The Original Code is SHA 180-1 Reference Implementation (Compact version)
- *
+ *
* The Initial Developer of the Original Code is Paul Kocher of
- * Cryptography Research. Portions created by Paul Kocher are
+ * Cryptography Research. Portions created by Paul Kocher are
* Copyright (C) 1995-9 by Cryptography Research, Inc. All
* Rights Reserved.
- *
+ *
* Contributor(s):
*
* Paul Kocher
- *
+ *
* Alternatively, the contents of this file may be used under the
* terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable
- * instead of those above. If you wish to allow use of your
+ * "GPL"), in which case the provisions of the GPL are applicable
+ * instead of those above. If you wish to allow use of your
* version of this file only under the terms of the GPL and not to
* allow others to use your version of this file under the MPL,
* indicate your decision by deleting the provisions above and
ctx->H[3] += D;
ctx->H[4] += E;
}
-
diff --git a/mozilla-sha1/sha1.h b/mozilla-sha1/sha1.h
index 5d82afa3bdd21a2855c569a73cf3277b5c6a41bc..16f2d3d43ca8bee1eeb306308277bef8c707a972 100644 (file)
--- a/mozilla-sha1/sha1.h
+++ b/mozilla-sha1/sha1.h
-/*
+/*
* The contents of this file are subject to the Mozilla Public
* License Version 1.1 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.mozilla.org/MPL/
- *
+ *
* Software distributed under the License is distributed on an "AS
* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
* implied. See the License for the specific language governing
* rights and limitations under the License.
- *
+ *
* The Original Code is SHA 180-1 Header File
- *
+ *
* The Initial Developer of the Original Code is Paul Kocher of
- * Cryptography Research. Portions created by Paul Kocher are
+ * Cryptography Research. Portions created by Paul Kocher are
* Copyright (C) 1995-9 by Cryptography Research, Inc. All
* Rights Reserved.
- *
+ *
* Contributor(s):
*
* Paul Kocher
- *
+ *
* Alternatively, the contents of this file may be used under the
* terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable
- * instead of those above. If you wish to allow use of your
+ * "GPL"), in which case the provisions of the GPL are applicable
+ * instead of those above. If you wish to allow use of your
* version of this file only under the terms of the GPL and not to
* allow others to use your version of this file under the MPL,
* indicate your decision by deleting the provisions above and
diff --git a/object-refs.c b/object-refs.c
index 022e8d841c7f5498b6f008647ed37c430826b443..5345671569e9500ad31124dacf9525739687d9be 100644 (file)
--- a/object-refs.c
+++ b/object-refs.c
mark_reachable(refs->ref[i], mask);
}
}
-
-
diff --git a/object.h b/object.h
index 94f19eed86ceebcc85770a379faf7b1270d1fad4..397bbfa090cd281214013c42a5f0b1de6063a861 100644 (file)
--- a/object.h
+++ b/object.h
void mark_reachable(struct object *obj, unsigned int mask);
-struct object_list *object_list_insert(struct object *item,
+struct object_list *object_list_insert(struct object *item,
struct object_list **list_p);
void object_list_append(struct object *item,
diff --git a/pack-redundant.c b/pack-redundant.c
index 6bc3bdf3f4c33f369c63acf9284ce9af18286184..f5cd0ac59e5794a375172b998399a546eaef4ab1 100644 (file)
--- a/pack-redundant.c
+++ b/pack-redundant.c
{
struct llist *ret;
struct llist_item *new, *old, *prev;
-
+
llist_init(&ret);
if ((ret->size = list->size) == 0)
}
new->next = NULL;
ret->back = new;
-
+
return ret;
}
diff --git a/patch-id.c b/patch-id.c
index 086d2d9c68835c6a7434932f6e3b430e0906578d..9349bc5580456b378d41da7cc2518e4fa9a7e81a 100644 (file)
--- a/patch-id.c
+++ b/patch-id.c
generate_id_list();
return 0;
-}
+}
diff --git a/path-list.c b/path-list.c
index caaa5cc57b05e1a27bb4fd8f49bb74e06b9936e3..dcb4b3ac139a5a264df04d91cee17679efe55aa6 100644 (file)
--- a/path-list.c
+++ b/path-list.c
for (i = 0; i < p->nr; i++)
printf("%s:%p\n", p->items[i].path, p->items[i].util);
}
-
diff --git a/perl/Makefile b/perl/Makefile
index 0d695fd2f35f91b47455dc382d86b52bb51088d2..5e079ad01126845c39fd9583fa742f54d5658b49 100644 (file)
--- a/perl/Makefile
+++ b/perl/Makefile
# (even though GIT-CFLAGS aren't used yet. If ever)
../GIT-CFLAGS:
$(MAKE) -C .. GIT-CFLAGS
-
diff --git a/pkt-line.c b/pkt-line.c
index b60526869a38bd20f800c275f7b42390c8bea1ee..355546a1ad844492234dc7ee91528c525af5610a 100644 (file)
--- a/pkt-line.c
+++ b/pkt-line.c
* Write a packetized stream, where each line is preceded by
* its length (including the header) as a 4-byte hex number.
* A length of 'zero' means end of stream (and a length of 1-3
- * would be an error).
+ * would be an error).
*
* This is all pretty stupid, but we use this packetized line
* format to make a streaming format possible without ever
diff --git a/ppc/sha1.c b/ppc/sha1.c
index 0820398b004dd8af93a25e7fa26be60cf4dda410..738e36c1e81def4822ccc2a66bc2761402a07f26 100644 (file)
--- a/ppc/sha1.c
+++ b/ppc/sha1.c
p += nb;
}
return 0;
-}
+}
int SHA1_Final(unsigned char *hash, SHA_CTX *c)
{
diff --git a/read-cache.c b/read-cache.c
index ad4e18753777a951e396116c989896f393d56e47..4362b11f475748e89e9deaf6257fb0c411948105 100644 (file)
--- a/read-cache.c
+++ b/read-cache.c
changed |= MTIME_CHANGED;
if (ce->ce_ctime.nsec != htonl(st->st_ctim.tv_nsec))
changed |= CTIME_CHANGED;
-#endif
+#endif
if (ce->ce_uid != htonl(st->st_uid) ||
ce->ce_gid != htonl(st->st_gid))
* is being added, or we already have path and path/file is being
* added. Either one would result in a nonsense tree that has path
* twice when git-write-tree tries to write it out. Prevent it.
- *
+ *
* If ok-to-replace is specified, we remove the conflicting entries
* from the cache so the caller should recompute the insert position.
* When this happens, we return non-zero.
write_buffer_len = buffered;
len -= partial;
data = (char *) data + partial;
- }
- return 0;
+ }
+ return 0;
}
static int write_index_ext_header(SHA_CTX *context, int fd,
* size to zero here, then the object name recorded
* in index is the 6-byte file but the cached stat information
* becomes zero --- which would then match what we would
- * obtain from the filesystem next time we stat("frotz").
+ * obtain from the filesystem next time we stat("frotz").
*
* However, the second update-index, before calling
* this function, notices that the cached size is 6
index 3b4194239dc419c38910012b129c4c92b72ef8ad..ee2f49929131c684bcffa3e95a1ee29521e8818b 100644 (file)
--- a/rsh.h
+++ b/rsh.h
#ifndef RSH_H
#define RSH_H
-int setup_connection(int *fd_in, int *fd_out, const char *remote_prog,
+int setup_connection(int *fd_in, int *fd_out, const char *remote_prog,
char *url, int rmt_argc, char **rmt_argv);
#endif
index a45ea8309a9773160597f142f1208a6129885499..14f62c42e3ac6ead75d4963ee705b9a110da3de0 100644 (file)
--- a/setup.c
+++ b/setup.c
if (len) {
int speclen = strlen(path);
char *n = xmalloc(speclen + len + 1);
-
+
memcpy(n, prefix, len);
memcpy(n + len, path, speclen+1);
path = n;
return path;
}
-/*
+/*
* Unlike prefix_path, this should be used if the named file does
* not have to interact with index entry; i.e. name of a random file
* on the filesystem.
diff --git a/sha1_file.c b/sha1_file.c
index 30bcd46ceb761b0f0b17295d532a6ddb5f33387a..2b860868f55a83ed599f39d7820a9fb227946912 100644 (file)
--- a/sha1_file.c
+++ b/sha1_file.c
*buf++ = hex[val >> 4];
*buf++ = hex[val & 0xf];
}
-
+
return base;
}
*buf++ = hex[val >> 4];
*buf++ = hex[val & 0xf];
}
-
+
return base;
}
unsigned long size;
/*
- * The type can be at most ten bytes (including the
+ * The type can be at most ten bytes (including the
* terminating '\0' that we add), and is followed by
* a space.
*/
@@ -1738,7 +1738,7 @@ static int find_pack_entry(const unsigned char *sha1, struct pack_entry *e, cons
return 0;
}
-struct packed_git *find_sha1_pack(const unsigned char *sha1,
+struct packed_git *find_sha1_pack(const unsigned char *sha1,
struct packed_git *packs)
{
struct packed_git *p;
diff --git a/shallow.c b/shallow.c
index d17868929ceadbd2565549a60cb738a95c90a4bb..dbd9f5ad0ac21e70fc3a095d8e2938f245c238d3 100644 (file)
--- a/shallow.c
+++ b/shallow.c
return result;
}
-
diff --git a/ssh-upload.c b/ssh-upload.c
index 498d41e19b5756c82ef8e0ead779f40812f84227..20c35f03dd1fb468c7cecc71f91951657f229f5e 100644 (file)
--- a/ssh-upload.c
+++ b/ssh-upload.c
}
if (!size)
return -1;
-
+
if (verbose)
fprintf(stderr, "Serving %s\n", sha1_to_hex(sha1));
remote = 0;
-
+
if (!has_sha1_file(sha1)) {
fprintf(stderr, "git-ssh-upload: could not find %s\n",
sha1_to_hex(sha1));
remote = -1;
}
-
+
if (write_in_full(fd_out, &remote, 1) != 1)
return 0;
-
+
if (remote < 0)
return 0;
-
+
return write_sha1_to_fd(fd_out, sha1);
}
diff --git a/strbuf.c b/strbuf.c
index 7f14b0fb59bd7e14979b002f441ae84ff5b0e9a2..e33d06b87c978ad7484c9d6bf972681c3d6cdeb0 100644 (file)
--- a/strbuf.c
+++ b/strbuf.c
sb->eof = 1;
strbuf_end(sb);
}
-
diff --git a/t/Makefile b/t/Makefile
index 19e38508a70708b78de6467df71ed36373999d6a..b25caca887103d81d406d2e8696e28e598ec8f7b 100644 (file)
--- a/t/Makefile
+++ b/t/Makefile
.PHONY: $(T) clean
.NOTPARALLEL:
-
index d195603dfa9dc0328f1fcfd6c79c6c6cbe424f0c..586df2113f81aed913769bf977924ec7851207fe 100644 (file)
test_expect_success \
'recording branch A tree' \
'tree_A=$(git-write-tree)'
-
+
################################################################
# Branch B
# Start from O
diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh
index 186de7024336ca98bd5dcea6f675e1fc221d0ce0..8bfe8320ea99f50c6e6c748d0b9e6b5be1a7e3d3 100755 (executable)
--- a/t/t0000-basic.sh
+++ b/t/t0000-basic.sh
find .git/objects -type f -print >should-be-empty
test_expect_success \
'.git/objects should be empty after git-init in an empty repo.' \
- 'cmp -s /dev/null should-be-empty'
+ 'cmp -s /dev/null should-be-empty'
# also it should have 2 subdirectories; no fan-out anymore, pack, and info.
# 3 is counting "objects" itself
diff --git a/t/t1200-tutorial.sh b/t/t1200-tutorial.sh
index ca2c30f7aff5beda97ea598e272750c23e34296e..d3f83584856acd83bd37550579fe5d450061ce60 100755 (executable)
--- a/t/t1200-tutorial.sh
+++ b/t/t1200-tutorial.sh
test_expect_failure '-> only packed objects' 'find -type f .git/objects/[0-9a-f][0-9a-f]'
test_done
-
diff --git a/t/t1300-repo-config.sh b/t/t1300-repo-config.sh
index 3f3fd2d7f7cc148948a20e47cccd06751b9a2241..7731fa72ceef16ba85b3ce4dcf1c21630f81f634 100755 (executable)
--- a/t/t1300-repo-config.sh
+++ b/t/t1300-repo-config.sh
test_expect_success 'value continued on next line' 'cmp result expect'
test_done
-
index 03ea4dece4b7fd3849269a0af3e960572ab5618d..d556b41f130f96b3043892e81a3dad7d66c9bff1 100755 (executable)
'test -f path0 && test -d path1 && test -f path1/file1'
test_done
-
-
index 0dcab8f1dea0d3d5e4bcebbc0b571fe46c2265e0..b895a0fe36c1508b754d6ec78bdf0efe085abd70 100755 (executable)
test ! -h path1/file1 && test -f path1/file1'
test_done
-
index 86ee2b0bd3737f94ebab32a344a6b1c5afc5ea92..607f57ff941b7da5296ab58cbf5e30db66087669 100755 (executable)
'
test_done
-
diff --git a/t/t3403-rebase-skip.sh b/t/t3403-rebase-skip.sh
index 977c498f00f2d8e2066bd586130ee84fe1a196a3..9e11ed295d02f760f01a5b4fcb371b17a5b710cf 100755 (executable)
--- a/t/t3403-rebase-skip.sh
+++ b/t/t3403-rebase-skip.sh
test_debug 'gitk --all & sleep 1'
test_done
-
diff --git a/t/t4006-diff-mode.sh b/t/t4006-diff-mode.sh
index e72c6fd1b4fa294e3e52fe55ab68c672bfc57e15..b8acca1813955ca0034f7b2c0b9a12e3e2a4926f 100755 (executable)
--- a/t/t4006-diff-mode.sh
+++ b/t/t4006-diff-mode.sh
'git diff expected check'
test_done
-
diff --git a/t/t4100-apply-stat.sh b/t/t4100-apply-stat.sh
index 7b81c32e57f502f2c6d952bd9b7e6b432e092372..c23341feb55e2404533b94fdf627de13c01b4ada 100755 (executable)
--- a/t/t4100-apply-stat.sh
+++ b/t/t4100-apply-stat.sh
git diff ../t4100/t-apply-7.expect current'
test_done
-
diff --git a/t/t4110-apply-scan.sh b/t/t4110-apply-scan.sh
index 005f74481625e88a4f36bd5f17d339c1924778c4..9faef0d66e49b61826d4602e13206445bdb1b319 100755 (executable)
--- a/t/t4110-apply-scan.sh
+++ b/t/t4110-apply-scan.sh
'cmp apply.txt patch.txt'
test_done
-
index 69e9603c784b580ff143e4249c72aea79f64f471..9baf810beeb513e5a86b822c5a23354e948ef5c4 100755 (executable)
--- a/t/t4112-apply-renames.sh
+++ b/t/t4112-apply-renames.sh
- * arch/x86_64/include/klibc/archsetjmp.h
+ * arch/cris/include/klibc/archsetjmp.h
*/
-
+
#ifndef _KLIBC_ARCHSETJMP_H
#define _KLIBC_ARCHSETJMP_H
-
+
struct __jmp_buf {
- unsigned long __rbx;
- unsigned long __rsp;
+ unsigned long __sp;
+ unsigned long __srp;
};
-
+
typedef struct __jmp_buf jmp_buf[1];
-
+
-#endif /* _SETJMP_H */
+#endif /* _KLIBC_ARCHSETJMP_H */
diff --git a/klibc/arch/x86_64/include/klibc/archsetjmp.h b/include/arch/m32r/klibc/archsetjmp.h
- * arch/x86_64/include/klibc/archsetjmp.h
+ * arch/m32r/include/klibc/archsetjmp.h
*/
-
+
#ifndef _KLIBC_ARCHSETJMP_H
#define _KLIBC_ARCHSETJMP_H
-
+
struct __jmp_buf {
- unsigned long __rbx;
- unsigned long __rsp;
unsigned long __r15;
- unsigned long __rip;
};
-
+
typedef struct __jmp_buf jmp_buf[1];
-
+
-#endif /* _SETJMP_H */
+#endif /* _KLIBC_ARCHSETJMP_H */
EOF
index 27cc6f2b88974051cd521755800342e375d84af7..dd88e81e04beaa0e0a703efa3e4130c474ef0b69 100755 (executable)
'
test_done
-
index 620a9207bf14f5a7e2506742f1e7d0ddb91d0a78..edae7056e409fb2314bd1db1b4689f55ed08248b 100755 (executable)
--- a/t/t4119-apply-config.sh
+++ b/t/t4119-apply-config.sh
+++ file1+ 2007-02-21 01:07:44.000000000 -0800
@@ -1 +1 @@
-A
-+B
++B
EOF
sed -e 's|file1|sub/&|' gpatch.file >gpatch-sub.file &&
diff --git a/t/t4121-apply-diffs.sh b/t/t4121-apply-diffs.sh
index 2b2f1eda21c647c5c8aa0f0d2b41cecf8d90f6c4..b95b89c341d3da9bb6f22c68cbb1144380396155 100755 (executable)
--- a/t/t4121-apply-diffs.sh
+++ b/t/t4121-apply-diffs.sh
'( git diff test~2 test~1; git diff test~1 test~0 )| git apply'
test_done
-
index 3ddfe64b02490c2fa2e8cf7445aa518e0de8bf1b..841773f75fc085d07836b39b3775f49bde5d8d19 100755 (executable)
'
test_done
-
diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh
index c64ebbb2e9e9eaf3fbb792a4f119cd9a1c2b4352..a46d7f74bedb105297a9015af9f9098c84365100 100755 (executable)
--- a/t/t4200-rerere.sh
+++ b/t/t4200-rerere.sh
"test ! -f $rr/preimage && test ! -f $rr2/preimage"
test_done
-
-
diff --git a/t/t5400-send-pack.sh b/t/t5400-send-pack.sh
index 477b267599512fee5a5a3cf86687c3708ff967b8..4eaea8f3364343385227b38ac279a603f7ca025b 100755 (executable)
--- a/t/t5400-send-pack.sh
+++ b/t/t5400-send-pack.sh
'
test_expect_success \
- 'pushing rewound head should not barf but require --force' '
+ 'pushing rewound head should not barf but require --force' '
# should not fail but refuse to update.
if git-send-pack ./victim/.git/ master
then
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
index 243212d3dac03c19db18e9c8fcfc3b9049137cdd..93eaf2c1544b5374dbe8043c66478a0a80b0bb82 100755 (executable)
--- a/t/t5520-pull.sh
+++ b/t/t5520-pull.sh
'
test_done
-
index 2f8e97cb7ea4b8bdf56d5795d512534d504d25c0..699df6ebd8b6e76f95b255783c892de23610e504 100755 (executable)
cd "$base_dir"
test_done
-
diff --git a/t/t6000lib.sh b/t/t6000lib.sh
index d40262159bce36e78dd56d931eaf1d007ef77da8..d548bf8026289f1d590ecd0e0b7ec883650c4d78 100755 (executable)
--- a/t/t6000lib.sh
+++ b/t/t6000lib.sh
_text=$1
_tree=$2
shift 2
- echo $_text | git-commit-tree $(tag $_tree) "$@"
+ echo $_text | git-commit-tree $(tag $_tree) "$@"
}
# Save the output of a command into the tag specified. Prepend
# a substitution script for the tag onto the front of sed.script
save_tag()
{
- _tag=$1
+ _tag=$1
[ -n "$_tag" ] || error "usage: save_tag tag commit-args ..."
shift 1
- "$@" >.git/refs/tags/$_tag
+ "$@" >.git/refs/tags/$_tag
echo "s/$(tag $_tag)/$_tag/g" > sed.script.tmp
cat sed.script >> sed.script.tmp
mv sed.script.tmp sed.script
}
-# Replace unhelpful sha1 hashses with their symbolic equivalents
+# Replace unhelpful sha1 hashses with their symbolic equivalents
entag()
{
sed -f sed.script
commit_date()
{
_commit=$1
- git-cat-file commit $_commit | sed -n "s/^committer .*> \([0-9]*\) .*/\1/p"
+ git-cat-file commit $_commit | sed -n "s/^committer .*> \([0-9]*\) .*/\1/p"
}
on_committer_date()
# Execute the test described by the first argument, by eval'ing
# command line specified in the 2nd argument. Check the status code
-# is zero and that the output matches the stream read from
+# is zero and that the output matches the stream read from
# stdin.
test_output_expect_success()
-{
+{
_description=$1
_test=$2
[ $# -eq 2 ] || error "usage: test_output_expect_success description test <<EOF ... EOF"
_name=$(echo $_description | name_from_description)
cat > $_name.expected
- test_expect_success "$_description" "check_output $_name \"$_test\""
+ test_expect_success "$_description" "check_output $_name \"$_test\""
}
index fcb33027648b8449cba5869cbe808a4e26ff7f2d..71cbb72e1bc2e8b11c248c01cb7559e43ddabe04 100755 (executable)
# Test if bisection size is close to half of list size within
# tolerance.
- #
+ #
_bisect_err=`expr $_list_size - $_bisection_size \* 2`
test "$_bisect_err" -lt 0 && _bisect_err=`expr 0 - $_bisect_err`
_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
test_sequence()
{
- _bisect_option=$1
-
+ _bisect_option=$1
+
test_bisection_diff 0 $_bisect_option l0 ^root
test_bisection_diff 0 $_bisect_option l1 ^root
test_bisection_diff 0 $_bisect_option l2 ^root
test_bisection_diff 0 $_bisect_option u3 ^U
test_bisection_diff 0 $_bisect_option u4 ^U
test_bisection_diff 0 $_bisect_option u5 ^U
-
+
#
# the following illustrates Linus' binary bug blatt idea.
#
index 499cafb882b83b780171c8601b9f4c54b294ed43..0ab14a6e81302db6a1239d68270ab909cb2fd216 100755 (executable)
7
8
9" > file &&
-git add file &&
+git add file &&
git commit -m "Initial commit" file &&
git branch A &&
git branch B &&
diff --git a/t/t6023-merge-file.sh b/t/t6023-merge-file.sh
index c76fccfb5a0811aca3bb5af67f8558745935148f..43aa5d033d0d8877b4f252710efa4bd26ee42d30 100755 (executable)
--- a/t/t6023-merge-file.sh
+++ b/t/t6023-merge-file.sh
test_expect_success "expected conflict markers" "git diff expect out"
test_done
-
index 30f6ade13f088df1ce6c7e3649c2afb343649d65..03cdba5808aef6fbec2d95f771e6551396ff94cf 100755 (executable)
#
#
test_done
-
index b0252b9413e5274d87f5437882be1fd625bc8bef..dd6cc3a55c54a04d9bf83ba618d81fdeeed82e69 100755 (executable)
test $start = $abbrv'
test_done
-
index dc2afdaa4561ce037239907297718dba1fa33ce6..d549665400a2eccffec0689865a1e9fdcc034985 100755 (executable)
"
test_done
-
diff --git a/t/t9111/svnsync.dump b/t/t9111/svnsync.dump
index a9a46eeb2978071e44db85405b62c515e0b6c278..499fa9594fafe5d45a32005c189634b6a3048777 100644 (file)
--- a/t/t9111/svnsync.dump
+++ b/t/t9111/svnsync.dump
Content-length: 4
cba
-
-
diff --git a/t/test-lib.sh b/t/test-lib.sh
index dee3ad76212ea95c75c8287c8d8c0f312125bd06..8bf4cf49a207132d0f517468b6ca1182cca61aeb 100644 (file)
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
mv .git/hooks .git/hooks-disabled
cd "$owd"
}
-
+
test_done () {
trap - exit
case "$test_failure" in
index 9b04f2d69c6dc054e8e5403062fb7ef5d2117328..c5cdb9d7eeebab7edf048e77eb92437de24751bf 100644 (file)
echo >&2 Duplicate Signed-off-by lines.
exit 1
}
-
index 190de2688cd2ef82525a0998e0c5133f8cd45a83..b70c8fd36430fb1e0b02119d7f802c2144fa2a41 100644 (file)
#. /usr/share/doc/git-core/contrib/hooks/post-receive-email
-
index 5f56ce8053a40919cbf02010e29f185b6f9d8784..eeccc934cad8bb74624ed388988fe79c26e6900d 100644 (file)
test -x "$GIT_DIR/hooks/pre-commit" &&
exec "$GIT_DIR/hooks/pre-commit" ${1+"$@"}
:
-
index 723a9ef210bb84c217026c2cdf9d30661f64447b..18b87309f65be23794b87260e08c547f5deeefce 100644 (file)
}
exit($found_bad);
'
-
diff --git a/tree-walk.c b/tree-walk.c
index cbb24eb3f663cd0370f528d983a2266a55b91c4f..8d4b67317f21508a105175686c7ec98a090ed9b5 100644 (file)
--- a/tree-walk.c
+++ b/tree-walk.c
@@ -206,4 +206,3 @@ int get_tree_entry(const unsigned char *tree_sha1, const char *name, unsigned ch
free(tree);
return retval;
}
-
diff --git a/upload-pack.c b/upload-pack.c
index d3a09e78d56642db9b1fb1b1ead34ff60dd8c923..0e881c85b5cc5e128904d5a149634c077b62644d 100644 (file)
--- a/upload-pack.c
+++ b/upload-pack.c
break;
}
}
-
+
if (i != argc-1)
usage(upload_pack_usage);
dir = argv[i];
index e585e59d315061e2e82ea8a23843c128bcce2555..4127031910c83987c8ef394e3711942e2db8a8f9 100644 (file)
--- a/var.c
+++ b/var.c
val = read_var(argv[1]);
if (!val)
usage(var_usage);
-
+
printf("%s\n", val);
-
+
return 0;
}
diff --git a/xdiff-interface.c b/xdiff-interface.c
index 963bb89b08e64188ba278587f63f380653b019c6..e407cf11b1d8ba28be64eda7bcb505d9edb4d253 100644 (file)
--- a/xdiff-interface.c
+++ b/xdiff-interface.c
size = FIRST_FEW_BYTES;
return !!memchr(ptr, 0, size);
}
-
-
diff --git a/xdiff/xdiff.h b/xdiff/xdiff.h
index e874a7c46a90104ebf586d0fc48964634f356763..9402bb0799978e181ba972a749a0ad849d2bd706 100644 (file)
--- a/xdiff/xdiff.h
+++ b/xdiff/xdiff.h
#endif /* #ifdef __cplusplus */
#endif /* #if !defined(XDIFF_H) */
-
diff --git a/xdiff/xdiffi.c b/xdiff/xdiffi.c
index 9aeebc473b11a3dbfa5b52930b4a8e5a35f22215..5cb7171a8f528881c6171defa5b102e87d7aa522 100644 (file)
--- a/xdiff/xdiffi.c
+++ b/xdiff/xdiffi.c
return 0;
}
-
diff --git a/xdiff/xdiffi.h b/xdiff/xdiffi.h
index 472aeaecfab85e7276baaceb446d2095eeab01fd..3e099dc445d6130f6a0ce2c6270a3b06d6ee119f 100644 (file)
--- a/xdiff/xdiffi.h
+++ b/xdiff/xdiffi.h
xdemitconf_t const *xecfg);
#endif /* #if !defined(XDIFFI_H) */
-
diff --git a/xdiff/xemit.c b/xdiff/xemit.c
index e291dc7608c4ab9b54a5d049bf3b555704e37fe8..78b1d4b8bb6e364e867991de1b57ad02e472e3d6 100644 (file)
--- a/xdiff/xemit.c
+++ b/xdiff/xemit.c
return 0;
}
-
diff --git a/xdiff/xemit.h b/xdiff/xemit.h
index e629417dd2028be30e661fe9059a9a3af30b482d..440a7390fa4abb0411c336cfba616e3229484e86 100644 (file)
--- a/xdiff/xemit.h
+++ b/xdiff/xemit.h
#endif /* #if !defined(XEMIT_H) */
-
diff --git a/xdiff/xinclude.h b/xdiff/xinclude.h
index 04a9da82c9cb7a2ab24d86efb0e6c6aafdd55f3b..526ccb344d231fb978f53b80deb17ec6c8fed368 100644 (file)
--- a/xdiff/xinclude.h
+++ b/xdiff/xinclude.h
#endif /* #if !defined(XINCLUDE_H) */
-
diff --git a/xdiff/xmacros.h b/xdiff/xmacros.h
index e2cd2023b31e794bc0c5ba28f64ae4ce4e128184..8ef232cfad12d706aaafe705bf16c546f3597182 100644 (file)
--- a/xdiff/xmacros.h
+++ b/xdiff/xmacros.h
#endif /* #if !defined(XMACROS_H) */
-
diff --git a/xdiff/xprepare.c b/xdiff/xprepare.c
index 1be7b3195059bebffe83d17301f3ff0fb261799e..e87ab57c652b56b1a684e2a0a56885c1d1b27ef7 100644 (file)
--- a/xdiff/xprepare.c
+++ b/xdiff/xprepare.c
return 0;
}
-
diff --git a/xdiff/xprepare.h b/xdiff/xprepare.h
index 344c569e8b4ebeec2f1e6130184a424ae1341bf6..8fb06a537451cbf3335ab4bdacb0f992e9744338 100644 (file)
--- a/xdiff/xprepare.h
+++ b/xdiff/xprepare.h
#endif /* #if !defined(XPREPARE_H) */
-
diff --git a/xdiff/xtypes.h b/xdiff/xtypes.h
index 3593a664fc2e58a6cdd2a5f3bdee46dd5ffdaa8e..2511aef8d89ab52be5ec6a5e46236b4b6bcd07ea 100644 (file)
--- a/xdiff/xtypes.h
+++ b/xdiff/xtypes.h
#endif /* #if !defined(XTYPES_H) */
-
diff --git a/xdiff/xutils.c b/xdiff/xutils.c
index bf91c0f73c658637d078ac93226148faa3bb0dc4..2ade97b2574a9f77e7ae4002a4e07a6a38e46d07 100644 (file)
--- a/xdiff/xutils.c
+++ b/xdiff/xutils.c
return 0;
}
-
diff --git a/xdiff/xutils.h b/xdiff/xutils.h
index 70d8b9838a7333bc5a1edb93cf0e9abdbcf146cc..d5de8292e05e7c36c4b68857c1cf9855e3d2f70a 100644 (file)
--- a/xdiff/xutils.h
+++ b/xdiff/xutils.h
#endif /* #if !defined(XUTILS_H) */
-