gitweb.git
Merge branch 'maint-1.5.4' into maint-1.5.5Junio C Hamano Wed, 11 Feb 2009 09:40:12 +0000 (01:40 -0800)

Merge branch 'maint-1.5.4' into maint-1.5.5

* maint-1.5.4:
revision traversal and pack: notice and die on missing commit

revision traversal and pack: notice and die on missing... Junio C Hamano Wed, 11 Feb 2009 09:27:43 +0000 (01:27 -0800)

revision traversal and pack: notice and die on missing commit

cc0e6c5 (Handle return code of parse_commit in revision machinery,
2007-05-04) attempted to tighten error checking in the revision machinery,
but it wasn't enough. When get_revision_1() was asked for the next commit
to return, it tries to read and simplify the parents of the commit to be
returned, but an error while doing so was silently ignored and reported as
a truncated history to the caller instead.

This resulted in an early end of "git log" output or a pack that lacks
older commits from "git pack-objects", without any error indication in the
exit status from these commands, even though the underlying parse_commit()
issues an error message to the end user.

Note that the codepath in add_parents_list() that paints parents of an
UNINTERESTING commit UNINTERESTING silently ignores the error when
parse_commit() fails; this is deliberate and in line with aeeae1b
(revision traversal: allow UNINTERESTING objects to be missing,
2009-01-27).

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

GIT 1.5.5.6 v1.5.5.6Junio C Hamano Wed, 17 Dec 2008 06:08:22 +0000 (22:08 -0800)

GIT 1.5.5.6

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

GIT 1.5.4.7 v1.5.4.7Junio C Hamano Wed, 17 Dec 2008 06:03:29 +0000 (22:03 -0800)

GIT 1.5.4.7

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

gitweb: do not run "git diff" that is PorcelainJunio C Hamano Wed, 17 Dec 2008 03:42:02 +0000 (19:42 -0800)

gitweb: do not run "git diff" that is Porcelain

Jakub says that legacy-style URI to view two blob differences are never
generated since 1.4.3. This codepath runs "git diff" Porcelain from the
gitweb, which is a no-no. It can trigger diff.external command that is
specified in the configuration file of the repository being viewed.

This patch applies to v1.5.4 and later.

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

GIT 1.5.5.5 v1.5.5.5Junio C Hamano Fri, 27 Jun 2008 00:16:50 +0000 (17:16 -0700)

GIT 1.5.5.5

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

Merge branch 'maint-1.5.4' into maint-1.5.5Junio C Hamano Fri, 27 Jun 2008 00:14:03 +0000 (17:14 -0700)

Merge branch 'maint-1.5.4' into maint-1.5.5

* maint-1.5.4:
GIT 1.5.4.6
git-shell: accept "git foo" form

Conflicts:

GIT-VERSION-GEN
RelNotes

GIT 1.5.4.6 v1.5.4.6Junio C Hamano Fri, 27 Jun 2008 00:11:21 +0000 (17:11 -0700)

GIT 1.5.4.6

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

git-shell: accept "git foo" formJunio C Hamano Sun, 2 Dec 2007 06:16:19 +0000 (22:16 -0800)

git-shell: accept "git foo" form

This is a backport of 0a47dc110e042b5bcc63dc94c8d517e67efe9306
to 'maint' to be included in 1.5.6.2 so that older server side
can accept dashless form of request when clients are updated.

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

diff.c: fix emit_line() again not to add extra lineJunio C Hamano Tue, 17 Jun 2008 00:37:21 +0000 (17:37 -0700)

diff.c: fix emit_line() again not to add extra line

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

diff: reset color before printing newlineSZEDER Gábor Mon, 16 Jun 2008 22:00:02 +0000 (00:00 +0200)

diff: reset color before printing newline

It worked that way since commit 50f575fc (Tweak diff colors,
2006-06-22), but commit c1795bb0 (Unify whitespace checking, 2007-12-13)
changed it. This patch restores the old behaviour.

Besides Linus' arguments in the log message of 50f575fc, resetting color
before printing newline is also important to keep 'git add --patch'
happy. If the last line(s) of a file are removed, then that hunk will
end with a colored line. However, if the newline comes before the color
reset, then the diff output will have an additional line at the end
containing only the reset sequence. This causes trouble in
git-add--interactive.perl's parse_diff function, because @colored will
have one more element than @diff, and that last element will contain the
color reset. The elements of these arrays will then be copied to @hunk,
but only as many as the number of elements in @diff. As a result the
last color reset is lost and all subsequent terminal output will be
printed in color.

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

fix typo in tutorialFred Maranhão Wed, 11 Jun 2008 23:09:48 +0000 (19:09 -0400)

fix typo in tutorial

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

git-read-tree: document -v option.Miklos Vajna Mon, 9 Jun 2008 20:25:15 +0000 (22:25 +0200)

git-read-tree: document -v option.

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

Remove exec bit from builtin-fast-export.cJohannes Sixt Sun, 8 Jun 2008 14:40:13 +0000 (16:40 +0200)

Remove exec bit from builtin-fast-export.c

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

