git.git
19 years ago[PATCH] add NO_CURL option to the Makefile
Johannes Schindelin [Sun, 31 Jul 2005 00:14:23 +0000 (02:14 +0200)]
[PATCH] add NO_CURL option to the Makefile

This patch implements Linus' idea that if you are not interested in
pulling by HTTP, you can now say

NO_CURL=1 make

to compile everything except git-http-pull (thus not needing curl at all).

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoFix merge-base from getting confused.
Linus Torvalds [Sat, 30 Jul 2005 22:10:20 +0000 (15:10 -0700)]
Fix merge-base from getting confused.

On Sat, 30 Jul 2005, Linus Torvalds wrote:
>
> Yup, it's git-merge-base, and it is confused by the same thing that
> confused git-rev-list.

Hmm.. Here's a tentative fix. I'm not really happy with it, and maybe
somebody else can come up with a better one. I think this one ends up
being quite a bit more expensive than the old one (it will look up _all_
common parents that have a child that isn't common, and then select the
newest one of the bunch), but I haven't really thought it through very
much.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] Making it easier to find which change introduced a bug
Linus Torvalds [Sat, 30 Jul 2005 17:08:20 +0000 (10:08 -0700)]
[PATCH] Making it easier to find which change introduced a bug

This adds a new "git bisect" command.

 - "git bisect start"
start bisection search.

 - "git bisect bad <rev>"
mark some version known-bad (if no arguments, then current HEAD)

 - "git bisect good <revs>..."
mark some versions known-good (if no arguments, then current HEAD)

 - "git bisect reset <branch>"
done with bisection search and go back to your work (if
no arguments, then "master").

The way you use it is:

git bisect start
git bisect bad # Current version is bad
git bisect good v2.6.13-rc2 # v2.6.13-rc2 was the last version
# tested that was good

When you give at least one bad and one good versions, it will
bisect the revision tree and say something like:

Bisecting: 675 revisions left to test after this

and check out the state in the middle. Now, compile that kernel, and boot
it. Now, let's say that this booted kernel works fine, then just do

git bisect good # this one is good

which will now say

Bisecting: 337 revisions left to test after this

and you continue along, compiling that one, testing it, and depending on
whether it is good or bad, you say "git bisect good" or "git bisect bad",
and ask for the next bisection.

Until you have no more left, and you'll have been left with the first bad
kernel rev in "refs/bisect/bad".

Oh, and then after you want to reset to the original head, do a

git bisect reset

to get back to the master branch, instead of being in one of the bisection
branches ("git bisect start" will do that for you too, actually: it will
reset the bisection state, and before it does that it checks that you're
not using some old bisection branch).

Not really any harder than doing series of "quilt push" and "quilt pop",
now is it?

[jc: This patch is a rework based on what Linus posted to the
     list.  The changes are:

  - The original introduced four separate commands, which was
    three too many, so I merged them into one with subcommands.

  - Since the next thing you would want to do after telling it
    "bad" and "good" is always to bisect, this version does it
    automatically for you.

  - I think the termination condition was wrong.  The original
    version checked if the set of revisions reachable from next
    bisection but not rechable from any of the known good ones
    is empty, but if the current bisection was a bad one, this
    would not terminate, so I changed it to terminate it when
    the set becomes a singleton or empty.

  - Removed the use of shell array variable.

]

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoNO_OPENSSL should really mean no openssl.
Junio C Hamano [Sat, 30 Jul 2005 05:43:06 +0000 (22:43 -0700)]
NO_OPENSSL should really mean no openssl.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoFix typo in recent Makefile cleanup.
Junio C Hamano [Sat, 30 Jul 2005 01:38:15 +0000 (18:38 -0700)]
Fix typo in recent Makefile cleanup.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years ago[PATCH] document git-rev-list better
Matthias Urlichs [Fri, 29 Jul 2005 18:10:46 +0000 (20:10 +0200)]
[PATCH] document git-rev-list better

Document new (and not-so-new) flags of git-rev-list.

Signed-off-By: Matthias Urlichs <smurf@smurf.noris.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years ago[PATCH] Build commands through object files
Petr Baudis [Fri, 29 Jul 2005 17:21:53 +0000 (19:21 +0200)]
[PATCH] Build commands through object files

Separate the process of building the commands to compilation and
linkage. This makes it more consistent with the library objects, is the
traditional thing to do, and significantly speeds up the subsequent
rebuilds, especially for us the people who develop git on 300MHz
notebooks.

Ported from Cogito.

Signed-off-by: Petr Baudis <pasky@ucw.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoSkip --merge-order test when built with NO_OPENSSL
Junio C Hamano [Fri, 29 Jul 2005 22:32:43 +0000 (15:32 -0700)]
Skip --merge-order test when built with NO_OPENSSL

When built with NO_OPENSSL, rev-list --merge-order does not
work, causing t6001 test to fail.  Detect that and skip this
test to allow continuing to the rest of the tests.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years ago[PATCH] Support for NO_OPENSSL
Petr Baudis [Fri, 29 Jul 2005 15:50:51 +0000 (17:50 +0200)]
[PATCH] Support for NO_OPENSSL

Support for completely OpenSSL-less builds. FSF considers distributing GPL
binaries with OpenSSL linked in as a legal problem so this is trouble
e.g. for Debian, or some people might not want to install OpenSSL
anyway. If you

make NO_OPENSSL=1

you get completely OpenSSL-less build, disabling --merge-order and using
Mozilla's SHA1 implementation.

Ported from Cogito.

Signed-off-by: Petr Baudis <pasky@ucw.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years ago[PATCH] Reorder Makefile rules
Petr Baudis [Fri, 29 Jul 2005 15:50:24 +0000 (17:50 +0200)]
[PATCH] Reorder Makefile rules

The Makefile rules were massively reordered so that they are actually
logically grouped now. Captions were added to separate the sections. No
rule contents was touched during the process.

