gitweb.git
t4013: add tests for log -p -m --first-parentJunio C Hamano Tue, 9 Mar 2010 05:11:40 +0000 (21:11 -0800)

t4013: add tests for log -p -m --first-parent

Signed-off-by: Junio C Hamano <gitster@pobox.com>

git log -p -m: document -m and honor --first-parentPetr Baudis Wed, 10 Feb 2010 01:11:49 +0000 (02:11 +0100)

git log -p -m: document -m and honor --first-parent

git log -p -m is used to show one merge entry per parent, with an
appropriate diff; this can be useful when examining histories where
full set of changes introduced by a merged branch is interesting, not
only the conflicts.

This patch properly documents the -m switch, which has so far been
mentioned only as a fairly special diff-tree flag.

It also makes the code show full patch entry only for the first parent
when --first-parent is used. Thus:

git log -p -m --first-parent

will show the history from the "main branch perspective", while also
including full diff of changes introduced by other merged in branches.

Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge git://repo.or.cz/git-gui v1.7.0-rc2Junio C Hamano Sun, 7 Feb 2010 23:52:28 +0000 (15:52 -0800)

Merge git://repo.or.cz/git-gui

* git://repo.or.cz/git-gui:
git-gui: update french translation
git-gui: update Japanese translation
git-gui: fix shortcut for menu "Commit/Revert Changes"
git-gui: Quote git path when starting another gui in a submodule
git-gui: update Italian translation
git-gui: Update Swedish translation (520t0f0u)
git-gui: use themed tk widgets with Tk 8.5
git-gui: Update German translation (12 new or changed strings).
git-gui: Update translation template
git-gui: Remove unused icon file_parttick
git-gui: use different icon for new and modified files in the index
git-gui: set GIT_DIR and GIT_WORK_TREE after setup
git-gui: update shortcut tools to use _gitworktree
git-gui: handle bare repos correctly
git-gui: handle non-standard worktree locations
git-gui: Support applying a range of changes at once
git-gui: Add a special diff popup menu for submodules
git-gui: Use git diff --submodule when available

Merge branch 'maint'Junio C Hamano Sun, 7 Feb 2010 23:52:12 +0000 (15:52 -0800)

Merge branch 'maint'

* maint:
archive: simplify archive format guessing

archive: simplify archive format guessingRené Scharfe Sun, 7 Feb 2010 23:30:20 +0000 (00:30 +0100)

archive: simplify archive format guessing

The code to guess an output archive's format consumed any --format
options and built a new one. Jonathan noticed that it does so in an
unsafe way, risking to overflow the static buffer fmt_opt.

Change the code to keep the existing --format options intact and to only
add a new one if a format could be guessed based on the output file name.
The new option is added as the first one, allowing the existing ones to
overrule it, i.e. explicit --format options given on the command line win
over format guesses, as before.

To simplify the code further, format_from_name() is changed to return the
full --format option, thus no potentially dangerous sprintf() calls are
needed any more.

Reported-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Fix invalid read in quote_c_style_countedJeff King Mon, 1 Feb 2010 13:39:03 +0000 (08:39 -0500)

Fix invalid read in quote_c_style_counted

This function did not work on strings that were not NUL-terminated. It
reads through a length-bounded string, searching for characters in need of
quoting. After we find one, we output the quoted character, then advance
our pointer to find the next one. However, we never decremented the
length, meaning we ended up looking at whatever random junk was stored
after the string.

This bug was not found by the existing tests because most code paths feed
a NUL-terminated string. The notable exception is a directory name being
fed by ls-tree.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

docs: fix filter-branch example for quoted pathsJeff King Mon, 1 Feb 2010 12:43:45 +0000 (07:43 -0500)

docs: fix filter-branch example for quoted paths

If there is a quoted path, update-index will correctly
unquote it. However, we must take care to put our new prefix
inside the double-quote.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t9501: Re-fix max load testBrian Gernhardt Sat, 6 Feb 2010 14:50:03 +0000 (09:50 -0500)

t9501: Re-fix max load test

Revert the previous attempt to skip this test on platforms where we
currently cannot determine the system load. We want to make sure that
the max-load-limit codepath produces results cleanly, when gitweb is
updated and becomes capable of reading the load average by some other
method.

The code to check for load returns 0 if it doesn't know how to find
load. It also checks to see if the current load is higher than the
max load. So to force the script to quit early by setting the maxload
variable negative which should work for systems where we can detect
load (which should be a positive number) and systems where we can't
(where detected load is 0)

Signed-off-by: Brian Gernhardt <brian@gernhardtsoftware.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

bash: support the --autosquash option for rebaseBjörn Gustavsson Sat, 6 Feb 2010 08:37:53 +0000 (09:37 +0100)

bash: support the --autosquash option for rebase

Signed-off-by: Björn Gustavsson <bgustavsson@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano Sat, 6 Feb 2010 05:22:59 +0000 (21:22 -0800)

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

* git://git.kernel.org/pub/scm/gitk/gitk:
gitk: Fix copyright symbol in About box message

t9501: Skip testing load if we can't detect itBrian Gernhardt Sat, 6 Feb 2010 05:00:40 +0000 (00:00 -0500)

t9501: Skip testing load if we can't detect it

Currently gitweb only knows how to check for load using /proc/loadavg,
which isn't available on all systems. We shouldn't fail the test just
because we don't know how to check the system load.

Signed-off-by: Brian Gernhardt <brian@gernhardtsoftware.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Update draft release notes to 1.7.0Junio C Hamano Sat, 6 Feb 2010 00:36:56 +0000 (16:36 -0800)

