gitweb.git
fix minor memory leak in get_tree_entry()René Scharfe Sun, 14 Feb 2010 09:56:46 +0000 (10:56 +0100)

fix minor memory leak in get_tree_entry()

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

Merge branch 'maint'Junio C Hamano Sat, 13 Feb 2010 23:14:04 +0000 (15:14 -0800)

Merge branch 'maint'

* maint:
Start 1.7.0 maintenance track

Conflicts:
RelNotes

Merge branch 'rs/git-dir-cleanup'Junio C Hamano Sat, 13 Feb 2010 23:09:33 +0000 (15:09 -0800)

Merge branch 'rs/git-dir-cleanup'

* rs/git-dir-cleanup:
Resurrect "git grep --no-index"
setenv(GIT_DIR) clean-up

Conflicts:
builtin-grep.c
t/t7002-grep.sh

Merge branch 'jk/cherry-pick-reword'Junio C Hamano Sat, 13 Feb 2010 23:09:33 +0000 (15:09 -0800)

Merge branch 'jk/cherry-pick-reword'

* jk/cherry-pick-reword:
cherry-pick: prettify the advice message
cherry-pick: show commit name instead of sha1
cherry-pick: format help message as strbuf
cherry-pick: refactor commit parsing code
cherry-pick: rewrap advice message

Merge branch 'jk/grep-double-dash'Junio C Hamano Sat, 13 Feb 2010 23:09:33 +0000 (15:09 -0800)

Merge branch 'jk/grep-double-dash'

* jk/grep-double-dash:
accept "git grep -- pattern"

Resurrect "git grep --no-index"Junio C Hamano Sat, 6 Feb 2010 18:40:08 +0000 (10:40 -0800)

Resurrect "git grep --no-index"

This reverts commit 3c8f6c8 (Revert 30816237 and 7e62265, 2010-02-05) as
the issue has been sorted out.

Start 1.7.0 maintenance trackJunio C Hamano Sat, 13 Feb 2010 23:04:00 +0000 (15:04 -0800)

Start 1.7.0 maintenance track

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

Start 1.7.1 cycleJunio C Hamano Sat, 13 Feb 2010 23:01:37 +0000 (15:01 -0800)

Start 1.7.1 cycle

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

Git 1.7.0 v1.7.0Junio C Hamano Fri, 12 Feb 2010 23:45:05 +0000 (15:45 -0800)

Git 1.7.0

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

Merge branch 'maint'Junio C Hamano Fri, 12 Feb 2010 23:40:59 +0000 (15:40 -0800)

Merge branch 'maint'

* maint:
Fix typo in 1.6.6.2 release notes
Re-fix check-ref-format documentation mark-up

Fix typo in 1.6.6.2 release notesJunio C Hamano Fri, 12 Feb 2010 23:40:01 +0000 (15:40 -0800)

Fix typo in 1.6.6.2 release notes

Of course, these are changes since 1.6.6.1; changes since 1.6.6.2
would have been nil.

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

Re-fix check-ref-format documentation mark-upJunio C Hamano Fri, 12 Feb 2010 23:39:03 +0000 (15:39 -0800)

Re-fix check-ref-format documentation mark-up

