Code

git.git
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>
18 years agoMerge branch 'master' into next
Junio C Hamano [Thu, 4 May 2006 00:18:21 +0000 (17:18 -0700)]
Merge branch 'master' into next

* master:
  fix various typos in documentation
  blame: Fix path pruning
  cvsserver: use git-rev-list instead of git-log
  Fix "git-log --parents" breakage post v1.3.0
  add documentation for update-index --unresolve

18 years agoMerge branch 'js/repoconfig' into next
Junio C Hamano [Thu, 4 May 2006 00:15:47 +0000 (17:15 -0700)]
Merge branch 'js/repoconfig' into next

* js/repoconfig:
  repo-config: deconvolute logics

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

* fix:
  fix various typos in documentation

18 years agoblame: Fix path pruning
Fredrik Kuivinen [Wed, 3 May 2006 21:28:46 +0000 (23:28 +0200)]
blame: Fix path pruning

This makes git-blame useable again, it has been totally broken for
some time on larger repositories.

Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agocvsserver: use git-rev-list instead of git-log
Martin Langhoff [Wed, 3 May 2006 22:53:37 +0000 (10:53 +1200)]
cvsserver: use git-rev-list instead of git-log

Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agorepo-config: deconvolute logics
Johannes Schindelin [Wed, 3 May 2006 12:41:03 +0000 (14:41 +0200)]
repo-config: deconvolute logics

It was rightly noticed that the logic is quite convoluted. Fix that.

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 [Wed, 3 May 2006 23:17:33 +0000 (16:17 -0700)]
Merge branch 'jc/cache-tree' into next

* jc/cache-tree:
  cache-tree: a bit more debugging support.
  read-tree: invalidate cache-tree entry when a new index entry is added.
  Fix test-dump-cache-tree in one-tree disappeared case.

18 years agocache-tree: a bit more debugging support.
Junio C Hamano [Wed, 3 May 2006 23:10:45 +0000 (16:10 -0700)]
cache-tree: a bit more debugging support.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoread-tree: invalidate cache-tree entry when a new index entry is added.
Junio C Hamano [Wed, 3 May 2006 23:07:02 +0000 (16:07 -0700)]
read-tree: invalidate cache-tree entry when a new index entry is added.

When doing two-way merge, we failed to invalidate the directory
that a new entry is added (we correctly did so for modified and
deleted entries).

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoFix test-dump-cache-tree in one-tree disappeared case.
Junio C Hamano [Wed, 3 May 2006 22:32:54 +0000 (15:32 -0700)]
Fix test-dump-cache-tree in one-tree disappeared case.

When reconstructing an invalidated subtree for reference purposes by
test-dump-cache-tree, we did not handle the case where we shouldn't
have a cached and invalidated subtree in the result, leading to an
unneeded die().

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoFix "git-log --parents" breakage post v1.3.0
Linus Torvalds [Wed, 3 May 2006 14:59:00 +0000 (07:59 -0700)]
Fix "git-log --parents" breakage post v1.3.0

Post 1.3.0 "git log" forgets to list parent commits on the first line
when --parents is given.  git-cvsserver relied on it.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoadd documentation for update-index --unresolve
Matthias Kestenholz [Wed, 3 May 2006 10:53:19 +0000 (12:53 +0200)]
add documentation for update-index --unresolve

Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agofix various typos in documentation
Matthias Kestenholz [Wed, 3 May 2006 10:51:40 +0000 (12:51 +0200)]
fix various typos in documentation

Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'jc/count' into next
Junio C Hamano [Wed, 3 May 2006 06:03:52 +0000 (23:03 -0700)]
Merge branch 'jc/count' into next

* jc/count:
  builtin-count-objects: open packs when running -v

18 years agobuiltin-count-objects: open packs when running -v
Junio C Hamano [Wed, 3 May 2006 06:03:15 +0000 (23:03 -0700)]
builtin-count-objects: open packs when running -v

