gitweb.git
Merge branch 'tr/http-updates'Junio C Hamano Sun, 10 Jan 2010 16:53:04 +0000 (08:53 -0800)

Merge branch 'tr/http-updates'

* tr/http-updates:
Remove http.authAny
Allow curl to rewind the RPC read buffer
Add an option for using any HTTP authentication scheme, not only basic
http: maintain curl sessions

Merge branch 'jk/maint-1.6.5-reset-hard'Junio C Hamano Sun, 10 Jan 2010 16:52:53 +0000 (08:52 -0800)

Merge branch 'jk/maint-1.6.5-reset-hard'

* jk/maint-1.6.5-reset-hard:
reset: unbreak hard resets with GIT_WORK_TREE

Merge branch 'jk/push-to-delete'Junio C Hamano Sun, 10 Jan 2010 16:52:45 +0000 (08:52 -0800)

Merge branch 'jk/push-to-delete'

* jk/push-to-delete:
builtin-push: add --delete as syntactic sugar for :foo

Merge branch 'mm/config-path'Junio C Hamano Sun, 10 Jan 2010 16:52:41 +0000 (08:52 -0800)

Merge branch 'mm/config-path'

* mm/config-path:
builtin-config: add --path option doing ~ and ~user expansion.

Merge branch 'pm/cvs-environ'Junio C Hamano Sun, 10 Jan 2010 16:52:37 +0000 (08:52 -0800)

Merge branch 'pm/cvs-environ'

* pm/cvs-environ:
CVS Server: Support reading base and roots from environment

Merge branch 'tr/maint-1.6.5-bash-prompt-show-submodule... Junio C Hamano Sun, 10 Jan 2010 16:52:32 +0000 (08:52 -0800)

Merge branch 'tr/maint-1.6.5-bash-prompt-show-submodule-changes'

* tr/maint-1.6.5-bash-prompt-show-submodule-changes:
bash completion: factor submodules into dirty state

Merge branch 'bg/maint-remote-update-default'Junio C Hamano Sun, 10 Jan 2010 16:52:24 +0000 (08:52 -0800)

Merge branch 'bg/maint-remote-update-default'

* bg/maint-remote-update-default:
Fix "git remote update" with remotes.defalt set

Merge branch 'mm/diag-path-in-treeish'Junio C Hamano Sun, 10 Jan 2010 16:52:10 +0000 (08:52 -0800)

Merge branch 'mm/diag-path-in-treeish'

* mm/diag-path-in-treeish:
Detailed diagnosis when parsing an object name fails.

Merge branch 'fc/opt-quiet-gc-reset'Junio C Hamano Sun, 10 Jan 2010 16:52:06 +0000 (08:52 -0800)

Merge branch 'fc/opt-quiet-gc-reset'

* fc/opt-quiet-gc-reset:
General --quiet improvements

Merge branch 'maint'Junio C Hamano Sun, 10 Jan 2010 08:52:04 +0000 (00:52 -0800)

Merge branch 'maint'

* maint:
base85: Make the code more obvious instead of explaining the non-obvious
base85: encode_85() does not use the decode table
base85 debug code: Fix length byte calculation
Documentation: tiny git config manual tweaks
Documentation: git gc packs refs by default now
checkout -m: do not try to fall back to --merge from an unborn branch

Merge branch 'maint-1.6.2' into maintJunio C Hamano Sun, 10 Jan 2010 08:51:54 +0000 (00:51 -0800)

Merge branch 'maint-1.6.2' into maint

* maint-1.6.2:
base85: Make the code more obvious instead of explaining the non-obvious
base85: encode_85() does not use the decode table
base85 debug code: Fix length byte calculation
checkout -m: do not try to fall back to --merge from an unborn branch

Conflicts:
diff.c

Merge branch 'maint-1.6.1' into maint-1.6.2Junio C Hamano Sun, 10 Jan 2010 08:49:47 +0000 (00:49 -0800)

Merge branch 'maint-1.6.1' into maint-1.6.2

* maint-1.6.1:
base85: Make the code more obvious instead of explaining the non-obvious
base85: encode_85() does not use the decode table
base85 debug code: Fix length byte calculation
checkout -m: do not try to fall back to --merge from an unborn branch
branch: die explicitly why when calling "git branch [-a|-r] branchname".
textconv: stop leaking file descriptors
commit: --cleanup is a message option
git count-objects: handle packs bigger than 4G
t7102: make the test fail if one of its check fails

Conflicts:
diff.c

Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano Sun, 10 Jan 2010 08:48:47 +0000 (00:48 -0800)

Merge branch 'maint-1.6.0' into maint-1.6.1

* maint-1.6.0:
base85: Make the code more obvious instead of explaining the non-obvious
base85: encode_85() does not use the decode table
base85 debug code: Fix length byte calculation
checkout -m: do not try to fall back to --merge from an unborn branch
branch: die explicitly why when calling "git branch [-a|-r] branchname".

daemon: consider only address in kill_some_child()Erik Faye-Lund Sat, 9 Jan 2010 14:13:28 +0000 (15:13 +0100)

daemon: consider only address in kill_some_child()

