git.git
17 years agogit-push: Update description of refspecs and add examples
Junio C Hamano [Sat, 9 Jun 2007 18:01:23 +0000 (11:01 -0700)]
git-push: Update description of refspecs and add examples

Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years agoremote.c: "git-push frotz" should update what matches at the source.
Junio C Hamano [Sat, 9 Jun 2007 08:37:14 +0000 (01:37 -0700)]
remote.c: "git-push frotz" should update what matches at the source.

Earlier, when the local repository has a branch "frotz" and the
remote repository has a tag "frotz" (but not branch "frotz"),
"git-push frotz" mistakenly updated the tag at the remote side.
This was because the partial refname matching code was applied
independently on both source and destination side.

With this fix, when a colon-less refspec is given to git-push,
we first match it with the refs in the source repository, and
update the matching ref in the destination repository.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years agoremote.c: fix "git push" weak match disambiguation
Junio C Hamano [Sat, 9 Jun 2007 08:23:53 +0000 (01:23 -0700)]
remote.c: fix "git push" weak match disambiguation

When "git push A:B" is given, and A (or B) is not a full refname
that begins with refs/, we require an unambiguous match with an
existing ref.  For this purpose, a match with a local branch or
a tag (i.e. refs/heads/A and refs/tags/A) is called a "strong
match", and any other match is called a "weak match".  A partial
refname is unambiguous when there is only one strong match with
any number of weak matches, or when there is only one weak match
and no other match.

However, as reported by Sparse with Ramsay Jones recently,
count_refspec_match() function had a bug where a variable in an
inner block masked a different variable of the same name, which
caused the weak matches to be ignored.

This fixes it, and adds tests for the fix.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years agoremote.c: minor clean-up of match_explicit()
Junio C Hamano [Sat, 9 Jun 2007 07:14:04 +0000 (00:14 -0700)]
remote.c: minor clean-up of match_explicit()

When checking what ref the source refspec matches, we have no
business setting the default for the destination, so move that
code lower.  Also simplify the result from the code block that
matches the source side by making it set matched_src only upon
unambiguous match.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years agoremote.c: refactor creation of new dst ref
Junio C Hamano [Sat, 9 Jun 2007 07:07:34 +0000 (00:07 -0700)]
remote.c: refactor creation of new dst ref

This refactors open-coded sequence to create a new "struct ref"
and link it to the tail of dst list into a new function.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years agoremote.c: refactor match_explicit_refs()
Junio C Hamano [Sat, 9 Jun 2007 06:22:58 +0000 (23:22 -0700)]
remote.c: refactor match_explicit_refs()

This does not change functionality; just splits one block that
is deeply nested and indented out of a huge loop into a separate
function.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years agoMerge branch 'maint'
Junio C Hamano [Sat, 9 Jun 2007 18:52:43 +0000 (11:52 -0700)]
Merge branch 'maint'

* maint:
  Make command description imperative statement, not third-person present.

17 years agoRemove unnecessary code and comments on non-existing 8kB tag object restriction
Johan Herland [Sat, 9 Jun 2007 00:12:37 +0000 (02:12 +0200)]
Remove unnecessary code and comments on non-existing 8kB tag object restriction

Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years agoMake command description imperative statement, not third-person present.
william pursell [Sat, 9 Jun 2007 15:44:12 +0000 (16:44 +0100)]
Make command description imperative statement, not third-person present.

In several of the text messages, the tense of the verb is inconsistent.
For example, "Add" vs "Creates".  It is customary to use imperative for
command description.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years agot5000: silence unzip availability check
René Scharfe [Sat, 9 Jun 2007 06:31:12 +0000 (08:31 +0200)]
t5000: silence unzip availability check

unzip -v on (at least) Ubuntu prints a screenful of version info
to stdout.  Get rid of it since we only want to know if unzip is
installed or not.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
17 years agoMerge branch 'aj/pack'
Junio C Hamano [Sat, 9 Jun 2007 09:06:31 +0000 (02:06 -0700)]
Merge branch 'aj/pack'

* aj/pack:
  pack-check: Sort entries by pack offset before unpacking them.

17 years agoMerge branch 'js/merge'
Junio C Hamano [Sat, 9 Jun 2007 09:06:01 +0000 (02:06 -0700)]
Merge branch 'js/merge'

* js/merge:
  git-merge-file: refuse to merge binary files

17 years agocmd_log_init: remove parsing of --encoding command line parameter
Jeff King [Wed, 16 May 2007 11:15:07 +0000 (07:15 -0400)]
cmd_log_init: remove parsing of --encoding command line parameter

This was moved to the setup_revisions parsing in 7cbcf4d5, so it was
never being triggered.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years agoMerge branch 'ar/wildcardpush'
Junio C Hamano [Sat, 9 Jun 2007 04:03:36 +0000 (21:03 -0700)]
Merge branch 'ar/wildcardpush'