Signed-off-by: Petr Baudis <pasky@ucw.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years ago[PATCH] Remove the explicit Makefile dependencies description
Petr Baudis [Fri, 29 Jul 2005 15:48:50 +0000 (17:48 +0200)]
[PATCH] Remove the explicit Makefile dependencies description

Remove about one gazillion of explicit dependency rules with few lines
describing the general dependency pattern and then the exceptions. This
noticably shortens the Makefile and makes it easier to touch it.

This is part of the Cogito Makefile changes port.

Signed-off-by: Petr Baudis <pasky@ucw.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years ago[PATCH] Improve the compilation-time settings interface
Petr Baudis [Fri, 29 Jul 2005 15:48:26 +0000 (17:48 +0200)]
[PATCH] Improve the compilation-time settings interface

Describe variables which make itself takes and adjusts compilation
accordingly (MOZILLA_SHA1, NO_OPENSSL, PPC_SHA1), and make adding
defines more convenient through the $DEFINES variable. $COPTS includes
-g as well now and is not overriden if it was already declared in the
environment. Also, $CFLAGS is appended to rather than reset, so that if
there was already a $CFLAGS environment variable, it's appended to. Some
more variables are also made overridable through the environment. Renamed
$bin to $bindir which is the name commonly used for this.

This is part of the Cogito Makefile changes port.

Signed-off-by: Petr Baudis <pasky@ucw.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years ago[PATCH] Unify usage strings declaration
Petr Baudis [Fri, 29 Jul 2005 09:01:26 +0000 (11:01 +0200)]
[PATCH] Unify usage strings declaration

All usage strings are now declared as static const char [].

This is carried over from my old git-pb branch.

Signed-off-by: Petr Baudis <pasky@ucw.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years ago[PATCH] Trivial tidyups
Petr Baudis [Fri, 29 Jul 2005 09:00:45 +0000 (11:00 +0200)]
[PATCH] Trivial tidyups

Simple whitespace-related tidyups ensuring style consistency.

This is carried over from my old git-pb branch.

Signed-off-by: Petr Baudis <pasky@ucw.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years ago[PATCH] mmap error handling
Pavel Roskin [Fri, 29 Jul 2005 14:49:14 +0000 (10:49 -0400)]
[PATCH] mmap error handling

I have reviewed all occurrences of mmap() in git and fixed three types
of errors/defects:

1) The result is not checked.
2) The file descriptor is closed if mmap() succeeds, but not when it
fails.
3) Various casts applied to -1 are used instead of MAP_FAILED, which is
specifically defined to check mmap() return value.

[jc: This is a second round of Pavel's patch.  He fixed up the problem
that close() potentially clobbering the errno from mmap, which
the first round had.]

Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoDocumentation and tests: ls-files exclude pattern.
Junio C Hamano [Fri, 29 Jul 2005 06:53:29 +0000 (23:53 -0700)]
Documentation and tests: ls-files exclude pattern.

Update the tests and documentation to match the new "last one
determines its fate" semantics.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agols-files: rework exclude patterns.
Junio C Hamano [Fri, 29 Jul 2005 06:32:20 +0000 (23:32 -0700)]
ls-files: rework exclude patterns.

Pasky and others raised many valid points on the problems
initial exclude pattern enhancement work had.  Based on the
list discussion, rework the exclude logic to use "last match
determines its fate" rule, and order the list by exclude-from
(the fallback default pattern file), exclude-per-directory
(shallower to deeper, so deeper ones can override), and then
command line exclude patterns.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years ago[PATCH] Fix interesting git-rev-list corner case
Linus Torvalds [Fri, 29 Jul 2005 22:50:30 +0000 (15:50 -0700)]
[PATCH] Fix interesting git-rev-list corner case

This corner-case was triggered by a kernel commit that was not in date
order, due to a misconfigured time zone that made the commit appear three
hours older than it was.

That caused git-rev-list to traverse the commit tree in a non-obvious
order, and made it parse several of the _parents_ of the misplaced commit
before it actually parsed the commit itself. That's fine, but it meant
that the grandparents of the commit didn't get marked uninteresting,
because they had been reached through an "interesting" branch.

The reason was that "mark_parents_uninteresting()" (which is supposed to
mark all existing parents as being uninteresting - duh) didn't actually
traverse more than one level down the parent chain.

NORMALLY this is fine, since with the date-based traversal order,
grandparents won't ever even have been looked at before their parents (so
traversing the chain down isn't needed, because the next time around when
we pick out the parent we'll mark _its_ parents uninteresting), but since
we'd gotten out of order, we'd already seen the parent and thus never got
around to mark the grandparents.

Anyway, the fix is simple. Just traverse parent chains recursively.
Normally the chain won't even exist (since the parent hasn't been parsed
yet), so this is not actually going to trigger except in this strange
corner-case.

Add a comment to the simple one-liner, since this was a bit subtle, and I
had to really think things through to understand how it could happen.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoTutorial: use a bit longer sample filenames.
Junio C Hamano [Fri, 29 Jul 2005 05:33:45 +0000 (22:33 -0700)]
Tutorial: use a bit longer sample filenames.

Darrin Thompson noticed when he was showing off GIT to others
that the use of filenames "a" and "b" in the tutorial example
was unnecessarily confusing, especially with our "patch -p1"
prefix a/ and b/, without giving us any patch.  I was very
tempted to change them back to l/ and k/ prefixes, but decided
to restrain myself and update the tutorial instead ;-).

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years ago[PATCH] support older versions of libcurl
Johannes Schindelin [Fri, 29 Jul 2005 02:24:13 +0000 (19:24 -0700)]
[PATCH] support older versions of libcurl

Some newer features of libcurl are used which are not strictly necessary
for http-pull. Use them only if libcurl is new enough to know about them.