Otherwise we would report absolutely no objects in a fully
packed repository.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'jc/symref' into next
Junio C Hamano [Wed, 3 May 2006 05:04:34 +0000 (22:04 -0700)]
Merge branch 'jc/symref' into next

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

18 years agoMerge branch 'jc/grep' into next
Junio C Hamano [Wed, 3 May 2006 05:04:16 +0000 (22:04 -0700)]
Merge branch 'jc/grep' into next

* jc/grep:
  builtin-grep: tighten path wildcard vs tree traversal.

18 years agoMerge branch 'np/delta' into next
Junio C Hamano [Wed, 3 May 2006 04:56:29 +0000 (21:56 -0700)]
Merge branch 'np/delta' into next

* np/delta:
  improve diff-delta with sparse and/or repetitive data
  tiny optimization to diff-delta

18 years agoMerge branch 'js/repoconfig' into next
Junio C Hamano [Wed, 3 May 2006 04:33:40 +0000 (21:33 -0700)]
Merge branch 'js/repoconfig' into next

* js/repoconfig:
  repo-config: readability fixups.
  repo-config: support --get-regexp
  gitk: Allow view to specify arbitrary arguments to git-rev-list
  gitk: Fix file list display when files are renamed
  gitk: Basic support for highlighting one view within another
  gitk: Add a tree-browsing mode
  gitk: Use a text widget for the file list
  gitk: add menu item for editing the current view
  gitk: Implement "permanent" views (stored in ~/.gitk)
  gitk: Use git-rev-parse only to identify file/dir names on cmd line
  gitk: Remember the view in the history list
  gitk: Don't reread git-rev-list output from scratch on view switch
  gitk: Fix various bugs in the view support
  gitk: Make File->Update work properly again
  gitk: Implement multiple views
  [PATCH] gitk: Add a visual tag for remote refs

18 years agoimprove diff-delta with sparse and/or repetitive data
Nicolas Pitre [Wed, 3 May 2006 03:31:00 +0000 (23:31 -0400)]
improve diff-delta with sparse and/or repetitive data

It is useless to preserve multiple hash entries for consecutive blocks
with the same hash.  Keeping only the first one will allow for matching
the longest string of identical bytes while subsequent blocks will only
allow for shorter matches.  The backward matching code will match the
end of it as necessary.

This improves both performances (no repeated string compare with long
successions of identical bytes, or even small group of bytes), as well
as compression (less likely to need random hash bucket entry culling),
especially with sparse files.

With well behaved data sets this patch doesn't change much.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agotiny optimization to diff-delta
Nicolas Pitre [Wed, 3 May 2006 03:46:51 +0000 (23:46 -0400)]
tiny optimization to diff-delta

This is my assembly freak side looking at generated code again.  And
since create_delta() is certainly pretty high on the radar every bits
count.  In this case shorter code is generated if hash_mask is not
copied to a local variable.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agorepo-config: readability fixups.
Junio C Hamano [Wed, 3 May 2006 04:06:56 +0000 (21:06 -0700)]
repo-config: readability fixups.

Signed-off-by: Junio C Hamano <junkio@cox.net>
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>
18 years agorepo-config: support --get-regexp
Johannes Schindelin [Tue, 2 May 2006 12:22:48 +0000 (14:22 +0200)]
repo-config: support --get-regexp

With --get-regexp, output all key/value pairs where the key matches a
regexp. Example:

git-repo-config --get-regexp remote.*.url

will output something like

remote.junio.url git://git.kernel.org/pub/scm/git/git.git
remote.gitk.url git://git.kernel.org/pub/scm/gitk/gitk.git

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge git://git.kernel.org/pub/scm/gitk/gitk
Junio C Hamano [Wed, 3 May 2006 03:07:14 +0000 (20:07 -0700)]
Merge git://git.kernel.org/pub/scm/gitk/gitk