* ar/wildcardpush:
  Test wildcard push/fetch
  Fix push with refspecs containing wildcards

17 years agoMerge branch 'ar/clone'
Junio C Hamano [Sat, 9 Jun 2007 04:03:04 +0000 (21:03 -0700)]
Merge branch 'ar/clone'

* ar/clone:
  Fix clone to setup the origin if its name ends with .git

17 years agoMerge branch 'maint'
Junio C Hamano [Fri, 8 Jun 2007 09:55:19 +0000 (02:55 -0700)]
Merge branch 'maint'

* maint:
  checkout: do not get confused with ambiguous tag/branch names

17 years agoEven more missing static
Junio C Hamano [Fri, 8 Jun 2007 09:54:57 +0000 (02:54 -0700)]
Even more missing static

Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years agoMore missing static
Junio C Hamano [Fri, 8 Jun 2007 09:22:56 +0000 (02:22 -0700)]
More missing static

Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years agoMore missing static
Junio C Hamano [Fri, 8 Jun 2007 09:24:58 +0000 (02:24 -0700)]
More missing static

Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years agoMissing statics.
Pierre Habouzit [Thu, 7 Jun 2007 20:45:00 +0000 (22:45 +0200)]
Missing statics.

Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years agoActive_nr is unsigned, hence can't be < 0
Pierre Habouzit [Thu, 7 Jun 2007 20:44:59 +0000 (22:44 +0200)]
Active_nr is unsigned, hence can't be < 0

Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years agocvsserver: Make req_Root more critical of its input data
Frank Lichtenheld [Thu, 7 Jun 2007 14:57:00 +0000 (16:57 +0200)]
cvsserver: Make req_Root more critical of its input data

The path submitted with the Root request has to be absolute
(cvs does it this way and it may save us some sanity checks
later)

If multiple roots are specified (e.g. because we use
pserver authentication which will already include the
root), ensure that they say all the same.

Probably neither is a security risk, and neither should ever
be triggered by a sane client, but when validating
input data, it's better to be save than sorry.

Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years agogitview: Define __slots__ for Commit
Michael Ellerman [Wed, 30 May 2007 04:47:09 +0000 (14:47 +1000)]
gitview: Define __slots__ for Commit

Define __slots__ for the Commit class. This reserves space in each Commit
object for only the defined variables. On my system this reduces heap usage
when viewing a kernel repo by 12% ~= 55868 KB.

Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years agogitview: Use new-style classes
Michael Ellerman [Wed, 30 May 2007 04:47:08 +0000 (14:47 +1000)]
gitview: Use new-style classes

This changes the Commit class to use new-style class, which has
been available since Python 2.2 (Dec 2001).  This is a necessary
step in order to use __slots__[] declaration, so that we can
reduce the memory footprint in the next patch.

Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years agocheckout: do not get confused with ambiguous tag/branch names
Junio C Hamano [Fri, 8 Jun 2007 08:19:13 +0000 (01:19 -0700)]
checkout: do not get confused with ambiguous tag/branch names

Although it is not advisable, we have always allowed a branch
and a tag to have the same basename (i.e. it is not illegal to
have refs/heads/frotz and refs/tags/frotz at the same time).
When talking about a specific commit, the interpretation of
'frotz' has always been "use tag and then check branch",
although we warn when ambiguities exist.

However "git checkout $name" is defined to (1) first see if it
matches the branch name, and if so switch to that branch; (2)
otherwise it is an instruction to detach HEAD to point at the
commit named by $name.  We did not follow this definition when
$name appeared under both refs/heads/ and refs/tags/ -- we
switched to the branch but read the tree from the tagged commit,
which was utterly bogus.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years agoTest wildcard push/fetch
Junio C Hamano [Fri, 8 Jun 2007 07:43:22 +0000 (00:43 -0700)]
Test wildcard push/fetch

Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years agoFix push with refspecs containing wildcards
Alex Riesen [Thu, 7 Jun 2007 23:43:05 +0000 (01:43 +0200)]
Fix push with refspecs containing wildcards

Otherwise

    git push 'remote-name' 'refs/heads/*:refs/remotes/other/*'

will consider references in "refs/heads" of the remote repository
"remote-name", instead of the ones in "refs/remotes/other", which
the given refspec clearly means.

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years agoWar on whitespace
Junio C Hamano [Thu, 7 Jun 2007 07:04:01 +0000 (00:04 -0700)]
War on whitespace

This uses "git-apply --whitespace=strip" to fix whitespace errors that have
crept in to our source files over time.  There are a few files that need
to have trailing whitespaces (most notably, test vectors).  The results
still passes the test, and build result in Documentation/ area is unchanged.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years agoFix clone to setup the origin if its name ends with .git
Alex Riesen [Wed, 6 Jun 2007 23:39:05 +0000 (16:39 -0700)]
Fix clone to setup the origin if its name ends with .git