[jc: I just reworked #ifdef sprinkled all over the code into a
single section that defines a set of macros.]

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoMerge with gitk.
Junio C Hamano [Fri, 29 Jul 2005 17:17:37 +0000 (10:17 -0700)]
Merge with gitk.

19 years agoImprove the merge display when the result differs from all parents.
Paul Mackerras [Fri, 29 Jul 2005 14:23:03 +0000 (09:23 -0500)]
Improve the merge display when the result differs from all parents.

Now we see if the result is quite similar to one of the parents, and
if it is, display the result as a diff from that parent.  If the result
is similar to more than one parent, pick the one that it's most
similar to.

19 years ago[PATCH] socklen_t needs to be defined and libssl to be linked on old Mac OS X
Johannes Schindelin [Thu, 28 Jul 2005 14:51:41 +0000 (16:51 +0200)]
[PATCH] socklen_t needs to be defined and libssl to be linked on old Mac OS X

On older Mac OS X (10.2.8), no socklen_t is defined, and therefore
daemon.c does not compile. However, Mac OS X 10.4 seems to define
socklen_t differently.

Also, linking fails due to some symbols defined in libssl (not just
libcrypto).

[jc: I am tentatively dropping the socklen_t part of the patch
because I am waiting for confirmation on the server side IPV6
patch from Yoshifuji-san]

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years ago[PATCH] support bc version 1.04
Johannes Schindelin [Thu, 28 Jul 2005 14:48:37 +0000 (16:48 +0200)]
[PATCH] support bc version 1.04

Test t6002 unnecessarily fails when bc is a bit older than average.

Signed-off-by: Johannes.Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years ago[PATCH] remove "-r" option to xargs
Johannes Schindelin [Thu, 28 Jul 2005 14:48:13 +0000 (16:48 +0200)]
[PATCH] remove "-r" option to xargs

git-prune-script still contained that non-portable option.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoserver-info: do not complain if a tag points at a non-commit.
Junio C Hamano [Thu, 28 Jul 2005 21:33:17 +0000 (14:33 -0700)]
server-info: do not complain if a tag points at a non-commit.

Linux 2.6 tree has one of those tree tags.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years ago[PATCH] Make git-apply --stat less butt-ugly with long filenames
Linus Torvalds [Fri, 29 Jul 2005 03:37:23 +0000 (20:37 -0700)]
[PATCH] Make git-apply --stat less butt-ugly with long filenames

When git-apply was printing out long filenames, it used to just truncate
them to show the last "max_len" characters of the filename. Which can be
really quite ugly (note the two filenames that have just been silently
truncated from the beginning - it looks even worse when there are lots
of them, like there were in the current v2.6.13-rc4 cris arch update):

 Documentation/video4linux/README.saa7134           |    9
 Documentation/video4linux/bttv/Cards               |   74
 umentation/video4linux/hauppauge-wintv-cx88-ir.txt |   54
 Documentation/video4linux/lifeview.txt             |   42
 mentation/video4linux/not-in-cx2388x-datasheet.txt |   41
 Documentation/w1/w1.generic                        |  107

With this patch it now looks like so:

 Documentation/video4linux/README.saa7134           |    9
 Documentation/video4linux/bttv/Cards               |   74
 .../video4linux/hauppauge-wintv-cx88-ir.txt        |   54
 Documentation/video4linux/lifeview.txt             |   42
 .../video4linux/not-in-cx2388x-datasheet.txt       |   41
 Documentation/w1/w1.generic                        |  107

ie we've made it clear with an ellipsis that we've cut off something from
the beginning, and it also tries to do it cleanly at a subdirectory level.

Signed-off-by: Linus "good taste" Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years ago[PATCH] gitk: Use GIT_DIR where appropriate.
Junio C Hamano [Thu, 28 Jul 2005 07:28:44 +0000 (00:28 -0700)]
[PATCH] gitk: Use GIT_DIR where appropriate.

Some places assumed .git is the GIT_DIR, resulting heads and
tags not showing when it was run like "GIT_DIR=. gitk --all".
This is not a contrived example --- I rely on it to verify
my private copy of git.git repository before pushing it out.

Define a single procedure "gitdir" and use it.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Paul Mackerras <paulus@samba.org>
19 years ago[PATCH] GIT: Listen on IPv6 as well, if available.
YOSHIFUJI Hideaki [Sat, 23 Jul 2005 08:24:59 +0000 (04:24 -0400)]
[PATCH] GIT: Listen on IPv6 as well, if available.

Signed-off-by: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years ago[PATCH] Add documentation for git-rename-script
Ryan Anderson [Mon, 25 Jul 2005 06:13:11 +0000 (02:13 -0400)]
[PATCH] Add documentation for git-rename-script

Signed-off-by: Ryan Anderson <ryan@michonline.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years ago[PATCH] Add support for directories to git-rename-script.
Ryan Anderson [Mon, 25 Jul 2005 05:26:47 +0000 (01:26 -0400)]
[PATCH] Add support for directories to git-rename-script.

Oh, and in the process, rewrite it in Perl.

Signed-off-by: Ryan Anderson <ryan@michonline.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoImport the --topo-order change and fix the writing of ~/.gitk.
Paul Mackerras [Thu, 28 Jul 2005 03:16:51 +0000 (22:16 -0500)]
Import the --topo-order change and fix the writing of ~/.gitk.

19 years agoDisplay the diffs for a merge in a unified fashion.
Paul Mackerras [Thu, 28 Jul 2005 03:15:47 +0000 (22:15 -0500)]
Display the diffs for a merge in a unified fashion.

Stuff that ended up in the result is shown in bold with a "+" at the
beginning of the line; stuff that didn't is in the normal font with
a "-" at the beginning of the line.  The color shows which parent
the stuff was in; red for the first parent, blue for the second, then
green, purple, brown, and the rest are grey.  If the result is different
from all of the parents it is shown in black (and bold).