GIT 1.5.5.4 v1.5.5.4Junio C Hamano Sat, 7 Jun 2008 18:45:48 +0000 (11:45 -0700)

GIT 1.5.5.4

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

git-for-each-ref.txt: minor improvementsLea Wiemann Thu, 5 Jun 2008 21:01:38 +0000 (23:01 +0200)

git-for-each-ref.txt: minor improvements

Rewrapped synopsis and removed wrong asterisk behind --count option;
clarified --sort=<key> description for multiple keys; documented that
for-each-ref supports not only glob patterns but also prefixes like
"refs/heads" as patterns, and that multiple patterns can be given.

Signed-off-by: Lea Wiemann <LeWiemann@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

name-rev: Fix segmentation fault when using --allBjörn Steinbrink Thu, 5 Jun 2008 23:31:55 +0000 (01:31 +0200)

name-rev: Fix segmentation fault when using --all

In commit da2478db "describe --always: fall back to showing an
abbreviated object name" we lost the check that skips empty entries in
the object hash table when iterating over it in cmd_name_rev. That may
cause a NULL pointer being handed to show_name(), leading to a
segmentation fault. So add that check back again.

Signed-off-by: Björn Steinbrink <B.Steinbrink@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

describe: match pattern for lightweight tags tooMichael Dressel Wed, 4 Jun 2008 19:06:31 +0000 (21:06 +0200)

describe: match pattern for lightweight tags too

The <pattern> given "git describe --match" was used only to filter tag
objects, and not to filter lightweight tags. This fixes it.

[jc: made the log to clarify this is a bugfix, not an enhancement, with
additional test]

Signed-off-by: Michael Dressel <MichaelTiloDressel@t-online.de>
Acked-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

GIT 1.5.5.3 v1.5.5.3Junio C Hamano Wed, 28 May 2008 05:20:53 +0000 (22:20 -0700)

GIT 1.5.5.3

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

commit --interactive: properly update the index before... Gerrit Pape Tue, 27 May 2008 08:59:16 +0000 (08:59 +0000)

commit --interactive: properly update the index before commiting

When adding files through git commit --interactive, and 'quit'
afterwards, the message in the editor of the commit message indicates
that many (maybe all) files are deleted from the tree. Dismissing that
and running git commit afterwards does the right thing. This commit
fixes git commit --interactive to properly update the index before
commiting.

Reported by Jiří Paleček through
http://bugs.debian.org/480429

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

gitweb: only display "next" links in logs if there... Lea Wiemann Tue, 27 May 2008 23:25:42 +0000 (01:25 +0200)

gitweb: only display "next" links in logs if there is a next page

There was a bug in the implementation of the "next" links in
format_paging_nav (for log and shortlog), which caused the next links
to always be displayed, even if there is no next page. This fixes it.

Signed-off-by: Lea Wiemann <LeWiemann@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Revert "filter-branch: subdirectory filter needs -... Johannes Sixt Mon, 26 May 2008 19:09:18 +0000 (21:09 +0200)

Revert "filter-branch: subdirectory filter needs --full-history"

This reverts commit cfabd6eee1745cfec58cfcb794ce8847e43b888a. I had
implemented it without understanding what --full-history does. Consider
this history:

C--M--N
/ / /
A--B /
\ /
D-/

where B and C modify a path, X, in the same way so that the result is
identical, and D does not modify it at all. With the path limiter X and
without --full-history this is simplified to

A--B

i.e. only one of the paths via B or C is chosen. I had assumed that
--full-history would keep both paths like this

C--M
/ /
A--B

removing the path via D; but in fact it keeps the entire history.

Currently, git does not have the capability to simplify to this
intermediary case. However, the other extreme to keep the entire history
is not wanted either in usual cases. I think we can expect that histories
like the above are rare, and in the usual cases we want a simplified
history. So let's remove --full-history again.