The problem is visible when cloning a local repo. The cloned
repository will have the origin url setup incorrectly: the origin name
will be copied verbatim in origin url of the cloned repository.
Normally, the name is to be expanded into absolute path.

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years agopack-check: Sort entries by pack offset before unpacking them.
Alexandre Julliard [Sun, 3 Jun 2007 18:21:41 +0000 (20:21 +0200)]
pack-check: Sort entries by pack offset before unpacking them.

Because of the way objects are sorted in a pack, unpacking them in
disk order is much more efficient than random access. Tests on the
Wine repository show a gain in pack validation time of about 35%.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years agoMerge branch 'sv/objfixes'
Junio C Hamano [Wed, 6 Jun 2007 22:43:24 +0000 (15:43 -0700)]
Merge branch 'sv/objfixes'

* sv/objfixes:
  Don't assume tree entries that are not dirs are blobs
  git-cvsimport: Make sure to use $git_dir always instead of .git sometimes
  fix documentation of unpack-objects -n
  Accept dates before 2000/01/01 when specified as seconds since the epoch

17 years agoDon't assume tree entries that are not dirs are blobs
Sam Vilain [Wed, 6 Jun 2007 10:25:17 +0000 (22:25 +1200)]
Don't assume tree entries that are not dirs are blobs

When scanning the trees in track_tree_refs() there is a "lazy" test
that assumes that entries are either directories or files.  Don't do
that.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years agogit-cvsimport: Make sure to use $git_dir always instead of .git sometimes
Michael Milligan [Tue, 5 Jun 2007 06:06:30 +0000 (00:06 -0600)]
git-cvsimport: Make sure to use $git_dir always instead of .git sometimes

CVS import was failing on a couple repos I was trying to import.
I was setting GIT_DIR=newproj.git and using the -i flag, but this bug
was thwarting the effort...  evil CVS.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years agofix documentation of unpack-objects -n
Sam Vilain [Wed, 6 Jun 2007 21:23:16 +0000 (09:23 +1200)]
fix documentation of unpack-objects -n

unpack-objects -n didn't print the object list as promised on the
manual page, so alter the documentation to reflect the behaviour

Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years agoAccept dates before 2000/01/01 when specified as seconds since the epoch
Johannes Sixt [Wed, 6 Jun 2007 08:11:55 +0000 (10:11 +0200)]
Accept dates before 2000/01/01 when specified as seconds since the epoch

Tests with git-filter-branch on a repository that was converted from
CVS and that has commits reaching back to 1999 revealed that it is
necessary to parse dates before 2000/01/01 when they are specified
as seconds since 1970/01/01. There is now still a limit, 100000000,
which is 1973/03/03 09:46:40 UTC, in order to allow that dates are
represented as 8 digits.

Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years agoMakefile: Remove git-merge-base from PROGRAMS.
Johannes Sixt [Mon, 4 Jun 2007 11:53:05 +0000 (13:53 +0200)]
Makefile: Remove git-merge-base from PROGRAMS.

git-merge-base is a builtin.

Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years agot5000: skip ZIP tests if unzip was not found
Johannes Schindelin [Wed, 6 Jun 2007 18:57:40 +0000 (19:57 +0100)]
t5000: skip ZIP tests if unzip was not found

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years agoMerge branch 'mm/tag'
Junio C Hamano [Wed, 6 Jun 2007 09:29:41 +0000 (02:29 -0700)]
Merge branch 'mm/tag'

* mm/tag:
  Teach git-tag about showing tag annotations.

17 years agogit-branch --track: fix tracking branch computation.
Junio C Hamano [Wed, 6 Jun 2007 08:10:14 +0000 (01:10 -0700)]
git-branch --track: fix tracking branch computation.

The original code did not take hierarchical branch names into account at all.

Tested-by: Gerrit Pape <pape@smarden.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years agoFix typo in git-mergetool
Josh Triplett [Wed, 6 Jun 2007 04:24:19 +0000 (21:24 -0700)]
Fix typo in git-mergetool

Signed-off-by: Josh Triplett <josh@freedesktop.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years agoAdd the --numbered-files option to git-format-patch.
Jon Loeliger [Tue, 5 Jun 2007 20:06:53 +0000 (15:06 -0500)]
Add the --numbered-files option to git-format-patch.

With this option, git-format-patch will generate simple
numbered files as output instead of the default using
with the first commit line appended.

This simplifies the ability to generate an MH-style
drafts folder with each message to be sent.

Signed-off-by: Jon Loeliger <jdl@freescale.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years ago$EMAIL is a last resort fallback, as it's system-wide.
Pierre Habouzit [Tue, 5 Jun 2007 16:40:41 +0000 (18:40 +0200)]
$EMAIL is a last resort fallback, as it's system-wide.