Update draft release notes to 1.7.0

Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'maint'Junio C Hamano Sat, 6 Feb 2010 00:34:00 +0000 (16:34 -0800)

Merge branch 'maint'

* maint:
Update git fsck --full short description to mention packs

Update git fsck --full short description to mention... Wesley J. Landaker Fri, 5 Feb 2010 19:58:50 +0000 (12:58 -0700)

Update git fsck --full short description to mention packs

The '--full' option to git fsck does two things:

1) Check objects in packs
2) Check alternate objects

This is documented in the git fsck manual; this patch reflects that in
the short git fsck option help message as well.

Signed-off-by: Wesley J. Landaker <wjl@icecavern.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'jc/maint-limit-note-output' into maintJunio C Hamano Fri, 5 Feb 2010 18:59:05 +0000 (10:59 -0800)

Merge branch 'jc/maint-limit-note-output' into maint

* jc/maint-limit-note-output:
Fix "log --oneline" not to show notes
Fix "log" family not to be too agressive about showing notes

Revert 30816237 and 7e62265Junio C Hamano Fri, 5 Feb 2010 17:20:01 +0000 (09:20 -0800)

Revert 30816237 and 7e62265

It seems that we have bad interaction with the code related to
GIT_WORK_TREE and "grep --no-index", and broke running grep inside
the .git directory. For now, just revert it and resurrect it after
1.7.0 ships.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-svn: persistent memoizationAndrew Myrick Sat, 30 Jan 2010 03:14:22 +0000 (03:14 +0000)

git-svn: persistent memoization

Make memoization of the svn:mergeinfo processing functions persistent with
Memoize::Storable so that the memoization tables don't need to be regenerated
every time the user runs git-svn fetch.

The Memoize::Storable hashes are stored in ENV{GIT_DIR}/svn/.caches.

[ew: changed caches path to avoid conflicts with old repos]
[ew: File::Path::{make_path => mkpath} for compatibility]
[ew: line-wrapped at 80 chars]

Acked-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Andrew Myrick <amyrick@apple.com>

fast-import: count --max-pack-size in bytesJunio C Hamano Thu, 4 Feb 2010 19:10:44 +0000 (11:10 -0800)

fast-import: count --max-pack-size in bytes

