Code

git.git
18 years agoMerge branch 'jc/grep' into next
Junio C Hamano [Wed, 10 May 2006 01:29:55 +0000 (18:29 -0700)]
Merge branch 'jc/grep' into next

* jc/grep:
  builtin-grep: -F (--fixed-strings)
  builtin-grep: -w fix
  builtin-grep: typofix

18 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>
18 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>
18 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>
18 years agoMerge branch 'jc/grep' into next
Junio C Hamano [Tue, 9 May 2006 20:05:53 +0000 (13:05 -0700)]
Merge branch 'jc/grep' into next

* jc/grep:
  builtin-grep: tighten argument parsing.

18 years agoMerge branch 'ml/cvs' into next
Junio C Hamano [Tue, 9 May 2006 20:05:48 +0000 (13:05 -0700)]
Merge branch 'ml/cvs' into next

* 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.

18 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.

18 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>
18 years agoMerge branch 'jc/clean' into next
Junio C Hamano [Mon, 8 May 2006 23:43:23 +0000 (16:43 -0700)]
Merge branch 'jc/clean' into next

* jc/clean:
  Teach git-clean optional <paths>... parameters.
  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.

18 years agoMerge branch 'jc/bindiff' into next
Junio C Hamano [Mon, 8 May 2006 23:42:12 +0000 (16:42 -0700)]
Merge branch 'jc/bindiff' into next

* jc/bindiff:
  improve base85 generated assembly code

18 years agoMerge branch 'jc/xsha1' into next
Junio C Hamano [Mon, 8 May 2006 23:41:15 +0000 (16:41 -0700)]
Merge branch 'jc/xsha1' into next

* jc/xsha1:
  get_sha1() - fix infinite loop on nonexistent stage.

18 years agoMerge branch 'jc/grep' into next
Junio C Hamano [Mon, 8 May 2006 23:41:10 +0000 (16:41 -0700)]
Merge branch 'jc/grep' into next

* jc/grep:
  builtin-grep: documentation
  Teach -f <file> option to builtin-grep.

18 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>
18 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.

18 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>
18 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>
18 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>
18 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>
18 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>
18 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>
18 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>
18 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>
18 years agoMerge branch 'jc/gitlink' into next
Junio C Hamano [Sun, 7 May 2006 23:17:43 +0000 (16:17 -0700)]
Merge branch 'jc/gitlink' into next

* jc/gitlink:
  write-tree: --prefix=<path>
  read-tree: --prefix=<path>/ option.

18 years agoMerge branch 'mw/alternates' into next
Junio C Hamano [Sun, 7 May 2006 23:06:45 +0000 (16:06 -0700)]
Merge branch 'mw/alternates' into next

* mw/alternates:
  clone: don't clone the info/alternates file
  test case for transitive info/alternates
  Transitively read alternatives
  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
  Sparse fix for builtin-diff
  Fix users of prefix_path() to free() only when necessary

18 years agoMerge branch 'jc/cache-tree' into next
Junio C Hamano [Sun, 7 May 2006 23:06:44 +0000 (16:06 -0700)]
Merge branch 'jc/cache-tree' into next

* jc/cache-tree:
  Fix crash when reading the empty tree

18 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>
18 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>
18 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>
18 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

18 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

18 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>
18 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>
18 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>
18 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

18 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>
18 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>
18 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

18 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

18 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>
18 years agoFix crash when reading the empty tree
Johannes Schindelin [Sun, 7 May 2006 15:42:37 +0000 (17:42 +0200)]
Fix crash when reading the empty tree

cvsimport needs to call git-read-tree without arguments to create an empty
tree.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'js/fmt-patch' into next
Junio C Hamano [Sun, 7 May 2006 04:47:22 +0000 (21:47 -0700)]
Merge branch 'js/fmt-patch' into next

* js/fmt-patch:
  fmt-patch: understand old <his> notation
  t1300-repo-config: two new config parsing tests.
  Another config file parsing fix.

18 years agoMerge branch 'jc/reupdate' into next
Junio C Hamano [Sun, 7 May 2006 04:47:07 +0000 (21:47 -0700)]
Merge branch 'jc/reupdate' into next

* jc/reupdate:
  Fix users of prefix_path() to free() only when necessary

18 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>
18 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>
18 years agofmt-patch: understand old <his> notation
Johannes Schindelin [Sat, 6 May 2006 20:56:38 +0000 (22:56 +0200)]
fmt-patch: understand old <his> notation

When calling "git fmt-patch HEAD~5", you now get the same as if you would
have said "git fmt-patch HEAD~5..". This makes it easier for my fingers
which are so used to the old syntax.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'master' into js/fmt-patch
Junio C Hamano [Sat, 6 May 2006 21:42:08 +0000 (14:42 -0700)]
Merge branch 'master' into js/fmt-patch