$EMAIL is a system-wide setup that is used for many many many
applications. If the git user chose a specific user.email setup,
then _this_ should be honoured rather than $EMAIL.

Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years agomake clean should remove all the test programs too
Matthias Lederhofer [Tue, 5 Jun 2007 13:43:17 +0000 (15:43 +0200)]
make clean should remove all the test programs too

Signed-off-by: Matthias Lederhofer <matled@gmx.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years agoadd git-filter-branch to .gitignore
Matthias Lederhofer [Tue, 5 Jun 2007 13:26:12 +0000 (15:26 +0200)]
add git-filter-branch to .gitignore

Signed-off-by: Matthias Lederhofer <matled@gmx.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years agoMerge branch 'gb/idx'
Junio C Hamano [Wed, 6 Jun 2007 04:36:51 +0000 (21:36 -0700)]
Merge branch 'gb/idx'

* gb/idx:
  Unify write_index_file functions

17 years agogit-merge-file: refuse to merge binary files
Johannes Schindelin [Tue, 5 Jun 2007 02:37:13 +0000 (03:37 +0100)]
git-merge-file: refuse to merge binary files

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years agomerge-recursive: refuse to merge binary files
Johannes Schindelin [Tue, 5 Jun 2007 02:36:49 +0000 (03:36 +0100)]
merge-recursive: refuse to merge binary files

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years agoMove buffer_is_binary() to xdiff-interface.h
Johannes Schindelin [Tue, 5 Jun 2007 02:36:11 +0000 (03:36 +0100)]
Move buffer_is_binary() to xdiff-interface.h

We already have two instances where we want to determine if a buffer
contains binary data as opposed to text.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years agogit-fsck: learn about --verbose
Johannes Schindelin [Tue, 5 Jun 2007 02:44:00 +0000 (03:44 +0100)]
git-fsck: learn about --verbose

With --verbose, it gets really chatty now.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years agogitweb: Handle non UTF-8 text better
Martin Koegler [Sun, 3 Jun 2007 15:42:44 +0000 (17:42 +0200)]
gitweb: Handle non UTF-8 text better

gitweb assumes that everything is in UTF-8. If a text contains invalid
UTF-8 character sequences, the text must be in a different encoding.

This commit introduces $fallback_encoding which would be used as input
encoding if gitweb encounters text with is not valid UTF-8.

Add basic test for this in t/t9500-gitweb-standalone-no-errors.sh

Signed-off-by: Martin Koegler <mkoegler@auto.tuwien.ac.at>
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Tested-by: Alexandre Julliard <julliard@winehq.org>
Tested-by: Ismail Dönmez <ismail@pardus.org.tr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years agoAdd test-sha1 to .gitignore.
Randal L. Schwartz [Sun, 3 Jun 2007 15:27:52 +0000 (08:27 -0700)]
Add test-sha1 to .gitignore.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years agoTeach git-tag about showing tag annotations.
Matthijs Melchior [Sun, 3 Jun 2007 00:05:39 +0000 (02:05 +0200)]
Teach git-tag about showing tag annotations.

The <pattern> for -l is now a shell pattern, not a list of grep parameters.
Option -l may be repeated with another <pattern>.

The new -n [<num>] option specifies how many lines from
the annotation are to be printed.
Not specifieing -n or -n 0 will just produce the tag names
Just -n or -n 1 will show the first line of the annotation on
the tag line.
Other valuse for -n will show that number of lines from the annotation.

The exit code used to indicate if any tag was found.
This is changed due to a different implementation.

A good way to test a tag for existence is to use:
git show-ref --quiet --verify refs/tags/$TAGNAME

Signed-off-by: Matthijs Melchior <mmelchior@xs4all.nl>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agogit-apply: what is detected and fixed is not just trailing spaces.
Junio C Hamano [Sun, 3 Jun 2007 02:55:54 +0000 (19:55 -0700)]
git-apply: what is detected and fixed is not just trailing spaces.

But we kept saying "trailing whitespace" all the same.  Reword the
error messages a bit.

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoUpdate to SubmittingPatches
Johannes Schindelin [Sun, 3 Jun 2007 00:46:47 +0000 (01:46 +0100)]
Update to SubmittingPatches

Make people aware of our testsuite, and of non-ASCII encodings.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoMerge branch 'maint' to sync with 1.5.2.1
Junio C Hamano [Sun, 3 Jun 2007 02:36:20 +0000 (19:36 -0700)]
Merge branch 'maint' to sync with 1.5.2.1

17 years agoRelease Notes: start preparing for 1.5.3
Junio C Hamano [Sun, 3 Jun 2007 02:32:48 +0000 (19:32 -0700)]
Release Notes: start preparing for 1.5.3

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoMerge branches 'lh/submodules' and 'pb/am'
Junio C Hamano [Sun, 3 Jun 2007 02:04:54 +0000 (19:04 -0700)]
Merge branches 'lh/submodules' and 'pb/am'

* lh/submodules:
  Add basic test-script for git-submodule
  Add git-submodule command