Similar in spirit to 07cf0f2 (make --max-pack-size argument to 'git
pack-object' count in bytes, 2010-02-03) which made the option by the same
name to pack-objects, this counts the pack size limit in bytes.

In order not to cause havoc with people used to the previous megabyte
scale an integer smaller than 8192 is interpreted in megabytes but the
user gets a warning. Also a minimum size of 1 MiB is enforced to avoid an
explosion of pack files.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
Acked-by: Shawn O. Pearce <spearce@spearce.org>
Acked-by: Nicolas Pitre <nico@fluxnic.net>

update git-repack documentation wrt repack.UseDeltaBase... Nicolas Pitre Thu, 4 Feb 2010 21:19:35 +0000 (16:19 -0500)

update git-repack documentation wrt repack.UseDeltaBaseOffset

This default for repack.UseDeltaBaseOffset has been "true" since
Git v1.6.0.

Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-clean: fix the description of the default behaviorMichael J Gruber Thu, 4 Feb 2010 16:01:16 +0000 (17:01 +0100)

git-clean: fix the description of the default behavior

Currently, when called without -n and -f, git clean issues

fatal: clean.requireForce not set and -n or -f not given; refusing to clean

which leaves the user wondering why force is required when requireForce
is not set. Looking up in git-clean(1) does not help because its
description is wrong.

Change it so that git clean issues

fatal: clean.requireForce defaults to true and -n or -f not given; refusing to clean

in this situation (and "...set to true..." when it is set) which makes
it clearer that an unset config means true here, and adjust the
documentation.

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

fast-import.c: Fix big-file-threshold parsing bugJunio C Hamano Thu, 4 Feb 2010 02:27:08 +0000 (18:27 -0800)

fast-import.c: Fix big-file-threshold parsing bug

Manual merge made at 844ad3d (Merge branch 'sp/maint-fast-import-large-blob'
into sp/fast-import-large-blob, 2010-02-01) did not correctly reflect the change
of unit in which this variable's value is counted from its previous version.

Now it counts in bytes, not in megabytes.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
Acked-by: Shawn O. Pearce <spearce@spearce.org>

make --max-pack-size argument to 'git pack-object'... Nicolas Pitre Thu, 4 Feb 2010 03:48:28 +0000 (22:48 -0500)

make --max-pack-size argument to 'git pack-object' count in bytes

The value passed to --max-pack-size used to count in MiB which was
inconsistent with the corresponding configuration variable as well as
other command arguments which are defined to count in bytes with an
optional unit suffix. This brings --max-pack-size in line with the
rest of Git.

Also, in order not to cause havoc with people used to the previous
megabyte scale, and because this is a sane thing to do anyway, a
minimum size of 1 MiB is enforced to avoid an explosion of pack files.

Adjust and extend test suite accordingly.

Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

pack-objects: fix pack generation when using pack_size_... Nicolas Pitre Thu, 4 Feb 2010 03:48:27 +0000 (22:48 -0500)

pack-objects: fix pack generation when using pack_size_limit

Current handling of pack_size_limit is quite suboptimal. Let's consider
a list of objects to pack which contain alternatively big and small
objects (which pretty matches reality when big blobs are interlaced
with tree objects). Currently, the code simply close the pack and opens
a new one when the next object in line breaks the size limit.

The current code may degenerate into:

- small tree object => store into pack #1
- big blob object busting the pack size limit => store into pack #2
- small blob but pack #2 is over the limit already => pack #3
- big blob busting the size limit => pack #4
- small tree but pack #4 is over the limit => pack #5
- big blob => pack #6
- small tree => pack #7
- ... and so on.

The reality is that the content of packs 1, 3, 5 and 7 could well be
stored more efficiently (and delta compressed) together in pack #1 if
the big blobs were not forcing an immediate transition to a new pack.

Incidentally this can be fixed pretty easily by simply skipping over
those objects that are too big to fit in the current pack while trying
the whole list of unwritten objects, and then that list considered from
the beginning again when a new pack is opened. This creates much fewer
smallish pack files and help making more predictable test cases for the
test suite.

This change made one of the self sanity checks useless so it is removed
as well. That check was rather redundant already anyway.

Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

fix multiple issues with t5300Nicolas Pitre Thu, 4 Feb 2010 03:48:26 +0000 (22:48 -0500)

fix multiple issues with t5300

First of all, trying to run 'git verify-pack' on packs produced by
the tests using pack.packSizeLimit always failed. After lots of digging
and head scratching, it turns out that the preceeding test simulating
a SHA1 collision did leave the repository quite confused, impacting
subsequent tests.

So let's move that destructive test last, and add tests to run
verify-pack on the output from those packSizeLimit tests to catch such
goofage.

Finally, group those packSizeLimit tests together.

Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

gitweb: Simplify (and fix) chop_strJohn 'Warthog9' Hawley Wed, 3 Feb 2010 11:28:28 +0000 (12:28 +0100)

gitweb: Simplify (and fix) chop_str

The chop_str subroutine is meant to be used on strings (such as commit
description / title) *before* HTML escaping, which means before
applying esc_html or equivalent.

Therefore get rid of the failed attempt to always remove full HTML
entities (like e.g. &amp; or &nbsp;). It is not necessary (HTML
entities gets added later), and it can cause chop_str to chop a string
incorrectly.

Specifically:

API & protocol: support option to force written data immediately to disk

from http://git.kernel.org/?p=daemon/distsrv/chunkd.git;a=commit;h=3b02f749df2cb1288f345a689d85e7061f507e54

The short version of the title gets chopped to

API ...

where it should be

API & protocol: support option to force written data...

Noticed-by: John 'Warthog9' Hawley <warthog9@kernel.org>
Signed-off-by: John 'Warthog9' Hawley <warthog9@kernel.org>
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

gitk: Fix copyright symbol in About box messagePaul Mackerras Wed, 3 Feb 2010 21:49:00 +0000 (08:49 +1100)

gitk: Fix copyright symbol in About box message

Somehow it got corrupted in commit d93f1713 ("gitk: Use themed tk
widgets").

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

grep: simplify assignment of ->fixedRené Scharfe Wed, 3 Feb 2010 18:16:30 +0000 (19:16 +0100)

grep: simplify assignment of ->fixed

After 885d211e, the value of the ->fixed pattern option only depends on
the grep option of the same name. Regex flags don't matter any more,
because fixed mode and regex mode are strictly separated. Thus we can
simply copy the value from struct grep_opt to struct grep_pat, as we do
already for ->word_regexp and ->ignore_case.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'ms/filter-branch-submodule'Junio C Hamano Wed, 3 Feb 2010 05:48:34 +0000 (21:48 -0800)

Merge branch 'ms/filter-branch-submodule'

* ms/filter-branch-submodule:
filter-branch: Add tests for submodules in tree-filter
filter-branch: Fix to allow replacing submodules with another content

Merge branch 'jh/gitweb-caching' (early part)Junio C Hamano Wed, 3 Feb 2010 05:48:22 +0000 (21:48 -0800)

Merge branch 'jh/gitweb-caching' (early part)

* 'jh/gitweb-caching' (early part):
gitweb: Add optional extra parameter to die_error, for extended explanation
gitweb: add a "string" variant of print_sort_th
gitweb: add a "string" variant of print_local_time
gitweb: Check that $site_header etc. are defined before using them
gitweb: Makefile improvements
gitweb: Load checking
gitweb: Make running t9501 test with '--debug' reliable and usable

Merge branch 'bw/no-python-autoconf'Junio C Hamano Wed, 3 Feb 2010 05:48:13 +0000 (21:48 -0800)

Merge branch 'bw/no-python-autoconf'

* bw/no-python-autoconf:
configure: Allow --without-python
configure: Allow GIT_ARG_SET_PATH to handle --without-PROGRAM

Merge branch 'sp/fast-import-large-blob'Junio C Hamano Wed, 3 Feb 2010 05:47:51 +0000 (21:47 -0800)

Merge branch 'sp/fast-import-large-blob'

* sp/fast-import-large-blob:
fast-import: Stream very large blobs directly to pack

Correct spelling of 'REUC' extensionShawn O. Pearce Tue, 2 Feb 2010 15:33:28 +0000 (07:33 -0800)

Correct spelling of 'REUC' extension

The new dircache extension CACHE_EXT_RESOLVE_UNDO, whose value is
0x52455543, is actually the ASCII sequence 'REUC', not the ASCII
sequence 'REUN'.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-gui: update french translationEmmanuel Trillaud Tue, 2 Feb 2010 11:59:34 +0000 (12:59 +0100)

git-gui: update french translation

Signed-off-by: Emmanuel Trillaud <etrillaud@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

git-gui: update Japanese translationNanako Shiraishi Tue, 2 Feb 2010 10:20:21 +0000 (19:20 +0900)

git-gui: update Japanese translation

Update ja.po to match 2010-01-26 version of pot file.

Signed-off-by: しらいし ななこ <nanako3@lavabit.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

build: make code "-Wpointer-arith" cleanJunio C Hamano Tue, 2 Feb 2010 06:04:03 +0000 (22:04 -0800)

build: make code "-Wpointer-arith" clean

Recently introduced resolve_undo_read() expected arithmetic to (void *)
to work on byte-addresses. Correct this.

Noticed by Brandon Casey.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

configure: Allow --without-pythonBen Walton Mon, 1 Feb 2010 02:15:05 +0000 (21:15 -0500)

configure: Allow --without-python

This patch allows someone to use configure to build git while at the
same time disabling the python remote helper code. It leverages the
ability of GIT_ARG_SET_PATH to accept an optional second argument
indicating that --without-$PROGRAM is acceptable.

Signed-off-by: Ben Walton <bwalton@artsci.utoronto.ca>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

configure: Allow GIT_ARG_SET_PATH to handle --without... Ben Walton Mon, 1 Feb 2010 02:15:04 +0000 (21:15 -0500)

configure: Allow GIT_ARG_SET_PATH to handle --without-PROGRAM

Add an optional second argument to both GIT_ARG_SET_PATH and
GIT_CONF_APPEND_PATH such that any value of the second argument will
enable configure to set NO_$PROGRAM in addition to an empty
$PROGRAM_PATH. This is initially useful for allowing configure to
disable the use of python, as the remote helper code has nothing
leveraging it yet.

The Makefile already recognizes NO_PYTHON, but configure provided no
way to set it appropriately.

Signed-off-by: Ben Walton <bwalton@artsci.utoronto.ca>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'sp/maint-fast-import-large-blob' into... Junio C Hamano Mon, 1 Feb 2010 20:41:31 +0000 (12:41 -0800)

Merge branch 'sp/maint-fast-import-large-blob' into sp/fast-import-large-blob

* sp/maint-fast-import-large-blob:
fast-import: Stream very large blobs directly to pack
bash: don't offer remote transport helpers as subcommands

Conflicts:
fast-import.c

fast-import: Stream very large blobs directly to packShawn O. Pearce Mon, 1 Feb 2010 17:27:35 +0000 (09:27 -0800)

fast-import: Stream very large blobs directly to pack

If a blob is larger than the configured big-file-threshold, instead
of reading it into a single buffer obtained from malloc, stream it
onto the end of the current pack file. Streaming the larger objects
into the pack avoids the 4+ GiB memory footprint that occurs when
fast-import is processing 2+ GiB blobs.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-p4: Fix sync errors due to new server versionPal-Kristian Engstad Fri, 22 Jan 2010 02:33:00 +0000 (18:33 -0800)

git-p4: Fix sync errors due to new server version

Fix sync errors due to new Perforce servers.

The P4D/NTX64/2009.2/228098 (2009/12/16) server reports
'move/delete' instead of 'delete'. This causes the Perforce
depot and the git repo to get out of sync. Fixed by adding
the new status string.

Signed-off-by: Pal-Kristian Engstad <pal_engstad@naughtydog.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Updates for dirty submodules in release notes and user... Jens Lehmann Mon, 1 Feb 2010 18:09:39 +0000 (19:09 +0100)

Updates for dirty submodules in release notes and user manual

In the release notes "git status" was not mentioned, also shortly explain
the "-dirty" output generated by diff.

Added a paragraph to the "Pitfalls with submodules" section in
user-manual.txt describing new and old behavior of "git status" and "git
diff" for dirty submodules.

Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Update draft release notes to 1.7.0Junio C Hamano Sun, 31 Jan 2010 20:20:30 +0000 (12:20 -0800)

Update draft release notes to 1.7.0

Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'dm/make-threaded-simplify'Junio C Hamano Sun, 31 Jan 2010 20:09:35 +0000 (12:09 -0800)

Merge branch 'dm/make-threaded-simplify'

* dm/make-threaded-simplify:
Make NO_PTHREADS the sole thread configuration variable

Make NO_PTHREADS the sole thread configuration variableDan McGee Sat, 30 Jan 2010 01:22:19 +0000 (19:22 -0600)

Make NO_PTHREADS the sole thread configuration variable

When the first piece of threaded code was introduced in commit 8ecce684, it
came with its own THREADED_DELTA_SEARCH Makefile option. Since this time,
more threaded code has come into the codebase and a NO_PTHREADS option has
also been added. Get rid of the original option as the newer, more generic
option covers everything we need.

Signed-off-by: Dan McGee <dpmcgee@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

RPM packaging: use %global inside %{!?...}Junio C Hamano Sun, 31 Jan 2010 19:11:16 +0000 (11:11 -0800)

RPM packaging: use %global inside %{!?...}

According to
https://www.redhat.com/archives/fedora-devel-list/2010-January/msg00093.html

scope of %define lasts until the end brace; earlier RPM up to Fedora 12
didn't necessarily honor the scope, but later versions corrected the bug.

Problem and solution both pointed out by Todd Zullinger.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

mention new shell execution behavior in release notesJeff King Sun, 31 Jan 2010 09:14:46 +0000 (04:14 -0500)

mention new shell execution behavior in release notes

This is already in the "bells and whistles" section, but it also has a
slight chance of breakage, so let's also mention it in the "changed
behaviors" section.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Fix memory leak in submodule.cJens Lehmann Sun, 31 Jan 2010 16:43:49 +0000 (17:43 +0100)

Fix memory leak in submodule.c

The strbuf used in add_submodule_odb() was never released. So for every
submodule - populated or not - we leaked its object directory name when
using "git diff*" with the --submodule option.

Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Fix typos in technical documentation.Ralf Wildenhues Sun, 31 Jan 2010 13:24:39 +0000 (14:24 +0100)

Fix typos in technical documentation.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

gitweb: Add optional extra parameter to die_error,... John 'Warthog9' Hawley Sat, 30 Jan 2010 22:30:44 +0000 (23:30 +0100)

gitweb: Add optional extra parameter to die_error, for extended explanation

Add a 3rd, optional, parameter to die_error to allow for extended error
information to be output along with what the error was.

Signed-off-by: John 'Warthog9' Hawley <warthog9@kernel.org>
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

gitweb: add a "string" variant of print_sort_thJohn 'Warthog9' Hawley Sat, 30 Jan 2010 22:30:43 +0000 (23:30 +0100)

gitweb: add a "string" variant of print_sort_th

Add a function (named format_sort_th) that returns the string that
print_sort_th would print.

Signed-off-by: John 'Warthog9' Hawley <warthog9@kernel.org>
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

gitweb: add a "string" variant of print_local_timeJohn 'Warthog9' Hawley Sat, 30 Jan 2010 22:30:42 +0000 (23:30 +0100)

gitweb: add a "string" variant of print_local_time

Add a function (named format_local_time) that returns the string that
print_local_time would print.

Signed-off-by: John 'Warthog9' Hawley <warthog9@kernel.org>
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

gitweb: Check that $site_header etc. are defined before... John 'Warthog9' Hawley Sat, 30 Jan 2010 22:30:41 +0000 (23:30 +0100)

gitweb: Check that $site_header etc. are defined before using them

If one of $site_header, $site_footer or $home_text is not defined, you
get extraneous errors in the web logs, for example (line wrapped for
better readibility):

[Wed Jan 13 16:55:42 2010] [error] [client ::1] [Wed Jan 13 16:55:42 2010]
gitweb.cgi: Use of uninitialized value $site_header in -f at
/var/www/gitweb/gitweb.cgi line 3287., referer: http://git/gitweb.cgi

This ensures that those variables are defined before trying to use it.

Note that such error can happen only because of an error in gitweb
config file; building gitweb.cgi can make mentioned variables holding
empty string (it is even the default), but they are still defined.

Signed-off-by: John 'Warthog9' Hawley <warthog9@kernel.org>
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

gitweb: Makefile improvementsJohn 'Warthog9' Hawley Sat, 30 Jan 2010 22:30:40 +0000 (23:30 +0100)

gitweb: Makefile improvements

Adjust the main Makefile so you can simply run

make gitweb

which in turn calls gitweb/Makefile. This means that in order to
generate gitweb, you can simply run 'make' from gitweb subdirectory:

cd gitweb
make

Targets gitweb/gitweb.cgi and (dependent on JSMIN being defined)
gitweb/gitweb.min.js in main Makefile are preserved for backward
compatibility.

Signed-off-by: John 'Warthog9' Hawley <warthog9@kernel.org>
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

gitweb: Load checkingJohn 'Warthog9' Hawley Sat, 30 Jan 2010 22:30:39 +0000 (23:30 +0100)

gitweb: Load checking

This changes slightly the behavior of gitweb, so that it verifies
that the box isn't inundated with before attempting to serve gitweb.
If the box is overloaded, it basically returns a 503 Server Unavailable
until the load falls below the defined threshold. This helps dramatically
if you have a box that's I/O bound, reaches a certain load and you
don't want gitweb, the I/O hog that it is, increasing the pain the
server is already undergoing.

This behavior is controlled by $maxload configuration variable.
Default is a load of 300, which for most cases should never be hit.
Unset it (set it to undefined value, i.e. undef) to turn off checking.

Currently it requires that '/proc/loadavg' file exists, otherwise the
load check is bypassed (load is taken to be 0). So platforms that do
not implement '/proc/loadavg' currently cannot use this feature
(provisions are included for additional checks to be added by others).

There is simple test in t/t9501-gitweb-standalone-http-status.sh to
check that it correctly returns "503 Service Unavailable" if load is
too high, and also if there are any Perl warnings or errors.

Signed-off-by: John 'Warthog9' Hawley <warthog9@kernel.org>
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

gitweb: Make running t9501 test with '--debug' reliable... Jakub Narebski Sat, 30 Jan 2010 22:30:38 +0000 (23:30 +0100)

gitweb: Make running t9501 test with '--debug' reliable and usable

Remove test_debug lines after 'snapshots: tgz only default format
enabled' and 'snapshots: all enabled in default, use default disabled
value' tests. Those tests constitute of multiple gitweb_run
invocation, therefore outputting gitweb.output for the last gitweb_run
wouldn't help much in debugging test failure, and can only confuse.

For snapshot tests which check for "200 OK" status, change
test_debug 'cat gitweb.output'
to
test_debug 'cat gitweb.headers'
Otherwise when running this test with '--debug' option,
t/t9501-gitweb-standalone-http-status.sh would dump *binary data* (the
snapshot itself) to standard output, which can mess up state of terminal
due to term control characters which can be embedded in output.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

is_submodule_modified(): fix breakage with external... v1.7.0-rc1Junio C Hamano Sat, 30 Jan 2010 20:08:26 +0000 (12:08 -0800)

is_submodule_modified(): fix breakage with external GIT_INDEX_FILE

Even when the environment was given for the top-level process, checking
in the submodule work tree should use the index file associated with the
work tree of the submodule. Do not export it to the environment.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

RPM packaging: don't include foreign-scm-helper bits yetJunio C Hamano Sat, 30 Jan 2010 17:45:11 +0000 (09:45 -0800)

RPM packaging: don't include foreign-scm-helper bits yet

The files in /usr/lib/python* are only the support infrastructure for
foreign scm interface yet to be written and/or shipped with git. Don't
include them in the binary package (this will also free us from Python
dependency).

When we ship with foreign scm interface, we will need to package these
files with it in a separate subpackage, but we are not there yet.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

grep: Fix two memory leaksDan McGee Sat, 30 Jan 2010 15:42:58 +0000 (09:42 -0600)

grep: Fix two memory leaks

We duplicate the grep_opt structure when using grep threads, but didn't
later free either the patterns attached to this new structure or the
structure itself.

Signed-off-by: Dan McGee <dpmcgee@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

rebase: don't invoke the pager for each commit summaryMarkus Heidelberg Sat, 30 Jan 2010 16:23:37 +0000 (17:23 +0100)

rebase: don't invoke the pager for each commit summary

This regression was introduced by commit 0aa958d (rebase: replace
antiquated sed invocation, 2010-01-24), which changed the invocation of
"git rev-list | sed" to "git log".

It can be reproduced by something like this:
$ git rebase -s recursive origin/master

Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Update draft release notes to 1.7.0Junio C Hamano Sat, 30 Jan 2010 07:38:31 +0000 (23:38 -0800)

Update draft release notes to 1.7.0

Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'maint'Junio C Hamano Sat, 30 Jan 2010 07:36:17 +0000 (23:36 -0800)

Merge branch 'maint'

* maint:
fix memcpy of overlapping area

Merge branch 'maint-1.6.5' into maintJunio C Hamano Sat, 30 Jan 2010 07:36:13 +0000 (23:36 -0800)

Merge branch 'maint-1.6.5' into maint

* maint-1.6.5:
fix memcpy of overlapping area

Implement pthread_cond_broadcast on WindowsJohannes Sixt Fri, 29 Jan 2010 23:54:05 +0000 (00:54 +0100)

Implement pthread_cond_broadcast on Windows

See http://www.cse.wustl.edu/~schmidt/win32-cv-1.html, section "The
SignalObjectAndWait solution". But note that this implementation does not
use SignalObjectAndWait (which is needed to achieve fairness, but we do
not need fairness).

Note that our implementations of pthread_cond_broadcast and
pthread_cond_signal require that they are invoked with the mutex held that
is used in the pthread_cond_wait calls.

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

If deriving SVN_SSH from GIT_SSH on msys, also add... Sebastian Schuberth Sat, 23 Jan 2010 14:20:28 +0000 (15:20 +0100)

If deriving SVN_SSH from GIT_SSH on msys, also add quotes

In contrast to GIT_SSH, SVN_SSH requires quotes for paths that contain
spaces. As GIT_SSH will not work if it contains quotes, it is safe to
assume it never contains quotes. Also, adding quotes to SVN_SSH for paths
that do not contain spaces does no harm. So we always add quotes when
deriving SVN_SSH from GIT_SSH on msys.

This fixes msysGit issue 385, see
http://code.google.com/p/msysgit/issues/detail?id=385

Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano Fri, 29 Jan 2010 20:57:44 +0000 (12:57 -0800)

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

* git://git.kernel.org/pub/scm/gitk/gitk:
gitk: Update German translation
gitk: Add French translation
gitk: update Italian translation
gitk: Update Swedish translation
gitk: Adjust two equal strings which differed in whitespace
gitk: Display submodule diffs with appropriate encoding
gitk: Fix display of newly-created tags
gitk: Enable gitk to create tags with messages
gitk: Update Hungarian translation
gitk: Add Hungarian translation
gitk: Add "--no-replace-objects" option

add shebang line to git-mergetool--lib.shJeff King Fri, 29 Jan 2010 10:37:23 +0000 (05:37 -0500)

add shebang line to git-mergetool--lib.sh

Even though this script is expected to be sourced instead of
executed on its own, the #!/bin/sh line provides simple
documentation about what format the file is in.

In particular, the lack of such a line was confusing the
valgrind support of our test scripts, which assumed that any
executable without a #!-line should be intercepted and run
through valgrind. So during valgrind-enabled tests, any
script sourcing this file actually sourced the valgrind
interception script instead.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

fix off-by-one allocation errorJeff King Fri, 29 Jan 2010 10:31:30 +0000 (05:31 -0500)

fix off-by-one allocation error

Caught by valgrind in t5516. Reading the code shows we
malloc enough for our string, but not trailing NUL.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

fix memcpy of overlapping areaJeff King Fri, 29 Jan 2010 10:28:44 +0000 (05:28 -0500)

fix memcpy of overlapping area

Caught by valgrind in t5500, but it is pretty obvious from
reading the code that this is shifting elements of an array
to the left, which needs memmove.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'maint'Shawn O. Pearce Fri, 29 Jan 2010 15:58:56 +0000 (07:58 -0800)

Merge branch 'maint'

* maint:
git-gui: fix shortcut for menu "Commit/Revert Changes"

git-gui: fix shortcut for menu "Commit/Revert Changes"Heiko Voigt Fri, 29 Jan 2010 15:57:48 +0000 (16:57 +0100)

git-gui: fix shortcut for menu "Commit/Revert Changes"

The shortcut was not properly recognized previously.

Signed-off-by: Heiko Voigt <heiko.voigt@mahr.de>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

gitk: Update German translationChristian Stimming Fri, 29 Jan 2010 11:55:14 +0000 (22:55 +1100)

gitk: Update German translation

Signed-off-by: Christian Stimming <stimming@tuhh.de>
Signed-off-by: Paul Mackerras <paulus@samba.org>

gitk: Add French translationEmmanuel Trillaud Tue, 12 Jan 2010 13:02:50 +0000 (14:02 +0100)

gitk: Add French translation

Signed-off-by: Emmanuel Trillaud <etrillaud@gmail.com>
Signed-off-by: Thomas Moulard <thomas.moulard@gmail.com>
Signed-off-by: Guy Brand <gb@unistra.fr>
Signed-off-by: Nicolas Sebrecht <nicolas.s.dev@gmx.fr>
Signed-off-by: Paul Mackerras <paulus@samba.org>

gitk: update Italian translationMichele Ballabio Fri, 29 Jan 2010 11:51:28 +0000 (22:51 +1100)

gitk: update Italian translation

Signed-off-by: Michele Ballabio <barra_cuda@katamail.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>

gitk: Update Swedish translationPeter Krefting Fri, 29 Jan 2010 11:50:29 +0000 (22:50 +1100)

gitk: Update Swedish translation

Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
Signed-off-by: Paul Mackerras <paulus@samba.org>

git-gui: Quote git path when starting another gui in... Jens Lehmann Thu, 28 Jan 2010 21:20:39 +0000 (22:20 +0100)

git-gui: Quote git path when starting another gui in a submodule

In do_git_gui the path of the git executable has to be put into a
list, otherwise calling it will fail when when spaces are present
in its path.

Reported-by: Heiko Voigt <hvoigt@hvoigt.net>
Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

Merge branch 'maint'Junio C Hamano Thu, 28 Jan 2010 22:33:33 +0000 (14:33 -0800)

Merge branch 'maint'

* maint:
bash: don't offer remote transport helpers as subcommands

bash: support 'git notes' and its subcommandsSZEDER Gábor Thu, 28 Jan 2010 01:05:55 +0000 (02:05 +0100)

bash: support 'git notes' and its subcommands

... and it will offer refs unless after -m or -F, because these two
options require a non-ref argument.

Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
Acked-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

filter-branch: Add tests for submodules in tree-filterMichal Sojka Thu, 28 Jan 2010 09:08:47 +0000 (10:08 +0100)

filter-branch: Add tests for submodules in tree-filter

Add tests to make sure that:

1) a submodule can be removed and its content replaced with regular files
('rewrite submodule with another content'). This test passes only with
the previous patch applied.

2) it is possible to replace submodule revision by direct index
manipulation ('replace submodule revision'). Although it would be
better to run such a filter in --index-filter, this test shows that
this functionality is not broken by the previous patch. This succeeds
both with and without the previous patch.