kill_some_child() compares the entire sockaddr_storage
structure (with the pad-bits zeroed out) when trying to
find out if connections originate from the same host.
However, sockaddr_storage contains the port-number for
the connection (which varies between connections), so
the comparison always fails.

Change the code so we only consider the host-address,
by introducing the addrcmp()-function that inspects
the address family and compare as appropriate.

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

help: fix configured help format taking over command... Christian Couder Sat, 9 Jan 2010 05:10:05 +0000 (06:10 +0100)

help: fix configured help format taking over command line one

Since commit 7c3baa9 (help -a: do not unnecessarily look for a
repository, 2009-09-04), the help format that is passed as a
command line option is not used if an help format has been
configured. This patch fixes that.

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

string-list: rename the include guard to STRING_LIST_HThiago Farina Fri, 8 Jan 2010 22:45:08 +0000 (17:45 -0500)

string-list: rename the include guard to STRING_LIST_H

Signed-off-by: Thiago Farina <tfransosi@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

base85: Make the code more obvious instead of explainin... Andreas Gruenbacher Fri, 8 Jan 2010 13:40:00 +0000 (14:40 +0100)

base85: Make the code more obvious instead of explaining the non-obvious

Here is another cleanup ...

Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

base85: encode_85() does not use the decode tableAndreas Gruenbacher Fri, 8 Jan 2010 16:22:18 +0000 (17:22 +0100)

base85: encode_85() does not use the decode table

Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

base85 debug code: Fix length byte calculationAndreas Gruenbacher Fri, 8 Jan 2010 13:39:58 +0000 (14:39 +0100)

base85 debug code: Fix length byte calculation

Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Documentation: tiny git config manual tweaksJonathan Nieder Sun, 10 Jan 2010 03:01:21 +0000 (21:01 -0600)

Documentation: tiny git config manual tweaks

As a verb, 'setup' is spelled 'set up'. “diff commands such as
diff-files” scans better without a comma. Clarify that shallow
and deep are special non-boolean values for format.thread rather
than boolean values with some other name.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Documentation: git gc packs refs by default nowJonathan Nieder Sun, 10 Jan 2010 02:59:41 +0000 (20:59 -0600)

Documentation: git gc packs refs by default now

In commit 56752391 (Make "git gc" pack all refs by default,
2007-05-24), 'git gc' was changed to run pack-refs by default

Versions before v1.5.1.2 cannot clone repos with packed refs over
http, and versions before v1.4.4 cannot handled packed refs at
all, but more recent git should have no problems. Try to make
this more clear in the git-config manual.

The analagous passage in git-gc.txt was updated already with
commit fe2128a (Change git-gc documentation to reflect
gc.packrefs implementation., 2008-01-09).

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Describe second batch for 1.7.0 in draft release notesJunio C Hamano Thu, 7 Jan 2010 23:47:32 +0000 (15:47 -0800)

Describe second batch for 1.7.0 in draft release notes

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

Merge branch 'js/filter-branch-prime'Junio C Hamano Thu, 7 Jan 2010 23:40:30 +0000 (15:40 -0800)

Merge branch 'js/filter-branch-prime'

* js/filter-branch-prime:
filter-branch: remove an unnecessary use of 'git read-tree'

Merge branch 'sb/maint-octopus'Junio C Hamano Thu, 7 Jan 2010 23:40:21 +0000 (15:40 -0800)

Merge branch 'sb/maint-octopus'

* sb/maint-octopus:
octopus: remove dead code
octopus: reenable fast-forward merges
octopus: make merge process simpler to follow

Conflicts:
git-merge-octopus.sh

Merge branch 'mg/tag-d-show'Junio C Hamano Thu, 7 Jan 2010 23:38:50 +0000 (15:38 -0800)

Merge branch 'mg/tag-d-show'

* mg/tag-d-show:
tag -d: print sha1 of deleted tag

Merge branch 'so/cvsserver-update'Junio C Hamano Thu, 7 Jan 2010 23:38:11 +0000 (15:38 -0800)

Merge branch 'so/cvsserver-update'

* so/cvsserver-update:
cvsserver: make the output of 'update' more compatible with cvs.

Merge branch 'bg/maint-add-all-doc'Junio C Hamano Thu, 7 Jan 2010 23:37:57 +0000 (15:37 -0800)

Merge branch 'bg/maint-add-all-doc'

* bg/maint-add-all-doc:
git-rm doc: Describe how to sync index & work tree
git-add/rm doc: Consistently back-quote
Documentation: 'git add -A' can remove files

git-rm doc: Describe how to sync index & work treeBjörn Gustavsson Mon, 7 Dec 2009 18:35:42 +0000 (19:35 +0100)

git-rm doc: Describe how to sync index & work tree

Newcomers to git that want to remove from the index only the
files that have disappeared from the working tree will probably
look for a way to do that in the documentation for 'git rm'.

Therefore, describe how that can be done (even though it involves
other commands than 'git rm'). Based on a suggestion by Junio,
but re-arranged and rewritten to better fit into the style of
command reference.

While at it, change a single occurrence of "work tree" to "working
tree" for consistency.

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

