gitweb.git
filter-branch: Test renaming directories in a tree... Johannes Sixt Mon, 31 Mar 2008 07:14:14 +0000 (09:14 +0200)

filter-branch: Test renaming directories in a tree-filter

This test currently fails.

If b is a directory then 'mv a b' is not a plain "rename", but really a
"move", so we must also test that the directory does not exist with the
old name in the directory with the new name.

There's also some cleanup in the corresponding "rename file" test to avoid
spurious shell syntax errors and "ambigous ref" error from 'git show' (but
these should show up only if the test would fail anyway). Plus we also
test for the non-existence of the old file.

Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>

GIT 1.5.5-rc2 v1.5.5-rc2Junio C Hamano Fri, 28 Mar 2008 03:43:51 +0000 (20:43 -0700)

GIT 1.5.5-rc2

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

GIT 1.5.4.5 v1.5.4.5Junio C Hamano Fri, 28 Mar 2008 03:36:35 +0000 (20:36 -0700)

GIT 1.5.4.5

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

builtin-prune: protect objects listed on the command... Junio C Hamano Tue, 25 Mar 2008 06:20:51 +0000 (23:20 -0700)

builtin-prune: protect objects listed on the command line

Finally, this resurrects the documented behaviour to protect other
objects listed on the command line from getting pruned.

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

builtin-prune.c: use parse_options()Michele Ballabio Sun, 23 Mar 2008 20:50:29 +0000 (21:50 +0100)

builtin-prune.c: use parse_options()

Using the OPT_DATE() introduced earlier, this updates builtin-prune to
use parse_options().

Signed-off-by: Michele Ballabio <barra_cuda@katamail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Add tests for git-pruneMichele Ballabio Sun, 23 Mar 2008 21:34:34 +0000 (22:34 +0100)

Add tests for git-prune

It seems that git prune changed behaviour with respect to revisions added
from command line, probably when it became a builtin. Currently, it prints
a short usage and exits: instead, it should take those revisions into
account and not prune them. So add a couple of test to point this out.

We'll be fixing this by switching to parse_options(), so add tests to
detect bogus command line parameters as well, to keep ourselves from
introducing regressions.

Signed-off-by: Michele Ballabio <barra_cuda@katamail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

parse-options.c: introduce OPT_DATEMichele Ballabio Mon, 24 Mar 2008 14:02:21 +0000 (15:02 +0100)

parse-options.c: introduce OPT_DATE

There are quite a few places that will need to call approxidate(),
when they'll adopt the parse-options system, so this patch adds the
function parse_opt_approxidate_cb(), used by OPT_DATE.

Signed-off-by: Michele Ballabio <barra_cuda@katamail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Update draft release notes for 1.5.5Junio C Hamano Thu, 27 Mar 2008 20:37:29 +0000 (13:37 -0700)

Update draft release notes for 1.5.5

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

Merge branch 'maint'Junio C Hamano Thu, 27 Mar 2008 20:35:18 +0000 (13:35 -0700)

Merge branch 'maint'