Signed-off-by: Michal Sojka <sojkam1@fel.cvut.cz>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

filter-branch: Fix to allow replacing submodules with... Michal Sojka Thu, 28 Jan 2010 09:08:46 +0000 (10:08 +0100)

filter-branch: Fix to allow replacing submodules with another content

When git filter-branch is used to replace a submodule with another
content, it always fails on the first commit.

Consider a repository with submod directory containing a submodule. The
following command to remove the submodule and replace it with a file fails:

git filter-branch --tree-filter 'rm -rf submod &&
git rm -q submod &&
mkdir submod &&
touch submod/file'

with an error:

error: submod: is a directory - add files inside instead

The reason is that git diff-index, which generates the first part of the
list of files updated by the tree filter, emits also the removed submodule
even if it was replaced by a real directory.

Signed-off-by: Michal Sojka <sojkam1@fel.cvut.cz>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

bash: don't offer remote transport helpers as subcommandsSZEDER Gábor Fri, 22 Jan 2010 10:54:51 +0000 (11:54 +0100)

bash: don't offer remote transport helpers as subcommands

Since commits a2d725b7 (Use an external program to implement fetching
with curl, 2009-08-05) and c9e388bb (Make the
"traditionally-supported" URLs a special case, 2009-09-03) remote
transport helpers like 'remote-ftp' and 'remote-curl' are offered by the
completion script as available subcommands. Not good, since they are
helpers, therefore should not be offered, so filter them out.

Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
Acked-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