Merge branch 'mv/commit-date'Junio C Hamano Thu, 7 Jan 2010 23:35:55 +0000 (15:35 -0800)

Merge branch 'mv/commit-date'

* mv/commit-date:
Document date formats accepted by parse_date()
builtin-commit: add --date option

Merge branch 'mo/bin-wrappers'Junio C Hamano Thu, 7 Jan 2010 23:35:52 +0000 (15:35 -0800)

Merge branch 'mo/bin-wrappers'

* mo/bin-wrappers:
INSTALL: document a simpler way to run uninstalled builds
run test suite without dashed git-commands in PATH
build dashless "bin-wrappers" directory similar to installed bindir

checkout -m: do not try to fall back to --merge from... Junio C Hamano Thu, 7 Jan 2010 07:51:47 +0000 (23:51 -0800)

checkout -m: do not try to fall back to --merge from an unborn branch

If switching from an unborn branch (= empty tree) to a valid commit failed
without -m, it would fail with -m option as well.

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

.gitattributes: detect 8-space indent in shell scriptsJunio C Hamano Wed, 6 Jan 2010 20:22:25 +0000 (12:22 -0800)

.gitattributes: detect 8-space indent in shell scripts

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

Makefile: make ppc/sha1ppc.o depend on GIT-CFLAGSJonathan Nieder Wed, 6 Jan 2010 06:37:59 +0000 (00:37 -0600)

Makefile: make ppc/sha1ppc.o depend on GIT-CFLAGS

The %.o: %.S pattern rule should depend on GIT-CFLAGS to avoid
trouble when ALL_CFLAGS changes.