* git://git.kernel.org/pub/scm/gitk/gitk:
  gitk: Allow view to specify arbitrary arguments to git-rev-list
  gitk: Fix file list display when files are renamed
  gitk: Basic support for highlighting one view within another
  gitk: Add a tree-browsing mode
  gitk: Use a text widget for the file list
  gitk: add menu item for editing the current view
  gitk: Implement "permanent" views (stored in ~/.gitk)
  gitk: Use git-rev-parse only to identify file/dir names on cmd line
  gitk: Remember the view in the history list
  gitk: Don't reread git-rev-list output from scratch on view switch
  gitk: Fix various bugs in the view support
  gitk: Make File->Update work properly again
  gitk: Implement multiple views
  [PATCH] gitk: Add a visual tag for remote refs

18 years agobuiltin-grep: tighten path wildcard vs tree traversal.
Junio C Hamano [Wed, 3 May 2006 00:27:07 +0000 (17:27 -0700)]
builtin-grep: tighten path wildcard vs tree traversal.

The earlier code descended into Documentation/technical when
given "Documentation/how*" as the pattern, which was too loose.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitk: Allow view to specify arbitrary arguments to git-rev-list
Paul Mackerras [Tue, 2 May 2006 23:32:53 +0000 (09:32 +1000)]
gitk: Allow view to specify arbitrary arguments to git-rev-list

The list of arguments to git-rev-list, including arguments that
select the range of commits, is now a part of the view specification.
If any arguments are given to gitk, they become part of the
"Command line" view, and the non-file arguments become the default
for any new views created.

Getting an error from git-rev-list is no longer fatal; instead the
error window pops up, and when you press OK, the main window just
shows "No commits selected".

The git-rev-list arguments are entered in an entry widget in the
view editor window using shell quoting conventions, not Tcl quoting
conventions.

Signed-off-by: Paul Mackerras <paulus@samba.org>
18 years agoMerge branch 'master' into next
Junio C Hamano [Tue, 2 May 2006 23:22:11 +0000 (16:22 -0700)]
Merge branch 'master' into next

* master:
  git-send-email: fix version string to be valid perl
  Give the user a hint for how to continue in the case that git-am fails because it requires user intervention
  repo-config: trim white-space before comment
  repo-config: fix segfault with no argument.

18 years agoMerge branch 'jc/grep' into next
Junio C Hamano [Tue, 2 May 2006 23:15:29 +0000 (16:15 -0700)]
Merge branch 'jc/grep' into next

* jc/grep:
  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.

18 years agobuiltin-grep: support -w (--word-regexp).
Junio C Hamano [Tue, 2 May 2006 22:40:49 +0000 (15:40 -0700)]
builtin-grep: support -w (--word-regexp).

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agobuiltin-grep: support -c (--count).
Junio C Hamano [Tue, 2 May 2006 22:40:49 +0000 (15:40 -0700)]
builtin-grep: support -c (--count).

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agobuiltin-grep: allow more than one patterns.
Junio C Hamano [Tue, 2 May 2006 22:40:49 +0000 (15:40 -0700)]
builtin-grep: allow more than one patterns.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agobuiltin-grep: allow -<n> and -[ABC]<n> notation for context lines.
Junio C Hamano [Tue, 2 May 2006 22:17:05 +0000 (15:17 -0700)]
builtin-grep: allow -<n> and -[ABC]<n> notation for context lines.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'fix'
Junio C Hamano [Tue, 2 May 2006 22:05:34 +0000 (15:05 -0700)]
Merge branch 'fix'

* fix:
  git-send-email: fix version string to be valid perl
  Give the user a hint for how to continue in the case that git-am fails because it requires user intervention

18 years agogit-send-email: fix version string to be valid perl
Martin Langhoff [Tue, 2 May 2006 21:44:36 +0000 (09:44 +1200)]
git-send-email: fix version string to be valid perl

This makes git-send-email easier to develop and debug, skipping the need
to `make git-send-email` every time.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'js/remoteconfig' into next
Junio C Hamano [Tue, 2 May 2006 21:17:39 +0000 (14:17 -0700)]
Merge branch 'js/remoteconfig' into next