grep --quiet: finishing touchesJunio C Hamano Thu, 28 Jan 2010 20:33:42 +0000 (12:33 -0800)

grep --quiet: finishing touches

Name the option "--quiet" not "--quick", document it, and add tests.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

reject @{-1} not at beginning of object nameJeff King Thu, 28 Jan 2010 09:56:43 +0000 (04:56 -0500)

reject @{-1} not at beginning of object name

Something like foo@{-1} is nonsensical, as the @{-N} syntax
is reserved for "the Nth last branch", and is not an actual
reflog selector. We should not feed such nonsense to
approxidate at all.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

fix parsing of @{-1}@{u} combinationJeff King Thu, 28 Jan 2010 09:52:22 +0000 (04:52 -0500)

fix parsing of @{-1}@{u} combination

Previously interpret_branch_name would see @{-1} and stop
parsing, leaving the @{u} as cruft that provoked an error.
Instead, we should recurse if there is more to parse.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

test combinations of @{} syntaxJeff King Thu, 28 Jan 2010 09:50:20 +0000 (04:50 -0500)

test combinations of @{} syntax

Now that we have several different types of @{} syntax, it
is a good idea to test them together, which reveals some
failures.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

rerere: fix too-short initializationJeff King Thu, 28 Jan 2010 14:52:16 +0000 (09:52 -0500)