19 years agoDocument --strict flag to the fsck-cache command.
Junio C Hamano [Thu, 28 Jul 2005 01:55:18 +0000 (18:55 -0700)]
Document --strict flag to the fsck-cache command.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agogit-fsck-cache: be stricter about "tree" objects
Linus Torvalds [Wed, 27 Jul 2005 23:08:43 +0000 (16:08 -0700)]
git-fsck-cache: be stricter about "tree" objects

In particular, warn about things like zero-padding of the mode bits,
which is a big no-no, since it makes otherwise identical trees have
different representations (and thus different SHA1 numbers).

Also make the warnings more regular.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years agogit-convert-cache: fix up mode conversion
Linus Torvalds [Wed, 27 Jul 2005 22:29:38 +0000 (15:29 -0700)]
git-convert-cache: fix up mode conversion

The old mode conversion was not only complex, it also refused to change
the length of a mode, which made it fragile.  By moving the mode
conversion around a bit, we can not only simplify it, it also ends up
being more powerful.

Also fix a memory leak that made it impossible to convert huge archives
without tons and tons of memory.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years agogit-fsck-cache.c: check commit objects more carefully
Linus Torvalds [Wed, 27 Jul 2005 22:16:03 +0000 (15:16 -0700)]
git-fsck-cache.c: check commit objects more carefully

We historically used to be very careful in fsck-cache, but when it was
re-written to use "parse_object()" instead of parsing everything by
hand, it lost a bit of the checks.  This, together with the previous
commit, should make it do more proper commit object syntax checks.

Also add a "--strict" flag, which warns about the old-style "0664" file
mode bits, which shouldn't exist in modern trees, but that happened
early on in git trees and that the default git-fsck-cache thus silently
accepts.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years agoMake "parse_commit()" be a lot more careful
Linus Torvalds [Wed, 27 Jul 2005 22:12:48 +0000 (15:12 -0700)]
Make "parse_commit()" be a lot more careful

This was brought on by a bad tree of Thomas Gleixner, where some bogus
commit objects weren't warned about properly

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years agoTutorial typofix.
Linus Torvalds [Wed, 27 Jul 2005 03:04:22 +0000 (20:04 -0700)]
Tutorial typofix.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoTypofix: usage strings fix.
Junio C Hamano [Wed, 27 Jul 2005 07:04:16 +0000 (00:04 -0700)]
Typofix: usage strings fix.

The *_usage strings should not start with "usage: ", since the
usage() function gives its own.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agogit-log: make sure we have some commit to start from.
Linus Torvalds [Wed, 27 Jul 2005 03:04:22 +0000 (20:04 -0700)]
git-log: make sure we have some commit to start from.

When no usable head/tag is specified, git log barfed with
underlying error message from rev-list, which was not helpful.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agorequest-pull: minor tweaks.
Junio C Hamano [Tue, 26 Jul 2005 18:47:31 +0000 (11:47 -0700)]
request-pull: minor tweaks.

 - use --verify to make sure rev param is a rev, and barf otherwise.
 - make it always output to stdout; no funny business with tee.
 - take optional branch head name to specify which branch to summarize.
 - show baserev in a human readable way.
 - do not depend on diffstat; use git-apply --stat instead.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years ago[PATCH] Add git-request-pull-script, a short script that generates a summary of pendi...
Ryan Anderson [Tue, 26 Jul 2005 07:30:36 +0000 (03:30 -0400)]
[PATCH] Add git-request-pull-script, a short script that generates a summary of pending changes

A short message requesting a pull from the repository is also included.

Signed-off-by: Ryan Anderson <ryan@michonline.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years ago[PATCH] git-status-script was missed during the conversion from N -> A
Ryan Anderson [Wed, 27 Jul 2005 08:36:08 +0000 (04:36 -0400)]
[PATCH] git-status-script was missed during the conversion from N -> A

git-status-script was missed during the conversion from "N" to "A" as
the new-file marker flag.

Signed-off-by: Ryan Anderson <ryan@michonline.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoDeb Packaging fixes: Build against Mozilla libs for Debian, conflict with "git"
Ryan Anderson [Sat, 23 Jul 2005 19:26:32 +0000 (15:26 -0400)]
Deb Packaging fixes: Build against Mozilla libs for Debian, conflict with "git"

This patch includes two fixes to the git-core Debian package:

    * Conflict with the GNU Interactive Tools package, which _also_
      wants to install /usr/bin/git.

    * Compile against the unencumbered Mozilla SHA1 code, instead of
      the iffy OpenSSL code, as much as possible.  This makes it easier to get
      the package included for distribution with Debian.

This has been based upon the original patch by Sebastian Kuzminsky
<seb@highlab.com>, but has been fixed up based upon feedback.

Signed-off-by: Ryan Anderson <ryan@michonline.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoFix potential send-pack SIGSEGV
Linus Torvalds [Wed, 27 Jul 2005 03:04:22 +0000 (20:04 -0700)]
Fix potential send-pack SIGSEGV

The check that the source is ahead of the destination incorrectly expects
pop_most_recent_commit() to gracefully handle an empty list.

Fix by just checking the list itself, rather than the return value of the
pop function.

[jc: I did the test script that demonstrated the problem]

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoName it 0.99.2 v0.99.2
Junio C Hamano [Wed, 27 Jul 2005 00:21:16 +0000 (17:21 -0700)]
Name it 0.99.2

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoAdjust diff-raw tests to the status letter change.
Junio C Hamano [Tue, 26 Jul 2005 07:22:43 +0000 (00:22 -0700)]
Adjust diff-raw tests to the status letter change.

We use 'A' for added files instead of 'N' to make the it
visually easier to distinguish from 'M' now.