* master: (109 commits)
  t1300-repo-config: two new config parsing tests.
  Another config file parsing fix.
  update-index: plug memory leak from prefix_path()
  checkout-index: plug memory leak from prefix_path()
  update-index --unresolve: work from a subdirectory.
  pack-object: squelch eye-candy on non-tty
  core.prefersymlinkrefs: use symlinks for .git/HEAD
  repo-config: trim white-space before comment
  Fix for config file section parsing.
  Clarify git-cherry documentation.
  Update git-unpack-objects documentation.
  Fix up docs where "--" isn't displayed correctly.
  Several trivial documentation touch ups.
  git-svn 1.0.0
  git-svn: documentation updates
  delta: stricter constness
  Makefile: do not link rev-list any specially.
  builtin-push: --all and --tags _are_ explicit refspecs
  builtin-log/whatchanged/show: make them official.
  show-branch: omit uninteresting merges.
  ...

18 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>
18 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>
18 years agoMerge branch 'jc/reupdate' into next
Junio C Hamano [Sat, 6 May 2006 07:20:54 +0000 (00:20 -0700)]
Merge branch 'jc/reupdate' into next

* jc/reupdate:
  update-index --again: take optional pathspecs
  update-index --again
  update-index: plug memory leak from prefix_path()
  checkout-index: plug memory leak from prefix_path()
  update-index --unresolve: work from a subdirectory.

18 years agoMerge branch 'jc/bindiff' into next
Junio C Hamano [Sat, 6 May 2006 07:20:45 +0000 (00:20 -0700)]
Merge branch 'jc/bindiff' into next

* jc/bindiff:
  binary diff and apply: testsuite.

18 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>
18 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>
18 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>
18 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>
18 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>
18 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>
18 years agoMerge branch 'jc/bindiff' into next
Junio C Hamano [Fri, 5 May 2006 22:36:04 +0000 (15:36 -0700)]
Merge branch 'jc/bindiff' into next

* jc/bindiff:
  binary diff: further updates.
  binary patch.
  pack-object: squelch eye-candy on non-tty
  core.prefersymlinkrefs: use symlinks for .git/HEAD
  repo-config: trim white-space before comment
  Fix for config file section parsing.
  Clarify git-cherry documentation.
  Update git-unpack-objects documentation.
  Fix up docs where "--" isn't displayed correctly.
  Several trivial documentation touch ups.
  git-svn 1.0.0
  git-svn: documentation updates
  delta: stricter constness
  Makefile: do not link rev-list any specially.
  builtin-push: --all and --tags _are_ explicit refspecs

18 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>
18 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>
18 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>
18 years agoMerge branch 'js/fmt-patch' into next
Junio C Hamano [Fri, 5 May 2006 21:54:43 +0000 (14:54 -0700)]
Merge branch 'js/fmt-patch' into next

* js/fmt-patch:
  Teach fmt-patch about --keep-subject
  Teach fmt-patch about --numbered
  fmt-patch: implement -o <dir>
  fmt-patch: output file names to stdout
  Teach fmt-patch to write individual files.

18 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.

18 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)

18 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)

18 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>
18 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>
18 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>
18 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>
18 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>
18 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>
18 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>
18 years agoTeach fmt-patch about --keep-subject
Johannes Schindelin [Fri, 5 May 2006 02:31:29 +0000 (04:31 +0200)]
Teach fmt-patch about --keep-subject

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoTeach fmt-patch about --numbered
Johannes Schindelin [Fri, 5 May 2006 02:30:52 +0000 (04:30 +0200)]
Teach fmt-patch about --numbered

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agofmt-patch: implement -o <dir>
Johannes Schindelin [Fri, 5 May 2006 01:33:32 +0000 (03:33 +0200)]
fmt-patch: implement -o <dir>

I had to move the command line parsing around a little; setup_revisions()
could mistaken <dir> for a valid ref.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agofmt-patch: output file names to stdout
Johannes Schindelin [Fri, 5 May 2006 01:33:05 +0000 (03:33 +0200)]
fmt-patch: output file names to stdout

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoTeach fmt-patch to write individual files.
Johannes Schindelin [Thu, 4 May 2006 23:16:40 +0000 (01:16 +0200)]
Teach fmt-patch to write individual files.

When called with "--stdout", it still writes to standard output.

Notable differences to git-format-patch:

- since fmt-patch uses the standardized logging machinery, it is
  no longer "From nobody", but "From <commit_sha1>",

- the empty lines before and after the "---" just before the
  diffstat are no longer there,

- git-format-patch outputs the commit_sha1 just before the first
  diff, which fmt-patch does not,

- the file names are no longer output to stdout, but to stderr
  (since stdout is freopen()ed all the time), and

- "git fmt-patch HEAD^" does not work as expected: it outputs
  *all* commits reachable from HEAD^!