rerere: fix too-short initialization

This was caused by a typo in the sizeof parameter, and meant
we looked at uninitialized memory. Caught by valgrind in
t2030.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-gui: update Italian translationMichele Ballabio Mon, 7 Sep 2009 16:45:16 +0000 (18:45 +0200)

git-gui: update Italian translation

Signed-off-by: Michele Ballabio <barra_cuda@katamail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

git-gui: Update Swedish translation (520t0f0u)Peter Krefting Thu, 28 Jan 2010 12:57:34 +0000 (13:57 +0100)

git-gui: Update Swedish translation (520t0f0u)

Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

t0101: use absolute dateJeff King Thu, 28 Jan 2010 08:52:18 +0000 (03:52 -0500)

t0101: use absolute date

The original version used relative approxidates, which don't
reproduce as reliably as absolute ones. Commit 6c647a fixed
this for one case, but missed the "silly" case.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'fk/threaded-grep'Junio C Hamano Thu, 28 Jan 2010 08:46:45 +0000 (00:46 -0800)

Merge branch 'fk/threaded-grep'

* fk/threaded-grep:
Threaded grep
grep: expose "status-only" feature via -q

Merge branch 'gp/maint-cvsserver'Junio C Hamano Thu, 28 Jan 2010 08:46:33 +0000 (00:46 -0800)

