gitweb.git
Merge branch 'jc/combine' into nextJunio C Hamano Tue, 11 Apr 2006 21:34:59 +0000 (14:34 -0700)

Merge branch 'jc/combine' into next

* jc/combine:
combine-diff: fix hunks at the end (take #2).
combine-diff: do not lose hunks with only deletion at end.

Merge branch 'jc/diff' into nextJunio C Hamano Tue, 11 Apr 2006 21:34:53 +0000 (14:34 -0700)

Merge branch 'jc/diff' into next

* jc/diff:
blame and friends: adjust to multiple pathspec change.
git log --full-diff
tree-diff: do not assume we use only one pathspec

combine-diff: fix hunks at the end (take #2).Junio C Hamano Tue, 11 Apr 2006 21:31:31 +0000 (14:31 -0700)

combine-diff: fix hunks at the end (take #2).

The previous round showed the delete-only hunks at the end, but
forgot to mark them interesting when they were.

Signed-off-by: Junio C Hamano <junkio@cox.net>

combine-diff: do not lose hunks with only deletion... Junio C Hamano Tue, 11 Apr 2006 10:13:29 +0000 (03:13 -0700)

combine-diff: do not lose hunks with only deletion at end.

We used to lose hunks that appear at the end and have only
deletion. This makes sure that the record beyond the end of
file (which holds such deletions) is examined.

Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge branch 'ds/index' into nextJunio C Hamano Tue, 11 Apr 2006 18:52:36 +0000 (11:52 -0700)

Merge branch 'ds/index' into next

* ds/index:
Replace index() with strchr().
Solaris 9 also wants our own unsetenv/setenv.
Retire git-log.sh (take #3)

Merge branch 'jc/withraw' into nextJunio C Hamano Tue, 11 Apr 2006 18:52:01 +0000 (11:52 -0700)

Merge branch 'jc/withraw' into next

* jc/withraw:
Separate the raw diff and patch with a newline
Document --patch-with-raw

Replace index() with strchr().Dennis Stosberg Tue, 11 Apr 2006 16:37:58 +0000 (18:37 +0200)

Replace index() with strchr().

strchr() is more portable than index() and is used everywhere in
git already.

Signed-off-by: Junio C Hamano <junkio@cox.net>

Solaris 9 also wants our own unsetenv/setenv.Dennis Stosberg Tue, 11 Apr 2006 18:42:26 +0000 (11:42 -0700)

Solaris 9 also wants our own unsetenv/setenv.

[jc: the original had "index() is evil" but that should be a
separate patch.]

Retire git-log.sh (take #3)Junio C Hamano Tue, 11 Apr 2006 18:29:36 +0000 (11:29 -0700)

Retire git-log.sh (take #3)

Do not install built-in commands as separate files -- use
hardlinks instead.

Signed-off-by: Junio C Hamano <junkio@cox.net>

Separate the raw diff and patch with a newlinePetr Baudis Tue, 11 Apr 2006 11:30:46 +0000 (13:30 +0200)

Separate the raw diff and patch with a newline

More friendly for human reading I believe, and possibly friendlier to some
parsers (although only by an epsilon).

Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Document --patch-with-rawPetr Baudis Tue, 11 Apr 2006 11:22:17 +0000 (13:22 +0200)

Document --patch-with-raw

Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge branch 'eb/apply' into nextJunio C Hamano Tue, 11 Apr 2006 02:45:30 +0000 (19:45 -0700)

Merge branch 'eb/apply' into next

* eb/apply:
Implement limited context matching in git-apply.

Merge branch 'jc/withraw' into nextJunio C Hamano Tue, 11 Apr 2006 02:44:35 +0000 (19:44 -0700)

Merge branch 'jc/withraw' into next

* jc/withraw:
diff-* --patch-with-raw
Retire git-log.sh (take#2)
Retire git-log.sh
Retire diffcore-pathspec.
Improve the git-diff-tree -c/-cc documentation

diff-* --patch-with-rawJunio C Hamano Tue, 11 Apr 2006 00:36:53 +0000 (17:36 -0700)

diff-* --patch-with-raw

This new flag outputs the diff-raw output and diff-patch output
at the same time. Requested by Cogito.

Signed-off-by: Junio C Hamano <junkio@cox.net>

Implement limited context matching in git-apply.Eric W. Biederman Mon, 10 Apr 2006 09:33:06 +0000 (03:33 -0600)

Implement limited context matching in git-apply.

Ok this really should be the good version. The option
handling has been reworked to be automation safe.

Currently to import the -mm tree I have to work around
git-apply by using patch. Because some of Andrews
patches in quilt will only apply with fuzz.

I started out implementing a --fuzz option and then I realized
fuzz is not a very safe concept for an automated system. What
you really want is a minimum number of context lines that must
match. This allows policy to be set without knowing how many
lines of context a patch actually provides. By default
the policy remains to match all provided lines of context.

Allowng git-apply to match a restricted set of context makes
it much easier to import the -mm tree into git. I am still only
processing 1.5 to 1.6 patches a second for the 692 patches in
2.6.17-rc1-mm2 is still painful but it does help.

If I just loop through all of Andrews patches in order
and run git-apply --index -C1 I process the entire patchset
in 1m53s or about 6 patches per second. So running
git-mailinfo, git-write-tree, git-commit-tree, and
git-update-ref everytime has a measurable impact,
and shows things can be speeded up even more.

All of these timings were taking on my poor 700Mhz Athlon
with 512MB of ram. So people with fast machiens should
see much better performance.

When a match is found after the number of context are reduced a
warning is generated. Since this is a rare event and possibly
dangerous this seems to make sense. Unless you are patching
a single file the error message is a little bit terse at
the moment, but it should be easy to go back and fix.

I have also updated the documentation for git-apply to reflect
the new -C option that sets the minimum number of context
lines that must match.

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Retire git-log.sh (take#2)Junio C Hamano Tue, 11 Apr 2006 00:37:58 +0000 (17:37 -0700)

Retire git-log.sh (take#2)

... and install a replacement properly.

Signed-off-by: Junio C Hamano <junkio@cox.net>

blame and friends: adjust to multiple pathspec change.Junio C Hamano Tue, 11 Apr 2006 01:14:54 +0000 (18:14 -0700)

blame and friends: adjust to multiple pathspec change.

This makes things that include revision.h build again.

Blame is also built, but I am not sure how well it works (or how
well it worked to begin with) -- it was relying on tree-diff to
be using whatever pathspec was used the last time, which smells
a bit suspicious.

Signed-off-by: Junio C Hamano <junkio@cox.net>

Retire git-log.shJunio C Hamano Tue, 11 Apr 2006 00:37:58 +0000 (17:37 -0700)

Retire git-log.sh

Signed-off-by: Junio C Hamano <junkio@cox.net>

git log --full-diffJunio C Hamano Mon, 10 Apr 2006 23:40:40 +0000 (16:40 -0700)

git log --full-diff

Without this flag, "git log -p paths..." shows commits that
touch the specified paths, and diffs about the same specified
paths. With this, the full diff is shown for commits that touch
the specified paths.

Signed-off-by: Junio C Hamano <junkio@cox.net>

tree-diff: do not assume we use only one pathspecJunio C Hamano Mon, 10 Apr 2006 23:39:11 +0000 (16:39 -0700)

tree-diff: do not assume we use only one pathspec

The way tree-diff was set up assumed we would use only one set
of pathspec during the entire life of the program. Move the
pathspec related static variables out to diff_options structure
so that we can filter commits with one set of paths while show
the actual diffs using different set of paths.

I suspect this breaks blame.c, and makes "git log paths..." to
default to the --full-diff, the latter of which is dealt with
the next commit.

Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge branch 'master' into jc/diffJunio C Hamano Mon, 10 Apr 2006 23:44:59 +0000 (16:44 -0700)

Merge branch 'master' into jc/diff

* master:
Make "--parents" logs also be incremental
Retire diffcore-pathspec.
Improve the git-diff-tree -c/-cc documentation

Merge branch 'lt/rev'Junio C Hamano Mon, 10 Apr 2006 22:58:41 +0000 (15:58 -0700)

Merge branch 'lt/rev'

* lt/rev:
Make "--parents" logs also be incremental

Retire diffcore-pathspec.Junio C Hamano Mon, 10 Apr 2006 22:57:24 +0000 (15:57 -0700)

Retire diffcore-pathspec.

Nobody except diff-stages used it -- the callers instead filtered
the input to diffcore themselves. Make diff-stages do that as
well and retire diffcore-pathspec.

Signed-off-by: Junio C Hamano <junkio@cox.net>

Improve the git-diff-tree -c/-cc documentationPetr Baudis Sun, 9 Apr 2006 13:43:17 +0000 (15:43 +0200)

Improve the git-diff-tree -c/-cc documentation

This tries to clarify the -c/-cc documentation and clean up the style and
grammar.

Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge branch 'jc/diff' into nextJunio C Hamano Sun, 9 Apr 2006 09:07:33 +0000 (02:07 -0700)

Merge branch 'jc/diff' into next

* jc/diff:
git log [diff-tree options]...
log-tree: separate major part of diff-tree.

git log [diff-tree options]...Junio C Hamano Sun, 9 Apr 2006 08:59:03 +0000 (01:59 -0700)

git log [diff-tree options]...

And this makes "git log" to take common diff-tree options, so
that it can be used as "git whatchanged".

The recent revision walker updates by Linus to make path
limiting low-latency helps this quite a bit.

Signed-off-by: Junio C Hamano <junkio@cox.net>

log-tree: separate major part of diff-tree.Junio C Hamano Sun, 9 Apr 2006 08:11:11 +0000 (01:11 -0700)

log-tree: separate major part of diff-tree.

This separates out the part that deals with one-commit diff-tree
(and --stdin form) into a separate log-tree module.

There are two goals with this. The more important one is to be
able to make this part available to "git log --diff", so that we
can have a native "git whatchanged" command. Another is to
simplify the commit log generation part simpler.

Signed-off-by: Junio C Hamano <junkio@cox.net>

Make "--parents" logs also be incrementalLinus Torvalds Sun, 9 Apr 2006 00:05:58 +0000 (17:05 -0700)

Make "--parents" logs also be incremental

The parent rewriting feature caused us to create the whole history in one
go, and then simplify it later, because of how rewrite_parents() had been
written. However, with a little tweaking, it's perfectly possible to do
even that one incrementally.

Right now, this doesn't really much matter, because every user of
"--parents" will probably generally _also_ use "--topo-order", which will
cause the old non-incremental behaviour anyway. However, I'm hopeful that
we could make even the topological sort incremental, or at least
_partially_ so (for example, make it incremental up to the first merge).

In the meantime, this at least moves things in the right direction, and
removes a strange special case.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

xdiff/xdiffi.c: fix warnings about possibly uninitializ... Marco Roeland Sat, 8 Apr 2006 15:27:20 +0000 (17:27 +0200)

xdiff/xdiffi.c: fix warnings about possibly uninitialized variables

Compiling this module gave the following warnings (some double dutch!):

xdiff/xdiffi.c: In functie 'xdl_recs_cmp':
xdiff/xdiffi.c:298: let op: 'spl.i1' may be used uninitialized in this function
xdiff/xdiffi.c:298: let op: 'spl.i2' may be used uninitialized in this function
xdiff/xdiffi.c:219: let op: 'fbest1' may be used uninitialized in this function
xdiff/xdiffi.c:219: let op: 'bbest1' may be used uninitialized in this function

A superficial tracking of their usage, without deeper knowledge about the
algorithm, indeed confirms that there are code paths on which these
variables will be used uninitialized. In practice these code paths might never
be reached, but then these fixes will not change the algorithm. If these
code paths are ever reached we now at least have a predictable outcome. And
should the very small performance impact of these initializations be
noticeable, then they should at least be replaced by comments why certain
code paths will never be reached.

Some extra initializations in this patch now fix the warnings.

diffcore-rename: fix merging back a broken pair.Junio C Hamano Sun, 9 Apr 2006 03:17:46 +0000 (20:17 -0700)

diffcore-rename: fix merging back a broken pair.

When a broken pair is matched up by rename detector to be merged
back, we do not want to say it is "dissimilar" with the
similarity index. The output should just say they were changed,
taking the break score left by the earlier diffcore-break run if
any.

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff: fix output of total-rewrite diff.Junio C Hamano Sun, 9 Apr 2006 02:45:39 +0000 (19:45 -0700)

diff: fix output of total-rewrite diff.

We did not read in the file data before emitting the
total-rewrite diff. Noticed by Pasky.

Signed-off-by: Junio C Hamano <junkio@cox.net>

git-log: match rev-list --abbrev and --abbrev-commitJunio C Hamano Sat, 8 Apr 2006 05:34:11 +0000 (22:34 -0700)

git-log: match rev-list --abbrev and --abbrev-commit

Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge branch 'master' into nextJunio C Hamano Sat, 8 Apr 2006 01:03:07 +0000 (18:03 -0700)

Merge branch 'master' into next

* master:
GIT 1.3.0-rc3

GIT 1.3.0-rc3 v1.3.0-rc3Junio C Hamano Sat, 8 Apr 2006 01:02:40 +0000 (18:02 -0700)

GIT 1.3.0-rc3

Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge branch 'kh/svn'Junio C Hamano Sat, 8 Apr 2006 01:01:55 +0000 (18:01 -0700)

Merge branch 'kh/svn'

* kh/svn:
git-svnimport: Don't assume that copied files haven't changed

Merge branch 'jc/thinpack'Junio C Hamano Sat, 8 Apr 2006 01:00:16 +0000 (18:00 -0700)

Merge branch 'jc/thinpack'

* jc/thinpack:
Thin pack generation: optimization.

Merge branch 'jc/date'Junio C Hamano Sat, 8 Apr 2006 01:00:06 +0000 (18:00 -0700)

Merge branch 'jc/date'

* jc/date:
date parsing: be friendlier to our European friends.

Merge branch 'nh/http'Junio C Hamano Sat, 8 Apr 2006 00:59:36 +0000 (17:59 -0700)

Merge branch 'nh/http'

* nh/http:
Fix compile with expat, but an old curl version
http-fetch: add optional DAV-based pack list

Merge branch 'ew/rev-abbrev'Junio C Hamano Sat, 8 Apr 2006 00:59:10 +0000 (17:59 -0700)

Merge branch 'ew/rev-abbrev'

* ew/rev-abbrev:
rev-list --abbrev-commit

Merge branch 'jc/blame'Junio C Hamano Sat, 8 Apr 2006 00:57:46 +0000 (17:57 -0700)

Merge branch 'jc/blame'

* jc/blame:
blame -S <ancestry-file>
Match ofs/cnt types in diff interface.
blame: use built-in xdiff
combine-diff: move the code to parse hunk-header into common library.
combine-diff: refactor built-in xdiff interface.
combine-diff: use built-in xdiff.

Merge branch 'master' into nextJunio C Hamano Fri, 7 Apr 2006 23:53:06 +0000 (16:53 -0700)

Merge branch 'master' into next

* master:
gitk: Fix incorrect invocation of getmergediffline
[PATCH] gitk: Fix searching for filenames in gitk
count-delta: match get_delta_hdr_size() changes.
check patch_delta bounds more carefully

Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano Fri, 7 Apr 2006 23:52:59 +0000 (16:52 -0700)

Merge git://git.kernel.org/pub/scm/gitk/gitk

* git://git.kernel.org/pub/scm/gitk/gitk:
gitk: Fix incorrect invocation of getmergediffline
[PATCH] gitk: Fix searching for filenames in gitk

Merge branch 'maint'Junio C Hamano Fri, 7 Apr 2006 23:51:55 +0000 (16:51 -0700)

Merge branch 'maint'

* maint:
count-delta: match get_delta_hdr_size() changes.
check patch_delta bounds more carefully

count-delta: match get_delta_hdr_size() changes. v1.2.6Junio C Hamano Fri, 7 Apr 2006 23:48:09 +0000 (16:48 -0700)

count-delta: match get_delta_hdr_size() changes.

Signed-off-by: Junio C Hamano <junkio@cox.net>

check patch_delta bounds more carefullyNicolas Pitre Fri, 7 Apr 2006 19:26:10 +0000 (15:26 -0400)

check patch_delta bounds more carefully

Let's avoid going south with invalid delta data.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge branch 'jc/thinpack' into nextJunio C Hamano Fri, 7 Apr 2006 09:13:20 +0000 (02:13 -0700)

Merge branch 'jc/thinpack' into next

* jc/thinpack:
Thin pack generation: optimization.

Merge branch 'ew/rev-abbrev' into nextJunio C Hamano Fri, 7 Apr 2006 09:12:55 +0000 (02:12 -0700)

Merge branch 'ew/rev-abbrev' into next

* ew/rev-abbrev:
rev-list --abbrev-commit

Merge branch 'jc/blame' into nextJunio C Hamano Fri, 7 Apr 2006 09:12:48 +0000 (02:12 -0700)

Merge branch 'jc/blame' into next

* jc/blame:
blame -S <ancestry-file>
Match ofs/cnt types in diff interface.

Merge branch 'kh/svn' into nextJunio C Hamano Fri, 7 Apr 2006 09:12:18 +0000 (02:12 -0700)

Merge branch 'kh/svn' into next

* kh/svn:
git-svnimport: Don't assume that copied files haven't changed
Add Documentation/technical/pack-format.txt
Added Packing Heursitics IRC writeup.
Add documentation for git-imap-send.

git-svnimport: Don't assume that copied files haven... Karl Hasselström Fri, 7 Apr 2006 06:06:09 +0000 (08:06 +0200)

git-svnimport: Don't assume that copied files haven't changed

Don't assume that a file that SVN claims was copied from somewhere
else is bit-for-bit identical with its parent, since SVN allows
changes to copied files before they are committed.

Without this fix, such copy-modify-commit operations causes the
imported file to lack the "modify" part -- that is, we get subtle data
corruption.

Signed-off-by: Karl Hasselström <kha@treskal.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

rev-list --abbrev-commitJunio C Hamano Fri, 7 Apr 2006 04:32:36 +0000 (21:32 -0700)

rev-list --abbrev-commit

This should make --pretty=oneline a whole lot more readable for
people using 80-column terminals. Originally from Eric Wong.

Signed-off-by: Junio C Hamano <junkio@cox.net>

Thin pack generation: optimization.Junio C Hamano Thu, 6 Apr 2006 06:24:57 +0000 (23:24 -0700)

Thin pack generation: optimization.

Jens Axboe noticed that recent "git push" has become very slow
since we made --thin transfer the default.

Thin pack generation to push a handful revisions that touch
relatively small number of paths out of huge tree was stupid; it
registered _everything_ from the excluded revisions. As a
result, "Counting objects" phase was unnecessarily expensive.

This changes the logic to register the blobs and trees from
excluded revisions only for paths we are actually going to send
to the other end.

Signed-off-by: Junio C Hamano <junkio@cox.net>

Add Documentation/technical/pack-format.txtJunio C Hamano Fri, 7 Apr 2006 09:07:40 +0000 (02:07 -0700)

Add Documentation/technical/pack-format.txt

... along with the previous one, pack-heuristics, by popular
demand.

Signed-off-by: Junio C Hamano <junkio@cox.net>

Added Packing Heursitics IRC writeup.Jon Loeliger Fri, 3 Mar 2006 01:19:29 +0000 (19:19 -0600)

Added Packing Heursitics IRC writeup.

Signed-off-by: Jon Loeliger <jdl@jdl.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

blame -S <ancestry-file>Junio C Hamano Fri, 7 Apr 2006 06:58:51 +0000 (23:58 -0700)

blame -S <ancestry-file>

This adds the -S <ancestry-file> option to blame, which is
needed by the CVS server emulation.

Signed-off-by: Junio C Hamano <junkio@cox.net>

Match ofs/cnt types in diff interface.Junio C Hamano Fri, 7 Apr 2006 05:29:55 +0000 (22:29 -0700)

Match ofs/cnt types in diff interface.

Signed-off-by: Junio C Hamano <junkio@cox.net>

Add documentation for git-imap-send.Mike McCormack Thu, 6 Apr 2006 03:32:19 +0000 (12:32 +0900)

Add documentation for git-imap-send.

Signed-off-by: Mike McCormack <mike@codeweavers.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge branch 'master' into nextJunio C Hamano Thu, 6 Apr 2006 01:22:19 +0000 (18:22 -0700)

Merge branch 'master' into next

* master:
blame.c: fix completely broken ancestry traversal.

blame.c: fix completely broken ancestry traversal.Junio C Hamano Thu, 6 Apr 2006 01:21:17 +0000 (18:21 -0700)

blame.c: fix completely broken ancestry traversal.

Recent revision.c updates completely broken the assignment of
blames by not rewriting commit->parents field unless explicitly
asked to by the caller. The caller needs to set revs.parents.

Signed-off-by: Junio C Hamano <junkio@cox.net>

gitk: Fix incorrect invocation of getmergedifflinePaul Mackerras Thu, 6 Apr 2006 00:20:03 +0000 (10:20 +1000)

gitk: Fix incorrect invocation of getmergediffline

Signed-off-by: Paul Mackerras <paulus@samba.org>

[PATCH] gitk: Fix searching for filenames in gitkPavel Roskin Wed, 5 Apr 2006 23:02:50 +0000 (19:02 -0400)

[PATCH] gitk: Fix searching for filenames in gitk

findcont should not accept any arguments.

Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>

Merge branch 'jc/date' into nextJunio C Hamano Wed, 5 Apr 2006 22:47:29 +0000 (15:47 -0700)

Merge branch 'jc/date' into next

* jc/date:
date parsing: be friendlier to our European friends.
Tweaks to make asciidoc play nice.
git-commit: document --amend
Avoid a crash if realloc returns a different pointer.
Avoid a divide by zero if there's no messages to send.
[PATCH] Provide configurable UI font for gitk
[PATCH] gitk: Use git wrapper to run git-ls-remote.
[PATCH] gitk: add key bindings for selecting first and last commit
gitk: Add a help menu item to display key bindings
[PATCH] gitk: allow goto heads
gitk: replace parent and children arrays with lists

date parsing: be friendlier to our European friends.Junio C Hamano Wed, 5 Apr 2006 22:31:12 +0000 (15:31 -0700)

date parsing: be friendlier to our European friends.

This does three things, only applies to cases where the user
manually tries to override the author/commit time by environment
variables, with non-ISO, non-2822 format date-string:

- Refuses to use the interpretation to put the date in the
future; recent kernel history has a commit made with
10/03/2006 which is recorded as October 3rd.

- Adds '.' as the possible year-month-date separator. We
learned from our European friends on the #git channel that
dd.mm.yyyy is the norm there.

- When the separator is '.', we prefer dd.mm.yyyy over
mm.dd.yyyy; otherwise mm/dd/yy[yy] takes precedence over
dd/mm/yy[yy].

Signed-off-by: Junio C Hamano <junkio@cox.net>

Tweaks to make asciidoc play nice.Francis Daly Wed, 5 Apr 2006 22:25:17 +0000 (23:25 +0100)

Tweaks to make asciidoc play nice.

Once the content has been generated, the formatting elves can reorder
it to be pretty...

Signed-off-by: Francis Daly <francis@daoine.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge branch 'jc/blame' into nextJunio C Hamano Wed, 5 Apr 2006 21:26:00 +0000 (14:26 -0700)

Merge branch 'jc/blame' into next

* jc/blame:
blame: use built-in xdiff

Merge branch 'nh/http' into nextJunio C Hamano Wed, 5 Apr 2006 21:25:57 +0000 (14:25 -0700)

Merge branch 'nh/http' into next

* nh/http:
Fix compile with expat, but an old curl version

blame: use built-in xdiffJunio C Hamano Wed, 5 Apr 2006 19:23:29 +0000 (12:23 -0700)

blame: use built-in xdiff

This removes the last use of external diff from core git suite.
Also addresses the use of index() -- elsewhere we tend to use
strchr().

Signed-off-by: Junio C Hamano <junkio@cox.net>

git-commit: document --amendMarco Roeland Wed, 5 Apr 2006 20:28:28 +0000 (22:28 +0200)

git-commit: document --amend

The "--amend" option is used to amend the tip of the current branch. This
documentation text was copied straight from the commit that implemented it.

Some minor format tweaks for asciidoc were taken from work by Francis Daly
in commit b0d08a5.. It looks good now also in the html page.

[jc: amended further to follow the recommendation by Francis in
commit 3070b60].

Signed-off-by: Marco Roeland <marco.roeland@xs4all.nl>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge branch 'jc/clone'Junio C Hamano Wed, 5 Apr 2006 21:06:50 +0000 (14:06 -0700)

Merge branch 'jc/clone'

* jc/clone:
git-clone: fix handling of upsteram whose HEAD does not point at master.

Merge branch 'pb/regex'Junio C Hamano Wed, 5 Apr 2006 21:06:26 +0000 (14:06 -0700)

Merge branch 'pb/regex'

* pb/regex:
On some platforms, certain headers need to be included before regex.h
Support for pickaxe matching regular expressions

Avoid a crash if realloc returns a different pointer.Mike McCormack Wed, 5 Apr 2006 14:22:19 +0000 (23:22 +0900)

Avoid a crash if realloc returns a different pointer.

Signed-off-by: Junio C Hamano <junkio@cox.net>

Avoid a divide by zero if there's no messages to send.Mike McCormack Wed, 5 Apr 2006 14:22:52 +0000 (23:22 +0900)

Avoid a divide by zero if there's no messages to send.

Signed-off-by: Junio C Hamano <junkio@cox.net>

Fix compile with expat, but an old curl versionJohannes Schindelin Wed, 5 Apr 2006 14:22:40 +0000 (16:22 +0200)

Fix compile with expat, but an old curl version

With an old curl version, git-http-push is not compiled. But git-http-fetch
still needs to be linked with expat if NO_EXPAT is not defined.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano Wed, 5 Apr 2006 19:45:17 +0000 (12:45 -0700)

Merge git://git.kernel.org/pub/scm/gitk/gitk

* git://git.kernel.org/pub/scm/gitk/gitk:
[PATCH] Provide configurable UI font for gitk
[PATCH] gitk: Use git wrapper to run git-ls-remote.
[PATCH] gitk: add key bindings for selecting first and last commit
gitk: Add a help menu item to display key bindings
[PATCH] gitk: allow goto heads
gitk: replace parent and children arrays with lists

Merge branch 'jc/combine' into nextJunio C Hamano Wed, 5 Apr 2006 19:25:03 +0000 (12:25 -0700)

Merge branch 'jc/combine' into next

* jc/combine:
combine-diff: move the code to parse hunk-header into common library.

combine-diff: move the code to parse hunk-header into... Junio C Hamano Wed, 5 Apr 2006 19:22:35 +0000 (12:22 -0700)

combine-diff: move the code to parse hunk-header into common library.

Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge branches 'master' and 'jc/combine' into nextJunio C Hamano Wed, 5 Apr 2006 09:58:14 +0000 (02:58 -0700)

Merge branches 'master' and 'jc/combine' into next

* master:
Add git-clean command
diff_flush(): leakfix.
parse_date(): fix parsing 03/10/2006

* jc/combine:
combine-diff: refactor built-in xdiff interface.

Add git-clean commandPavel Roskin Wed, 5 Apr 2006 06:00:48 +0000 (02:00 -0400)

Add git-clean command

This command removes untracked files from the working tree. This
implementation is based on cg-clean with some simplifications. The
documentation is included.

[jc: with trivial documentation fix, noticed by Jakub Narebski]

Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge branch 'fix'Junio C Hamano Wed, 5 Apr 2006 09:50:54 +0000 (02:50 -0700)

Merge branch 'fix'

* fix:
diff_flush(): leakfix.
parse_date(): fix parsing 03/10/2006

diff_flush(): leakfix.Junio C Hamano Wed, 5 Apr 2006 09:06:49 +0000 (02:06 -0700)

diff_flush(): leakfix.

We were leaking filepairs when output-format was set to
NO_OUTPUT.

Signed-off-by: Junio C Hamano <junkio@cox.net>

combine-diff: refactor built-in xdiff interface.Junio C Hamano Wed, 5 Apr 2006 09:03:58 +0000 (02:03 -0700)

combine-diff: refactor built-in xdiff interface.

This refactors the line-by-line callback mechanism used in
combine-diff so that other programs can reuse it more easily.

Signed-off-by: Junio C Hamano <junkio@cox.net>

parse_date(): fix parsing 03/10/2006Junio C Hamano Wed, 5 Apr 2006 05:57:15 +0000 (22:57 -0700)

parse_date(): fix parsing 03/10/2006

The comment associated with the date parsing code for three
numbers separated with slashes or dashes implied we wanted to
interpret using this order:

yyyy-mm-dd
yyyy-dd-mm
mm-dd-yy
dd-mm-yy

However, the actual code had the last two wrong, and making it
prefer dd-mm-yy format over mm-dd-yy.

Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge branch 'nh/http' into nextJunio C Hamano Wed, 5 Apr 2006 01:13:54 +0000 (18:13 -0700)

Merge branch 'nh/http' into next

* nh/http:
http-fetch: add optional DAV-based pack list
cvsimport: use git-update-ref when updating

http-fetch: add optional DAV-based pack listNick Hengeveld Tue, 4 Apr 2006 12:33:18 +0000 (05:33 -0700)

http-fetch: add optional DAV-based pack list

If git is not built with NO_EXPAT, this patch changes git-http-fetch to
attempt using DAV to get a list of remote packs and fall back to using
objects/info/packs if the DAV request fails.

Signed-off-by: Nick Hengeveld <nickh@reactrix.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

[PATCH] Provide configurable UI font for gitkKeith Packard Tue, 4 Apr 2006 07:19:45 +0000 (00:19 -0700)

[PATCH] Provide configurable UI font for gitk

This makes the font used in the UI elements of gitk configurable in the
same way the other fonts are. The default fonts used in the Xft build of
tk8.5 are particularily horrific, making this change more important
there.

Signed-off-by: Keith Packard <keithp@neko.keithp.com>
Acked-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Paul Mackerras <paulus@samba.org>

[PATCH] gitk: Use git wrapper to run git-ls-remote.Mark Wooding Tue, 4 Apr 2006 06:24:55 +0000 (23:24 -0700)

[PATCH] gitk: Use git wrapper to run git-ls-remote.

For some reason, the Cygwin Tcl's `exec' command has trouble running
scripts. Fix this by using the C `git' wrapper. Other GIT programs run
by gitk are written in C already, so we don't need to incur a
performance hit of going via the wrapper (which I'll bet isn't pretty
under Cygwin).

Signed-off-by: Mark Wooding <mdw@distorted.org.uk>
Acked-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Paul Mackerras <paulus@samba.org>

[PATCH] gitk: add key bindings for selecting first... Rutger Nijlunsing Wed, 5 Apr 2006 00:24:03 +0000 (10:24 +1000)

[PATCH] gitk: add key bindings for selecting first and last commit

For a keyboard addict like me some keys are still missing from
gitk. Especially a key to select a commit when no commit is selected,
like just after startup. While we're at it, complete the bindings for
moving the view seperately from the selected line. Currently, the up
and down keys act on the selected line while pageup and pagedown act
on the commits viewed.

The idea is to have to normal keys change the selected line:
- Home selects first commit
- End selects last commit
- Up selects previous commit
- Down selects next commit
- PageUp moves selected line one page up
- PageDown moves selected line one page down
...and together with the Control key, it moves the commits view:
- Control-Home views first page of commits
- Control-End views last page of commits
- Control-Up moves commit view one line up
- Control-Down moves commit view one line down
- Control-PageUp moves commit view one page up
- Control-PageDown moves commit view one page down

Signed-off-By: Rutger Nijlunsing <gitk@tux.tmfweb.nl>
and with some cleanups and simplifications...
Signed-off-by: Paul Mackerras <paulus@samba.org>

Merge branch 'pb/regex' into nextJunio C Hamano Wed, 5 Apr 2006 00:15:02 +0000 (17:15 -0700)

Merge branch 'pb/regex' into next

* pb/regex:
On some platforms, certain headers need to be included before regex.h

On some platforms, certain headers need to be included... Johannes Schindelin Tue, 4 Apr 2006 23:01:03 +0000 (01:01 +0200)

On some platforms, certain headers need to be included before regex.h

Happily, these are already included in cache.h, which is included anyway...
so: change the order of includes.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>

cvsimport: use git-update-ref when updatingJohannes Schindelin Thu, 30 Mar 2006 12:06:15 +0000 (14:06 +0200)

cvsimport: use git-update-ref when updating

This simplifies code, and also fixes a subtle bug: when importing in a
shared repository, where another user last imported from CVS, cvsimport
used to complain that it could not open <branch> for update.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>

gitk: Add a help menu item to display key bindingsPaul Mackerras Tue, 4 Apr 2006 23:39:51 +0000 (09:39 +1000)

gitk: Add a help menu item to display key bindings

Suggested by Paul Schulz. I made it a separate entry under the Help
menu rather than putting it in the About box, though.

Signed-off-by: Paul Mackerras <paulus@samba.org>

[PATCH] gitk: allow goto headsStephen Rothwell Thu, 30 Mar 2006 05:13:12 +0000 (16:13 +1100)

[PATCH] gitk: allow goto heads

This patch allows you to enter a head name in the SHA1 id: field.

It also removes some unnecessary global declarations.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>

Merge branch 'jc/combine' into nextJunio C Hamano Tue, 4 Apr 2006 22:00:34 +0000 (15:00 -0700)

Merge branch 'jc/combine' into next

* jc/combine:
combine-diff: use built-in xdiff.
GIT 1.3.0-rc2
Set HTTP user agent to git/GIT_VERSION
git-ls-remote: send no-cache header when fetching info/refs

combine-diff: use built-in xdiff.Junio C Hamano Tue, 4 Apr 2006 01:53:15 +0000 (18:53 -0700)

combine-diff: use built-in xdiff.

Now there is no GNU diff invocations, except the one from
blame.c

Signed-off-by: Junio C Hamano <junkio@cox.net>

GIT 1.3.0-rc2 v1.3.0-rc2Junio C Hamano Tue, 4 Apr 2006 21:52:53 +0000 (14:52 -0700)

GIT 1.3.0-rc2

Bunch of cleanups with a few notable enhancements since
1.3.0-rc1:

- revision traversal infrastructure is updated so that
existence of paths limiters and/or --max-age does not cause
it to call limit_list(). This helps the latency working with
the command quite a bit.

- comes with updated gitk.

One notable fix is to make sure that the IO is restarted upon
signal even on platforms whose default signal semantics is not
to do so. This is the fix for the notorious "clone is broken
since 1.2.2 on Solaris" problem.

Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge in xdiff cleanup piecesJunio C Hamano Tue, 4 Apr 2006 21:43:57 +0000 (14:43 -0700)

Merge in xdiff cleanup pieces

Set HTTP user agent to git/GIT_VERSIONNick Hengeveld Tue, 4 Apr 2006 17:11:29 +0000 (10:11 -0700)

Set HTTP user agent to git/GIT_VERSION

Useful for diagnostics/troubleshooting to know which client versions are
hitting your server.

Signed-off-by: Nick Hengeveld <nickh@reactrix.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

git-ls-remote: send no-cache header when fetching info... Nick Hengeveld Tue, 4 Apr 2006 18:01:30 +0000 (11:01 -0700)

git-ls-remote: send no-cache header when fetching info/refs

Proxies should not cache this file as it can cause a client to end up with
a stale version, as reported here:

http://marc.theaimsgroup.com/?l=git&m=114407944125389

Signed-off-by: Nick Hengeveld <nickh@reactrix.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge branch 'pb/regex' into nextJunio C Hamano Tue, 4 Apr 2006 20:45:29 +0000 (13:45 -0700)

Merge branch 'pb/regex' into next

* pb/regex:
Support for pickaxe matching regular expressions

Support for pickaxe matching regular expressionsPetr Baudis Wed, 29 Mar 2006 00:16:33 +0000 (02:16 +0200)

Support for pickaxe matching regular expressions

git-diff-* --pickaxe-regex will change the -S pickaxe to match
POSIX extended regular expressions instead of fixed strings.

The regex.h library is a rather stupid interface and I like pcre too, but
with any luck it will be everywhere we will want to run Git on, it being
POSIX.2 and all. I'm not sure if we can expect platforms like AIX to
conform to POSIX.2 or if win32 has regex.h. We might add a flag to
Makefile if there is a portability trouble potential.

Signed-off-by: Petr Baudis <pasky@suse.cz>