While we are at it, make the test scripts executable.  Yes, I
know it does not matter because t/Makefile runs them explicitly
with "sh tXXXX-blah.sh", but being consistent is always better.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agodiff-raw: Use 'A' instead of 'N' for added files.
Junio C Hamano [Mon, 25 Jul 2005 21:31:19 +0000 (14:31 -0700)]
diff-raw: Use 'A' instead of 'N' for added files.

This actually changes the diff-raw status letter from N to A
for added files.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoUse symbolic constants for diff-raw status indicators.
Junio C Hamano [Mon, 25 Jul 2005 20:05:44 +0000 (13:05 -0700)]
Use symbolic constants for diff-raw status indicators.

Both Cogito and StGIT prefer to see 'A' for new files.  The
current 'N' is visually harder to distinguish from 'M', which is
used for modified files.  Prepare the internals to use symbolic
constants to make the change easier.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoDocumentation: describe git-ls-files --exclude patterns.
Junio C Hamano [Sun, 24 Jul 2005 22:47:26 +0000 (15:47 -0700)]
Documentation: describe git-ls-files --exclude patterns.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agogit-ls-files: --exclude mechanism updates.
Junio C Hamano [Sun, 24 Jul 2005 22:26:09 +0000 (15:26 -0700)]
git-ls-files: --exclude mechanism updates.

Add --exclude-per-directory=<name> option that specifies a file
to contain exclude patterns local to that directory and its
subdirectories.  Update the exclusion logic to be able to say
"include files that match this more specific pattern, even
though later exclude patterns may match them".  Also enhances
that a pattern can contain '/' in which case fnmatch is called
with FNM_PATHNAME flag to match the entire path.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoUpdate the documentation for git-tag-script to reflect current behavior.
Ryan Anderson [Mon, 25 Jul 2005 06:17:16 +0000 (02:17 -0400)]
Update the documentation for git-tag-script to reflect current behavior.

[jc: I updated Ryan's patch to mention -a to create an unsigned
tag.]

Signed-off-by: Ryan Anderson <ryan@michonline.com>
19 years agogit-tag-script updates.
Junio C Hamano [Mon, 25 Jul 2005 22:18:35 +0000 (15:18 -0700)]
git-tag-script updates.

This adds -a (annotate only but not sign) option "A Large Angry
SCM" <gitzilla@gmail.com> sent to the list, after fixing up the
whitespace corruption in the patch, with some of my own fixes.
Namely:

 * A new flag '-a' can be used to create an unsigned tag
   object;

 * The '-f' flag logic did not do the right thing;

 * When creating a signed tag, we did not check for GPG failure
   as we should;

 * Try to use the key for the tagger identity when signing the
   tag.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoFix up applymbox script for the addition of "git-" prefix
Linus Torvalds [Sun, 24 Jul 2005 03:28:34 +0000 (20:28 -0700)]
Fix up applymbox script for the addition of "git-" prefix

Ehh, it works much better that way ;)

19 years ago[PATCH] diffcore-pickaxe: switch to "counting" behaviour.
Junio C Hamano [Sat, 23 Jul 2005 23:35:25 +0000 (16:35 -0700)]
[PATCH] diffcore-pickaxe: switch to "counting" behaviour.

Instead of finding old/new pair that one side has and the
other side does not have the specified string, find old/new pair
that contains the specified string as a substring different
number of times.  This would still not catch a case where you
introduce two static variable declarations and remove two static
function definitions from a file with -S"static", but would make
it behave a bit more intuitively.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years agoAdd a "git rename" to help with - surprise surprise - renames
Linus Torvalds [Sun, 24 Jul 2005 01:52:22 +0000 (18:52 -0700)]
Add a "git rename" to help with - surprise surprise - renames

It's stupid.  We'd want to rename directories too, but this doesn't do
that yet - easy enough to do per se, we just need to carefully list all
the pathnames that got moved (and remember to ignore the files that
weren't tracked but are in the subdirectory that got moved).

Doing the directory case will require a bit more scripting.. Something like

oldfiles=($(git-ls-files | grep '^$src'))
newfiles=($(git-ls-files | sed ':^$src: s:^$src:$dst:'))
mv $src $dst && git-update-cache --add --remove -- "${oldfiles[@]}" "${newfiles[@]}"

might do it, except it needs to be done right, and carefully.  Methinks
perl is probably better at this. Hint hint..

19 years agoRename the "tools" programs to also have the "git-" prefix
Linus Torvalds [Sun, 24 Jul 2005 01:46:27 +0000 (18:46 -0700)]
Rename the "tools" programs to also have the "git-" prefix

Hey, people are using them, and we have an install target for them, so
make sure that we can actually install them sanely without disturbing
the namespace.

19 years ago[PATCH] Support cloning packed repo from dumb http servers.
Junio C Hamano [Sun, 24 Jul 2005 00:55:07 +0000 (17:55 -0700)]
[PATCH] Support cloning packed repo from dumb http servers.

Using the information prepared with update-server-info, a truly
dumb http server can allow cloning with this client side
support.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] Document update-server-info.
Junio C Hamano [Sun, 24 Jul 2005 00:54:56 +0000 (17:54 -0700)]
[PATCH] Document update-server-info.

This adds a minimum documentation to the new command.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] Add update-server-info.
Junio C Hamano [Sun, 24 Jul 2005 00:54:41 +0000 (17:54 -0700)]
[PATCH] Add update-server-info.

The git-update-server-info command prepares informational files
to help clients discover the contents of a repository, and pull
from it via a dumb transport protocols.  Currently, the
following files are produced.

 - The $repo/info/refs file lists the name of heads and tags
   available in the $repo/refs/ directory, along with their
   SHA1.  This can be used by git-ls-remote command running on
   the client side.

 - The $repo/info/rev-cache file describes the commit ancestry
   reachable from references in the $repo/refs/ directory.  This
   file is in an append-only binary format to make the server
   side friendly to rsync mirroring scheme, and can be read by
   git-show-rev-cache command.

 - The $repo/objects/info/pack file lists the name of the packs
   available, the interdependencies among them, and the head
   commits and tags contained in them.  Along with the other two
   files, this is designed to help clients to make smart pull
   decisions.