* js/remoteconfig:
  Revert "fetch, pull: ask config for remote information"

18 years agoRevert "fetch, pull: ask config for remote information"
Junio C Hamano [Tue, 2 May 2006 21:16:46 +0000 (14:16 -0700)]
Revert "fetch, pull: ask config for remote information"

This reverts 5a223a0d434c874984a0251eca4520ef95718a6d commit.
I asked Johannes to roll an updated version, so let's wait for it.

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>
18 years agorepo-config: fix segfault with no argument.
Johannes Schindelin [Tue, 2 May 2006 19:54:12 +0000 (12:54 -0700)]
repo-config: fix segfault with no argument.

An earlier addition of --list feature was carelessly done and
caused an invalid access to argv[1] when it was not given.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoGive the user a hint for how to continue in the case that git-am fails because it...
Robert Shearman [Tue, 2 May 2006 12:32:43 +0000 (13:32 +0100)]
Give the user a hint for how to continue in the case that git-am fails because it requires user intervention

Give the user a hint for how to continue in the case that git-am fails
because it requires user intervention.

Signed-off-by: Robert Shearman <rob@codeweaves.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitk: Fix file list display when files are renamed
Paul Mackerras [Tue, 2 May 2006 09:55:31 +0000 (19:55 +1000)]
gitk: Fix file list display when files are renamed

The conversion of the file list to use a text widget assumed incorrectly
that the list of files from git-diff-tree -r would correspond 1-1 with
the diff sections in the output of git-diff-tree -r -p -C, which is
not true when renames are detected.  This fixes it by keeping the
elements in the difffilestart list in the order they appear in the
file list window.

Since this means that the elements of difffilestart are no longer
necessarily in ascending order, it's somewhat hard to do the dynamic
highlighting in the file list as the diff window is scrolled, so I
have taken that out for now.

Signed-off-by: Paul Mackerras <paulus@samba.org>
18 years agoMerge branch 'jc/grep' into next
Junio C Hamano [Tue, 2 May 2006 08:28:39 +0000 (01:28 -0700)]
Merge branch 'jc/grep' into next

* jc/grep:
  builtin-grep: printf %.*s length is int, not ptrdiff_t.

18 years agobuiltin-grep: printf %.*s length is int, not ptrdiff_t.
Junio C Hamano [Tue, 2 May 2006 08:28:02 +0000 (01:28 -0700)]
builtin-grep: printf %.*s length is int, not ptrdiff_t.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'js/remoteconfig' into next
Junio C Hamano [Tue, 2 May 2006 08:04:14 +0000 (01:04 -0700)]
Merge branch 'js/remoteconfig' into next

* js/remoteconfig:
  fetch, pull: ask config for remote information
  builtin-push: also ask config for remote information

18 years agofetch, pull: ask config for remote information
Johannes Schindelin [Sun, 30 Apr 2006 13:24:03 +0000 (15:24 +0200)]
fetch, pull: ask config for remote information

Now you can say

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

in your .git/config.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agobuiltin-push: also ask config for remote information
Johannes Schindelin [Sun, 30 Apr 2006 13:23:48 +0000 (15:23 +0200)]
builtin-push: also ask config for remote information

Now you can store your remote information in the config file like this:

[remote.upstream]
url = me@company.com:the-project
push = master:iceballs

[jc: fixed up to adjust a different fix for Push: lines earlier.]

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'lt/push' into next
Junio C Hamano [Tue, 2 May 2006 06:41:57 +0000 (23:41 -0700)]
Merge branch 'lt/push' into next

* lt/push:
  builtin-push: make it official.

18 years agobuiltin-push: make it official.
Junio C Hamano [Tue, 2 May 2006 06:40:37 +0000 (23:40 -0700)]
builtin-push: make it official.

Remove the shell script version, and hardlink the git binary to it.

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