The last one is possibly a showstopper. At least I used to call that
command quite often...

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 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>
18 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>
18 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>
18 years agoMerge branch 'jc/cache-tree' into next
Junio C Hamano [Thu, 4 May 2006 07:17:28 +0000 (00:17 -0700)]
Merge branch 'jc/cache-tree' into next

* jc/cache-tree:
  fsck-objects: do not segfault on missing tree in cache-tree

18 years agoMerge branch 'jc/grep' into next
Junio C Hamano [Thu, 4 May 2006 07:15:23 +0000 (00:15 -0700)]
Merge branch 'jc/grep' into next

* jc/grep:
  builtin-grep: -L (--files-without-match).
  builtin-grep: binary files -a and -I
  builtin-grep: terminate correctly at EOF

18 years agoMerge branch 'js/fetchconfig' into next
Junio C Hamano [Thu, 4 May 2006 07:14:56 +0000 (00:14 -0700)]
Merge branch 'js/fetchconfig' into next

* js/fetchconfig:
  Add a conversion tool to migrate remote information into the config
  fetch, pull: ask config for remote information
  Add a few more words to the glossary.
  Added definitions for a few words:
  Alphabetize the glossary.
  sha1_to_hex() usage cleanup

18 years agoAdd a conversion tool to migrate remote information into the config
Johannes Schindelin [Wed, 3 May 2006 13:27:26 +0000 (15:27 +0200)]
Add a conversion tool to migrate remote information into the config

Use this tool to rewrite the .git/remotes/* files into the config.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agofetch, pull: ask config for remote information
Johannes Schindelin [Wed, 3 May 2006 13:20:21 +0000 (15:20 +0200)]
fetch, pull: ask config for remote information

Now you can say

    [remote.junio]
        url = git://git.kernel.org/pub/scm/git/git.git
        fetch = next:next

    in your .git/config.

[jc: fixed up the log message that still said "pull" ]

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 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.

18 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.

18 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

18 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.

18 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

18 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.

18 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"

18 years agoMerge branch 'maint'
Junio C Hamano [Thu, 4 May 2006 06:00:02 +0000 (23:00 -0700)]
Merge branch 'maint'

* maint:
  Add a few more words to the glossary.
  Added definitions for a few words:
  Alphabetize the glossary.

18 years agoAdd a few more words to the glossary. v1.3.2
Jon Loeliger [Thu, 4 May 2006 04:19:54 +0000 (23:19 -0500)]
Add a few more words to the glossary.

Clean up a few entries and fix typos.

    bare repository
    cherry-picking
    hook
    topic branch

[jc: removing questionable "symbolic ref -- see 'ref'" for now.]

Signed-off-by: Jon Loeliger <jdl@jdl.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoAdded definitions for a few words:
Jon Loeliger [Thu, 4 May 2006 04:18:59 +0000 (23:18 -0500)]
Added definitions for a few words:

    fast forward
    pickaxe
    refspec
    tracking branch

Wild hack allows "link:git-" prefix to reference commands too.

Signed-off-by: Jon Loeliger <jdl@jdl.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoAlphabetize the glossary.
Jon Loeliger [Thu, 4 May 2006 04:15:46 +0000 (23:15 -0500)]
Alphabetize the glossary.

Signed-off-by: Jon Loeliger <jdl@jdl.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agosha1_to_hex() usage cleanup
Linus Torvalds [Thu, 4 May 2006 00:21:08 +0000 (17:21 -0700)]
sha1_to_hex() usage cleanup

Somebody on the #git channel complained that the sha1_to_hex() thing uses
a static buffer which caused an error message to show the same hex output
twice instead of showing two different ones.

That's pretty easily rectified by making it uses a simple LRU of a few
buffers, which also allows some other users (that were aware of the buffer
re-use) to be written in a more straightforward manner.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agobuiltin-grep: -L (--files-without-match).
Junio C Hamano [Thu, 4 May 2006 04:46:29 +0000 (21:46 -0700)]
builtin-grep: -L (--files-without-match).

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agofsck-objects: do not segfault on missing tree in cache-tree
Junio C Hamano [Thu, 4 May 2006 04:17:45 +0000 (21:17 -0700)]
fsck-objects: do not segfault on missing tree in cache-tree

Even if trees are missing in cache-tree, we should continue and
check the rest of the object database.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agobuiltin-grep: binary files -a and -I
Junio C Hamano [Thu, 4 May 2006 04:05:29 +0000 (21:05 -0700)]
builtin-grep: binary files -a and -I

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agobuiltin-grep: terminate correctly at EOF
Junio C Hamano [Thu, 4 May 2006 04:03:25 +0000 (21:03 -0700)]
builtin-grep: terminate correctly at EOF

It barfed and segfaulted with an incomplete line.

Signed-off-by: Junio C Hamano <junkio@cox.net>