The pattern only applies to one file (ppc/sha1ppc.S) and that
file does not use any #ifdefs, so leaving the dependency out is
probably harmless. Nevertheless, it is safer to include the
dependency in case future code's behavior does depend on the
build flags.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Use warning function instead of fprintf(stderr, "Warnin... Thiago Farina Sun, 3 Jan 2010 16:20:30 +0000 (11:20 -0500)

Use warning function instead of fprintf(stderr, "Warning: ...").

Signed-off-by: Thiago Farina <tfransosi@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'maint'Junio C Hamano Sun, 3 Jan 2010 07:04:11 +0000 (23:04 -0800)

Merge branch 'maint'

* maint:
stash: mention --patch in usage string.

stash: mention --patch in usage string.Matthieu Moy Sat, 2 Jan 2010 16:35:32 +0000 (17:35 +0100)

stash: mention --patch in usage string.

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

Merge branch 'maint'Junio C Hamano Thu, 31 Dec 2009 23:00:38 +0000 (15:00 -0800)

Merge branch 'maint'

* maint:
branch: die explicitly why when calling "git branch [-a|-r] branchname".
fast-import: Document author/committer/tagger name is optional
SubmittingPatches: hints to know the status of a submitted patch.

Merge branch 'maint-1.6.0' into maintJunio C Hamano Thu, 31 Dec 2009 23:00:14 +0000 (15:00 -0800)

Merge branch 'maint-1.6.0' into maint

* maint-1.6.0:
branch: die explicitly why when calling "git branch [-a|-r] branchname".

branch: die explicitly why when calling "git branch... Matthieu Moy Wed, 30 Dec 2009 14:45:31 +0000 (15:45 +0100)

branch: die explicitly why when calling "git branch [-a|-r] branchname".

The -a and -r options used to be silently ignored in such a command.

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

fast-import: Document author/committer/tagger name... Shawn O. Pearce Wed, 30 Dec 2009 15:03:48 +0000 (07:03 -0800)

fast-import: Document author/committer/tagger name is optional

The fast-import parser does not validate that the author, committer
or tagger name component contains both a name and an email address.
Therefore the name component has always been optional. Correct the
documentation to match the implementation.

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

SubmittingPatches: hints to know the status of a submit... Matthieu Moy Wed, 30 Dec 2009 14:51:22 +0000 (15:51 +0100)

SubmittingPatches: hints to know the status of a submitted patch.

"What happened to my patch" is pretty much a FAQ on the Git mailing list,
it deserves a few paragraphs in SubmittingPatches...

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

bash completion: factor submodules into dirty stateThomas Rast Thu, 31 Dec 2009 11:48:41 +0000 (12:48 +0100)

bash completion: factor submodules into dirty state

In the implementation of GIT_PS1_SHOWDIRTYSTATE in 738a94a (bash:
offer to show (un)staged changes, 2009-02-03), I cut&pasted the
git-diff invocations from dirty-worktree checks elsewhere, carrying
along the --ignore-submodules option.

As pointed out by Kevin Ballard, this doesn't really make sense: to
the _user_, a changed submodule counts towards uncommitted changes.

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

Fix "git remote update" with remotes.defalt setBjörn Gustavsson Thu, 31 Dec 2009 09:43:17 +0000 (10:43 +0100)

Fix "git remote update" with remotes.defalt set

Starting from commit 8db35596, "git remote update" (with no
group name given) will fail with the following message if
remotes.default has been set in the config file:

fatal: 'default' does not appear to be a git repository
fatal: The remote end hung up unexpectedly

The problem is that the --multiple option is not passed to
"git fetch" if no remote or group name is given on the command
line. Fix the problem by always passing the --multiple
option to "git fetch" (which actually simplifies the code).

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

builtin-config: add --path option doing ~ and ~user... Matthieu Moy Wed, 30 Dec 2009 16:51:53 +0000 (17:51 +0100)

builtin-config: add --path option doing ~ and ~user expansion.

395de250 (Expand ~ and ~user in core.excludesfile, commit.template)
introduced a C function git_config_pathname, doing ~/ and ~user/
expansion. This patch makes the feature available to scripts with 'git
config --get --path'.

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

cvsserver: make the output of 'update' more compatible... Sergei Organov Mon, 7 Dec 2009 11:11:44 +0000 (14:11 +0300)

cvsserver: make the output of 'update' more compatible with cvs.

Native cvs update outputs the string "cvs update: Updating <DIR>" for
every directory it processes (to stderr) unless -q or -Q is given on
comman-line. This is used, e.g., by emacs pcl-cvs to split files by
directory. This commit implements this feature in cvsserver.

Signed-off-by: Sergei Organov <osv@javad.com>
Acked-by: Martin Langhoff <martin.langhoff@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

bash completion: add space between branch name and... Shawn O. Pearce Thu, 31 Dec 2009 03:04:38 +0000 (19:04 -0800)

bash completion: add space between branch name and status flags

Improve the readability of the bash prompt by adding a space between
the branch name and the status flags (dirty, stash, untracked).

While we are cleaning up this section of code, the two cases for
formatting the prompt are identical except for the format string,
so make them the same.

Suggested-by: Roman Fietze <roman.fietze@telemotive.de>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

CVS Server: Support reading base and roots from environmentPhil Miller Wed, 30 Dec 2009 19:35:31 +0000 (13:35 -0600)

CVS Server: Support reading base and roots from environment

The Gitosis single-account Git/ssh hosting system runs git commands
through git-shell after confirming that the connecting user is
authorized to access the requested repository. This works well for
upload-pack and receive-pack, which take a repository argument through
git-shell. This doesn't work so well for `cvs server', which is passed
through literally, with no arguments. Allowing arguments risks
sneaking in `--export-all', so that restriction should be maintained.

Despite that, passing a repository root is necessary for per-user
access control by the hosting software, and passing a base path
improves usability without weakening security. Thus, git-cvsserver
needs to come up with these values at runtime by some other
means. Since git-shell preserves the environment for other purposes,
the environment can carry these arguments as well.

Thus, modify git-cvsserver to read $GIT_CVSSERVER_{BASE_PATH,ROOT} in
the absence of equivalent command line arguments.

Signed-off-by: Phil Miller <mille121@illinois.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

builtin-push: add --delete as syntactic sugar for :fooJan Krüger Wed, 30 Dec 2009 19:57:42 +0000 (20:57 +0100)

builtin-push: add --delete as syntactic sugar for :foo

Refspecs without a source side have been reported as confusing by many.
As an alternative, this adds support for commands like:

git push origin --delete somebranch
git push origin --delete tag sometag

Specifically, --delete will prepend a colon to all colon-less refspecs
given on the command line, and will refuse to accept refspecs with
colons to prevent undue confusion.

Signed-off-by: Jan Krüger <jk@jk.gs>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Add completion for git-svn mkdirs,reset,and gcRobert Zeh Wed, 30 Dec 2009 00:58:48 +0000 (18:58 -0600)

Add completion for git-svn mkdirs,reset,and gc

Signed-off-by: Robert Zeh <robert.a.zeh@gmail.com>
Acked-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'maint'Junio C Hamano Wed, 30 Dec 2009 09:25:21 +0000 (01:25 -0800)

Merge branch 'maint'

* maint:
textconv: stop leaking file descriptors
commit: --cleanup is a message option
git count-objects: handle packs bigger than 4G
t7102: make the test fail if one of its check fails
Documentation: always respect core.worktree if set

Merge branch 'maint-1.6.1' into maintJunio C Hamano Wed, 30 Dec 2009 09:24:12 +0000 (01:24 -0800)

Merge branch 'maint-1.6.1' into maint

* maint-1.6.1:
textconv: stop leaking file descriptors
commit: --cleanup is a message option
git count-objects: handle packs bigger than 4G
t7102: make the test fail if one of its check fails

Conflicts:
builtin-commit.c
diff.c

textconv: stop leaking file descriptorsJeff King Wed, 30 Dec 2009 09:02:53 +0000 (04:02 -0500)

textconv: stop leaking file descriptors

We read the output from textconv helpers over a pipe, but we
never actually closed our end of the pipe after using it.

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

reset: unbreak hard resets with GIT_WORK_TREEJeff King Wed, 30 Dec 2009 08:47:03 +0000 (03:47 -0500)

reset: unbreak hard resets with GIT_WORK_TREE

Commit 952dfc6 tried to tighten the safety valves for doing
a "reset --hard" in a bare repository or outside the work
tree, but accidentally broke the case for GIT_WORK_TREE.
This patch unbreaks it.

Most git commands which need a work tree simply use
NEED_WORK_TREE in git.c to die before they get to their
cmd_* function. Reset, however, only needs a work tree in
some cases, and so must handle the work tree itself. The
error that 952dfc6 made was to simply forbid certain
operations if the work tree was not set up; instead, we need
to do the same thing that NEED_WORK_TREE does, which is to
call setup_work_tree(). We no longer have to worry about dying
in the non-worktree case, as setup_work_tree handles that
for us.

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

Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano Wed, 30 Dec 2009 04:16:34 +0000 (20:16 -0800)

Merge branch 'maint-1.6.0' into maint-1.6.1

* maint-1.6.0:
commit: --cleanup is a message option
t7102: make the test fail if one of its check fails

commit: --cleanup is a message optionGreg Price Tue, 29 Dec 2009 21:54:49 +0000 (16:54 -0500)

commit: --cleanup is a message option

In the usage message for "git commit", the --cleanup option appeared
at the end, as one of the "contents options":

usage: git commit [options] [--] <filepattern>...
...
Commit message options
...
Commit contents options
...
--allow-empty ok to record an empty change
--cleanup <default> how to strip spaces and #comments from message

This is confusing, in part because it makes it ambiguous whether
--allow-empty, just above, refers to an empty diff or an empty message.

Move --cleanup into the 'message options' group. Also add a pair of
comments to prevent similar oversights in the future.

Signed-off-by: Greg Price <price@ksplice.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git count-objects: handle packs bigger than 4GAndreas Schwab Tue, 29 Dec 2009 19:09:15 +0000 (20:09 +0100)

git count-objects: handle packs bigger than 4G

Use off_t to count sizes of packs and objects to avoid overflow after
4Gb.

Signed-off-by: Andreas Schwab <schwab@linux-m68k.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t7102: make the test fail if one of its check failsNguyễn Thái Ngọc Duy Tue, 29 Dec 2009 08:13:18 +0000 (15:13 +0700)

t7102: make the test fail if one of its check fails

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Remove http.authAnyJunio C Hamano Mon, 28 Dec 2009 18:04:24 +0000 (10:04 -0800)

Remove http.authAny

Back when the feature to use different HTTP authentication methods was
originally written, it needed an extra HTTP request for everything when
the feature was in effect, because we didn't reuse curl sessions.

However, b8ac923 (Add an option for using any HTTP authentication scheme,
not only basic, 2009-11-27) builds on top of an updated codebase that does
reuse curl sessions; there is no need to manually avoid the extra overhead
by making this configurable anymore.

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

Documentation: always respect core.worktree if setNguyễn Thái Ngọc Duy Tue, 29 Dec 2009 07:48:41 +0000 (14:48 +0700)

Documentation: always respect core.worktree if set

The value of core.worktree in a ".git/config" is honored even when it
differs from the directory that has the ".git" directory as its
subdirectory. This is likely to be a misconfiguration, so warn users
about it. Also, drop the part of the documentation that incorrectly
claimed that we ignore such a misconfigured value.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'jk/1.7.0-status'Junio C Hamano Mon, 28 Dec 2009 07:01:32 +0000 (23:01 -0800)

Merge branch 'jk/1.7.0-status'

* jk/1.7.0-status:
status/commit: do not suggest "reset HEAD <path>" while merging
commit/status: "git add <path>" is not necessarily how to resolve
commit/status: check $GIT_DIR/MERGE_HEAD only once
t7508-status: test all modes with color
t7508-status: status --porcelain ignores relative paths setting
status: reduce duplicated setup code
status: disable color for porcelain format
status -s: obey color.status
builtin-commit: refactor short-status code into wt-status.c
t7508-status.sh: Add tests for status -s
status -s: respect the status.relativePaths option
docs: note that status configuration affects only long format
commit: support alternate status formats
status: add --porcelain output format
status: refactor format option parsing
status: refactor short-mode printing to its own function
status: typo fix in usage
git status: not "commit --dry-run" anymore
git stat -s: short status output
git stat: the beginning of "status that is not a dry-run of commit"

Conflicts:
t/t4034-diff-words.sh
wt-status.c

Merge branch 'maint'Junio C Hamano Mon, 28 Dec 2009 06:59:55 +0000 (22:59 -0800)

Merge branch 'maint'

* maint:
read_index(): fix reading extension size on BE 64-bit archs

Merge branch 'nf/maint-fix-index-ext-len-on-be64' into... Junio C Hamano Sun, 27 Dec 2009 18:42:00 +0000 (10:42 -0800)

Merge branch 'nf/maint-fix-index-ext-len-on-be64' into maint

* nf/maint-fix-index-ext-len-on-be64:
read_index(): fix reading extension size on BE 64-bit archs

read_index(): fix reading extension size on BE 64-bit... Nathaniel W Filardo Sun, 27 Dec 2009 06:11:21 +0000 (01:11 -0500)

read_index(): fix reading extension size on BE 64-bit archs

On big endian platforms with 8-byte unsigned long, the code reads the
size of the index extension section (which is a 4-byte network byte
order integer) incorrectly.

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

Merge branch 'maint'Junio C Hamano Sat, 26 Dec 2009 22:33:05 +0000 (14:33 -0800)

Merge branch 'maint'

* maint:
Makefile: FreeBSD (both 7 and 8) needs OLD_ICONV
Start 1.6.6.X maintenance track
Add git-http-backend to command-list.
t4019 "grep" portability fix
t1200: work around a bug in some implementations of "find"

Conflicts:
RelNotes

Makefile: FreeBSD (both 7 and 8) needs OLD_ICONVJunio C Hamano Sat, 26 Dec 2009 22:32:36 +0000 (14:32 -0800)

Makefile: FreeBSD (both 7 and 8) needs OLD_ICONV

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

Start 1.6.6.X maintenance trackJunio C Hamano Sat, 26 Dec 2009 22:20:09 +0000 (14:20 -0800)

Start 1.6.6.X maintenance track

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

Merge branch 'jc/maint-obsd46' into maintJunio C Hamano Sat, 26 Dec 2009 22:15:55 +0000 (14:15 -0800)

Merge branch 'jc/maint-obsd46' into maint

* jc/maint-obsd46:
t4019 "grep" portability fix
t1200: work around a bug in some implementations of "find"

Add git-http-backend to command-list.Tarmigan Casebolt Sat, 26 Dec 2009 17:01:07 +0000 (12:01 -0500)

Add git-http-backend to command-list.

Signed-off-by: Tarmigan Casebolt <tarmigan+git@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Kick off 1.7.0 cycleJunio C Hamano Sat, 26 Dec 2009 22:11:46 +0000 (14:11 -0800)

Kick off 1.7.0 cycle

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

Merge branch 'gb/1.7.0-diff-whitespace-only-output'Junio C Hamano Sat, 26 Dec 2009 22:03:18 +0000 (14:03 -0800)

Merge branch 'gb/1.7.0-diff-whitespace-only-output'

* gb/1.7.0-diff-whitespace-only-output:
No diff -b/-w output for all-whitespace changes

Merge branch 'jc/1.7.0-diff-whitespace-only-status'Junio C Hamano Sat, 26 Dec 2009 22:03:18 +0000 (14:03 -0800)

Merge branch 'jc/1.7.0-diff-whitespace-only-status'

* jc/1.7.0-diff-whitespace-only-status:
diff.c: fix typoes in comments
Make test case number unique
diff: Rename QUIET internal option to QUICK
diff: change semantics of "ignore whitespace" options

Conflicts:
diff.h

Merge branch 'jc/1.7.0-push-safety'Junio C Hamano Sat, 26 Dec 2009 22:03:17 +0000 (14:03 -0800)

Merge branch 'jc/1.7.0-push-safety'

* jc/1.7.0-push-safety:
Refuse deleting the current branch via push
Refuse updating the current branch in a non-bare repository via push

Merge branch 'jc/1.7.0-send-email-no-thread-default'Junio C Hamano Sat, 26 Dec 2009 22:03:17 +0000 (14:03 -0800)

Merge branch 'jc/1.7.0-send-email-no-thread-default'

* jc/1.7.0-send-email-no-thread-default:
send-email: make --no-chain-reply-to the default

Conflicts:
git-send-email.perl

Merge branch 'sr/vcs-helper'Junio C Hamano Sat, 26 Dec 2009 22:03:16 +0000 (14:03 -0800)

Merge branch 'sr/vcs-helper'

* sr/vcs-helper:
tests: handle NO_PYTHON setting
builtin-push: don't access freed transport->url
Add Python support library for remote helpers
Basic build infrastructure for Python scripts
Allow helpers to report in "list" command that the ref is unchanged
Fix various memory leaks in transport-helper.c
Allow helper to map private ref names into normal names
Add support for "import" helper command
Allow specifying the remote helper in the url
Add a config option for remotes to specify a foreign vcs
Allow fetch to modify refs
Use a function to determine whether a remote is valid
Allow programs to not depend on remotes having urls
Fix memory leak in helper method for disconnect

Conflicts:
Documentation/git-remote-helpers.txt
Makefile
builtin-ls-remote.c
builtin-push.c
transport-helper.c

t4019 "grep" portability fixJunio C Hamano Sat, 26 Dec 2009 21:53:17 +0000 (13:53 -0800)

t4019 "grep" portability fix

Input to "grep" is supposed to be "text", but we deliberately feed output
from "git diff --color" to sift it into two sets of lines (ones with
errors, the other without). Some implementations of "grep" only report
matches with the exit status, without showing the matched lines in their
output (e.g. OpenBSD 4.6, which says "Binary file .. matches").

Fortunately, "grep -a" is often a way to force the command to treat its
input as text.

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

t1200: work around a bug in some implementations of... Junio C Hamano Sat, 26 Dec 2009 21:53:45 +0000 (13:53 -0800)

t1200: work around a bug in some implementations of "find"

"find path ..." command should exit with zero status only when all path
operands were traversed successfully. When a non-existent path is given,
however, some implementations of "find" (e.g. OpenBSD 4.6) exit with zero
status and break the last test in t1200.

Rewrite the test to check that there is no regular files in the objects
fan-out directories to work around this bug; it is closer to what we are
testing anyway.

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

Git 1.6.6 v1.6.6Junio C Hamano Wed, 23 Dec 2009 19:58:52 +0000 (11:58 -0800)

Git 1.6.6

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

git svn: add test for a git svn gc followed by a git... Robert Zeh Wed, 23 Dec 2009 17:54:11 +0000 (11:54 -0600)

git svn: add test for a git svn gc followed by a git svn mkdirs

git svn gc will compress the unhandled.log files that git svn mkdirs reads,
causing git svn mkdirs to skip directory creation.

[ew: trivial whitespace cleanups]
Acked-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Robert Zeh <robert.a.zeh@gmail.com>

git svn: branch/tag commands detect username in URLsEric Wong Wed, 23 Dec 2009 06:40:18 +0000 (22:40 -0800)

git svn: branch/tag commands detect username in URLs

svn+ssh:// repositories often have userinfo embedded in the URL
which were stripped out of the "git-svn-id:" trailers. Since
the SVN::Client::copy function takes userinfo into account when
matching URLs for SVN repositories, we need to retrieve the full
URL with embedded userinfo in it to avoid mismatched URLs.

Tested-by: Florian Köberle <florian@fkoeberle.de>
Signed-off-by: Eric Wong <normalperson@yhbt.net>

Merge branch 'maint'Junio C Hamano Tue, 22 Dec 2009 20:32:39 +0000 (12:32 -0800)

Merge branch 'maint'

* maint:
Prevent git blame from segfaulting on a missing author name

git svn: lookup new parents correctly from svn:mergeinfoEric Wong Tue, 22 Dec 2009 20:15:40 +0000 (12:15 -0800)

git svn: lookup new parents correctly from svn:mergeinfo

This appears to be a trivial case where array indices were being
passed to git rev-list, instead of the contents stored in the
array itself.

Signed-off-by: Eric Wong <normalperson@yhbt.net>

Prevent git blame from segfaulting on a missing author... David Reiss Tue, 22 Dec 2009 18:51:41 +0000 (10:51 -0800)

Prevent git blame from segfaulting on a missing author name

The human-readable author and committer name can be missing from
commits imported from foreign SCM interfaces. Make sure we parse
the "author" and "committer" line a bit more leniently and avoid
segfaulting by assuming the name always exists.

Signed-off-by: David Reiss <dreiss@facebook.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-svn: Remove obsolete MAXPARENT checkAndrew Myrick Mon, 21 Dec 2009 22:22:54 +0000 (14:22 -0800)

git-svn: Remove obsolete MAXPARENT check

Change git-svn not to impose a limit of 16 parents on a merge.

This limit in git-svn artificially prevents cloning svn repositories
that contain commits with more than 16 merge parents.

The limit was removed from builtin-commit-tree.c for git v1.6.0 in commit
ef98c5cafb3e799b1568bb843fcd45920dc62f16, so there is no need to check for it
it in git-svn.

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

git-svn: detect cherry-picks correctly.Sam Vilain Sat, 19 Dec 2009 16:26:26 +0000 (05:26 +1300)

git-svn: detect cherry-picks correctly.

The old function was incorrect; in some instances it marks a cherry picked
range as a merged branch (because of an incorrect assumption that
'rev-list COMMIT --not RANGE' would work). This is replaced with a
function which should detect them correctly, memoized to limit the expense
of dealing with branches with many cherry picks to one 'merge-base' call
per merge, per branch which used cherry picking.

Signed-off-by: Sam Vilain <sam@vilain.net>
Acked-by: Eric Wong <normalperson@yhbt.net>

git-svn: exclude already merged tips using one rev... Sam Vilain Sat, 19 Dec 2009 16:25:31 +0000 (05:25 +1300)

git-svn: exclude already merged tips using one rev-list call

The old function would have to check all mentioned merge tips, every time
that the mergeinfo ticket changed. This involved 1-2 rev-list operation
for each listed mergeinfo line. If there are a lot of feature branches
being merged into a trunk, this makes for a very expensive operation for
detecting the new parents on every merge.

This new version first uses a single 'rev-list' to figure out which commit
ranges are already reachable from the parents. This is used to eliminate
the already merged branches from the list.

Signed-off-by: Sam Vilain <sam@vilain.net>
Acked-by: Eric Wong <normalperson@yhbt.net>

git-svn: fix some mistakes with interpreting SVN mergei... Sam Vilain Sat, 19 Dec 2009 16:22:42 +0000 (05:22 +1300)

git-svn: fix some mistakes with interpreting SVN mergeinfo commit ranges

SVN's list of commit ranges in mergeinfo tickets is inclusive, whereas
git commit ranges are exclusive on the left hand side. Also, the end
points of the commit ranges may not exist; they simply delineate
ranges of commits which may or may not exist. Fix these two mistakes.

Signed-off-by: Sam Vilain <sam@vilain.net>
Acked-by: Eric Wong <normalperson@yhbt.net>

git-svn: memoize conversion of SVN merge ticket info... Sam Vilain Sat, 19 Dec 2009 11:55:13 +0000 (00:55 +1300)

git-svn: memoize conversion of SVN merge ticket info to git commit ranges

Each time the svn mergeinfo ticket changes, we look it up in the rev_map;
when there are a lot of merged branches, this will result in many repeated
lookups of the same information for subsequent commits. Arrange the slow
part of the function so that it may be memoized, and memoize it. The more
expensive revision walking operation can be memoized separately.

[ew: changed "next" to "return" for function exit]

Signed-off-by: Sam Vilain <sam@vilain.net>
Acked-by: Eric Wong <normalperson@yhbt.net>

git-svn: expand the svn mergeinfo test suite, highlight... Sam Vilain Sat, 19 Dec 2009 16:20:30 +0000 (05:20 +1300)

git-svn: expand the svn mergeinfo test suite, highlighting some failures

As shown, git-svn has some problems; not all svn merges are correctly
detected, and cherry picks may incorrectly be detected as real merges.
These test cases will be marked as _success once the relevant fixes are in.

Signed-off-by: Sam Vilain <sam@vilain.net>
Acked-by: Eric Wong <normalperson@yhbt.net>

update release notes for git svn in 1.6.6Eric Wong Mon, 21 Dec 2009 10:21:33 +0000 (02:21 -0800)

update release notes for git svn in 1.6.6

Signed-off-by: Eric Wong <normalperson@yhbt.net>

git svn: fix --revision when fetching deleted pathsEric Wong Mon, 21 Dec 2009 10:06:04 +0000 (02:06 -0800)

git svn: fix --revision when fetching deleted paths

When using the -r/--revision argument to fetch deleted history,
calling SVN::Ra::get_log() from an SVN::Ra object initialized
to track the deleted URL will fail.

This regression was introduced in:
commit 4aacaeb3dc82bb6479e70e120053dc27a399460e
"fix shallow clone when upstream revision is too new"

We now ignore errors from SVN::Ra::get_log() here because using
--revision will always override the value of $head here if
(and only if) we're tracking deleted directories.

Signed-off-by: Eric Wong <normalperson@yhbt.net>

Git 1.6.6-rc4 v1.6.6-rc4Junio C Hamano Sun, 20 Dec 2009 20:15:02 +0000 (12:15 -0800)

Git 1.6.6-rc4

Hopefully the last rc before the final one.

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

Merge branch 'maint'Junio C Hamano Sun, 20 Dec 2009 07:20:16 +0000 (23:20 -0800)

Merge branch 'maint'

* maint:
rebase -i: abort cleanly if the editor fails to launch
technical-docs: document hash API
api-strbuf.txt: fix typos and document launch_editor()

rebase -i: abort cleanly if the editor fails to launchBjörn Gustavsson Sat, 19 Dec 2009 12:04:03 +0000 (13:04 +0100)

rebase -i: abort cleanly if the editor fails to launch

If the user's configured editor is emacsclient, the editor
will fail to launch if emacs is not running and the git
command that tried to lanuch the editor will abort. For most
commands, all you have to do is to start emacs and repeat
the command.

The "git rebase -i" command, however, aborts without cleaning
the "$GIT_DIR/rebase-merge" directory if it fails to launch the
editor, so you'll need to do "git rebase --abort" before
repeating the rebase command.

Change "git rebase -i" to terminate using "die_abort" (instead of
with "die") if the initial launch of the editor fails.

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

t9146: use 'svn_cmd' wrapperEric Wong Sun, 20 Dec 2009 07:05:57 +0000 (23:05 -0800)

t9146: use 'svn_cmd' wrapper

Using 'svn' directly may not work for all users.

Signed-off-by: Eric Wong <normalperson@yhbt.net>

git svn: make empty directory creation gc-awareEric Wong Sat, 19 Dec 2009 21:49:00 +0000 (13:49 -0800)

git svn: make empty directory creation gc-aware

The "git svn gc" command creates and appends to unhandled.log.gz
files which should be parsed before the uncompressed
unhandled.log files.

Reported-by: Robert Zeh
Signed-off-by: Eric Wong <normalperson@yhbt.net>

technical-docs: document hash APIStephen Boyd Fri, 18 Dec 2009 00:05:29 +0000 (16:05 -0800)

technical-docs: document hash API

Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

api-strbuf.txt: fix typos and document launch_editor()Stephen Boyd Fri, 18 Dec 2009 00:05:28 +0000 (16:05 -0800)

api-strbuf.txt: fix typos and document launch_editor()

Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Git 1.6.6-rc3 v1.6.6-rc3Junio C Hamano Wed, 16 Dec 2009 20:50:33 +0000 (12:50 -0800)

Git 1.6.6-rc3

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

Merge branch 'maint' to sync with 1.6.5.7Junio C Hamano Wed, 16 Dec 2009 19:09:31 +0000 (11:09 -0800)

Merge branch 'maint' to sync with 1.6.5.7

* maint:
Git 1.6.5.7
worktree: don't segfault with an absolute pathspec without a work tree
ignore unknown color configuration
help.autocorrect: do not run a command if the command given is junk
Illustrate "filter" attribute with an example

Git 1.6.5.7 v1.6.5.7Junio C Hamano Wed, 16 Dec 2009 18:23:54 +0000 (10:23 -0800)

Git 1.6.5.7

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