* maint:
Update draft release notes for 1.5.4.5
Documentation: clarify use of .git{ignore,attributes} versus .git/info/*
t/t3800-mktag.sh: use test_must_fail rather than '!'

Conflicts:

t/t3800-mktag.sh

Update draft release notes for 1.5.4.5Junio C Hamano Thu, 27 Mar 2008 20:14:20 +0000 (13:14 -0700)

Update draft release notes for 1.5.4.5

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

Merge branch 'jc/maint-fetch-regression-1.5.4' into... Junio C Hamano Thu, 27 Mar 2008 20:03:56 +0000 (13:03 -0700)

Merge branch 'jc/maint-fetch-regression-1.5.4' into maint

* jc/maint-fetch-regression-1.5.4:
git-fetch test: test tracking fetch results, not just FETCH_HEAD
Fix branches file configuration
Tighten refspec processing

Documentation: clarify use of .git{ignore,attributes... Jeff King Thu, 27 Mar 2008 05:31:00 +0000 (01:31 -0400)

Documentation: clarify use of .git{ignore,attributes} versus .git/info/*

gitignore patterns can be read from three different
files, while gitattributes can come from two files. Let's
provide some hints to the user about the differences and how
they are typically used.

Suggested by Toby Corkindale, but gratuitously reworded by Jeff King.

Signed-off-by: Toby Corkindale <toby.corkindale@rea-group.com>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

test_must_fail: 129 is a valid error code from usage()Junio C Hamano Tue, 25 Mar 2008 06:07:08 +0000 (23:07 -0700)

test_must_fail: 129 is a valid error code from usage()

When a git command is run under test_must_fail to make sure that
the argument parser catches bogus command line, it exits with 129.
We need to catch it as a valid "graceful error exit".

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

imap-send: properly error out if imap.host is not set... Gerrit Pape Wed, 26 Mar 2008 18:05:17 +0000 (18:05 +0000)

imap-send: properly error out if imap.host is not set in config

If no imap host is specified in the git config, git imap-send used
to try to lookup a null pointer through gethostbyname(), causing a
segfault. Since setting the imap.host variable is mandatory,
imap-send now properly fails with an explanatory error message.

The problem has been reported by picca through
http://bugs.debian.org/472632

Signed-off-by: Gerrit Pape <pape@smarden.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t9600-cvsimport.sh: set HOME before checking for cvsps... Frank Lichtenheld Wed, 26 Mar 2008 17:34:20 +0000 (17:34 +0000)

t9600-cvsimport.sh: set HOME before checking for cvsps availability

This actually sounds like a bug in cvsps, which requires an existing
home directory when asked for the usage through -h

$ HOME=/nonexistent cvsps -h
Cannot create the cvsps directory '.cvsps': No such file or directory

This made t9600 think that cvsps is not available if HOME did not exist,
causing the tests to be skipped

$ HOME=/nonexistent sh t9600-cvsimport.sh
* skipping cvsimport tests, cvsps not found
* passed all 0 test(s)

Now t9600 sets HOME to the current working directory before checking for
the availability of the cvsps program.

This issue has been discovered by Marco Rodrigues, and fixed by Frank
Lichtenheld through
http://bugs.debian.org/471969

Signed-off-by: Gerrit Pape <pape@smarden.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Always set *nongit_ok in setup_git_directory_gently()SZEDER Gábor Tue, 25 Mar 2008 21:06:26 +0000 (22:06 +0100)

Always set *nongit_ok in setup_git_directory_gently()

setup_git_directory_gently() only modified the value of its *nongit_ok
argument if we were not in a git repository. Now it will always set it
to 0 when we are inside a repository.

Also remove now unnecessary initializations in the callers of this
function.

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

t/t3800-mktag.sh: use test_must_fail rather than '!'Brandon Casey Wed, 26 Mar 2008 00:20:52 +0000 (19:20 -0500)

t/t3800-mktag.sh: use test_must_fail rather than '!'

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

Merge branch 'jc/maint-fetch-regression-1.5.4'Junio C Hamano Wed, 26 Mar 2008 08:49:41 +0000 (01:49 -0700)

Merge branch 'jc/maint-fetch-regression-1.5.4'

* jc/maint-fetch-regression-1.5.4:
git-fetch test: test tracking fetch results, not just FETCH_HEAD
Fix branches file configuration
Tighten refspec processing
Fix the wrong output of `git-show v1.3.0~155^2~4` in documentation.

git-fetch test: test tracking fetch results, not just... Junio C Hamano Wed, 26 Mar 2008 08:17:07 +0000 (01:17 -0700)

git-fetch test: test tracking fetch results, not just FETCH_HEAD

We really should have done this long time ago. Existing t5515 test
was written for the specific purpose of catching regression to the
contents of generated FETCH_HEAD file, but it also is a good place
to make sure various fetch configurations do fetch what they intend
to fetch (and nothing else).

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

Fix branches file configurationDaniel Barkalow Tue, 25 Mar 2008 23:35:28 +0000 (19:35 -0400)

Fix branches file configuration

Fetched remote branch from .git/branches/foo should fetch into
refs/heads/foo. Also when partial URL is given, the fetched head should
always be remote HEAD, and the result should not be stored anywhere.

Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Tighten refspec processingDaniel Barkalow Tue, 18 Mar 2008 02:05:23 +0000 (22:05 -0400)

Tighten refspec processing

This changes the pattern matching code to not store the required final
/ before the *, and then to require each side to be a valid ref (or
empty). In particular, any refspec that looks like it should be a
pattern but doesn't quite meet the requirements will be found to be
invalid as a fallback non-pattern.

This was cherry picked from commit ef00d15 (Tighten refspec processing,
2008-03-17), and two fix-up commits 46220ca (remote.c: Fix overtight
refspec validation, 2008-03-20) and 7d19da4 (refspec: allow colon-less
wildcard "refs/category/*", 2008-03-25) squashed in.

Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Fix the wrong output of `git-show v1.3.0~155^2~4` in... Guanqun Lu Mon, 24 Mar 2008 07:27:28 +0000 (15:27 +0800)

Fix the wrong output of `git-show v1.3.0~155^2~4` in documentation.

Texts between ~ and ~ will be subscripted during the asciidoc translation.

Signed-off-by: Guanqun Lu <Guanqun.Lu@Gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
(cherry picked from commit 0c829391cfcdc57172765322575804a7ad5f3116)

refspec: allow colon-less wildcard "refs/category/*"Junio C Hamano Wed, 26 Mar 2008 04:15:52 +0000 (21:15 -0700)

refspec: allow colon-less wildcard "refs/category/*"

"git push --tags elsewhere" is implemented in terms of wildcarded refspec
"refs/tags/*" these days, and the user wants to push the tags under the
same name to the other branch. This resurrects the support for it.

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

init: show "Reinit" message even in an (existing) empty... Johannes Schindelin Mon, 24 Mar 2008 15:14:52 +0000 (16:14 +0100)

init: show "Reinit" message even in an (existing) empty repository

Earlier, git-init tested for a valid HEAD ref, but if the repository
was empty, there was none. Instead, test for the existence of
the file $GIT_DIR/HEAD.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Documentation/git-checkout: Update summary to reflect... Julian Phillips Mon, 24 Mar 2008 03:06:20 +0000 (03:06 +0000)

Documentation/git-checkout: Update summary to reflect current abilities

For a while now, git-checkout has been more powerful than the man-page
summary would suggest (the main text does describe the new features),
so update the summary to hopefully better reflect the current
functionality. Also update the glossary description of the word checkout.

Signed-off-by: Julian Phillips <julian@quantumfyre.co.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Documentation: git-tag '-m'/'-F' implies '-a'Dirk Süsserott Mon, 24 Mar 2008 19:43:08 +0000 (15:43 -0400)

Documentation: git-tag '-m'/'-F' implies '-a'

builtin-remote: Fix missing newline at end of listing... Johannes Sixt Tue, 18 Mar 2008 20:52:00 +0000 (21:52 +0100)

builtin-remote: Fix missing newline at end of listing of pushed branches

Without this the output of 'git remote show' does not end with a new-line:

bash> git remote show repo
* remote repo
URL: repo.or.cz:/srv/git/kdbg.git
Tracked remote branches
maint master mob
Local branch pushed with 'git push'
+master:masterbash>

Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Fix the wrong output of `git-show v1.3.0~155^2~4` in... Guanqun Lu Mon, 24 Mar 2008 07:27:28 +0000 (15:27 +0800)

Fix the wrong output of `git-show v1.3.0~155^2~4` in documentation.

Texts between ~ and ~ will be subscripted during the asciidoc translation.

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

RelNotes: mention checkout/branch's --track option... Johannes Schindelin Sun, 23 Mar 2008 11:35:37 +0000 (12:35 +0100)

RelNotes: mention checkout/branch's --track option, too

checkout and branch recently learnt to track local branches when
branch.autosetupmerge = always, but they _also_ learnt to do that when
asked explicitely with the option "--track".

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

GIT 1.5.5-rc1 v1.5.5-rc1Junio C Hamano Sun, 23 Mar 2008 07:21:48 +0000 (00:21 -0700)

GIT 1.5.5-rc1

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

gc --auto: raise default auto pack limit from 20 to 50Junio C Hamano Sun, 23 Mar 2008 07:04:48 +0000 (00:04 -0700)

gc --auto: raise default auto pack limit from 20 to 50

Recent discussion on the list, with the improvement f7c22cc (always start
looking up objects in the last used pack first, 2007-05-30) brought in,
reached the concensus that the current default 20 is too low.

Reference: http://thread.gmane.org/gmane.comp.version-control.git/77586
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'git-p4' of git://repo.or.cz/git/git-p4Junio C Hamano Sun, 23 Mar 2008 07:02:06 +0000 (00:02 -0700)

Merge branch 'git-p4' of git://repo.or.cz/git/git-p4

* 'git-p4' of git://repo.or.cz/git/git-p4:
git-p4: Use P4EDITOR environment variable when set
git-p4: Unset P4DIFF environment variable when using 'p4 -du diff'
git-p4: Optimize the fetching of data from perforce.

remote.c: Fix overtight refspec validationJunio C Hamano Fri, 21 Mar 2008 06:34:37 +0000 (23:34 -0700)

remote.c: Fix overtight refspec validation

We tightened the refspec validation code in an earlier commit ef00d15
(Tighten refspec processing, 2008-03-17) per my suggestion, but the
suggestion was misguided to begin with and it broke this usage:

$ git push origin HEAD~12:master

The syntax of push refspecs and fetch refspecs are similar in that they
are both colon separated LHS and RHS (possibly prefixed with a + to
force), but the similarity ends there. For example, LHS in a push refspec
can be anything that evaluates to a valid object name at runtime (except
when colon and RHS is missing, or it is a glob), while it must be a
valid-looking refname in a fetch refspec. To validate them correctly, the
caller needs to be able to say which kind of refspecs they are. It is
unreasonable to keep a single interface that cannot tell which kind it is
dealing with, and ask it to behave sensibly.

This commit separates the parsing of the two into different functions, and
clarifies the code to implement the parsing proper (i.e. splitting into
two parts, making sure both sides are wildcard or neither side is).

This happens to also allow pushing a commit named with the esoteric "look
for that string" syntax:

$ git push ../test.git ':/remote.c: Fix overtight refspec:master'

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

fast-import: Document the effect of "merge" with no... Eyvind Bernhardsen Fri, 21 Mar 2008 15:25:18 +0000 (16:25 +0100)

fast-import: Document the effect of "merge" with no "from" in a commit

The fast-import documentation currently does not document the behaviour
of "merge" when there is no "from" in a commit. This patch adds a
description of what happens: the commit is created with a parent, but
no files. This behaviour is equivalent to "from" followed by
"filedeleteall".

Signed-off-by: Eyvind Bernhardsen <eyvind-git@orakel.ntnu.no>
Acked-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Make git-svn tests behave better on OS XKevin Ballard Fri, 21 Mar 2008 07:27:35 +0000 (03:27 -0400)

Make git-svn tests behave better on OS X

Give lib-git-svn.sh a few alternate paths to look for apache2.
Explicitly define the LockFile so httpd will actually start under OS X

Signed-off-by: Kevin Ballard <kevin@sb.org>
Acked-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Improve description of git filter-branch.Ralf Wildenhues Thu, 20 Mar 2008 21:30:32 +0000 (22:30 +0100)

Improve description of git filter-branch.

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

t/t7003-filter-branch.sh: use test_must_fail rather... Brandon Casey Thu, 20 Mar 2008 16:54:30 +0000 (11:54 -0500)

t/t7003-filter-branch.sh: use test_must_fail rather than '!'

Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Don't try and percent-escape existing percent escapes... Kevin Ballard Thu, 20 Mar 2008 20:08:49 +0000 (16:08 -0400)

Don't try and percent-escape existing percent escapes in git-svn URIs

git-svn project names are percent-escaped ever since f5530b8
(git-svn: support for funky branch and project names over HTTP(S),
2007-11-11).

Unfortunately this breaks the scenario where the user hands git-svn an
already-escaped URI. Fix the regexp to skip over what looks like
existing percent escapes, and test this scenario.

Signed-off-by: Kevin Ballard <kevin@sb.org>
Acked-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

remote show: do not show symbolic refsJohannes Schindelin Wed, 19 Mar 2008 00:27:42 +0000 (00:27 +0000)

remote show: do not show symbolic refs

For symbolic refs, a sane notion of being "stale" is that the ref
they point to no longer exists. Since this is checked already,
"remote show" does not need to show them at all.

Incidentally, this fixes the issue that "HEAD" was shown as a
stale ref by "remote show" in a freshly cloned repository.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Document the sendemail.smtpserverport config variableKevin Ballard Wed, 19 Mar 2008 06:16:29 +0000 (02:16 -0400)

Document the sendemail.smtpserverport config variable

Add sendemail.smtpserverport to the Configuration section
of the git-send-email manpage. It should probably be
referenced in the --smtp-server-port option as well.

Signed-off-by: Kevin Ballard <kevin@sb.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Add --reverse to the git-rev-list usage stringKevin Ballard Wed, 19 Mar 2008 06:16:28 +0000 (02:16 -0400)

Add --reverse to the git-rev-list usage string

git-rev-list accepts --reverse, as documented in
the manpage, but the usage string does not list it.

Signed-off-by: Kevin Ballard <kevin@sb.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

make it easier for people who just want to get rid... Nicolas Pitre Wed, 19 Mar 2008 21:06:11 +0000 (17:06 -0400)

make it easier for people who just want to get rid of 'git gc --auto'

Give a direct hint to those who feel highly annoyed by the auto gc
behavior.

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

builtin-gc.c: allow disabling all auto-gc'ing by assign... Brandon Casey Wed, 19 Mar 2008 21:53:20 +0000 (16:53 -0500)

builtin-gc.c: allow disabling all auto-gc'ing by assigning 0 to gc.auto

The gc.auto configuration variable is somewhat ambiguous now that there
is also a gc.autopacklimit setting. Some users may assume that it controls
all auto-gc'ing. Also, now users must set two configuration variables to
zero when they want to disable autopacking. Since it is unlikely that users
will want to autopack based on some threshold of pack files when they have
disabled autopacking based on the number of loose objects, be nice and allow
a setting of zero for gc.auto to disable all autopacking.

Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Documentation/git-merge: document subtree strategy.Miklos Vajna Tue, 18 Mar 2008 12:26:43 +0000 (13:26 +0100)

Documentation/git-merge: document subtree strategy.

There was already some documentation about subtree under
Documentation/howto but it was missing from git-merge manpage.

Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Fix tag followingDaniel Barkalow Tue, 18 Mar 2008 02:15:02 +0000 (22:15 -0400)

Fix tag following

Before the second fetch-pack connection in the same process, unmark
all of the objects marked in the first connection, in order that we'll
list them as things we have instead of thinking we've already
mentioned them.

Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Make revision limiting more robust against occasional... Linus Torvalds Tue, 18 Mar 2008 01:56:33 +0000 (18:56 -0700)

Make revision limiting more robust against occasional bad commit dates

The revision limiter uses the commit date to decide when it has seen
enough commits to finalize the revision list, but that can get confused
if there are incorrect dates far in the past on some commits.

This makes the logic a bit more robust by

- we always walk an extra SLOP commits from the source list even if we
decide that the source list is probably all done (unless the source is
entirely empty, of course, because then we really can't do anything at
all)

- we keep track of the date of the last commit we added to the
destination list (this will *generally* be the oldest entry we've seen
so far)

- we compare that with the youngest entry (the first one) of the source
list, and if the destination is older than the source, we know we want
to look at the source.

which causes occasional date mishaps to be handled cleanly.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Fix t3200 configDaniel Barkalow Tue, 18 Mar 2008 02:04:40 +0000 (22:04 -0400)

Fix t3200 config

"git-config name = value" doesn't do anything most of the time. The
test meant "git-config name value", but that leaves the configuration
such that later tests will be confused, so move it to the end.

Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Tighten refspec processingDaniel Barkalow Tue, 18 Mar 2008 02:05:23 +0000 (22:05 -0400)

Tighten refspec processing

This changes the pattern matching code to not store the required final
/ before the *, and then to require each side to be a valid ref (or
empty). In particular, any refspec that looks like it should be a
pattern but doesn't quite meet the requirements will be found to be
invalid as a fallback non-pattern.

Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Fix possible Solaris problem in 'checkout_entry()'Linus Torvalds Mon, 17 Mar 2008 15:56:27 +0000 (08:56 -0700)

Fix possible Solaris problem in 'checkout_entry()'

Currently when checking out an entry "path", we try to unlink(2) it first
(because there could be stale file), and if there is a directory there,
try to deal with it (typically we run recursive rmdir). We ignore the
error return from this unlink because there may not even be any file
there.

However if you are root on Solaris, you can unlink(2) a directory
successfully and corrupt your filesystem.

This moves the code around and check the directory first, and then
unlink(2). Also we check the error code from it.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Fix read-tree not to discard errorsJunio C Hamano Wed, 19 Mar 2008 05:01:28 +0000 (22:01 -0700)

Fix read-tree not to discard errors

This fixes the issue identified with recently added tests to t1004

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

Add tests to catch problems with un-unlinkable symlinksJunio C Hamano Wed, 19 Mar 2008 04:59:39 +0000 (21:59 -0700)

Add tests to catch problems with un-unlinkable symlinks

This currently fails not because we refuse to check out, but because we
detect error but incorrectly discard it in the callchain.

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

Test: catch if trash cannot be removedJunio C Hamano Wed, 19 Mar 2008 04:58:01 +0000 (21:58 -0700)

Test: catch if trash cannot be removed

When your test creates an unwritable directory that test framework cannot
clean out by "rm -fr trash", later tests cannot start in a fresh state
they expect to. Detect this and error out early.

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

git-merge-one-file: fix longstanding stupid thinkoJunio C Hamano Mon, 17 Mar 2008 23:47:18 +0000 (16:47 -0700)

git-merge-one-file: fix longstanding stupid thinko

When a merge result creates a new file, and when our side already has a
file in the path, taking the merge result may clobber the untracked file.
However, the logic to detect this situation was totally the wrong way. We
should complain when the file exists, not when the file does not exist.

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

Merge branch 'jc/makefile'Junio C Hamano Mon, 17 Mar 2008 07:52:19 +0000 (00:52 -0700)

Merge branch 'jc/makefile'

* jc/makefile:
Makefile: flatten enumeration of headers, objects and programs
Makefile: DIFF_OBJS is not special at all these days

Don't update unchanged merge entriesLinus Torvalds Sun, 16 Mar 2008 18:42:50 +0000 (11:42 -0700)

Don't update unchanged merge entries

In commit 34110cd4e394e3f92c01a4709689b384c34645d8 ("Make 'unpack_trees()'
have a separate source and destination index") I introduced a really
stupid bug in that it would always add merged entries with the CE_UPDATE
flag set. That caused us to always re-write the file, even when it was
already up-to-date in the source index.

Not only is that really stupid from a performance angle, but more
importantly it's actively wrong: if we have dirty state in the tree when
we merge, overwriting it with the result of the merge will incorrectly
overwrite that dirty state.

This trivially fixes the problem - simply don't set the CE_UPDATE flag
when the merge result matches the old state.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

fast-import: Allow "reset" to delete a new branch witho... Eyvind Bernhardsen Sun, 16 Mar 2008 19:49:09 +0000 (20:49 +0100)

fast-import: Allow "reset" to delete a new branch without error

Creating a branch in fast-import and then resetting it without making
any further commits to it currently causes an error message at the
end of the import.

This error is triggered by cvs2svn's git backend, which uses a
temporary fixup branch when it creates tags, because the fixup branch
is reset after each tag.

This patch prevents the error, allowing "reset" to be used to delete
temporary branches.

Signed-off-by: Eyvind Bernhardsen <eyvind-git@orakel.ntnu.no>
Acked-by: Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t1000: use "test_must_fail git frotz", not "! git frotz"Junio C Hamano Sun, 16 Mar 2008 21:13:04 +0000 (14:13 -0700)

t1000: use "test_must_fail git frotz", not "! git frotz"

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

Update draft release notes for 1.5.5 v1.5.5-rc0Junio C Hamano Sun, 16 Mar 2008 06:59:29 +0000 (23:59 -0700)

Update draft release notes for 1.5.5

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

Resurrect git-rerere to contrib/examplesJunio C Hamano Sun, 16 Mar 2008 06:58:10 +0000 (23:58 -0700)

Resurrect git-rerere to contrib/examples

It is handy to have a copy readily available for checking regressions.

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

Merge branch 'maint'Junio C Hamano Sun, 16 Mar 2008 08:03:16 +0000 (01:03 -0700)

Merge branch 'maint'

* maint:
Start draft ReleaseNotes for 1.5.4.5
rebase -m: do not trigger pre-commit verification

Conflicts:

RelNotes

Start draft ReleaseNotes for 1.5.4.5Junio C Hamano Sun, 16 Mar 2008 06:29:28 +0000 (23:29 -0700)

Start draft ReleaseNotes for 1.5.4.5

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

rebase -m: do not trigger pre-commit verificationJunio C Hamano Sun, 16 Mar 2008 07:50:22 +0000 (00:50 -0700)

rebase -m: do not trigger pre-commit verification

When rebasing changes that contain issues that the pre-commit hook flags
as problematic, the rebase cannot be continued. However, rebase is about
transplanting commits that are already made with as little distortion as
possible, and pre-commit check should not interfere.

Earlier, c5b09fe (Avoid update hook during git-rebase --interactive,
2007-12-19) fixed "rebase -i", but "rebase -m" shared the same issue.

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

Merge branch 'master' of git://repo.or.cz/git-guiJunio C Hamano Sun, 16 Mar 2008 06:07:54 +0000 (23:07 -0700)

Merge branch 'master' of git://repo.or.cz/git-gui

* 'master' of git://repo.or.cz/git-gui:
git-gui: Improve directions regarding POT update in po/README
git-gui: Update Japanese translation
git-gui: Adjusted Japanese translation to updated POT
git-gui: Update Japanese translation
git-gui: Don't translate the special Apple menu
git-gui: Updated Hungarian translation (e5fba18)
git-gui: update russian translation
git-gui: remove spurious "fuzzy" attributes in po/it.po
git-gui: updated Swedish translation
git-gui: Regenerated po template and merged translations with it
Update Hungarian translation. 100% completed.
git-gui: update Italian translation

git-gui: Improve directions regarding POT update in... Junio C Hamano Sat, 15 Mar 2008 07:43:34 +0000 (00:43 -0700)

git-gui: Improve directions regarding POT update in po/README

Keeping POT up to date relative to the software is absolutely
necessary. What is unwarranted is updating language files at
the same time by running msgmerge without checking if there is
any outstanding translation work first. If we assume that the
translators do not have access to msgmerge, that is a good service
to them (the less they have to do, the better), but otherwise,
it is better to be leave po/${language}.po files alone.

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

git-gui: Update Japanese translationしらいしななこ Sat, 15 Mar 2008 11:12:00 +0000 (20:12 +0900)

git-gui: Update Japanese translation

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

Redo "add test_cmp function for test scripts"Junio C Hamano Sat, 15 Mar 2008 08:23:26 +0000 (01:23 -0700)

Redo "add test_cmp function for test scripts"

We had a handful test updates since we accepted 82ebb0b (add test_cmp
function for test scripts). This fixes them up.

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

Merge branch 'jk/portable'Junio C Hamano Sat, 15 Mar 2008 08:10:53 +0000 (01:10 -0700)

Merge branch 'jk/portable'

* jk/portable:
t6000lib: re-fix tr portability
t7505: use SHELL_PATH in hook
t9112: add missing #!/bin/sh header
filter-branch: use $SHELL_PATH instead of 'sh'
filter-branch: don't use xargs -0
add NO_EXTERNAL_GREP build option
t6000lib: tr portability fix
t4020: don't use grep -a
add test_cmp function for test scripts
remove use of "tail -n 1" and "tail -1"
grep portability fix: don't use "-e" or "-q"
more tr portability test script fixes
t0050: perl portability fix
tr portability fixes

Merge branch 'py/submodule'Junio C Hamano Sat, 15 Mar 2008 08:10:44 +0000 (01:10 -0700)

Merge branch 'py/submodule'

* py/submodule:
git-submodule summary: fix that some "wc" flavors produce leading spaces
git-submodule summary: test
git-submodule summary: documentation
git-submodule summary: limit summary size
git-submodule summary: show commit summary
git-submodule summary: code framework

Merge branch 'db/diff-to-fp'Junio C Hamano Sat, 15 Mar 2008 08:10:38 +0000 (01:10 -0700)

Merge branch 'db/diff-to-fp'

* db/diff-to-fp:
wt-status.c: no need for dup() dance anymore
Write diff output to a file in struct diff_options

Merge branch 'cc/help'Junio C Hamano Sat, 15 Mar 2008 08:10:32 +0000 (01:10 -0700)

Merge branch 'cc/help'

* cc/help:
Documentation/git-help: typofix
help: warn if specified 'man.viewer' is unsupported, instead of erroring out
Documentation: help: explain 'man.viewer' multiple values
help: implement multi-valued "man.viewer" config option
Documentation: help: describe 'man.viewer' config variable
help: add "man.viewer" config var to use "woman" or "konqueror"

shortlog: do not require to run from inside a git repos... Jonas Fonseca Fri, 14 Mar 2008 21:35:24 +0000 (22:35 +0100)

shortlog: do not require to run from inside a git repository

Once upon a time shortlog could be run from a non-git directory
and still do its job. Fix this regression and add a small test
for it.

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'maint'Junio C Hamano Sat, 15 Mar 2008 07:09:20 +0000 (00:09 -0700)

Merge branch 'maint'

* maint:
format-patch: generate MIME header as needed even when there is format.header

format-patch: generate MIME header as needed even when... Junio C Hamano Sat, 15 Mar 2008 00:10:09 +0000 (17:10 -0700)

format-patch: generate MIME header as needed even when there is format.header

Earlier, the callchain from pretty_print_commit() down to pp_title_line()
had an unwarranted assumption that the presense of "after_subject"
parameter, means the caller has already output MIME headers for
attachments. The parameter's primary purpose is to give extra header
lines the caller wants to place after pp_title_line() generates the
"Subject: " line.

This assumption does not hold when the user used the format.header
configuration variable to pass extra headers, and caused a message with
non-ASCII character to lack proper MIME headers (e.g. 8-bit CTE header).
The earlier logic also failed to suppress duplicated MIME headers when
"format-patch -s --attach" is asked for and the signer's name demanded
8-bit clean transport.

This patch fixes the logic by introducing a separate need_8bit_cte
parameter passed down the callchain. This can have one of these values:

-1 : we've already done MIME crap and we do not want to add extra header
to say this is 8bit in pp_title_line();

0 : we haven't done MIME and we have not seen anything that is 8bit yet;

1 : we haven't done MIME and we have seen something that is 8bit;
pp_title_line() must add MIME header.

It adds two tests by Jeff King who independently diagnosed this issue.

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

Merge branch 'maint'Junio C Hamano Sat, 15 Mar 2008 07:05:40 +0000 (00:05 -0700)

Merge branch 'maint'

* maint:
Make man page building quiet when DOCBOOK_XSL_172 is defined
git-new-workdir: Share SVN meta data between work dirs and the repository
rev-parse: fix meaning of rev~ vs rev~0.
git-svn: don't blindly append '*' to branch/tags config

Make man page building quiet when DOCBOOK_XSL_172 is... Jonas Fonseca Fri, 14 Mar 2008 21:38:18 +0000 (22:38 +0100)

Make man page building quiet when DOCBOOK_XSL_172 is defined

Tell xmlto to repress printing of the lines:

Note: meta date : No date. Using generated date git-xyx
Note: Writing git-xyz.1

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-new-workdir: Share SVN meta data between work dirs... Bernt Hansen Sat, 15 Mar 2008 02:44:13 +0000 (22:44 -0400)

git-new-workdir: Share SVN meta data between work dirs and the repository

Multiple work dirs with git svn caused each work dir to have its own
stale copy of the SVN meta data in .git/svn

git svn rebase updates commits with git-svn-id: in the repository and
stores the SVN meta data information only in that work dir. Attempting to
git svn rebase in other work dirs for the same branch would fail because
the last revision fetched according to the git-svn-id is greater than the
revision in the SVN meta data for that work directory.

Signed-off-by: Bernt Hansen <bernt@norang.ca>
Acked-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Fix recent 'unpack_trees()'-related changes breaking... Linus Torvalds Sat, 15 Mar 2008 04:20:41 +0000 (21:20 -0700)

Fix recent 'unpack_trees()'-related changes breaking 'git stash'

On Sat, 15 Mar 2008, SZEDER G?bor wrote:
>
> The testcase usually fails during the first 25 run, but sometimes it
> runs more than 100 times before failing.

Damn, this series has had more subtle issues than I ever expected.

'git stash' creates its saved working tree object with:

# state of the working tree
w_tree=$( (
rm -f "$TMP-index" &&
cp -p ${GIT_INDEX_FILE-"$GIT_DIR/index"} "$TMP-index" &&
GIT_INDEX_FILE="$TMP-index" &&
export GIT_INDEX_FILE &&
git read-tree -m $i_tree &&
git add -u &&
git write-tree &&
rm -f "$TMP-index"
) ) ||
die "Cannot save the current worktree state"

which creates a new index file with the updates, and writes the tree from
that.

We have this logic where we compare the timestamp of the index with the
timestamp of the files and we then write them out "smudged" if they are
the same, and it basically depends on the fact that the date on the index
file is compared with the date encoded in the stat information itself.

And what is going on is:

- we create a new index file with that "cp". We are careful to preserve
the timestamps by using "-p", so this one should be all ok.

- then we *update* that index by resetting it to the tree with git
read-tree, but now we do *not* preserve the timestamp on this new copy
any more, even though we copy over all the timestamps on the files that
are indexed from the stat information!

Now, we always had that problem when re-writing the index, but we had this
clever workaround in the writing part: if the source had racily clean
entries, then when we wrote those out (and thus can't depend on the index
fiel timestamp showing that they are racily clean any more!), we would
smudge them when writing.

IOW, we handle this issue by having write_index() do this:

for (i = 0; i < entries; i++) {
...
if (is_racy_timestamp(istate, ce))
ce_smudge_racily_clean_entry(ce);
..

when writing out entries. And that all took care of it, because now when
we wrote the new index, we'd change the timestamp on the index, yes, but
we'd smudge the entries we wrote out, so now the resulting index would
still show that file as not-up-to-date any more.

But with commit 34110cd4e394e3f92c01a4709689b384c34645d8 ("Make
'unpack_trees()' have a separate source and destination index"), this
logic no longer triggers, because we now write out the "result" index, and
that one never got its timestamp updated from the source index, so it had
lost all that "is_racy_timestamp()" information!

This trivial patch fixes it. It looks trivial, and it's a simple fix, but
boy did it take me way too much thinking and explaining to myself to
explain why there was a problem in the first place!

The trivial fix is to just copy the index timestamp from the source index
into the result index. But we only do this if we *have* a source index, of
course, and if we will even bother to use the result.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-gui: Adjusted Japanese translation to updated POTShawn O. Pearce Sat, 15 Mar 2008 06:22:41 +0000 (02:22 -0400)

git-gui: Adjusted Japanese translation to updated POT

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

git-gui: Update Japanese translationしらいしななこ Fri, 14 Mar 2008 13:03:21 +0000 (22:03 +0900)

git-gui: Update Japanese translation

I updated Japanese translation for the latest git-gui.

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

git-gui: Don't translate the special Apple menuShawn O. Pearce Sat, 15 Mar 2008 05:11:08 +0000 (01:11 -0400)

git-gui: Don't translate the special Apple menu

Peter Karlsson pointed out there is no value in translating the
string "Apple", as this is used as the dummy label for the Apple
menu on Mac OS X systems.

The Apple menu is actually not the menu with the Apple corporate
logo, but the menu next to it, which shows the name of the
application and is typically called the application menu. Most users
of git-gui see this menu titled as "Git Gui". The actual label of
this menu comes from our Info.plist file and cannot be specified
by any other means. Translating this string in the Tcl PO files
is not necessary.

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

git-gui: Updated Hungarian translation (e5fba18)Miklos Vajna Fri, 14 Mar 2008 16:28:53 +0000 (17:28 +0100)

git-gui: Updated Hungarian translation (e5fba18)

Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

git-gui: update russian translationAlex Riesen Fri, 14 Mar 2008 22:25:57 +0000 (23:25 +0100)

git-gui: update russian translation

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

git-gui: remove spurious "fuzzy" attributes in po/it.poMichele Ballabio Fri, 14 Mar 2008 20:59:52 +0000 (21:59 +0100)

git-gui: remove spurious "fuzzy" attributes in po/it.po

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

rev-parse: fix meaning of rev~ vs rev~0.Linus Torvalds Fri, 14 Mar 2008 18:49:40 +0000 (11:49 -0700)

rev-parse: fix meaning of rev~ vs rev~0.

I think it would make more sense for rev~ to have the same guarantees that
rev^ has, namely to always return a commit. I would also suggest that not
giving a number would have the same effect of defaulting to 1, not 0.

Right now it's a bit illogical, but at least it's an _undocumented_
illogical behaviour.

This patch makes '^' and '~' act the same for the default count (i.e. both
default to 1), and also have the same behaviour for a count of zero.

Before (no discernible pattern):

[torvalds@woody git]$ git rev-parse v1.5.1 v1.5.1^0 v1.5.1~0 v1.5.1^ v1.5.1~
45354a57ee7e3e42c7137db6c94fa968c6babe8d
89815cab95268e8f0f58142b848ac4cd5e9cbdcb
45354a57ee7e3e42c7137db6c94fa968c6babe8d
045f5759c97746589a067461e50fad16f60711ac
45354a57ee7e3e42c7137db6c94fa968c6babe8d

After (fairly logical):

[torvalds@woody git]$ git rev-parse v1.5.1 v1.5.1^0 v1.5.1~0 v1.5.1^ v1.5.1~
45354a57ee7e3e42c7137db6c94fa968c6babe8d
89815cab95268e8f0f58142b848ac4cd5e9cbdcb
89815cab95268e8f0f58142b848ac4cd5e9cbdcb
045f5759c97746589a067461e50fad16f60711ac
045f5759c97746589a067461e50fad16f60711ac

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-svn: don't blindly append '*' to branch/tags configEric Wong Fri, 14 Mar 2008 18:01:23 +0000 (11:01 -0700)

git-svn: don't blindly append '*' to branch/tags config

Previously, git-svn would blindly append '*' even if it was specified by
the user during initialization (for certain SVN setups, it is
necessary).

Now, the following command will work correctly:

git svn init -T trunk/docutils \
-t 'tags/*/docutils' \
-b 'branches/*/docutils' \
svn://svn.berlios.de/docutils

Thanks to martin f krafft for the bug report:
> My git-svn target configuration is
>
> [svn-remote "svn"]
> url = svn://svn.berlios.de/docutils
> fetch = trunk/docutils:refs/remotes/trunk
> branches = branches/*/docutils:refs/remotes/*
> tags = tags/*/docutils:refs/remotes/tags/*
>
> Unfortunately, when I run
>
> git-svn init -T trunk/docutils -t 'tags/*/docutils'
> -b 'branches/*/docutils'
>
> then I get (note the two asterisks on the left hand side):
>
> branches = branches/*/docutils/*:refs/remotes/*
> tags = tags/*/docutils/*:refs/remotes/tags/*
>
> I took a brief stab at the code but I can't even figure out where
> the /* is appended, so I defer to you.
>
> It should be trivial to keep git-svn from appending /* if the left
> side already contains an asterisk.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Tested-by: martin f krafft <madduck@madduck.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t6000lib: re-fix tr portabilityJeff King Sat, 15 Mar 2008 00:32:33 +0000 (20:32 -0400)

t6000lib: re-fix tr portability

It seems that some implementations of tr don't like a
replacement string of '-----...'; they try to find the
double-dash option "---...".

Instead of this pipeline of tr and sed invocations, just use a
single perl invocation.

Signed-off-by: Jeff King <peff@peff.net>

Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano Sat, 15 Mar 2008 00:49:40 +0000 (17:49 -0700)

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

* git://git.kernel.org/pub/scm/gitk/gitk:
gitk: initial Italian translation
gitk: Default to using po2msg.sh if msgfmt doesn't grok --tcl, -l and -d
gitk: Avoid Tcl error when switching views
[PATCH] gitk: Don't show local changes when we there is no work tree
[PATCH] gitk: Add horizontal scrollbar to the diff view
[PATCH] gitk: make autoselect optional
[PATCH] gitk: Mark another string for translation
[PATCH] Add an --argscmd flag to get the list of refs to show
gitk: Only restore window size from ~/.gitk, not position

gitk: initial Italian translationMichele Ballabio Thu, 13 Mar 2008 16:46:30 +0000 (17:46 +0100)

gitk: initial Italian translation

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

gitk: Default to using po2msg.sh if msgfmt doesn't... Paul Mackerras Fri, 14 Mar 2008 09:24:31 +0000 (20:24 +1100)

gitk: Default to using po2msg.sh if msgfmt doesn't grok --tcl, -l and -d

This is a similar change to that submitted by Junio C Hamano for
git-gui. It tests whether the msgfmt command can be run successfully
with --tcl, -l and -d, and if not, falls back to using po/po2msg.sh.

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

wt-status.c: no need for dup() dance anymoreKristian Høgsberg Mon, 10 Mar 2008 17:58:26 +0000 (13:58 -0400)

wt-status.c: no need for dup() dance anymore

Now we can generate diff to a file descriptor, we do not have to
dup() the stdout around when writing the status output.

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

Write diff output to a file in struct diff_optionsDaniel Barkalow Mon, 10 Mar 2008 02:43:39 +0000 (22:43 -0400)

Write diff output to a file in struct diff_options

Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Documention: web--browse: add info about "browser.... Christian Couder Fri, 14 Mar 2008 04:56:53 +0000 (05:56 +0100)

Documention: web--browse: add info about "browser.<tool>.cmd" config var

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

web--browse: use custom commands defined at config... Christian Couder Fri, 14 Mar 2008 04:56:49 +0000 (05:56 +0100)

web--browse: use custom commands defined at config time

Currently "git web--browse" is restricted to a set of commands defined
in the script. You can subvert the "browser.<tool>.path" to force "git
web--browse" to use a different command, but if you have a command
whose invocation syntax does not match one of the current tools then
you would have to write a wrapper script for it.

This patch adds a git config variable "browser.<tool>.cmd" which
allows a more flexible browser choice.

If you run "git web--browse" with -t/--tool, -b/--browser or the
"web.browser" config variable set to an unrecognized tool then "git
web--browse" will query the "browser.<tool>.cmd" config variable. If
this variable exists, then "git web--browse" will treat the specified
tool as a custom command and will use a shell eval to run the command
with the URLs added as extra parameters.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'mr/autoconf-fread'Junio C Hamano Fri, 14 Mar 2008 07:27:59 +0000 (00:27 -0700)

Merge branch 'mr/autoconf-fread'

* mr/autoconf-fread:
autoconf: Test FREAD_READS_DIRECTORIES

Merge branch 'maint'Junio C Hamano Fri, 14 Mar 2008 07:16:42 +0000 (00:16 -0700)

Merge branch 'maint'

* maint:
merge-file: handle empty files gracefully
merge-recursive: handle file mode changes
Minor wording changes in the keyboard descriptions in git-add --interactive.
git fetch: Take '-n' to mean '--no-tags'
quiltimport: fix misquoting of parsed -p<num> parameter
git-quiltimport: better parser to grok "enhanced" series files.

Merge branch 'ph/maint-quiltimport' into maintJunio C Hamano Fri, 14 Mar 2008 07:16:26 +0000 (00:16 -0700)

Merge branch 'ph/maint-quiltimport' into maint

* ph/maint-quiltimport:
quiltimport: fix misquoting of parsed -p<num> parameter
git-quiltimport: better parser to grok "enhanced" series files.

read-tree() and unpack_trees(): use consistent limitJunio C Hamano Fri, 14 Mar 2008 05:07:18 +0000 (22:07 -0700)

read-tree() and unpack_trees(): use consistent limit

read-tree -m can read up to MAX_TREES, which was arbitrarily set to 8 since
August 2007 (4 is needed to deal with 2 merge-base case).

However, the updated unpack_trees() code had an advertised limit of 4
(which it enforced). In reality the code was prepared to take only 3
trees and giving 4 caused it to stomp on its stack. Rename the MAX_TREES
constant to MAX_UNPACK_TREES, move it to the unpack-trees.h common header
file, and use it from both places to avoid future confusion.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

merge-file: handle empty files gracefullyJohannes Schindelin Thu, 13 Mar 2008 15:19:35 +0000 (16:19 +0100)

merge-file: handle empty files gracefully

Earlier, it would error out while trying to read and/or writing them.
Now, calling merge-file with empty files is neither interesting nor
useful, but it is a bug that needed fixing.

Noticed by Clemens Buchacher.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>

merge-recursive: handle file mode changesClemens Buchacher Thu, 13 Mar 2008 22:47:41 +0000 (23:47 +0100)

merge-recursive: handle file mode changes

File mode changes should be handled similarly to changes of content.
That is, if the file mode changed in only one branch, keep the changed
version, and if both branch changed to different mode, mark it as a
conflict.

Signed-off-by: Clemens Buchacher <drizzd@aon.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-gui: updated Swedish translationPeter Karlsson Fri, 14 Mar 2008 06:36:44 +0000 (02:36 -0400)

git-gui: updated Swedish translation

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