(Concerning t7003, subsequent tests depend on what the test case sets up,
so we can't just back out the entire test case.)

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

Documentation/git-bundle.txt: fix synopsisGerrit Pape Tue, 27 May 2008 08:51:22 +0000 (08:51 +0000)

Documentation/git-bundle.txt: fix synopsis

The <git-rev-list args> are mandatory to git bundle create, not
optional. The usage output of git bundle is already right on this.

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

Merge branch 'gp/bisect-fix' into maintJunio C Hamano Tue, 27 May 2008 02:15:03 +0000 (19:15 -0700)

Merge branch 'gp/bisect-fix' into maint

* gp/bisect-fix:
bisect: print an error message when "git rev-list --bisect-vars" fails
git-bisect.sh: don't accidentally override existing branch "bisect"

Documentation: fix graph in git-rev-parse.txtMichele Ballabio Mon, 26 May 2008 13:24:02 +0000 (15:24 +0200)

Documentation: fix graph in git-rev-parse.txt

Preformatted html and man pages show a mangled graph, caused by a
backslash.

Commit f1ec6b22a8c1ab1cca0f1875f85aea5d2434e5a6 fixed this same issue,
but it seems that new versions of the Asciidoc toolchain changed their
behaviour.

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

show-branch --current: do not barf on detached HEADJunio C Hamano Mon, 26 May 2008 22:09:51 +0000 (15:09 -0700)

show-branch --current: do not barf on detached HEAD

The code assumed that there always is the current branch, but the result
from resolve_ref() on detached HEAD does not even start with "refs/heads/".

Originally noticed and fixed by Stephan Beyer.

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

Merge branch 'jk/maint-send-email-compose' into maintJunio C Hamano Mon, 26 May 2008 05:34:23 +0000 (22:34 -0700)

Merge branch 'jk/maint-send-email-compose' into maint

* jk/maint-send-email-compose:
send-email: rfc2047-quote subject lines with non-ascii characters
send-email: specify content-type of --compose body

Merge branch 'hb/maint-send-email-quote-recipients... Junio C Hamano Mon, 26 May 2008 05:34:20 +0000 (22:34 -0700)

Merge branch 'hb/maint-send-email-quote-recipients' into maint

* hb/maint-send-email-quote-recipients:
Fix recipient santitization

Merge branch 'maint-1.5.4' into maintJunio C Hamano Mon, 26 May 2008 05:34:05 +0000 (22:34 -0700)

Merge branch 'maint-1.5.4' into maint

* maint-1.5.4:
builtin-fast-export: Only output a single parent per line

builtin-fast-export: Only output a single parent per... Pieter de Bie Sat, 24 May 2008 23:21:53 +0000 (01:21 +0200)

builtin-fast-export: Only output a single parent per line

According to the git-fast-import man-page, you can only put a single
committish per merge: line, like this:

merge :10
merge :11

However, git-fast-export puts all parents on a single line, like this:

merge :10 :11

This changes fast-export to output a single parent per line. Otherwise
neither git-fast-import nor bzr-fast-import can read its output.

[jc: fix-up to remove excess LF in the output that makes fast-import barf]

Signed-off-by: Pieter de Bie <pdebie@ai.rug.nl>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Release Notes for 1.5.5.2Junio C Hamano Mon, 26 May 2008 04:11:24 +0000 (21:11 -0700)

Release Notes for 1.5.5.2

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

Merge branch 'maint-1.5.4' into maint v1.5.5.2Junio C Hamano Fri, 23 May 2008 22:52:43 +0000 (15:52 -0700)

Merge branch 'maint-1.5.4' into maint

* maint-1.5.4:
rev-parse --symbolic-full-name: don't print '^' if SHA1 is not a ref

rev-parse --symbolic-full-name: don't print '^' if... Johannes Sixt Fri, 23 May 2008 14:13:05 +0000 (16:13 +0200)

rev-parse --symbolic-full-name: don't print '^' if SHA1 is not a ref

The intention of --symbolic-full-name is to not print anything if a
revision is not an exact ref. But this command:

$ git-rev-parse --symbolic-full-name --not master~1

still emitted a sole '^' to stdout (provided that there's no other ref at
master~1). This fixes it.

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

Add missing "short" alternative to --date in rev-list... Heikki Orsila Thu, 22 May 2008 15:24:41 +0000 (18:24 +0300)

Add missing "short" alternative to --date in rev-list-options.txt

Signed-off-by: Heikki Orsila <heikki.orsila@iki.fi>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-show.txt: Not very stubby these days.Jon Loeliger Thu, 22 May 2008 19:59:25 +0000 (14:59 -0500)

git-show.txt: Not very stubby these days.

Signed-off-by: Jon Loeliger <jdl@freescale.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Clarify repack -n documentationShawn O. Pearce Thu, 22 May 2008 12:47:19 +0000 (08:47 -0400)

Clarify repack -n documentation

While repacking a local repository a coworker thought the -n option
was necessary to git-repack to keep it from updating some unknown
file on the central server we all share. Explaining further what
the option is (not) doing helps to make it clear the option does
not impact any remote repositories the user may have configured.

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

Merge branch 'maint-1.5.4' into maintJunio C Hamano Wed, 21 May 2008 21:27:59 +0000 (14:27 -0700)

Merge branch 'maint-1.5.4' into maint

* maint-1.5.4:
git-am: fix typo in usage message
doc/git-daemon: s/uploadarchive/uploadarch/

Fix recipient santitizationHorst H. von Brand Fri, 28 Mar 2008 14:09:04 +0000 (11:09 -0300)

Fix recipient santitization

Need to quote all special characters, not just the first one

Signed-off-by: Horst H. von Brand <vonbrand@inf.utfsm.cl>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

send-email: rfc2047-quote subject lines with non-ascii... Jeff King Fri, 28 Mar 2008 21:29:01 +0000 (17:29 -0400)

send-email: rfc2047-quote subject lines with non-ascii characters

We always use 'utf-8' as the encoding, since we currently
have no way of getting the information from the user.

This also refactors the quoting of recipient names, since
both processes can share the rfc2047 quoting code.

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

send-email: specify content-type of --compose bodyJeff King Fri, 28 Mar 2008 21:28:33 +0000 (17:28 -0400)

send-email: specify content-type of --compose body

If the compose message contains non-ascii characters, then
we assume it is in utf-8 and include the appropriate MIME
headers. If the user has already included a MIME-Version
header, then we assume they know what they are doing and
don't add any headers.

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

git-am: fix typo in usage messageJeff King Mon, 19 May 2008 20:09:06 +0000 (16:09 -0400)

git-am: fix typo in usage message

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

doc/git-daemon: s/uploadarchive/uploadarch/Jeff King Mon, 19 May 2008 20:08:33 +0000 (16:08 -0400)

doc/git-daemon: s/uploadarchive/uploadarch/

The git-daemon upload-archive feature has always used the
config directive 'daemon.uploadarch'; the documentation
which came later seems to have just mistakenly used the
wrong name.

Noticed by lionel@over-blog.com.

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

git-filter-branch: Clarify file removal example.Jon Loeliger Fri, 16 May 2008 19:43:50 +0000 (14:43 -0500)

git-filter-branch: Clarify file removal example.

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

Merge branch 'maint-1.5.4' into maintJunio C Hamano Wed, 14 May 2008 20:46:42 +0000 (13:46 -0700)

Merge branch 'maint-1.5.4' into maint

* maint-1.5.4:
Documentation/git-describe.txt: make description more readable

Documentation/git-describe.txt: make description more... Ian Hilt Wed, 14 May 2008 18:30:55 +0000 (14:30 -0400)

Documentation/git-describe.txt: make description more readable

Signed-off-by: Ian Hilt <ian.hilt@gmail.com>
Credit-to: Kevin Ballard <kevin@sb.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'maint-1.5.4' into maintJunio C Hamano Sun, 11 May 2008 19:09:12 +0000 (12:09 -0700)

Merge branch 'maint-1.5.4' into maint

* maint-1.5.4:
wt-status.h: declare global variables as extern
builtin-commit.c: add -u as short name for --untracked-files
git-repack: re-enable parsing of -n command line option

wt-status.h: declare global variables as externJohannes Sixt Fri, 9 May 2008 08:05:27 +0000 (10:05 +0200)

wt-status.h: declare global variables as extern

There are linkers out there that complain if a global non-static variable
is defined multiple times.

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

builtin-commit.c: add -u as short name for --untracked... Sitaram Chamarty Fri, 9 May 2008 17:12:55 +0000 (22:42 +0530)

builtin-commit.c: add -u as short name for --untracked-files

This makes the C code consistent with the documentation and the old shell
code.

Signed-off-by: Sitaram Chamarty <sitaramc@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-repack: re-enable parsing of -n command line optionA Large Angry SCM Sat, 10 May 2008 20:52:51 +0000 (16:52 -0400)

git-repack: re-enable parsing of -n command line option

In commit 5715d0b (Migrate git-repack.sh to use git-rev-parse --parseopt,
2007-11-04), parsing of the '-n' command line option was accidentally lost
when git-repack.sh was migrated to use git-rev-parse --parseopt. This adds
it back.

Signed-off-by: A Large Angry SCM <gitzilla@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'maint-1.5.4' into maintJunio C Hamano Fri, 9 May 2008 03:12:44 +0000 (20:12 -0700)

Merge branch 'maint-1.5.4' into maint

* maint-1.5.4:
Documentation/config.txt: Mention branch.<name>.rebase applies to "git pull"
doc: clarify definition of "update" for git-add -u

bisect: print an error message when "git rev-list ... Christian Couder Wed, 7 May 2008 21:54:28 +0000 (23:54 +0200)

bisect: print an error message when "git rev-list --bisect-vars" fails

Before this patch no error was printed when "git rev-list --bisect-vars"
failed. This can happen when bad and good revs are mistaken.

This patch prints an error message on stderr that describe the likely
failure cause.

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

Documentation/config.txt: Mention branch.<name>.rebase... Dustin Sallings Thu, 8 May 2008 18:28:07 +0000 (11:28 -0700)

Documentation/config.txt: Mention branch.<name>.rebase applies to "git pull"

Signed-off-by: Dustin Sallings <dustin@spy.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

doc: clarify definition of "update" for git-add -uJeff King Thu, 8 May 2008 17:25:06 +0000 (13:25 -0400)

doc: clarify definition of "update" for git-add -u

The "-u" option is described only in terms of "updating"
files, which in turn is described only as "similar to what
git commit -a does". Let's be a little more specific about
what updating entails.

Suggested by Geoffrey Irving.

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

git-bisect.sh: don't accidentally override existing... Gerrit Pape Mon, 5 May 2008 07:43:00 +0000 (07:43 +0000)

git-bisect.sh: don't accidentally override existing branch "bisect"

If a branch named "bisect" or "new-bisect" already was created in the
repo by other means than git bisect, doing a git bisect used to override
the branch without a warning. Now if the branch "bisect" or
"new-bisect" already exists, and it was not created by git bisect itself,
git bisect start fails with an appropriate error message. Additionally,
if checking out a new bisect state fails due to a merge problem, git
bisect cleans up the temporary branch "new-bisect".

The accidental override has been noticed by Andres Salomon, reported
through
http://bugs.debian.org/478647

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

Merge branch 'maint-1.5.4' into maintJunio C Hamano Sun, 4 May 2008 01:55:33 +0000 (18:55 -0700)

Merge branch 'maint-1.5.4' into maint

* maint-1.5.4:
filter-branch: Documentation fix.

checkout: don't rfc2047-encode oneline on detached... Jeff King Fri, 2 May 2008 14:05:36 +0000 (10:05 -0400)

checkout: don't rfc2047-encode oneline on detached HEAD

When calling pretty_print_commit, there is an implicit
assumption that passing in a non-NULL "subject" variable
for oneline or email formats means that the output is part
of a subject and therefore "subject" to rfc2047 encoding.
This is not the desired effect when reporting the movement
of detached HEAD.

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

filter-branch: Documentation fix.Florian Ragwitz Wed, 30 Apr 2008 07:47:43 +0000 (09:47 +0200)

filter-branch: Documentation fix.

It's --msg-filter, not --message-filter.

Signed-off-by: Florian Ragwitz <rafl@debian.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

fetch-pack: brown paper bag fixJunio C Hamano Wed, 30 Apr 2008 18:42:05 +0000 (11:42 -0700)

fetch-pack: brown paper bag fix

When I applied Linus's patch from the list by hand somehow I ended
up reversing the logic by mistake. This fixes it.

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

Merge branch 'maint-1.5.4' into maintJunio C Hamano Wed, 30 Apr 2008 05:55:07 +0000 (22:55 -0700)

Merge branch 'maint-1.5.4' into maint

* maint-1.5.4:
cvsimport: always pass user data to "system" as a list
fix reflog approxidate parsing bug

cvsimport: always pass user data to "system" as a listJeff King Wed, 30 Apr 2008 04:36:14 +0000 (00:36 -0400)

cvsimport: always pass user data to "system" as a list

This avoids invoking the shell. Not only is it faster, but
it prevents the possibility of interpreting our arguments in
the shell.

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

fix reflog approxidate parsing bugJeff King Wed, 30 Apr 2008 04:13:58 +0000 (00:13 -0400)

fix reflog approxidate parsing bug

In get_sha1_basic, we parse a string like

HEAD@{10 seconds ago}:path/to/file

into its constituent ref, reflog date, and path components.
We never actually munge the string itself, but instead keep
offsets into the string with their associated lengths.

When we call approxidate on the contents inside braces,
however, we pass just a string without a length. This means
that approxidate could sometimes look past the closing brace
and (erroneously) interpret the rest of the string as part
of the date.

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

Fix use after free() in builtin-fetchAlex Riesen Mon, 28 Apr 2008 20:23:35 +0000 (22:23 +0200)

Fix use after free() in builtin-fetch

As reported by Dave Jones:

Since master.kernel.org updated to latest, I noticed that I could crash
git-fetch by doing this..

export KERNEL=/pub/scm/linux/kernel/git/
git fetch $KERNEL/torvalds/linux-2.6 master:linus

(gdb) bt
0 0x000000349fd6d44b in free () from /lib64/libc.so.6
1 0x000000000048f4eb in transport_unlock_pack (transport=0x7ce530) at transport.c:811
2 0x000000349fd31b25 in exit () from /lib64/libc.so.6
3 0x00000000004043d8 in handle_internal_command (argc=3, argv=0x7fffea4449f0) at git.c:379
4 0x0000000000404547 in main (argc=3, argv=0x7fffea4449f0) at git.c:443
5 0x000000349fd1c784 in __libc_start_main () from /lib64/libc.so.6
6 0x0000000000403ef9 in ?? ()
7 0x00007fffea4449d8 in ?? ()
8 0x0000000000000000 in ?? ()

I then remembered, my .bashrc has this..

export MALLOC_PERTURB_=$(($RANDOM % 255 + 1))

which is handy for showing up such bugs.

More info on this glibc feature is at http://udrepper.livejournal.com/11429.html

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

fetch-pack: do not stop traversing an already parsed... Linus Torvalds Mon, 28 Apr 2008 23:27:49 +0000 (16:27 -0700)

fetch-pack: do not stop traversing an already parsed commit

f3ec549 (fetch-pack: check parse_commit/object results, 2008-03-03)
broke common ancestor computation by stopping traversal when it sees
an already parsed commit. This should fix it.

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

Use "=" instead of "==" in condition as it is more... Alex Riesen Mon, 28 Apr 2008 21:09:55 +0000 (23:09 +0200)

Use "=" instead of "==" in condition as it is more portable

At least the dash from Ubuntu's /bin/sh says:

test: 233: ==: unexpected operator

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

clone: detect and fail on excess parametersJunio C Hamano Wed, 23 Apr 2008 17:53:47 +0000 (10:53 -0700)

clone: detect and fail on excess parameters

"git clone [options] $src $dst excess-garbage" simply ignored
excess-garbage without giving any diagnostic message. Fix it.

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

Merge branch 'maint-1.5.4' into maintJunio C Hamano Mon, 28 Apr 2008 04:47:38 +0000 (21:47 -0700)

Merge branch 'maint-1.5.4' into maint

* maint-1.5.4:
Remove 'header' from --signoff option description

Remove 'header' from --signoff option descriptionDan McGee Sun, 27 Apr 2008 00:43:20 +0000 (19:43 -0500)

Remove 'header' from --signoff option description

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

remote: create fetch config lines with '+'Jeff King Tue, 22 Apr 2008 11:11:13 +0000 (07:11 -0400)

remote: create fetch config lines with '+'

Since git-remote always uses remote tracking branches, it
should be safe to always force updates of those branches.
I.e., we should generate

fetch = +refs/heads/*:refs/remotes/$remote/*

instead of

fetch = refs/heads/*:refs/remotes/$remote/*

This was the behavior of the perl version, which seems to
have been lost in the C rewrite.

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

push: allow unqualified dest refspecs to DWIMJeff King Wed, 23 Apr 2008 09:16:06 +0000 (05:16 -0400)

push: allow unqualified dest refspecs to DWIM

Previously, a push like:

git push remote src:dst

would go through the following steps:

1. check for an unambiguous 'dst' on the remote; if it
exists, then push to that ref
2. otherwise, check if 'dst' begins with 'refs/'; if it
does, create a new ref
3. otherwise, complain because we don't know where in the
refs hierarchy to put 'dst'

However, in some cases, we can guess about the ref type of
'dst' based on the ref type of 'src'. Specifically, before
complaining we now check:

2.5. if 'src' resolves to a ref starting with refs/heads
or refs/tags, then prepend that to 'dst'

So now this creates a new branch on the remote, whereas it
previously failed with an error message:

git push master:newbranch

Note that, by design, we limit this DWIM behavior only to
source refs which resolve exactly (including symrefs which
resolve to existing refs). We still complain on a partial
destination refspec if the source is a raw sha1, or a ref
expression such as 'master~10'.

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

Merge branch 'maint-1.5.4' into maintJunio C Hamano Fri, 25 Apr 2008 04:50:48 +0000 (21:50 -0700)

Merge branch 'maint-1.5.4' into maint

* maint-1.5.4:
t5516: remove ambiguity test (1)
Linked glossary from cvs-migration page
write-tree: properly detect failure to write tree objects

doc/git-gc: add a note about what is collectedJeff King Thu, 24 Apr 2008 01:28:36 +0000 (21:28 -0400)

doc/git-gc: add a note about what is collected

It seems to be a FAQ that people try running git-gc, and
then get puzzled about why the size of their .git directory
didn't change. This note mentions the reasons why things
might unexpectedly get kept.

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

t5516: remove ambiguity test (1)Jeff King Wed, 23 Apr 2008 09:21:45 +0000 (05:21 -0400)

t5516: remove ambiguity test (1)

This test tried to push into a remote with ambiguous refs in
remotes/$x/master and remotes/$y/master. However, the remote
never actually tells us about the refs/remotes hierarchy, so
we don't even see this ambiguity.

The test happened to pass because we were simply looking for
failure, and the test fails for another reason: the dst
refspec does not exist and does not begin with refs/, making
it invalid.

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

Linked glossary from cvs-migration pageMatt Graham Wed, 23 Apr 2008 13:13:51 +0000 (09:13 -0400)

Linked glossary from cvs-migration page

Coming from CVS, I found the git glossary vital to learning git and learning
how terms in git correlate to the cvs terminology with which I am familiar.

This patch links the glossary from the cvs-migration page so cvs users will
be able to fine the glossary as soon as they start looking at git documents.

Signed-off-by: Matt Graham <mdg149@gmail.com>
Acked-by: J. Bruce Fields <bfields@fieldses.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

write-tree: properly detect failure to write tree objectsJunio C Hamano Wed, 23 Apr 2008 16:47:17 +0000 (09:47 -0700)

write-tree: properly detect failure to write tree objects

Tomasz Fortuna reported that "git commit" does not error out properly when
it cannot write tree objects out. "git write-tree" shares the same issue,
as the failure to notice the error is deep in the logic to write tree
objects out recursively.

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

Merge branch 'maint-1.5.4' into maintJunio C Hamano Wed, 23 Apr 2008 06:37:06 +0000 (23:37 -0700)

Merge branch 'maint-1.5.4' into maint

* maint-1.5.4:
svn-git: Use binmode for reading/writing binary rev maps
diff options documentation: refer to --diff-filter in --name-status
git-svn bug with blank commits and author file
archive.c: format_subst - fixed bogus argument to memchr
copy.c: copy_fd - correctly report write errors
gitattributes: Fix subdirectory attributes specified from root directory

Amend git-push refspec documentationSam Vilain Mon, 21 Apr 2008 03:31:24 +0000 (15:31 +1200)

Amend git-push refspec documentation

These paragraphs are a little confusing. Also, make it clearer when
you have to specify the full name for <dst>

Signed-off-by: Sam Vilain <sam.vilain@catalyst.net.nz>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-gc --prune is deprecatedDmitry Potapov Mon, 14 Apr 2008 12:17:31 +0000 (16:17 +0400)

git-gc --prune is deprecated

25ee9731c137d0a24b0f4879eb0b0cce9b77d5b0 made the '--prune' option
deprecated and removed its description from the git-gc man page. This
patch removes all references to this option from the rest of the Git
documentation.

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

svn-git: Use binmode for reading/writing binary rev... Michael Weber Fri, 18 Apr 2008 13:12:04 +0000 (15:12 +0200)

svn-git: Use binmode for reading/writing binary rev maps

Otherwise, there is a possible interaction with UTF-8 locales in
combination with PERL_UNICODE, resulting in "inconsistent size: 40" or
"read:"-type errors.

See also:
perldoc -f binmode
<http://perldoc.perl.org/perl581delta.html#UTF-8-no-longer-default-under-UTF-8-locales>

Signed-off-by: Michael Weber <michaelw@foldr.org>
Acked-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff options documentation: refer to --diff-filter... Miklos Vajna Tue, 22 Apr 2008 12:23:48 +0000 (14:23 +0200)

diff options documentation: refer to --diff-filter in --name-status

git diff --name-status outputs letters, but the meaning of those letters
is documented elsewhere. Add a note to make the manpage more intuitive.

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

Don't force imap.host to be set when imap.tunnel is setJeff King Tue, 22 Apr 2008 10:41:47 +0000 (06:41 -0400)

Don't force imap.host to be set when imap.tunnel is set

The documentation for git-imap-send suggests a tunnel setting such as

Tunnel = "ssh -q user@server.com /usr/bin/imapd ./Maildir 2> /dev/null"

which works wonderfully and doesn't require a username, password or port
setting.

However, git-imap-send currently requires that the imap.host variable be
set in the config even when it was unused. This patch changes imap-send
to only require that the imap.host setting is set if imap.tunnel is not
set. Otherwise, server.host is set to "tunnel" for reporting purposes.

Acked-by: Andy Parkins <andyparkins@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-clone.txt: Adjust note to --shared for new pruning... Brandon Casey Thu, 3 Apr 2008 18:26:13 +0000 (13:26 -0500)

git-clone.txt: Adjust note to --shared for new pruning behavior of git-gc

Since git-gc now always calls prune, even with --auto, unreferenced objects
may be removed by more operations than just git-gc. This is important for
clones created using --shared or --reference.

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

git-svn bug with blank commits and author fileThomas Guyot-Sionnest Tue, 22 Apr 2008 10:07:47 +0000 (06:07 -0400)

git-svn bug with blank commits and author file

When trying to import from svn using an author file, git-svn bails out
if it encounters a blank author. The attached patch changes this
behavior and allow using the author file with blanks authors.

I came across this bug while importing from a cvs2svn repo where the
initial revision (1) has a blank author. This doesn't break the behavior
of bailing out when an unknown author is encountered.

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

archive.c: format_subst - fixed bogus argument to memchrAriel Badichi Wed, 23 Apr 2008 01:06:27 +0000 (04:06 +0300)

archive.c: format_subst - fixed bogus argument to memchr

Also removed a superfluous test.

Signed-off-by: Ariel Badichi <abadichi@bezeqint.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

copy.c: copy_fd - correctly report write errorsAriel Badichi Wed, 23 Apr 2008 01:05:29 +0000 (04:05 +0300)

copy.c: copy_fd - correctly report write errors

Previously, the errno could have been lost due to an intervening
close() call.

This patch also contains minor cosmetic changes.

Signed-off-by: Ariel Badichi <abadichi@bezeqint.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

gitattributes: Fix subdirectory attributes specified... Matthew Ogilvie Tue, 22 Apr 2008 18:19:12 +0000 (12:19 -0600)

gitattributes: Fix subdirectory attributes specified from root directory

Signed-off-by: Matthew Ogilvie <mmogilvi_git@miniinfo.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

post-receive-email: fix accidental removal of a trailin... Andy Parkins Mon, 21 Apr 2008 13:44:44 +0000 (14:44 +0100)

post-receive-email: fix accidental removal of a trailing space in signature line

post-receive-email adds a signature to the end of emails in
generate_email_footer(). The signature was separated from the main email
body using the standard string "-- ". (see RFC 3676)

a6080a0 (War on whitespace, 2007-06-07) removed the trailing whitespace
from "-- ", leaving it as "--", which is not a correct signature
separator.

This patch restores the missing space, but does it in a way that will
not set off the trailing whitespace alarms.

Signed-off-by: Andy Parkins <andyparkins@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Escape project names before creating pathinfo URLsmartin f. krafft Sun, 20 Apr 2008 21:23:38 +0000 (23:23 +0200)

Escape project names before creating pathinfo URLs

If a project name contains special URL characters like +, gitweb's links
break in subtle ways. The solution is to pass the project name through
esc_url() and using the return value.

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

Escape project name in regexpmartin f. krafft Sun, 20 Apr 2008 21:03:56 +0000 (23:03 +0200)

Escape project name in regexp

The project name, when used in a regular expression, needs to be quoted
properly, so that stuff like '++' in the project name does not cause
Perl to barf.

Related info: http://bugs.debian.org/476076
This is a bug in Perl's CGI.pm, but fixing that exposed a similar bug in
gitweb.perl

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

bash: Add completion for git diff --base --ours --theirsTeemu Likonen Sun, 20 Apr 2008 19:32:47 +0000 (22:32 +0300)

bash: Add completion for git diff --base --ours --theirs

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

diff-options.txt: document the new "--dirstat" optionGerrit Pape Mon, 21 Apr 2008 18:15:52 +0000 (18:15 +0000)

diff-options.txt: document the new "--dirstat" option

This commit adds the documentation for the new option added by 7df7c01
(Add "--dirstat" for some directory statistics, 2008-02-12).

Noticed by Clint Adams, reported through
http://bugs.debian.org/476437

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

GIT 1.5.5.1 v1.5.5.1Junio C Hamano Sun, 20 Apr 2008 18:36:53 +0000 (11:36 -0700)

GIT 1.5.5.1

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

Merge branch 'jc/maint-rebase-am' into maintJunio C Hamano Sun, 20 Apr 2008 06:01:51 +0000 (23:01 -0700)

Merge branch 'jc/maint-rebase-am' into maint

* jc/maint-rebase-am:
rebase: do not munge commit log message

Conflicts:

git-am.sh

gitweb: Fix 'history' view for deleted files with historyJakub Narebski Sun, 13 Apr 2008 12:12:15 +0000 (14:12 +0200)

gitweb: Fix 'history' view for deleted files with history

When asked for history of a file which is not present in given branch
("HEAD", i.e. current branch, or given by transient $hash_hase ('hb')
parameter), but is present deeper in the history (meaning that "git
rev-list --full-history $hash_base -- $file_name" is not empty), and
there is no $hash ('h') parameter set for a file, gitweb would spew
multiple of "Use of uninitialized value" warnings, and some links
would be missing. This commit fixes this bug.

This bug occurs in the rare cases when "git log -- <path>" is empty
and "git log --full-history -- <path>" is not, or to be more exact in
the cases when full-history starts later than given branch. It can
happen if you are using handcrafted gitwb URL, or if you follow
generic 'history' link or bookmark for a file which got deleted.

Gitweb tried to get file type ('tree', or 'blob', or even 'commit')
from the commit we start searching from (where the file was not
present), and not among found commits. This was the cause of "Use of
uninitialized value" warnings.

This commit also add tests for such situation to t9500 test.

While we are it, return HTTP error if there is _no_ history; it means
that file or directory was not found (for given branch). Also error
out if type of item could not be found: it should not happen now, but
better be sure.

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

Document that WebDAV doesn't need git on the server... Matthieu Moy Sun, 13 Apr 2008 13:38:21 +0000 (15:38 +0200)

Document that WebDAV doesn't need git on the server, and works over SSL

I managed to set up a Git repository on a preconfigured WebDAV server,
and using HTTPS, without installing Git on it or changing the server
configuration. This works through a proxy too. This patch reflects
this (it previously stated that Git was _necessary_ on the server,
which isn't true). Also give a few hints to troubleshoting.

Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'maint-1.5.4' into maintJunio C Hamano Sat, 19 Apr 2008 05:07:00 +0000 (22:07 -0700)

Merge branch 'maint-1.5.4' into maint

* maint-1.5.4:
am: POSIX portability fix

git-remote: reject adding remotes with invalid namesJonas Fonseca Sun, 13 Apr 2008 09:56:54 +0000 (11:56 +0200)

git-remote: reject adding remotes with invalid names

This can happen if the arguments to git-remote add is switched by the
user, and git would only show an error if fetching was also requested.
Fix it by using the refspec parsing engine to check if the requested
name can be parsed as a remote before add it.

Also cleanup so that the "remote.<name>.url" config name buffer is only
initialized once.

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

am: POSIX portability fixJunio C Hamano Fri, 18 Apr 2008 23:11:40 +0000 (16:11 -0700)

am: POSIX portability fix

POSIX allows echo without flag to interpret specials such as \n, and we
tried to make things portable by using printf instead where it matters.
Recently added code to "git am" had unprotected "echo", which was caught
by t4014 and Rémi Vanicat.

This should fix it.

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

Merge branch 'maint-1.5.4' into maintJunio C Hamano Thu, 17 Apr 2008 00:04:05 +0000 (17:04 -0700)

Merge branch 'maint-1.5.4' into maint

* maint-1.5.4:
git-am: minor cleanup
Clarify and fix English in "git-rm" documentation

git-am: minor cleanupJunio C Hamano Wed, 16 Apr 2008 23:46:26 +0000 (16:46 -0700)

git-am: minor cleanup

This moves the assignment to FIRSTLINE down so that we do not have
to have multiple copies.

Suggested by Linus.

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

Clarify and fix English in "git-rm" documentationJon Loeliger Wed, 16 Apr 2008 23:41:27 +0000 (18:41 -0500)

Clarify and fix English in "git-rm" documentation

Do some verb-noun agreement changes.
Clarify some file globbing cases.
Fixed a wrong statement in an example.

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