* pb/am:
  Remove git-applypatch
  git-applymbox: Remove command

17 years agoGIT 1.5.2.1 v1.5.2.1
Junio C Hamano [Sat, 2 Jun 2007 22:01:33 +0000 (15:01 -0700)]
GIT 1.5.2.1

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoUnify write_index_file functions
Geert Bosch [Fri, 1 Jun 2007 19:18:05 +0000 (15:18 -0400)]
Unify write_index_file functions

This patch unifies the write_index_file functions in
builtin-pack-objects.c and index-pack.c.  As the name
"index" is overloaded in git, move in the direction of
using "idx" and "pack idx" when refering to the pack index.
There should be no change in functionality.

Signed-off-by: Geert Bosch <bosch@gnat.com>
Acked-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoAdd basic test-script for git-submodule
Lars Hjemli [Sat, 2 Jun 2007 01:27:42 +0000 (03:27 +0200)]
Add basic test-script for git-submodule

This test tries to verify basic sanity of git-submodule, i.e. that it is
able to clone and update a submodule repository, that its status output is
sane, and that it barfs when the submodule path is occupied during init.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoMerge branch 'np/pack'
Junio C Hamano [Sat, 2 Jun 2007 19:18:56 +0000 (12:18 -0700)]
Merge branch 'np/pack'

* np/pack:
  fix repack with --max-pack-size
  builtin-pack-object: cache small deltas
  git-pack-objects: cache small deltas between big objects
  builtin-pack-objects: don't fail, if delta is not possible

17 years agoMerge branch 'sp/pack'
Junio C Hamano [Sat, 2 Jun 2007 19:18:51 +0000 (12:18 -0700)]
Merge branch 'sp/pack'

* sp/pack:
  Style nit - don't put space after function names
  Ensure the pack index is opened before access
  Simplify index access condition in count-objects, pack-redundant
  Test for recent rev-parse $abbrev_sha1 regression
  rev-parse: Identify short sha1 sums correctly.
  Attempt to delay prepare_alt_odb during get_sha1
  Micro-optimize prepare_alt_odb
  Lazily open pack index files on demand

17 years agogit-rebase: suggest to use git-add instead of git-update-index
Jonas Fonseca [Sat, 2 Jun 2007 17:59:49 +0000 (19:59 +0200)]
git-rebase: suggest to use git-add instead of git-update-index

The command is part of the main porcelain making git-add more
appropriate.

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoMerge branch 'maint'
Junio C Hamano [Sat, 2 Jun 2007 19:05:08 +0000 (12:05 -0700)]
Merge branch 'maint'

* maint:
  Use =20 when rfc2047 encoding spaces.
  Create a new manpage for the gitignore format, and reference it elsewhere
  Documentation: robustify asciidoc GIT_VERSION replacement

17 years agoUse =20 when rfc2047 encoding spaces.
Kristian Høgsberg [Fri, 1 Jun 2007 21:08:12 +0000 (17:08 -0400)]
Use =20 when rfc2047 encoding spaces.

Encode ' ' using '=20' even though rfc2047 allows using '_' for
readability.  Unfortunately, many programs do not understand this and
just leave the underscore in place.  Using '=20' seems to work better.

[jc: with adjustment to t3901]

Signed-off-by: Kristian Høgsberg <hoegsberg@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoCreate a new manpage for the gitignore format, and reference it elsewhere
Josh Triplett [Sat, 2 Jun 2007 17:08:54 +0000 (10:08 -0700)]
Create a new manpage for the gitignore format, and reference it elsewhere

Only git-ls-files(1) describes the gitignore format in detail, and it does so
with reference to git-ls-files options.  Most users don't use the plumbing
command git-ls-files directly, and shouldn't have to look in its manpage for
information on the gitignore format.

Create a new manpage gitignore(5) (Documentation/gitignore.txt), and factor
out the gitignore documentation into that file, changing it to refer to
.gitignore and $GIT_DIR/info/exclude as used by porcelain commands.  Reference
gitignore(5) from other relevant manpages and documentation.  Remove
now-redundant information on exclude patterns from git-ls-files(1), leaving
only information on how git-ls-files options specify exclude patterns and what
precedence they have.

Signed-off-by: Josh Triplett <josh@freedesktop.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoDocumentation: robustify asciidoc GIT_VERSION replacement
Jeff King [Fri, 1 Jun 2007 09:10:30 +0000 (05:10 -0400)]
Documentation: robustify asciidoc GIT_VERSION replacement

Instead of using sed on the resulting file, we now have a
git_version asciidoc attribute. This means that we don't
pipe the output of asciidoc, which means we can detect build
failures.