It is not double-backslash we forbid; backslashes are forbidden since
a4c2e699 (Disallow '\' in ref names, 2009-05-08)

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

git-imap-send: Convert LF to CRLF before storing patch... Hitoshi Mitake Fri, 12 Feb 2010 11:36:12 +0000 (20:36 +0900)

git-imap-send: Convert LF to CRLF before storing patch to draft box

When storing a message over IMAP (RFC 3501 6.3.11), the message should be
in the format of an RFC 2822 message; most notably, CRLF must be used as
a line terminator.

Convert "\n" line endings in the payload to CRLF before feeding it to
IMAP APPEND command.

Signed-off-by: Hitoshi Mitake <mitake@dcl.info.waseda.ac.jp>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

archive documentation: attributes are taken from the... Junio C Hamano Wed, 10 Feb 2010 20:33:58 +0000 (12:33 -0800)

archive documentation: attributes are taken from the tree by default

By default, git-archive takes attributes from the tree being archived.
People however often wonder why their attempts to affect the way how the
command archives their tree by changing .gitattributes in their work tree
fail.

Add a bit of explanatory note to tell them how to achieve what they want
to do.

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

Documentation: minor fixes to RelNotes-1.7.0Michael J Gruber Fri, 12 Feb 2010 09:47:53 +0000 (10:47 +0100)

Documentation: minor fixes to RelNotes-1.7.0

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

bash: support 'git am's new '--continue' optionSZEDER Gábor Fri, 12 Feb 2010 14:11:47 +0000 (15:11 +0100)

bash: support 'git am's new '--continue' option

Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'maint'Junio C Hamano Fri, 12 Feb 2010 07:06:32 +0000 (23:06 -0800)

Merge branch 'maint'

* maint:
filter-branch: Fix error message for --prune-empty --commit-filter

filter-branch: Fix error message for --prune-empty... Jacob Helwig Fri, 12 Feb 2010 02:46:22 +0000 (18:46 -0800)

filter-branch: Fix error message for --prune-empty --commit-filter

Running filter-branch with --prune-empty and --commit-filter reports:

"Cannot set --prune-empty and --filter-commit at the same time".

Change it to use the correct option name: --commit-filter

Signed-off-by: Jacob Helwig <jacob.helwig@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

cherry-pick: prettify the advice messageJeff King Thu, 11 Feb 2010 21:19:37 +0000 (16:19 -0500)

cherry-pick: prettify the advice message

It's hard to see the "how to commit" part of this message,
which users may want to cut and paste. On top of that,
having it in paragraph form means that a really long commit
name may cause ugly wrapping. Let's make it prettier, like:

Automatic cherry-pick failed. After resolving the conflicts,
mark the corrected paths with 'git add <paths>' or 'git rm <paths>'
and commit the result with:

git commit -c HEAD~23

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

cherry-pick: show commit name instead of sha1Jeff King Thu, 11 Feb 2010 21:08:15 +0000 (16:08 -0500)

cherry-pick: show commit name instead of sha1

When we have a conflict, we advise the user to do:

git commit -c $sha1

This works fine, but is unnecessarily confusing and annoying
for the user to type, when:

git commit -c $the_thing_you_called_cherry_pick_with

works just as well.

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

cherry-pick: format help message as strbufJeff King Thu, 11 Feb 2010 21:07:06 +0000 (16:07 -0500)

cherry-pick: format help message as strbuf

This gets rid of the fixed-size buffer and an unchecked
sprintf. That sprintf is actually OK as the only
variable-sized thing put in it is an abbreviated sha1, which
is bounded at 40 characters. However, the next patch will
change that to something unbounded.

Note that this function now returns an allocated buffer
instead of a static one; however, it doesn't matter as the
only caller exits immediately.

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

cherry-pick: refactor commit parsing codeJeff King Thu, 11 Feb 2010 21:06:43 +0000 (16:06 -0500)

cherry-pick: refactor commit parsing code

These lines are really just lookup_commit_reference
re-implemented.

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

cherry-pick: rewrap advice messageJeff King Thu, 11 Feb 2010 21:06:01 +0000 (16:06 -0500)

cherry-pick: rewrap advice message

The current message overflows on an 80-character terminal.
While we're at it, fix the spelling of 'committing'.

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

am: switch --resolved to --continueJeff King Thu, 11 Feb 2010 22:27:14 +0000 (17:27 -0500)

am: switch --resolved to --continue

Rebase calls this same function "--continue", which means
users may be trained to type it. There is no reason to
deprecate --resolved (or -r), so we will keep it as a
synonym.

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

Update draft release notes to 1.7.0 one more timeJunio C Hamano Wed, 10 Feb 2010 21:47:46 +0000 (13:47 -0800)

Update draft release notes to 1.7.0 one more time

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

Sync with 1.6.6.2Junio C Hamano Wed, 10 Feb 2010 21:46:15 +0000 (13:46 -0800)

Sync with 1.6.6.2

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

Git 1.6.6.2 v1.6.6.2Junio C Hamano Wed, 10 Feb 2010 21:44:11 +0000 (13:44 -0800)

Git 1.6.6.2

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

Merge branch 'maint-1.6.5' into maintJunio C Hamano Wed, 10 Feb 2010 21:42:48 +0000 (13:42 -0800)

Merge branch 'maint-1.6.5' into maint

* maint-1.6.5:
t8003: check exit code of command and error message separately

t8003: check exit code of command and error message... Junio C Hamano Tue, 9 Feb 2010 18:06:33 +0000 (10:06 -0800)

t8003: check exit code of command and error message separately

Shell reports exit status only from the most downstream command
in a pipeline. In these tests, we want to make sure that the
command fails in a controlled way, and produces a correct error
message.

This issue was known by Jay who submitted the patch, and also was
pointed out by Hannes during the review process, but I forgot to
fix it up before applying. Sorry about that.

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

Merge branch 'sp/maint-fast-import-large-blob' into... Junio C Hamano Wed, 10 Feb 2010 21:32:20 +0000 (13:32 -0800)

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

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

Merge branch 'gp/maint-cvsserver' into maintJunio C Hamano Wed, 10 Feb 2010 21:02:52 +0000 (13:02 -0800)

Merge branch 'gp/maint-cvsserver' into maint

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

Merge branch 'jc/maint-reflog-bad-timestamp' into maintJunio C Hamano Wed, 10 Feb 2010 21:02:43 +0000 (13:02 -0800)

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

* 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-xmallocz' into maintJunio C Hamano Wed, 10 Feb 2010 21:02:16 +0000 (13:02 -0800)

Merge branch 'il/maint-xmallocz' into maint

* 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' into maintJunio C Hamano Wed, 10 Feb 2010 21:02:05 +0000 (13:02 -0800)

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

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

Merge branch 'nd/include-termios-for-osol' into maintJunio C Hamano Wed, 10 Feb 2010 21:01:55 +0000 (13:01 -0800)

Merge branch 'nd/include-termios-for-osol' into maint

* nd/include-termios-for-osol:
Add missing #include to support TIOCGWINSZ on Solaris

Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge... Junio C Hamano Wed, 10 Feb 2010 20:54:15 +0000 (12:54 -0800)

Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge' into maint

* jc/maint-1.6.1-checkout-m-custom-merge:
checkout -m path: fix recreating conflicts

Conflicts:
t/t7201-co.sh

Merge branch 'rs/maint-archive-match-pathspec' into... Junio C Hamano Wed, 10 Feb 2010 20:52:39 +0000 (12:52 -0800)

Merge branch 'rs/maint-archive-match-pathspec' into maint

* rs/maint-archive-match-pathspec:
archive: complain about path specs that don't match anything

check-ref-format documentation: fix enumeration mark-upJunio C Hamano Wed, 10 Feb 2010 18:18:55 +0000 (10:18 -0800)

check-ref-format documentation: fix enumeration mark-up

The last item in the enumerated refname rule was mistakenly made into
a sub-item of the 7th one. It should be the 8th one in the list on its
own.

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

Documentation: quote braces in {upstream} notationThomas Rast Wed, 10 Feb 2010 16:30:29 +0000 (17:30 +0100)

Documentation: quote braces in {upstream} notation

The lack of quoting made the entire line disappear.

Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'sp/maint-push-sideband' into sp/push... Junio C Hamano Wed, 10 Feb 2010 18:00:49 +0000 (10:00 -0800)

Merge branch 'sp/maint-push-sideband' into sp/push-sideband

* sp/maint-push-sideband:
receive-pack: Send internal errors over side-band #2
t5401: Use a bare repository for the remote peer

Conflicts:
builtin-receive-pack.c
t/t5401-update-hooks.sh

receive-pack: Send internal errors over side-band #2Shawn O. Pearce Wed, 10 Feb 2010 17:34:12 +0000 (09:34 -0800)

receive-pack: Send internal errors over side-band #2

If the client has requested side-band-64k capability, send any
of the internal error or warning messages in the muxed side-band
stream using the same band as our hook output, band #2. By putting
everything in one stream we ensure all messages are processed by
the side-band demuxer, avoiding interleaving between our own stderr
and the side-band demuxer's stderr buffers.

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

t5401: Use a bare repository for the remote peerShawn O. Pearce Wed, 10 Feb 2010 02:01:29 +0000 (18:01 -0800)

t5401: Use a bare repository for the remote peer

We want to avoid the warnings (or later, test failures) about
updating the current branch. It was never my intention to have
this test deal with a repository with a working directory, and it
is a very old bug that the test even used a non-bare repository
for the remote side of the push operations.

This fixes the interleaved output error we were seeing as a test
failure by avoiding the giant warning message we were getting back
about updating the current branch being risky.

Its not a real fix, but is something we should do no matter what,
because the behavior will change in the future to reject, and the
test would break at that time.

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

t3902: Protect against OS X normalizationBrian Gernhardt Tue, 9 Feb 2010 04:07:25 +0000 (23:07 -0500)

t3902: Protect against OS X normalization

8424981: "Fix invalid read in quote_c_style_counted" introduced a test
that used "caractère spécial" as a directory name.

Git creates it as "caract\303\250re sp\303\251cial"
OS X stores it as "caracte\314\200re spe\314\201cial"

To work around this problem, use the already introduced $FN as the
directory name.

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

Merge branch 'maint'Junio C Hamano Tue, 9 Feb 2010 05:54:10 +0000 (21:54 -0800)

Merge branch 'maint'

* maint:
blame: prevent a segv when -L given start > EOF
git-push: document all the status flags used in the output
Fix parsing of imap.preformattedHTML and imap.sslverify
git-add documentation: Fix shell quoting example

Merge branch 'maint-1.6.5' into maintJunio C Hamano Tue, 9 Feb 2010 05:53:54 +0000 (21:53 -0800)

Merge branch 'maint-1.6.5' into maint

* maint-1.6.5:
blame: prevent a segv when -L given start > EOF

blame: prevent a segv when -L given start > EOFJay Soffian Tue, 9 Feb 2010 03:48:13 +0000 (22:48 -0500)

blame: prevent a segv when -L given start > EOF

blame would segv if given -L <lineno> with <lineno> past the end of the file.
While we're fixing the bug, add test cases for an invalid <start> when called
as -L <start>,<end> or -L<start>.

Signed-off-by: Jay Soffian <jaysoffian@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'jc/maint-push-doc-status' into maintJunio C Hamano Tue, 9 Feb 2010 00:49:22 +0000 (16:49 -0800)

Merge branch 'jc/maint-push-doc-status' into maint

* jc/maint-push-doc-status:
git-push: document all the status flags used in the output

git-push: document all the status flags used in the... Junio C Hamano Tue, 9 Feb 2010 00:45:21 +0000 (16:45 -0800)

git-push: document all the status flags used in the output

We didn't talk about '-' (deletion), '*' (addition), nor '+' (forced).

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

Merge branch 'jc/maint-imap-config-parse' into maintJunio C Hamano Mon, 8 Feb 2010 23:09:19 +0000 (15:09 -0800)

Merge branch 'jc/maint-imap-config-parse' into maint

* jc/maint-imap-config-parse:
Fix parsing of imap.preformattedHTML and imap.sslverify

Fix parsing of imap.preformattedHTML and imap.sslverifyJunio C Hamano Sat, 6 Feb 2010 19:26:35 +0000 (11:26 -0800)

Fix parsing of imap.preformattedHTML and imap.sslverify

These two variables are boolean and can lack "= value" in the
configuration file. Do not reject such input early in the
parser callback function.

Also the key are downcased before being given to the callback,
so we should run strcmp() with keyword spelled in all-lowercase.

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

Merge branch 'jc/maint-doc-git-add-example' into maintJunio C Hamano Mon, 8 Feb 2010 20:13:56 +0000 (12:13 -0800)

Merge branch 'jc/maint-doc-git-add-example' into maint

* jc/maint-doc-git-add-example:
git-add documentation: Fix shell quoting example

git-add documentation: Fix shell quoting exampleJunio C Hamano Mon, 8 Feb 2010 20:12:41 +0000 (12:12 -0800)

git-add documentation: Fix shell quoting example

When 921177f (Documentation: improve "add", "pull" and "format-patch"
examples, 2008-05-07) converted this from enumeration header to displayed
text, it failed to adjust for the AsciiDoc's rule to quote backslashes.
In displayed text, backslash is shown verbatim, while in enumeration
header, we need to double it.

We have a similar construct in git-rm.txt documentation, and need to be
careful when somebody wants to update it to match the style of the "git
add" example.

Noticed by: Greg Bacon <gbacon@dbresearch.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Revert "pack-objects: fix pack generation when using... Nicolas Pitre Mon, 8 Feb 2010 15:39:01 +0000 (10:39 -0500)

Revert "pack-objects: fix pack generation when using pack_size_limit"

This reverts most of commit a2430dde8ceaaaabf05937438249397b883ca77a.

That commit made the situation better for repositories with relatively
small number of objects. However with many objects and a small pack size
limit, the time required to complete the repack tends towards O(n^2),
or even much worse with long delta chains.

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

accept "git grep -- pattern"Jeff King Sun, 7 Feb 2010 04:44:15 +0000 (23:44 -0500)

accept "git grep -- pattern"

Currently the only way to "quote" a grep pattern that might
begin with a dash is to use "git grep -e pattern". This
works just fine, and is also the way right way to do it on
many traditional grep implemenations.

Some people prefer to use "git grep -- pattern", however, as
"--" is the usual "end of options" marker, and at least GNU
grep and Solaris 10 grep support this. This patch makes that
syntax work.

There is a slight behavior change, in that "git grep -- $X"
used to be interpreted as "grep for -- in $X". However, that
usage is questionable. "--" is usually the end-of-options
marker, so "git grep" was unlike many other greps in
treating it as a literal pattern (e.g., both GNU grep and
Solaris 10 grep will treat "grep --" as missing a pattern).

Signed-off-by: Jeff King <peff@peff.net>
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>

cvsimport: new -R option: generate .git/cvs-revisions... Aaron Crane Sat, 6 Feb 2010 18:26:24 +0000 (18:26 +0000)

cvsimport: new -R option: generate .git/cvs-revisions mapping

This option causes the creation or updating of a file mapping CVS
(filename, revision number) pairs to Git commit IDs. This is expected
to be useful if you have CVS revision numbers stored in commit messages,
bug-tracking systems, email archives, and the like.

Signed-off-by: Aaron Crane <git@aaroncrane.co.uk>
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>

setenv(GIT_DIR) clean-upRené Scharfe Sat, 6 Feb 2010 09:35:19 +0000 (10:35 +0100)

setenv(GIT_DIR) clean-up

This patch converts the setenv() calls in path.c and setup.c. After
the call, git grep with a pager works again in bare repos.

It leaves the setenv(GIT_DIR_ENVIRONMENT, ...) calls in git.c alone, as
they respond to command line switches that emulate the effect of setting
the environment variable directly.

The remaining site in environment.c is in set_git_dir() and is left
alone, too, of course. Finally, builtin-init-db.c is left changed
because the repo is still being carefully constructed when the
environment variable is set.

This fixes git shortlog when run inside a git directory, which had been
broken by abe549e1.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
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>

Merge branch 'sp/maint-push-sideband' into sp/push... Junio C Hamano Sat, 6 Feb 2010 05:08:53 +0000 (21:08 -0800)

Merge branch 'sp/maint-push-sideband' into sp/push-sideband

* sp/maint-push-sideband:
receive-pack: Send hook output over side band #2
receive-pack: Wrap status reports inside side-band-64k
receive-pack: Refactor how capabilities are shown to the client
send-pack: demultiplex a sideband stream with status data
run-command: support custom fd-set in async
run-command: Allow stderr to be a caller supplied pipe
Update git fsck --full short description to mention packs

Conflicts:
run-command.c

receive-pack: Send hook output over side band #2Shawn O. Pearce Fri, 5 Feb 2010 20:57:42 +0000 (12:57 -0800)

receive-pack: Send hook output over side band #2

If the client requests to enable side-band-64k capability we can
safely send any hook stdout or stderr data down side band #2,
so the client can present it to the user.

If side-band-64k isn't enabled, hooks continue to inherit stderr
from the parent receive-pack process.

When the side band channel is being used the push client will wind up
prefixing all server messages with "remote: ", just like fetch does,
so our test vector has to be updated with the new expected output.

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

receive-pack: Wrap status reports inside side-band-64kShawn O. Pearce Fri, 5 Feb 2010 20:57:41 +0000 (12:57 -0800)

receive-pack: Wrap status reports inside side-band-64k

If the client requests the side-band-64k protocol capability we
now wrap the status report data inside of packets sent to band #1.
This permits us to later send additional progress or informational
messages down band #2.

If side-band-64k was enabled, we always send a final flush packet
to let the client know we are done transmitting.

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

receive-pack: Refactor how capabilities are shown to... Shawn O. Pearce Fri, 5 Feb 2010 20:57:40 +0000 (12:57 -0800)

receive-pack: Refactor how capabilities are shown to the client

Moving capability advertisement into the packet_write call itself
makes it easier to add additional capabilities to the list, be
it optional by configuration, or always present in the protocol.

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

send-pack: demultiplex a sideband stream with status... Shawn O. Pearce Fri, 5 Feb 2010 20:57:39 +0000 (12:57 -0800)

send-pack: demultiplex a sideband stream with status data

If the server advertises side-band-64k capability, we request
it and pull the status report data out of side band #1, and let
side band #2 go to our stderr. The latter channel be used by the
remote side to send our user messages. This basically mirrors the
side-band-64k capability in upload-pack.

Servers may choose to use side band #2 to send error messages from
hook scripts that are meant for the push end user.

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

run-command: support custom fd-set in asyncErik Faye-Lund Fri, 5 Feb 2010 20:57:38 +0000 (12:57 -0800)

run-command: support custom fd-set in async

This patch adds the possibility to supply a set of non-0 file
descriptors for async process communication instead of the
default-created pipe.

Additionally, we now support bi-directional communiction with the
async procedure, by giving the async function both read and write
file descriptors.

To retain compatiblity and similar "API feel" with start_command,
we require start_async callers to set .out = -1 to get a readable
file descriptor. If either of .in or .out is 0, we supply no file
descriptor to the async process.

[sp: Note: Erik started this patch, and a huge bulk of it is
his work. All bugs were introduced later by Shawn.]

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

run-command: Allow stderr to be a caller supplied pipeShawn O. Pearce Fri, 5 Feb 2010 20:57:37 +0000 (12:57 -0800)

run-command: Allow stderr to be a caller supplied pipe

Like .out, .err may now be set to a file descriptor > 0, which
is a writable pipe/socket/file that the child's stderr will be
redirected into.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
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>

Typofixes outside documentation areaJunio C Hamano Thu, 4 Feb 2010 05:23:18 +0000 (21:23 -0800)

Typofixes outside documentation area

begining -> beginning
canonicalizations -> canonicalization
comand -> command
dewrapping -> unwrapping
dirtyness -> dirtiness
DISCLAMER -> DISCLAIMER
explicitely -> explicitly
feeded -> fed
impiled -> implied
madatory -> mandatory
mimick -> mimic
preceeding -> preceding
reqeuest -> request
substition -> substitution

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

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