The git-receive-pack command is changed to invoke it at the end,
so just after a push to a public repository finishes via "git
push", the server info is automatically updated.

In addition, building of the rev-cache file can be done by a
standalone git-build-rev-cache command separately.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] git-ls-remote: show and optionally store remote refs.
Junio C Hamano [Sun, 24 Jul 2005 00:54:26 +0000 (17:54 -0700)]
[PATCH] git-ls-remote: show and optionally store remote refs.

Retrieve and list the remote refs from git, http, and rsync
repositories, and optionally stores the retrieved refs in the
local repository under the same name.

To access a git URL, git-peek-remote command is used.  An http
URL needs to have an up-to-date info/refs file for discovery,
which will be introduced by a later update-server-info patch.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] Documentation: git-peek-remote.
Junio C Hamano [Sun, 24 Jul 2005 00:54:15 +0000 (17:54 -0700)]
[PATCH] Documentation: git-peek-remote.

Add documentation for the git-peek-remote and link it from the
main index.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] git-peek-remote: show tags and heads from a remote repository.
Junio C Hamano [Sun, 24 Jul 2005 00:54:03 +0000 (17:54 -0700)]
[PATCH] git-peek-remote: show tags and heads from a remote repository.

Add a git-peek-remote command that talks with upload-pack the
same way git-fetch-pack and git-clone-pack do, to show the
references the remote side has on the standard output.

A later patch introduces git-ls-remote that implements a UI to
store tag values retrieved using this command.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years agoUpdate tutorial.txt branches/tags to use the nicer helper syntax
Linus Torvalds [Sat, 23 Jul 2005 22:24:53 +0000 (15:24 -0700)]
Update tutorial.txt branches/tags to use the nicer helper syntax

Teach people to use "git tag <tag-name>" instead of writing the current
HEAD by hand into the .git/refs/tags/<tag-name> file.  Most people
probably don't really want to know about how git does things internally.

19 years agoMake "git tag" create both simple and signed tags
Linus Torvalds [Sat, 23 Jul 2005 22:21:22 +0000 (15:21 -0700)]
Make "git tag" create both simple and signed tags

A simple tag is just a direct pointer to the object, while a signed tag
is a pointer to a "tag object" that has a pgp signature and points to
the object we tagged.

Use "git tag -s tagname" to create a signed tag.

The "-f" flag overwrites any previous tag of that name (useful if you
update a tag to point to a newer version for things like "latest" etc
tags that aren't necessarily static versions).

19 years ago[PATCH] mailinfo: handle folded header.
Junio C Hamano [Sat, 23 Jul 2005 09:10:31 +0000 (02:10 -0700)]
[PATCH] mailinfo: handle folded header.

Some people split their long E-mail address over two lines
using the RFC2822 header "folding".  We can lose authorship
information this way, so make a minimum effort to deal with it,
instead of special casing only the "Subject:" field.

We could teach mailsplit to unfold the folded header, but
teaching mailinfo about folding would make more sense; a single
message can be fed to mailinfo without going through mailsplit.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years agoFix git protocol connection 'port' override
Linus Torvalds [Sat, 23 Jul 2005 18:10:21 +0000 (11:10 -0700)]
Fix git protocol connection 'port' override

It was broken by the IPv6 patches - we need to remove the ":" part from
the hostname for a successful name lookup.

19 years ago[PATCH] GIT: Try all addresses for given remote name
YOSHIFUJI Hideaki [Thu, 21 Jul 2005 13:10:36 +0000 (09:10 -0400)]
[PATCH] GIT: Try all addresses for given remote name

Try all addresses for given remote name until it succeeds.  Also
supports IPv6.

Signed-off-by: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] Deb packaging needs two more configuration files
Ryan Anderson [Fri, 22 Jul 2005 06:36:07 +0000 (02:36 -0400)]
[PATCH] Deb packaging needs two more configuration files

The deb package building needs these two new files to work correctly.

debian/compat sets the rules under which the debhelper scripts (dh_*)
operate.

debian/git-core.install tells dh_install what files to install in each
package that is generated.  There is only one package being generated,
so all files go into it.

(I missed these in the last patch, mostly because I needed to do this to
find stuff I had missed:
find . -name .git -type d -prune -o -type f -print \
| grep -v -e .tree1 -e .tree2 \
| sed -e "s/^\.\///" \
| sort >.tree1
git-ls-files | grep -v -e .tree1 -e .tree2 \
| sort >.tree2
diff -u .tree1 .tree2
)

Signed-off-by: Ryan Anderson <ryan@michonline.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] Deb packages should include the binaries
Ryan Anderson [Fri, 22 Jul 2005 05:55:56 +0000 (01:55 -0400)]
[PATCH] Deb packages should include the binaries

The Deb packages were missing a dependency on "build install" from the
binary target - this fixes that, and cleans up some inconsistencies
elsewhere in the rulesets.

Traditionally, Debian packaging uses a file called "build-stamp" (or
"install-stamp", etc) in the main source tree.  The initial deb package
support for Git tried to move this "build-stamp" file into the debian/
directory, but some instances were missed.  That problem, however, was
incidental - the real fix is the missing dependency mentioned above.

Signed-off-by: Ryan Anderson <ryan@michonline.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years agoBe more aggressive about marking trees uninteresting
Linus Torvalds [Sat, 23 Jul 2005 17:01:49 +0000 (10:01 -0700)]
Be more aggressive about marking trees uninteresting

We'll mark all the trees at the edges (as deep as we had to go to
realize that we have all the commits needed) as uninteresting.
Otherwise we'll occasionally list a lot of objects that were actually
available at the edge in a commit that we just never ended up parsing
because we could determine early that we had all relevant commits.