Problem reported by Scott Lamb, solution suggested by Jonas Fonseca.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoFix git-am(1) synopsis formatting
Jonas Fonseca [Sat, 2 Jun 2007 17:56:44 +0000 (19:56 +0200)]
Fix git-am(1) synopsis formatting

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoFix minor grammatical typos in the git-gc man page
Theodore Ts'o [Thu, 31 May 2007 23:00:48 +0000 (19:00 -0400)]
Fix minor grammatical typos in the git-gc man page

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agodiff-delta: use realloc instead of xrealloc
Martin Koegler [Tue, 29 May 2007 19:08:35 +0000 (21:08 +0200)]
diff-delta: use realloc instead of xrealloc

Commit 83572c1a914d3f7a8dd66d954c11bbc665b7b923 changed many
realloc to xrealloc. This change was made in diff-delta.c too,
although the code can handle an out of memory failure.

This patch reverts this change in diff-delta.c.

Signed-off-by: Martin Koegler <mkoegler@auto.tuwien.ac.at>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoMerge branch 'maint'
Junio C Hamano [Thu, 31 May 2007 07:15:14 +0000 (00:15 -0700)]
Merge branch 'maint'

* maint:
  git-config: Improve documentation of git-config file handling
  git-config: Various small fixes to asciidoc documentation
  decode_85(): fix missing return.
  fix signed range problems with hex conversions

17 years agoMerge branch 'maint-1.5.1' into maint
Junio C Hamano [Thu, 31 May 2007 07:09:26 +0000 (00:09 -0700)]
Merge branch 'maint-1.5.1' into maint

* maint-1.5.1:
  git-config: Improve documentation of git-config file handling
  git-config: Various small fixes to asciidoc documentation
  decode_85(): fix missing return.
  fix signed range problems with hex conversions

17 years agogit-config: Improve documentation of git-config file handling
Frank Lichtenheld [Thu, 31 May 2007 00:35:37 +0000 (02:35 +0200)]
git-config: Improve documentation of git-config file handling

The description which files git-config uses and how the various
command line options and environment variables affect its
behaviour was incomplete, outdated and confusing.

Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agogit-config: Various small fixes to asciidoc documentation
Frank Lichtenheld [Thu, 31 May 2007 00:35:36 +0000 (02:35 +0200)]
git-config: Various small fixes to asciidoc documentation

Add '' around the only mentioned commandline option that didn't
have it.

Make reference to section EXAMPLE a link and rename it to
EXAMPLES because it actually contains a lot of examples.

Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoalways start looking up objects in the last used pack first
Nicolas Pitre [Thu, 31 May 2007 02:48:13 +0000 (22:48 -0400)]
always start looking up objects in the last used pack first

Jon Smirl said:

| Once an object reference hits a pack file it is very likely that
| following references will hit the same pack file. So first place to
| look for an object is the same place the previous object was found.

This is indeed a good heuristic so here it is.  The search always start
with the pack where the last object lookup succeeded.  If the wanted
object is not available there then the search continues with the normal
pack ordering.

To test this I split the Linux repository into 66 packs and performed a
"time git-rev-list --objects --all > /dev/null".  Best results are as
follows:

Pack Sort w/o this patch w/ this patch
-------------------------------------------------------------
recent objects last 26.4s 20.9s
recent objects first 24.9s 18.4s

This shows that the pack order based on object age has some influence,
but that the last-used-pack heuristic is even more significant in
reducing object lookup.

Signed-off-by: Nicolas Pitre <nico@cam.org> --- Note: the
--max-pack-size to git-repack currently produces packs with old objects
after those containing recent objects.  The pack sort based on
filesystem timestamp is therefore backward for those.  This needs to be
fixed of course, but at least it made me think about this variable for
the test.
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agofix repack with --max-pack-size
Nicolas Pitre [Thu, 31 May 2007 01:43:12 +0000 (21:43 -0400)]
fix repack with --max-pack-size

Two issues here:

1) git-repack -a --max-pack-size=10 on the GIT repo dies pretty quick.
   There is a lot of confusion about deltas that were suposed to be
   reused from another pack but that get stored undeltified due to pack
   limit and object size doesn't match entry->size anymore.  This test
   is not really worth the complexity for determining when it is valid
   so get rid of it.

2) If pack limit is reached, the object buffer is freed, including when
   it comes from a cached delta data.  In practice the object will be
   stored in a subsequent pack undeltified, but let's make sure no
   pointer to freed data subsists by clearing entry->delta_data.

I also reorganized that code a bit to make it more readable.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoMakefile: Use generic rule to build test programs
Julian Phillips [Wed, 30 May 2007 23:18:24 +0000 (00:18 +0100)]
Makefile: Use generic rule to build test programs

Use a generic make rule to build all the test programs, rather than
specifically mentioning each one.

Signed-off-by: Julian Phillips <julian@quantumfyre.co.uk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agodecode_85(): fix missing return.
Jerald Fitzjerald [Wed, 30 May 2007 12:39:58 +0000 (05:39 -0700)]
decode_85(): fix missing return.

When the function detected an invalid base85 sequence, it issued
an error message but forgot to return error status at that point
and kept going.