Merge branch 'gp/maint-cvsserver'

* gp/maint-cvsserver:
git-cvsserver: allow regex metacharacters in CVSROOT

tests: update tests that used to failJunio C Hamano Thu, 28 Jan 2010 08:41:52 +0000 (00:41 -0800)

tests: update tests that used to fail

"diff --cc" output t4038 tests was fixed by b810cbb (diff --cc: a lost
line at the beginning of the file is shown incorrectly, 2009-07-22), which
was actually the commit that introduced this test..

An error in "git merge -s resolve" t6035 tests was fixed by 730f728
(unpack-trees.c: look ahead in the index, 2009-09-20).

Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-gui: use themed tk widgets with Tk 8.5Pat Thoyts Tue, 26 Jan 2010 00:05:31 +0000 (00:05 +0000)

git-gui: use themed tk widgets with Tk 8.5

This patch enables the use of themed Tk widgets with Tk 8.5 and above.
These make a significant difference on Windows in making the
application appear native. On Windows and MacOSX ttk defaults to the
native look as much as possible. On X11 the user may select a theme
using the TkTheme XRDB resource class by adding an line to the
.Xresources file. The set of installed theme names is available using
the Tk command 'ttk::themes'. The default on X11 is similar to the current
un-themed style - a kind of thin bordered motif look.