NOTE! The object listing is still just a _heuristic_.  It's guaranteed
to list a superset of the actual new objects, but there might be the
occasional old object in the list, just because the commit that
referenced it was much further back in the history.

For example, let's say that a recent commit is a revert of part of the
tree to much older state: since we didn't walk _that_ far back in the
commit history tree to list the commits necessary, git-rev-tree will
never have marked the old objects uninteresting, and we'll end up
listing them as "new".

That's ok.

19 years ago[PATCH] tutorial: mention "git clone" records .git/branches/origin
Junio C Hamano [Sat, 23 Jul 2005 02:13:07 +0000 (19:13 -0700)]
[PATCH] tutorial: mention "git clone" records .git/branches/origin

Update the recommended workflow for individual developers.
While they are tracking the origin, refs/heads/origin is updated
by "git fetch", so there is no need to manually copy FETCH_HEAD
to refs/heads/ anywhere.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years ago[PATCH] git-clone-script: store where we cloned from in .git/branches/origin
Junio C Hamano [Sat, 23 Jul 2005 02:11:22 +0000 (19:11 -0700)]
[PATCH] git-clone-script: store where we cloned from in .git/branches/origin

A bit more usability enhancement, while retaining Cogito
compatibility (and fixing the "-u" flag).

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years ago[PATCH] Test framework: prettyprint the failed command.
Junio C Hamano [Sat, 23 Jul 2005 02:09:34 +0000 (19:09 -0700)]
[PATCH] Test framework: prettyprint the failed command.

The output from a failure case had the test description message
and the first line of the actual test script concatenated on the
same line, which was ugly.  Correct the output routine a bit to
make it more readable.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years ago[PATCH] Install tools with "make install-tools".
Junio C Hamano [Sat, 23 Jul 2005 02:09:20 +0000 (19:09 -0700)]
[PATCH] Install tools with "make install-tools".

Match the main Makefile by separating COPTS from CFLAGS,
defining INSTALL, prefix, and bin.  Add a new target 'install-tools'
to the main Makefile to install them.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years ago[PATCH] Audit rev-parse users.
Junio C Hamano [Sat, 23 Jul 2005 02:09:05 +0000 (19:09 -0700)]
[PATCH] Audit rev-parse users.

This patch changes rev-parse users that pass a single argument
that is supposed to be a rev parameter to use "--verify".

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years ago[PATCH] git-branch: avoid getting confused by empty or nonexisting branches.
Junio C Hamano [Sat, 23 Jul 2005 02:08:47 +0000 (19:08 -0700)]
[PATCH] git-branch: avoid getting confused by empty or nonexisting branches.

When not specifying the start point explicitly, we ended up
emitting ^0 in addition to the default HEAD.  Be careful to see
if we have "$2" before finding out which commit to base the new
branch on.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years ago[PATCH] Help scripts that use git-rev-parse to grok args with SP/TAB/LF
Junio C Hamano [Sat, 23 Jul 2005 02:08:32 +0000 (19:08 -0700)]
[PATCH] Help scripts that use git-rev-parse to grok args with SP/TAB/LF

The git-rev-parse command uses LF to separate each argument it
parses, so its users at least need to set IFS to LF to be able
to handle filenames with embedded SPs and TABs.  Some commands,
however, can take and do expect arguments with embedded LF,
notably, "-S" (pickaxe) of diff family, so even this workaround
does not work for them.

When --sq flag to git-rev-parse is given, instead of showing one
argument per line, it outputs arguments quoted for consumption
with "eval" by the caller, to remedy this situation.

As an example, this patch converts git-whatchanged to use this
new feature.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] Document "curl" requirements.
Junio C Hamano [Sat, 23 Jul 2005 00:30:26 +0000 (17:30 -0700)]
[PATCH] Document "curl" requirements.

Not just libcurl, but now we require curl executable as well.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] Support more http features: https no cert, .netrc -> auth
Darrin Thompson [Wed, 13 Jul 2005 02:12:40 +0000 (21:12 -0500)]
[PATCH] Support more http features: https no cert, .netrc -> auth

Cause setting environment variable GIT_SSL_NO_VERIFY to turn off
curl's ssl peer verification.

Only use curl for http transfers, instead of curl and wget.

Make curl check ~/.netrc for credentials.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] Install git-verify-tag-script
Eric W. Biederman [Sat, 16 Jul 2005 20:19:24 +0000 (14:19 -0600)]
[PATCH] Install git-verify-tag-script

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] Cleanup: git-verify-tag-script
Eric W. Biederman [Sat, 16 Jul 2005 20:18:40 +0000 (14:18 -0600)]
[PATCH] Cleanup: git-verify-tag-script

- Use git-rev-parse to allow sha1 tags references
- When the tag does not verify set an appropriate exit status
- Use git-sh-setup-script to verify the .git directory

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] Fix a typo in git-unpack-objects documentation.
Jan Veldeman [Tue, 19 Jul 2005 21:59:09 +0000 (14:59 -0700)]
[PATCH] Fix a typo in git-unpack-objects documentation.

Fix a typo in git-unpack-objects documentation.

Signed-off-by: Jan Veldeman <jan@mind.be>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] debian/ fixes
Ryan Anderson [Wed, 20 Jul 2005 01:17:47 +0000 (21:17 -0400)]
[PATCH] debian/ fixes

Make debian/rules executable, and correct the spelling of rsync in
debian/control.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] format-patch: --mbox and --check.
Junio C Hamano [Fri, 22 Jul 2005 23:04:47 +0000 (16:04 -0700)]
[PATCH] format-patch: --mbox and --check.

Add --mbox option to export patches in a format resembling UNIX
mbox, so that later they can be concatenated and fed to
applymbox.

