git/git.git
14 years agoMerge branch 'jc/grep'
Junio C Hamano [Tue, 16 May 2006 01:12:06 +0000 (18:12 -0700)]
Merge branch 'jc/grep'

* jc/grep: (22 commits)
  Fix silly typo in new builtin grep
  builtin-grep: unparse more command line options.
  builtin-grep: use external grep when we can take advantage of it
  builtin-grep: -F (--fixed-strings)
  builtin-grep: -w fix
  builtin-grep: typofix
  builtin-grep: tighten argument parsing.
  builtin-grep: documentation
  Teach -f <file> option to builtin-grep.
  builtin-grep: -L (--files-without-match).
  builtin-grep: binary files -a and -I
  builtin-grep: terminate correctly at EOF
  builtin-grep: tighten path wildcard vs tree traversal.
  builtin-grep: support -w (--word-regexp).
  builtin-grep: support -c (--count).
  builtin-grep: allow more than one patterns.
  builtin-grep: allow -<n> and -[ABC]<n> notation for context lines.
  builtin-grep: printf %.*s length is int, not ptrdiff_t.
  builtin-grep: do not use setup_revisions()
  builtin-grep: support '-l' option.
  ...

14 years agoMerge branch 'lt/diff'
Junio C Hamano [Tue, 16 May 2006 01:09:15 +0000 (18:09 -0700)]
Merge branch 'lt/diff'

* lt/diff:
  git diff: support "-U" and "--unified" options properly

14 years agoFix silly typo in new builtin grep
Linus Torvalds [Tue, 16 May 2006 00:54:01 +0000 (17:54 -0700)]
Fix silly typo in new builtin grep

The "-F" flag apparently got mis-translated due to some over-eager
copy-paste work into a duplicate "-H" when using the external grep.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoMerge branch 'fix'
Junio C Hamano [Mon, 15 May 2006 20:48:22 +0000 (13:48 -0700)]
Merge branch 'fix'

* fix:
  Fix pack-index issue on 64-bit platforms a bit more portably.
  Install git-send-email by default
  Fix compilation on newer NetBSD systems
  git config syntax updates
  Another config file parsing fix.
  checkout: use --aggressive when running a 3-way merge (-m).

14 years agobuiltin-grep: unparse more command line options.
Junio C Hamano [Mon, 15 May 2006 20:28:01 +0000 (13:28 -0700)]
builtin-grep: unparse more command line options.

The earlier one to use external grep missed some often used options.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoFix pack-index issue on 64-bit platforms a bit more portably. v1.3.3
Junio C Hamano [Mon, 15 May 2006 19:52:00 +0000 (12:52 -0700)]
Fix pack-index issue on 64-bit platforms a bit more portably.

Apparently <stdint.h> is not enough for uint32_t on OpenBSD; use
"unsigned int" -- hopefully that would stay 32-bit on every
platform we care about, at least until we update the pack-index
file format.

Our sha1 routines optimized for architectures use uint32_t and
expects '#include <stdint.h>' to be enough, so OpenBSD on arm or
ppc might have similar issues down the road, I dunno.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoInstall git-send-email by default
Eric Wong [Mon, 15 May 2006 02:26:56 +0000 (19:26 -0700)]
Install git-send-email by default

After 567ffeb7722eefab3991cb894c96548b92b57cc2 and
4bc87a28be020a6bf7387161c65ea3d8e4a0228b, git-send-email no
longer requires any non-standard Perl modules, so there's no
reason to special-case it.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoFix compilation on newer NetBSD systems
Dennis Stosberg [Thu, 11 May 2006 17:35:31 +0000 (19:35 +0200)]
Fix compilation on newer NetBSD systems

NetBSD >=2.0 has iconv() in libc.  A libiconv is not required and
does not exist.

See: http://netbsd.gw.com/cgi-bin/man-cgi?iconv+3+NetBSD-2.0

[jc: with a bit of simplification later discussed on the list.]

Signed-off-by: Dennis Stosberg <dennis@stosberg.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoMerge branch 'fix'
Junio C Hamano [Mon, 15 May 2006 07:51:37 +0000 (00:51 -0700)]
Merge branch 'fix'

* fix:
  Ensure author & committer before asking for commit message.

14 years agoMerge branch 'fix' into maint
Junio C Hamano [Mon, 15 May 2006 07:49:25 +0000 (00:49 -0700)]
Merge branch 'fix' into maint

* fix:
  Ensure author & committer before asking for commit message.

14 years agoInstall git-send-email by default
Eric Wong [Mon, 15 May 2006 02:26:56 +0000 (19:26 -0700)]
Install git-send-email by default

After 567ffeb7722eefab3991cb894c96548b92b57cc2 and
4bc87a28be020a6bf7387161c65ea3d8e4a0228b, git-send-email no
longer requires any non-standard Perl modules, so there's no
reason to special-case it.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agosend-email: address expansion for common mailers
Eric Wong [Mon, 15 May 2006 02:13:44 +0000 (19:13 -0700)]
send-email: address expansion for common mailers