A new git config variable 'gui.usettk' may be set to disable this if
the user prefers the classic Tk look. Using Tk 8.4 will also avoid the
use of themed widgets as these are only available since 8.5.

Some support is included for Tk 8.6 features (themed spinbox and native
font chooser for MacOSX and Windows).

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

git-gui: Update German translation (12 new or changed... Christian Stimming Tue, 26 Jan 2010 21:26:45 +0000 (22:26 +0100)

git-gui: Update German translation (12 new or changed strings).

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

Merge branch 'jc/upstream-reflog'Junio C Hamano Wed, 27 Jan 2010 22:58:21 +0000 (14:58 -0800)

Merge branch 'jc/upstream-reflog'

* jc/upstream-reflog:
Fix log -g this@{upstream}

Merge branch 'jc/maint-reflog-bad-timestamp'Junio C Hamano Wed, 27 Jan 2010 22:57:37 +0000 (14:57 -0800)

Merge branch 'jc/maint-reflog-bad-timestamp'

* jc/maint-reflog-bad-timestamp:
t0101: use a fixed timestamp when searching in the reflog
Update @{bogus.timestamp} fix not to die()
approxidate_careful() reports errorneous date string

Merge branch 'il/maint-colon-address'Junio C Hamano Wed, 27 Jan 2010 22:56:42 +0000 (14:56 -0800)

Merge branch 'il/maint-colon-address'

* il/maint-colon-address:
Allow use of []-wrapped addresses in git://
Support addresses with ':' in git-daemon

Merge branch 'il/maint-xmallocz'Junio C Hamano Wed, 27 Jan 2010 22:56:38 +0000 (14:56 -0800)

Merge branch 'il/maint-xmallocz'

* il/maint-xmallocz:
Fix integer overflow in unpack_compressed_entry()
Fix integer overflow in unpack_sha1_rest()
Fix integer overflow in patch_delta()
Add xmallocz()

Merge branch 'jh/maint-config-file-prefix'Junio C Hamano Wed, 27 Jan 2010 22:56:25 +0000 (14:56 -0800)

Merge branch 'jh/maint-config-file-prefix'

* jh/maint-config-file-prefix:
builtin-config: Fix crash when using "-f <relative path>" from non-root dir

transport_get(): drop unnecessary check for !remoteJunio C Hamano Wed, 27 Jan 2010 20:22:37 +0000 (12:22 -0800)

transport_get(): drop unnecessary check for !remote

At the beginning of the function we make sure remote is not NULL, and
the remainder of the funciton already depends on it.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

Fix remote.<remote>.vcsIlari Liusvaara Wed, 27 Jan 2010 17:53:17 +0000 (19:53 +0200)

Fix remote.<remote>.vcs

remote.<remote>.vcs causes remote->foreign_vcs to be set on entry to
transport_get(). Unfortunately, the code assumed that any such entry
is stale from previous round.

Fix this by making VCS set by URL to be volatile w.r.t. transport_get()
instead.

Signed-off-by: Ilari Liusvaara <ilari.liusvaara@elisanet.fi>
Acked-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>