Signed-off-by: Jerald Fitzjerald <jfj@freemail.gr>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agofix signed range problems with hex conversions
Linus Torvalds [Wed, 30 May 2007 17:32:19 +0000 (10:32 -0700)]
fix signed range problems with hex conversions

Make hexval_table[] "const".  Also make sure that the accessor
function hexval() does not access the table with out-of-range
values by declaring its parameter "unsigned char", instead of
"unsigned int".

With this, gcc can just generate:

movzbl  (%rdi), %eax
movsbl  hexval_table(%rax),%edx
movzbl  1(%rdi), %eax
movsbl  hexval_table(%rax),%eax
sall    $4, %edx
orl     %eax, %edx

for the code to generate a byte from two hex characters.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoAdd DLH to .mailmap
Junio C Hamano [Wed, 30 May 2007 00:55:47 +0000 (17:55 -0700)]
Add DLH to .mailmap

... and make the entries sorted.

17 years agoStyle nit - don't put space after function names
Shawn O. Pearce [Wed, 30 May 2007 06:13:42 +0000 (02:13 -0400)]
Style nit - don't put space after function names

Our style is to not put a space after a function name.  I did here,
and Junio applied the patch with the incorrect formatting.  So I'm
cleaning up after myself since I noticed it upon review.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoEnsure the pack index is opened before access
Shawn O. Pearce [Wed, 30 May 2007 06:13:14 +0000 (02:13 -0400)]
Ensure the pack index is opened before access

In this particular location of fsck the index should have already
been opened by verify_pack, which is called just before we get
here and loop through the object names.  However, just in case a
future version of that function does not use the index file we'll
double-check its open before we access the num_objects field.

Better safe now than sorry later.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoSimplify index access condition in count-objects, pack-redundant
Shawn O. Pearce [Wed, 30 May 2007 06:12:28 +0000 (02:12 -0400)]
Simplify index access condition in count-objects, pack-redundant

My earlier lazy index opening patch changed this condition to check
index_data and call open_pack_index if it was NULL. In truth we only
care about num_objects.  Since open_pack_index does no harm if the
index is already open, and all indexes are likely to be closed in
this application, the "performance optimization" of inlining the
index_data check here was wrong.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoTest for recent rev-parse $abbrev_sha1 regression
Shawn O. Pearce [Wed, 30 May 2007 04:50:26 +0000 (00:50 -0400)]
Test for recent rev-parse $abbrev_sha1 regression

My recent patch "Lazily open pack index files on demand" caused a
regression in the case of parsing abbreviated SHA-1 object names.
Git was unable to translate the abbreviated name into the full name
if the object was packed, as the pack .idx files were not opened
before being accessed.

This is a simple test to repack a repository then test for an
abbreviated SHA-1 within the packfile.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agorev-parse: Identify short sha1 sums correctly.
James Bowes [Tue, 29 May 2007 23:29:51 +0000 (19:29 -0400)]
rev-parse: Identify short sha1 sums correctly.

find_short_packed_object was not loading the pack index files.
Teach it to do so.

Signed-off-by: James Bowes <jbowes@dangerouslyinc.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agobuiltin-pack-object: cache small deltas
Martin Koegler [Mon, 28 May 2007 21:20:59 +0000 (23:20 +0200)]
builtin-pack-object: cache small deltas

Signed-off-by: Martin Koegler <mkoegler@auto.tuwien.ac.at>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agogit-pack-objects: cache small deltas between big objects
Martin Koegler [Mon, 28 May 2007 21:20:58 +0000 (23:20 +0200)]
git-pack-objects: cache small deltas between big objects

Creating deltas between big blobs is a CPU and memory intensive task.
In the writing phase, all (not reused) deltas are redone.

This patch adds support for caching deltas from the deltifing phase, so
that that the writing phase is faster.

The caching is limited to small deltas to avoid increasing memory usage very much.
The implemented limit is (memory needed to create the delta)/1024.

Signed-off-by: Martin Koegler <mkoegler@auto.tuwien.ac.at>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agobuiltin-pack-objects: don't fail, if delta is not possible
Martin Koegler [Mon, 28 May 2007 21:20:57 +0000 (23:20 +0200)]
builtin-pack-objects: don't fail, if delta is not possible

If builtin-pack-objects runs out of memory while finding
the best deltas, it bails out with an error.

If the delta index creation fails (because there is not enough memory),
we can downgrade the error message to a warning and continue with the
next object.

Signed-off-by: Martin Koegler <mkoegler@auto.tuwien.ac.at>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoMerge branch 'db/remote'
Junio C Hamano [Tue, 29 May 2007 08:24:20 +0000 (01:24 -0700)]
Merge branch 'db/remote'

* db/remote:
  Move refspec pattern matching to match_refs().
  Update local tracking refs when pushing
  Add handlers for fetch-side configuration of remotes.
  Move refspec parser from connect.c and cache.h to remote.{c,h}
  Move remote parsing into a library file out of builtin-push.