mutt, gnus, pine, mailrc formats should be supported.

Testing and feedback for correctness and completeness of all formats
and support for additional formats would be good.

Nested expansions are also supported.

More than one alias file to be used.

All alias file formats must still of be the same type, though.

Two git repo-config keys are required for this
(as suggested by Ryan Anderson):

    sendemail.aliasesfile = <filename of aliases file>
    sendemail.aliasfiletype = (mutt|gnus|pine|mailrc)

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Acked-by: Ryan Anderson <ryan@michonline.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agobuiltin-grep: use external grep when we can take advantage of it
Linus Torvalds [Mon, 15 May 2006 03:49:15 +0000 (20:49 -0700)]
builtin-grep: use external grep when we can take advantage of it

It's not perfect, but it gets the "git grep some-random-string" down to
the good old half-a-second range for the kernel.

It should convert more of the argument flags for "grep", that should be
trivial to expand (I did a few just as an example). It should also bother
to try to return the right "hit" value (which it doesn't, right now - the
code is kind of there, but I didn't actually bother to do it _right_).

Also, right now it _just_ limits by number of arguments, but it should
also strictly speaking limit by total argument size (ie add up the length
of the filenames, and do the "exec_grep()" flush call if it's bigger than
some random value like 32kB).

But I think that it's _conceptually_ doing all the right things, and it
seems to work. So maybe somebody else can do some of the final polish.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agodiffstat rename squashing fix.
Junio C Hamano [Mon, 15 May 2006 05:07:28 +0000 (22:07 -0700)]
diffstat rename squashing fix.

When renaming leading/a/filename to leading/b/filename (and
"filename" is sufficiently long), we tried to squash the rename
to "leading/{a => b}/filename".  However, when "/a" or "/b" part
is empty, we underflowed and tried to print a substring of
length -1.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoEnsure author & committer before asking for commit message.
Sean [Sun, 14 May 2006 03:09:32 +0000 (23:09 -0400)]
Ensure author & committer before asking for commit message.

It's better to find out you need to fix your author and
committer information before you enter a long commit message.

Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogit diff: support "-U" and "--unified" options properly
Linus Torvalds [Sat, 13 May 2006 20:23:48 +0000 (13:23 -0700)]
git diff: support "-U" and "--unified" options properly

We used to parse "-U" and "--unified" as part of the GIT_DIFF_OPTS
environment variable, but strangely enough we would _not_ parse them as
part of the normal diff command line (where we only accepted "-u").

This adds parsing of -U and --unified, both with an optional numeric
argument. So now you can just say

git diff --unified=5

to get a unified diff with a five-line context, instead of having to do
something silly like

GIT_DIFF_OPTS="--unified=5" git diff -u

(that silly format does continue to still work, of course).

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoMerge branch 'fix'
Junio C Hamano [Sun, 14 May 2006 23:20:15 +0000 (16:20 -0700)]
Merge branch 'fix'

* fix:
  include header to define uint32_t, necessary on Mac OS X

14 years agoMerge branch 'fix' into maint
Junio C Hamano [Sun, 14 May 2006 23:20:09 +0000 (16:20 -0700)]
Merge branch 'fix' into maint

* fix:
  include header to define uint32_t, necessary on Mac OS X

14 years agoinclude header to define uint32_t, necessary on Mac OS X
Ben Clifford [Sun, 14 May 2006 20:34:56 +0000 (21:34 +0100)]
include header to define uint32_t, necessary on Mac OS X

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoMerge branch 'ml/cvs'
Junio C Hamano [Sun, 14 May 2006 07:42:16 +0000 (00:42 -0700)]
Merge branch 'ml/cvs'

* ml/cvs:
  Change to allow subdir updates from Eclipse
  Many fixes for most operations in Eclipse.
  Added logged warnings for CVS error returns
  cvsserver: use git-rev-list instead of git-log
  git-cvsexportcommit: Add -f(orce) and -m(essage prefix) flags, small cleanups.

14 years agoMerge branch 'fix'
Junio C Hamano [Sun, 14 May 2006 05:24:18 +0000 (22:24 -0700)]
Merge branch 'fix'

* fix:
  Fix git-pack-objects for 64-bit platforms

14 years agogit config syntax updates
Linus Torvalds [Tue, 9 May 2006 19:24:02 +0000 (12:24 -0700)]
git config syntax updates

This updates the hierarchical section name syntax to

[section<space>+"<randomstring>"]

where the only rule for "randomstring" is that it can't contain a newline,
and if you really want to insert a double-quote, you do it with \".

It turns that into the section name "secion.randomstring".  The
"section" part is still case insensitive, but the "randomstring"
part is case sensitive.

So you could use this for things like

[email "torvalds@osdl.org"]
name = Linus Torvalds

if you wanted to do the "email->name" conversion as part of the config
file format (I'm not claiming that is sensible, I'm just giving it as an
insane example). That would show up as the association

email.torvalds@osdl.org.name -> Linus Torvalds

which is easy to parse (the "." in the email _looks_ ambiguous, but it
isn't: you know that there will always be a single key-name, so you find
the key name with "strrchr(name, '.')" and things are entirely
unambiguous).

Repo-config is updated to be able to parse the new format, and also
write things out in the new format.

[jc: rolled two patches from Linus and one fix-up from Sean into one,
 with additional adjustments for t/t1300 test to check the case
 insensitiveness of section base and variable and case sensitiveness
 of the extended section part.  Then stripped some part off to make
 the result applicable to the stale 1.3.X series that does not have
 recent enhancements. ]

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoAnother config file parsing fix.
sean [Sat, 6 May 2006 18:14:02 +0000 (14:14 -0400)]
Another config file parsing fix.

If the variable we need to store should go into a section
that currently only has a single variable (not matching
the one we're trying to insert), we will already be into
the next section before we notice we've bypassed the correct
location to insert the variable.

To handle this case we store the current location as soon
as we find a variable matching the section of our new
variable.

This breakage was brought up by Linus.

Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agocheckout: use --aggressive when running a 3-way merge (-m).
Junio C Hamano [Wed, 10 May 2006 02:23:23 +0000 (19:23 -0700)]
checkout: use --aggressive when running a 3-way merge (-m).

After doing an in-index 3-way merge, we always do the stock
"merge-index merge-one-file" without doing anything fancy;
use of --aggressive helps performance quite a bit.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoFix git-pack-objects for 64-bit platforms
Dennis Stosberg [Thu, 11 May 2006 17:36:32 +0000 (19:36 +0200)]
Fix git-pack-objects for 64-bit platforms

The offset of an object in the pack is recorded as a 4-byte integer
in the index file.  When reading the offset from the mmap'ed index
in prepare_pack_revindex(), the address is dereferenced as a long*.
This works fine as long as the long type is four bytes wide.  On
NetBSD/sparc64, however, a long is 8 bytes wide and so dereferencing
the offset produces garbage.

[jc: taking suggestion by Linus to use uint32_t]

Signed-off-by: Dennis Stosberg <dennis@stosberg.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agofix diff-delta bad memory access
Nicolas Pitre [Wed, 10 May 2006 16:26:08 +0000 (12:26 -0400)]
fix diff-delta bad memory access

It cannot be assumed that the given buffer will never be moved when
shrinking the allocated memory size with realloc().  So let's ignore
that optimization for now.

This patch makes Electric Fence happy on Linux.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Acked-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoMerge branch 'fix'
Junio C Hamano [Wed, 10 May 2006 02:24:16 +0000 (19:24 -0700)]
Merge branch 'fix'

* fix:
  checkout: use --aggressive when running a 3-way merge (-m).
  revert/cherry-pick: use aggressive merge.

15 years agocheckout: use --aggressive when running a 3-way merge (-m).
Junio C Hamano [Wed, 10 May 2006 02:23:23 +0000 (19:23 -0700)]
checkout: use --aggressive when running a 3-way merge (-m).

After doing an in-index 3-way merge, we always do the stock
"merge-index merge-one-file" without doing anything fancy;
use of --aggressive helps performance quite a bit.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agorevert/cherry-pick: use aggressive merge.
Linus Torvalds [Wed, 10 May 2006 02:22:25 +0000 (19:22 -0700)]
revert/cherry-pick: use aggressive merge.

After doing an in-index 3-way merge, we always do the stock
"merge-index merge-one-file" without doing anything fancy;
use of --aggressive helps performance quite a bit.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agobuiltin-grep: -F (--fixed-strings)
Junio C Hamano [Wed, 10 May 2006 01:28:41 +0000 (18:28 -0700)]
builtin-grep: -F (--fixed-strings)

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agobuiltin-grep: -w fix
Junio C Hamano [Wed, 10 May 2006 01:27:56 +0000 (18:27 -0700)]
builtin-grep: -w fix

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agobuiltin-grep: typofix
Junio C Hamano [Wed, 10 May 2006 01:15:21 +0000 (18:15 -0700)]
builtin-grep: typofix

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoMerge branch 'jc/clean'
Junio C Hamano [Tue, 9 May 2006 23:52:54 +0000 (16:52 -0700)]
Merge branch 'jc/clean'

* jc/clean:
  Teach git-clean optional <paths>... parameters.

15 years agoMerge branch 'mw/alternates'
Junio C Hamano [Tue, 9 May 2006 23:45:45 +0000 (16:45 -0700)]
Merge branch 'mw/alternates'

* mw/alternates:
  clone: don't clone the info/alternates file
  test case for transitive info/alternates
  Transitively read alternatives

15 years agoMerge branch 'jc/xsha1'
Junio C Hamano [Tue, 9 May 2006 23:44:59 +0000 (16:44 -0700)]
Merge branch 'jc/xsha1'

* jc/xsha1:
  get_sha1() - fix infinite loop on nonexistent stage.
  get_sha1(): :path and :[0-3]:path to extract from index.

15 years agoMerge branch 'jc/again'
Junio C Hamano [Tue, 9 May 2006 23:40:53 +0000 (16:40 -0700)]
Merge branch 'jc/again'

* jc/again:
  Fix users of prefix_path() to free() only when necessary
  update-index --again: take optional pathspecs
  update-index --again

15 years agoMerge branch 'np/delta'
Junio C Hamano [Tue, 9 May 2006 23:40:28 +0000 (16:40 -0700)]
Merge branch 'np/delta'

* np/delta:
  improve diff-delta with sparse and/or repetitive data
  tiny optimization to diff-delta
  replace adler32 with Rabin's polynomial in diff-delta
  use delta index data when finding best delta matches
  split the diff-delta interface

15 years agoMerge branch 'jc/bindiff'
Junio C Hamano [Tue, 9 May 2006 21:16:56 +0000 (14:16 -0700)]
Merge branch 'jc/bindiff'

* jc/bindiff:
  improve base85 generated assembly code
  binary diff and apply: testsuite.
  binary diff: further updates.
  binary patch.

15 years agoMerge branch 'fix'
Junio C Hamano [Tue, 9 May 2006 20:54:42 +0000 (13:54 -0700)]
Merge branch 'fix'

* fix:
  read-cache.c: use xcalloc() not calloc()
  apply: fix infinite loop with multiple patches with --index

15 years agoMerge branch 'tojunio' of http://locke.catalyst.net.nz/git/git-martinlanghoff into...
Junio C Hamano [Tue, 9 May 2006 19:25:21 +0000 (12:25 -0700)]
Merge branch 'tojunio' of locke.catalyst.net.nz/git/git-martinlanghoff into ml/cvs

* 'tojunio' of http://locke.catalyst.net.nz/git/git-martinlanghoff:
  Change to allow subdir updates from Eclipse
  Many fixes for most operations in Eclipse.
  Added logged warnings for CVS error returns
  cvsserver: use git-rev-list instead of git-log
  git-cvsexportcommit: Add -f(orce) and -m(essage prefix) flags, small cleanups.

15 years agoread-cache.c: use xcalloc() not calloc()
Yakov Lerner [Tue, 9 May 2006 16:14:00 +0000 (16:14 +0000)]
read-cache.c: use xcalloc() not calloc()

Elsewhere we use xcalloc(); we should consistently do so.

Signed-off-by: Yakov Lerner <iler.ml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoapply: fix infinite loop with multiple patches with --index
Eric Wong [Tue, 9 May 2006 08:08:23 +0000 (01:08 -0700)]
apply: fix infinite loop with multiple patches with --index

When multiple patches are passed to git-apply, it will attempt
to open multiple file descriptors to an index, which means
multiple entries will be in the circular cache_file_list.

This change makes git-apply only open the index once and
write the index at exit.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agobuiltin-grep: tighten argument parsing.
Junio C Hamano [Tue, 9 May 2006 06:55:47 +0000 (23:55 -0700)]
builtin-grep: tighten argument parsing.

I mistyped

git grep next -e '"^@"' '*.c'

and got many hits that contain "next" without complaint.
Obviously what I meant to say was:

git grep -e '"^@"' next -- '*.c'

This tightens the argument parsing rule a bit:

 - All "grep" parameters should come first;

 - If there is no -e nor -f to specify pattern, the first non
   option string is the parameter;

 - After that, zero or more revs can follow.

 - An optional '--' can be present, and is skipped.

 - All the rest are pathspecs.  If '--' was not there, they must
   be paths that exist in the working tree.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoTeach git-clean optional <paths>... parameters.
Junio C Hamano [Mon, 8 May 2006 19:02:44 +0000 (12:02 -0700)]
Teach git-clean optional <paths>... parameters.

When optional paths arguments are given, git-clean passes them
to underlying git-ls-files; with this, you can say:

git clean 'temp-*'

to clean only the garbage files whose names begin with 'temp-'.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Pavel Roskin <proski@gnu.org>
15 years agoMerge branch 'fix'
Junio C Hamano [Mon, 8 May 2006 23:40:23 +0000 (16:40 -0700)]
Merge branch 'fix'

* fix:
  Separate object name errors from usage errors
  Documentation: {caret} fixes (git-rev-list.txt)
  Fix "git diff --stat" with long filenames
  Fix repo-config set-multivar error return path.

15 years agoSeparate object name errors from usage errors
Dmitry V. Levin [Mon, 8 May 2006 21:43:38 +0000 (01:43 +0400)]
Separate object name errors from usage errors

Separate object name errors from usage errors.

Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoget_sha1() - fix infinite loop on nonexistent stage.
Junio C Hamano [Mon, 8 May 2006 22:44:06 +0000 (15:44 -0700)]
get_sha1() - fix infinite loop on nonexistent stage.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoDocumentation: {caret} fixes (git-rev-list.txt)
Junio C Hamano [Mon, 8 May 2006 20:46:53 +0000 (13:46 -0700)]
Documentation: {caret} fixes (git-rev-list.txt)

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agobuiltin-grep: documentation
Junio C Hamano [Mon, 8 May 2006 20:28:49 +0000 (13:28 -0700)]
builtin-grep: documentation

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoTeach -f <file> option to builtin-grep.
Junio C Hamano [Mon, 8 May 2006 20:28:27 +0000 (13:28 -0700)]
Teach -f <file> option to builtin-grep.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoimprove base85 generated assembly code
Nicolas Pitre [Mon, 8 May 2006 15:31:11 +0000 (11:31 -0400)]
improve base85 generated assembly code

This code is arguably pretty hot, if you use binary patches of course.
This patch helps gcc generate both smaller and faster code especially in
the error free path.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoFix "git diff --stat" with long filenames
Linus Torvalds [Mon, 8 May 2006 16:46:53 +0000 (09:46 -0700)]
Fix "git diff --stat" with long filenames

When we cut off the front of a filename to make it fit on the line, we add
a "..." in front. However, the way the "git diff" code was written, we
will never reset the prefix back to the empty string, so every single
filename afterwards will have the "..." prefix, whether appropriate or
not.

You can see this with "git diff v2.6.16.." on the current kernel tree,
since there are filenames with long names that changed there:

 [ snip snip ]
 Documentation/filesystems/vfs.txt                  |  229
 .../firmware_class/firmware_sample_driver.c        |    3
 .../firmware_sample_firmware_class.c               |    1
 ...Documentation/fujitsu/frv/kernel-ABI.txt           |  192
 ...Documentation/hwmon/w83627hf                       |    4
 [ snip snip ]

notice how the two Documentation/firmware** filenames caused the "..." to
be added, but then the later filenames don't want it, and it also screws
up the alignment of the line numbering afterwards.

Trivially fixed by moving the declaration (and initial setting) of the
"prefix" variable into the for-loop where it is used.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoFix repo-config set-multivar error return path.
Junio C Hamano [Mon, 8 May 2006 04:27:30 +0000 (21:27 -0700)]
Fix repo-config set-multivar error return path.

This hopefully fixes the problem an earlier commit 5d8ee9ceb attemted
to fix.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoclone: don't clone the info/alternates file
Martin Waitz [Sun, 7 May 2006 18:19:33 +0000 (20:19 +0200)]
clone: don't clone the info/alternates file

Now that the cloned alternates file is parsed, too we don't need to
copy it into our new repository, we just reference it.

Signed-off-by: Martin Waitz <tali@admingilde.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agotest case for transitive info/alternates
Martin Waitz [Sun, 7 May 2006 18:19:47 +0000 (20:19 +0200)]
test case for transitive info/alternates

Signed-off-by: Martin Waitz <tali@admingilde.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoTransitively read alternatives
Martin Waitz [Sun, 7 May 2006 18:19:21 +0000 (20:19 +0200)]
Transitively read alternatives

When adding an alternate object store then add entries from its
info/alternates files, too.
Relative entries are only allowed in the current repository.
Loops and duplicate alternates through multiple repositories are ignored.
Just to be sure that nothing breaks it is not allow to build deep
nesting levels using info/alternates.

Signed-off-by: Martin Waitz <tali@admingilde.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoChange to allow subdir updates from Eclipse
Martyn Smith [Tue, 28 Mar 2006 01:24:27 +0000 (13:24 +1200)]
Change to allow subdir updates from Eclipse

(Now you can rightclick any directory and select team-update/team-commit) and it should work

15 years agoMerge branch 'fix'
Junio C Hamano [Sun, 7 May 2006 22:36:39 +0000 (15:36 -0700)]
Merge branch 'fix'

* fix:
  repack: honor -d even when no new pack was created
  clone: keep --reference even with -l -s
  repo-config: document what value_regexp does a bit more clearly.
  Release config lock if the regex is invalid
  core-tutorial.txt: escape asterisk

15 years agoSparse fix for builtin-diff
Peter Hagervall [Sun, 7 May 2006 14:50:47 +0000 (16:50 +0200)]
Sparse fix for builtin-diff

You gotta love sparse:

builtin-diff.c:88:4: error: Just how const do you want this type to be?

Signed-off-by: Peter Hagervall <hager@cs.umu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agorepack: honor -d even when no new pack was created
Martin Waitz [Sun, 7 May 2006 18:18:53 +0000 (20:18 +0200)]
repack: honor -d even when no new pack was created

If all objects are reachable via an alternate object store then we
still have to remove all obsolete local packs.

Signed-off-by: Martin Waitz <tali@admingilde.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoclone: keep --reference even with -l -s
Martin Waitz [Sun, 7 May 2006 18:19:09 +0000 (20:19 +0200)]
clone: keep --reference even with -l -s

Both -l -s and --reference update objects/info/alternates and used
to write over each other.

Signed-off-by: Martin Waitz <tali@admingilde.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoMany fixes for most operations in Eclipse.
Martyn Smith [Mon, 27 Mar 2006 03:51:42 +0000 (15:51 +1200)]
Many fixes for most operations in Eclipse.

* Implemented global -n option
* Implemented "Questionable"
* Fixed Directory method, I _believe_ it's now correct in both cmdline and Eclipse.
* Directory method Now looks for localdir of "." and compares the repo dir, uses THIS as a basis for all directory level calculations.
* Added extra parameter to filenamesplit() to force stripping of "prepended" directory name. This ensures commits/updates etc work from any directory in the source tree.
* Modified argsfromdir() so it is "always" called. This means that when the client specifies a directory, the method can detect this and behave accordingly (this is currently only implemented for the '.' directory)
* Fixed "commit" method to correctly work from in a subdir

15 years agorepo-config: document what value_regexp does a bit more clearly.
Junio C Hamano [Sun, 7 May 2006 22:32:51 +0000 (15:32 -0700)]
repo-config: document what value_regexp does a bit more clearly.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoRelease config lock if the regex is invalid
Pavel Roskin [Sun, 7 May 2006 21:36:12 +0000 (17:36 -0400)]
Release config lock if the regex is invalid

Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoAdded logged warnings for CVS error returns
Martyn Smith [Fri, 17 Mar 2006 00:33:19 +0000 (13:33 +1300)]
Added logged warnings for CVS error returns

15 years agoMerge with git://kernel.org/pub/scm/git/git.git
Martin Langhoff [Sun, 7 May 2006 22:03:37 +0000 (10:03 +1200)]
Merge with git://kernel.org/pub/scm/git/git.git

15 years agocore-tutorial.txt: escape asterisk
Matthias Lederhofer [Sun, 7 May 2006 17:32:53 +0000 (19:32 +0200)]
core-tutorial.txt: escape asterisk

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoFix users of prefix_path() to free() only when necessary
Johannes Schindelin [Sat, 6 May 2006 22:02:53 +0000 (00:02 +0200)]
Fix users of prefix_path() to free() only when necessary

Unfortunately, prefix_path() sometimes returns a newly xmalloc()ed buffer,
and in other cases it returns a substring!

For example, when calling

git update-index ./hello.txt

prefix_path() returns "hello.txt", but does not allocate a new buffer. The
original code only checked if the result of prefix_path() was different from
what was passed in, and thusly trigger a segmentation fault.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoFix users of prefix_path() to free() only when necessary
Johannes Schindelin [Sat, 6 May 2006 22:02:53 +0000 (00:02 +0200)]
Fix users of prefix_path() to free() only when necessary

Unfortunately, prefix_path() sometimes returns a newly xmalloc()ed buffer,
and in other cases it returns a substring!

For example, when calling

git update-index ./hello.txt

prefix_path() returns "hello.txt", but does not allocate a new buffer. The
original code only checked if the result of prefix_path() was different from
what was passed in, and thusly trigger a segmentation fault.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agot1300-repo-config: two new config parsing tests.
sean [Sat, 6 May 2006 19:43:43 +0000 (15:43 -0400)]
t1300-repo-config: two new config parsing tests.

- correctly insert a new variable into a section that only
  contains a single (different) variable.

- correctly insert a new section that matches the initial
  substring of an existing section.

Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoAnother config file parsing fix.
sean [Sat, 6 May 2006 18:14:02 +0000 (14:14 -0400)]
Another config file parsing fix.

If the variable we need to store should go into a section
that currently only has a single variable (not matching
the one we're trying to insert), we will already be into
the next section before we notice we've bypassed the correct
location to insert the variable.

To handle this case we store the current location as soon
as we find a variable matching the section of our new
variable.

This breakage was brought up by Linus.

Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agobinary diff and apply: testsuite.
Junio C Hamano [Sat, 6 May 2006 07:15:54 +0000 (00:15 -0700)]
binary diff and apply: testsuite.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoupdate-index --again: take optional pathspecs
Junio C Hamano [Sat, 6 May 2006 06:09:05 +0000 (23:09 -0700)]
update-index --again: take optional pathspecs

When pathspecs are given, update-index --again further limits
the set of paths to be updated to those that match them.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoupdate-index --again
Junio C Hamano [Sat, 6 May 2006 00:40:47 +0000 (17:40 -0700)]
update-index --again

After running 'git-update-index' for some paths, you may want to
do the update on the same set of paths again.

The new flag --again checks the paths whose index entries are
are different from the HEAD commit and updates them from the
working tree contents.

This was brought up by Carl Worth on #git.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoupdate-index: plug memory leak from prefix_path()
Junio C Hamano [Sat, 6 May 2006 05:53:56 +0000 (22:53 -0700)]
update-index: plug memory leak from prefix_path()

prefix_path() sometimes allocates new memory and returns it, and
other times returns the incoming path argument intact.  The
callers need to be a bit careful not to leak memory.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agocheckout-index: plug memory leak from prefix_path()
Junio C Hamano [Sat, 6 May 2006 05:38:06 +0000 (22:38 -0700)]
checkout-index: plug memory leak from prefix_path()

prefix_path() sometimes allocates new memory and returns it, and
other times returns the incoming path argument intact.  The
callers need to be a bit careful not to leak memory.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoupdate-index --unresolve: work from a subdirectory.
Junio C Hamano [Sat, 6 May 2006 00:50:06 +0000 (17:50 -0700)]
update-index --unresolve: work from a subdirectory.

It completely forgot to take the prefix into account, so you
had to feed the full path even when you start from a
subdirectory, which was nonsensical.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agobinary diff: further updates.
Junio C Hamano [Fri, 5 May 2006 09:41:53 +0000 (02:41 -0700)]
binary diff: further updates.

This updates the user interface and generated diff data format.

 * "diff --binary" is used to signal that we want an e-mailable
   binary patch.  It implies --full-index and -p.

 * "apply --allow-binary-replacement" acquired a short synonym
   "apply --binary".

 * After the "GIT binary patch\n" header line there is a token
   to record which binary patch mechanism was used, so that we
   can extend it later.  Currently there are two mechanisms
   defined: "literal" and "delta".  The former records the
   deflated postimage and the latter records the deflated delta
   from the preimage to postimage.

   For purely implementation convenience, I added the deflated
   length after these "literal/delta" tokens (otherwise the
   decoding side needs to guess and reallocate the buffer while
   inflating).  Improvement patches are very welcomed.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agobinary patch.
Junio C Hamano [Thu, 4 May 2006 23:51:44 +0000 (16:51 -0700)]
binary patch.

This adds "binary patch" to the diff output and teaches apply
what to do with them.

On the diff generation side, traditionally, we said "Binary
files differ\n" without giving anything other than the preimage
and postimage object name on the index line.  This was good
enough for applying a patch generated from your own repository
(very useful while rebasing), because the postimage would be
available in such a case.  However, this was not useful when the
recipient of such a patch via e-mail were to apply it, even if
the preimage was available.

This patch allows the diff to generate "binary" patch when
operating under --full-index option.  The binary patch follows
the usual extended git diff headers, and looks like this:

"GIT binary patch\n"
<length byte><data>"\n"
...
"\n"

Each line is prefixed with a "length-byte", whose value is upper
or lowercase alphabet that encodes number of bytes that the data
on the line decodes to (1..52 -- 'A' means 1, 'B' means 2, ...,
'Z' means 26, 'a' means 27, ...).  <data> is 1 or more groups of
5-byte sequence, each of which encodes up to 4 bytes in base85
encoding.  Because 52 / 4 * 5 = 65 and we have the length byte,
an output line is capped to 66 characters.  The payload is the
same diff-delta as we use in the packfiles.

On the consumption side, git-apply now can decode and apply the
binary patch when --allow-binary-replacement is given, the diff
was generated with --full-index, and the receiving repository
has the preimage blob, which is the same condition as it always
required when accepting an "Binary files differ\n" patch.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agopack-object: squelch eye-candy on non-tty
Junio C Hamano [Fri, 5 May 2006 10:20:44 +0000 (03:20 -0700)]
pack-object: squelch eye-candy on non-tty

One of my post-update scripts runs a git-fetch into a separate
repository and sends the results back to me (2>&1); I end up
getting this in the mail:

    Generating pack...
    Done counting 180 objects.
    Result has 131 objects.
    Deltifying 131 objects.
       0% (0/131) done^M   1% (2/131) done^M...

This defaults not to do the progress report when not on a tty.

You could give --progress to force the progress report, but
let's not bother even documenting it nor mentioning it in the
usage string.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoMerge branch 'fix'
Junio C Hamano [Fri, 5 May 2006 21:49:49 +0000 (14:49 -0700)]
Merge branch 'fix'

* fix:
  core.prefersymlinkrefs: use symlinks for .git/HEAD
  repo-config: trim white-space before comment
  Fix for config file section parsing.

15 years agocore.prefersymlinkrefs: use symlinks for .git/HEAD
Junio C Hamano [Tue, 2 May 2006 07:40:24 +0000 (00:40 -0700)]
core.prefersymlinkrefs: use symlinks for .git/HEAD

When inspecting a project whose build infrastructure used to
assume that .git/HEAD is a symlink ref, core.prefersymlinkrefs
in the config file of such a project would help to bisect its
history.

Signed-off-by: Junio C Hamano <junkio@cox.net>
(cherry picked from 9f0bb90d161edf8c43f5261d12bf83f14eb02ff4 commit)

15 years agorepo-config: trim white-space before comment
Johannes Schindelin [Tue, 2 May 2006 14:58:37 +0000 (16:58 +0200)]
repo-config: trim white-space before comment

Earlier, calling

git-repo-config core.hello

on a .git/config like this:

[core]
hello = world ; a comment

would yield "world " (i.e. with a trailing space).

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
(cherry picked from c1aee1fd8d94da9b3c5d2dc1d4264f7e73a58f80 commit)

15 years agoFix for config file section parsing.
sean [Fri, 5 May 2006 13:49:15 +0000 (09:49 -0400)]
Fix for config file section parsing.

Currently, if the target key has a section that matches
the initial substring of another section we mistakenly
believe we've found the correct section.  To avoid this
problem, ensure that the section lengths are identical
before comparison.

Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoClarify git-cherry documentation.
sean [Fri, 5 May 2006 19:06:07 +0000 (15:06 -0400)]
Clarify git-cherry documentation.

Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoUpdate git-unpack-objects documentation.
sean [Fri, 5 May 2006 19:05:36 +0000 (15:05 -0400)]
Update git-unpack-objects documentation.

Document that git-unpack-objects will not produce any
results when used on a pack that exists in a repository;
move it first.

Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoFix up docs where "--" isn't displayed correctly.
sean [Fri, 5 May 2006 19:05:24 +0000 (15:05 -0400)]
Fix up docs where "--" isn't displayed correctly.

A bare "--" doesn't show up in man or html pages correctly
as two individual dashes unless backslashed as \--
in the asciidoc source.  Note, no backslash is needed
inside a literal block.

Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoSeveral trivial documentation touch ups.
sean [Fri, 5 May 2006 19:05:10 +0000 (15:05 -0400)]
Several trivial documentation touch ups.

  Move incorrect asciidoc level 2 titles back to level 1.

  Show output of git-name-rev in man page example.

  Reword sentences that begin with a period (.) in asciidoc
  numbered lists to work around conversion to man page bug.

  Mention that git-repack now calls git-prune-packed
  when the -d option is passed to it.

  [imap] section headers in the config file example need to be
  contained in a literal block.  imap.pass is the proper config
  file variable to use, not imap.password.

Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agogit-svn 1.0.0
Eric Wong [Fri, 5 May 2006 19:35:40 +0000 (12:35 -0700)]
git-svn 1.0.0

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agogit-svn: documentation updates
Eric Wong [Fri, 5 May 2006 19:35:39 +0000 (12:35 -0700)]
git-svn: documentation updates

* Clarify that 'init' requires an argument
* Remove instances of 'SVN_URL' in the manpage, it's not an
  environment variable.
* Refer to 'Additional Fetch Arguments' when documenting 'fetch'
* document --authors-file / -A option

Thanks to Pavel Roskin and Seth Falcon for bringing these issues
to my attention.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agodelta: stricter constness
Junio C Hamano [Fri, 5 May 2006 09:35:58 +0000 (02:35 -0700)]
delta: stricter constness

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoMakefile: do not link rev-list any specially.
Junio C Hamano [Fri, 5 May 2006 00:38:41 +0000 (17:38 -0700)]
Makefile: do not link rev-list any specially.

We used to depend on bignum from openssl for rev-list to compute
merge-order, but there is no reason to use different build
recipe from other programs anymore.  Just build it with git-%$X
rule like everybody else.

Noticed by Alexey Dobriyan.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agobuiltin-push: --all and --tags _are_ explicit refspecs
Johannes Schindelin [Thu, 4 May 2006 21:18:14 +0000 (23:18 +0200)]
builtin-push: --all and --tags _are_ explicit refspecs

... so do not get refspecs from remotes/* or the config if one of them
was specified.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoMerge branch 'jc/logs'
Junio C Hamano [Thu, 4 May 2006 07:04:32 +0000 (00:04 -0700)]
Merge branch 'jc/logs'

* jc/logs:
  builtin-log/whatchanged/show: make them official.

15 years agoMerge branch 'jc/show-branch-dense'
Junio C Hamano [Thu, 4 May 2006 06:58:35 +0000 (23:58 -0700)]
Merge branch 'jc/show-branch-dense'

* jc/show-branch-dense:
  show-branch: omit uninteresting merges.

15 years agoMerge branch 'jc/symref'
Junio C Hamano [Thu, 4 May 2006 06:54:55 +0000 (23:54 -0700)]
Merge branch 'jc/symref'

* jc/symref:
  core.prefersymlinkrefs: use symlinks for .git/HEAD

15 years agoMerge branch 'jc/diff'
Junio C Hamano [Thu, 4 May 2006 06:54:34 +0000 (23:54 -0700)]
Merge branch 'jc/diff'

* jc/diff:
  builtin-diff: call it "git-diff", really.
  builtin-diff.c: die() formatting type fix.
  built-in diff: assorted updates.
  built-in diff.

15 years agoMerge branch 'js/repoconfig'
Junio C Hamano [Thu, 4 May 2006 06:41:28 +0000 (23:41 -0700)]
Merge branch 'js/repoconfig'

* js/repoconfig:
  repo-config: deconvolute logics
  repo-config: readability fixups.
  repo-config: support --get-regexp

15 years agoMerge branch 'jc/count'
Junio C Hamano [Thu, 4 May 2006 06:40:39 +0000 (23:40 -0700)]
Merge branch 'jc/count'

* jc/count:
  builtin-count-objects: open packs when running -v
  builtin-count-objects: make it official.
  built-in count-objects.

15 years agoMerge branch 'js/remoteconfig'
Junio C Hamano [Thu, 4 May 2006 06:28:09 +0000 (23:28 -0700)]
Merge branch 'js/remoteconfig'

* js/remoteconfig:
  Revert "fetch, pull: ask config for remote information"
  fetch, pull: ask config for remote information
  builtin-push: also ask config for remote information
  builtin-push: make it official.
  Fix builtin-push to honor Push: lines in remotes file.
  builtin-push: resurrect parsing of Push: lines
  git builtin "push"