Add --check to look for lines that introduce bogus whitespaces.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] git-format-patch-script and mailinfo updates.
Junio C Hamano [Fri, 22 Jul 2005 23:04:34 +0000 (16:04 -0700)]
[PATCH] git-format-patch-script and mailinfo updates.

 - avoid duplicating [PATCH] in the commit message body if the
   original commit has it already (happens for commits done from
   mails via applymbox).

 - check if the commit author is different from the one who is
   running the script, and emit an appropriate "From:" and
   "Date: " lines to the output.

 - with '--date', emit "Date: " line to preserve the original
   author date even for the user's own commit.

 - teach mailinfo to grok not just "From: " but "Date: ".

The patch e-mail output by format-patch starts with the first
line from the original commit message, prefixed with [PATCH],
and optionally a From: line if you are reformatting a patch
obtained from somebody else, a Date: line from the original
commit if (1) --date is specified or (2) for somebody else's
patch, and the rest of the commit message body.

Expected use of this is to move the title line from the commit
to Subject: when sending it via an e-mail, and leave the From:
and the Date: lines as the first lines of your message.

The mailinfo command has been changed to read Date: (in addition
to From: it already understands) and do sensible things when
running applymbox.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] tools/applymbox: allow manual fixing and continuing after a failure.
Junio C Hamano [Fri, 22 Jul 2005 23:04:19 +0000 (16:04 -0700)]
[PATCH] tools/applymbox: allow manual fixing and continuing after a failure.

With "-c .dotest/0002" flag, the applymbox command can be told
to use existing .dotest/patch file after hand-fixing the patch
conflicts for the second patch in the mailbox, and continue on
from that message, skipping the already applied first patch in
.dotest/0001.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] apply.c: --exclude=fnmatch-pattern option.
Junio C Hamano [Fri, 22 Jul 2005 16:56:57 +0000 (09:56 -0700)]
[PATCH] apply.c: --exclude=fnmatch-pattern option.

Adds --exclude=pattern option to the "git-apply" command.  This
was useful while reimporting the BKCVS patchset dump of the
Linux kernel, starting at 2.4.0 and ending at 2.6.12-rc2 Ingo
announced some time ago to exclude BitKeeper directory.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] apply.c: handle incomplete lines correctly.
Junio C Hamano [Fri, 22 Jul 2005 16:56:39 +0000 (09:56 -0700)]
[PATCH] apply.c: handle incomplete lines correctly.

The parsing code had a bug that failed to recognize an
incomplete line at the end of a fragment, and the fragment
application code had a comparison bug to recognize such.  Fix
them to handle incomplete lines correctly.

Add a test script for patches with various combinations of
complete and incomplete lines to make sure the fix works.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years agoHandle the rename cases reported by git-diff-tree -C correctly.
Paul Mackerras [Wed, 20 Jul 2005 16:25:54 +0000 (12:25 -0400)]
Handle the rename cases reported by git-diff-tree -C correctly.

19 years agoCalculate the list of interesting files for a merge.
Paul Mackerras [Wed, 20 Jul 2005 13:13:46 +0000 (09:13 -0400)]
Calculate the list of interesting files for a merge.

If there is a GCA for the parents of the merge, then a file is
interesting if some parent has a version that is different from both
the child and the GCA.  If there is no GCA (e.g. for a merge that
pulls in an external project) then a file is interesting if the child's
version is different from all of the parents.

Next step is to actually show the differences for the interesting
files...

19 years agoAdd "git commit --all" since everybody seems to want it.
Linus Torvalds [Tue, 19 Jul 2005 11:20:39 +0000 (07:20 -0400)]
Add "git commit --all" since everybody seems to want it.

This replaces

git-diff-files --name-only | xargs git-update-cache
git commit

with a new "--all" argument to "git commit".

19 years agogit-send-pack: verify that sender is a proper superset of receiver
Linus Torvalds [Tue, 19 Jul 2005 11:03:47 +0000 (07:03 -0400)]
git-send-pack: verify that sender is a proper superset of receiver

This should make sure that if you have multiple people pushing to the
same tree, they cannot overwrite each others work, but have to merge
before being able to update the common reference tree.

19 years agoMerge master.kernel.org:/pub/scm/gitk/gitk
Linus Torvalds [Mon, 18 Jul 2005 23:26:00 +0000 (19:26 -0400)]
Merge master.kernel.org:/pub/scm/gitk/gitk

19 years agoMake the diff display less gaudy.
Paul Mackerras [Mon, 18 Jul 2005 18:29:03 +0000 (14:29 -0400)]
Make the diff display less gaudy.

The old style is still available as an option (we still need a
preferences window so we can set/clear it though).

19 years agoAllow short SHA1 IDs in the SHA1 entry field.
Paul Mackerras [Mon, 18 Jul 2005 16:16:35 +0000 (12:16 -0400)]
Allow short SHA1 IDs in the SHA1 entry field.

19 years agoFix display of mode changes in details pane.
Paul Mackerras [Sun, 17 Jul 2005 15:11:44 +0000 (11:11 -0400)]
Fix display of mode changes in details pane.

Also simplified the parsing of the git-diff-tree -p output and got
rid of the unused 'seenfile' variable.

19 years agoFirst cut at displaying the diffs for a merge.
Paul Mackerras [Sun, 17 Jul 2005 07:39:44 +0000 (03:39 -0400)]
First cut at displaying the diffs for a merge.

We display the files where the child differs from the first parent
first in black in the file list window, followed by the second parent
in blue, and so on using different colors for each parent (provided
you don't have more than 6 parents; if you do we cycle around).

19 years agoMake searching in files changed faster, and fix some bugs.
Paul Mackerras [Sun, 17 Jul 2005 01:53:55 +0000 (21:53 -0400)]
Make searching in files changed faster, and fix some bugs.

We now kick off a single git-diff-tree -r --stdin and feed it all
the commit pairs we want to know about, instead of doing a separate
git-diff-tree invocation for each.