17 years agoMerge branch 'dh/repack' (early part)
Junio C Hamano [Tue, 29 May 2007 08:16:28 +0000 (01:16 -0700)]
Merge branch 'dh/repack' (early part)

* 'dh/repack' (early part):
  Ensure git-repack -a -d --max-pack-size=N deletes correct packs
  pack-objects: clarification & option checks for --max-pack-size
  git-repack --max-pack-size: add option parsing to enable feature
  git-repack --max-pack-size: split packs as asked by write_{object,one}()
  git-repack --max-pack-size: write_{object,one}() respect pack limit
  git-repack --max-pack-size: new file statics and code restructuring
  Alter sha1close() 3rd argument to request flush only

17 years agoMerge branch 'np/delta'
Junio C Hamano [Tue, 29 May 2007 07:49:23 +0000 (00:49 -0700)]
Merge branch 'np/delta'

* np/delta:
  update diff-delta.c copyright
  improve delta long block matching with big files

17 years agoMerge branch 'jc/nodelta'
Junio C Hamano [Tue, 29 May 2007 07:41:50 +0000 (00:41 -0700)]
Merge branch 'jc/nodelta'

* jc/nodelta:
  builtin-pack-objects: remove unnecessary code for no-delta
  Teach "delta" attribute to pack-objects.
  pack-objects: pass fullname down to add_object_entry()

17 years agoMerge branch 'ar/verbose'
Junio C Hamano [Tue, 29 May 2007 07:41:36 +0000 (00:41 -0700)]
Merge branch 'ar/verbose'

* ar/verbose:
  Add another verbosity level to git-fetch
  Verbose connect messages to show the IP addresses used

17 years agoMerge branch 'ar/run'
Junio C Hamano [Tue, 29 May 2007 07:41:22 +0000 (00:41 -0700)]
Merge branch 'ar/run'

* ar/run:
  Allow environment variables to be unset in the processes started by run_command
  Add ability to specify environment extension to run_command
  Add run_command_v_opt_cd: chdir into a directory before exec

17 years agoMerge branch 'ar/mergestat'
Junio C Hamano [Tue, 29 May 2007 07:38:52 +0000 (00:38 -0700)]
Merge branch 'ar/mergestat'

* ar/mergestat:
  Add a configuration option to control diffstat after merge

17 years agoMerge branch 'rr/cvsexport'
Junio C Hamano [Tue, 29 May 2007 07:37:23 +0000 (00:37 -0700)]
Merge branch 'rr/cvsexport'

* rr/cvsexport:
  Add option to cvs update before export

17 years agoMerge branch 'maint'
Junio C Hamano [Tue, 29 May 2007 07:27:24 +0000 (00:27 -0700)]
Merge branch 'maint'

* maint:
  cvsserver: Fix some typos in asciidoc documentation
  cvsserver: Note that CVS_SERVER can also be specified as method variable
  cvsserver: Correct inetd.conf example in asciidoc documentation
  user-manual: fixed typo in example
  Add test case for $Id$ expanded in the repository
  git-svn: avoid md5 calculation entirely if SVN doesn't provide one
  Makefile: Remove git-fsck and git-verify-pack from PROGRAMS
  Fix stupid typo in lookup_tag()
  git-gui: Guess our share/git-gui/lib path at runtime if possible
  Correct key bindings to Control-<foo>
  git-gui: Tighten internal pattern match for lib/ directory

17 years agocvsserver: Handle 'cvs login'
Frank Lichtenheld [Sun, 27 May 2007 12:33:10 +0000 (14:33 +0200)]
cvsserver: Handle 'cvs login'

Since this is a trivial variation of the general pserver
authentication, there is really no reason not to support
it.

Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agot9400: Work around CVS' deficiencies
Frank Lichtenheld [Sun, 27 May 2007 12:33:09 +0000 (14:33 +0200)]
t9400: Work around CVS' deficiencies

If we are too fast with our changes, the file in
the working copy might still have the same mtime
as noted in the CVS/Entries. This will cause CVS
to happily report to the server that the file is
unmodified which can lead to data loss (and in
our case test failure).

CVS sucks!

Work around that by sleeping for a second.

Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoAllow contrib new-workdir to link into bare repositories
Shawn O. Pearce [Sun, 27 May 2007 03:09:27 +0000 (23:09 -0400)]
Allow contrib new-workdir to link into bare repositories

On one particular system I like to keep a cluster of bare Git
repositories and spawn new-workdirs off of them.  Since the bare
repositories don't have working directories associated with them
they don't have a .git/ subdirectory that hosts the repository we
are linking to.

Using a bare repository as the backing repository for a workdir
created by this script does require that the user delete core.bare
from the repository's configuration file, so that Git auto-senses
the bareness of a repository based on pathname information, and
not based on the config file.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>