git/git.git
14 years agopack-objects --unpacked=<existing pack> option.
Junio C Hamano [Wed, 6 Sep 2006 09:12:09 +0000 (02:12 -0700)]
pack-objects --unpacked=<existing pack> option.

Incremental repack without -a essentially boils down to:

rev-list --objects --unpacked --all |
        pack-objects $new_pack

which picks up all loose objects that are still live and creates
a new pack.

This implements --unpacked=<existing pack> option to tell the
revision walking machinery to pretend as if objects in such a
pack are unpacked for the purpose of object listing.  With this,
we could say:

rev-list --objects --unpacked=$active_pack --all |
pack-objects $new_pack

instead, to mean "all live loose objects but pretend as if
objects that are in this pack are also unpacked".  The newly
created pack would be perfect for updating $active_pack by
replacing it.

Since pack-objects now knows how to do the rev-list's work
itself internally, you can also write the above example by:

pack-objects --unpacked=$active_pack --all $new_pack </dev/null

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agopack-objects: further work on internal rev-list logic.
Junio C Hamano [Wed, 6 Sep 2006 08:42:23 +0000 (01:42 -0700)]
pack-objects: further work on internal rev-list logic.

This teaches the internal rev-list logic to understand options
that are needed for pack handling: --all, --unpacked, and --thin.

It also moves two functions from builtin-rev-list to list-objects
so that the two programs can share more code.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agopack-objects: run rev-list equivalent internally.
Junio C Hamano [Tue, 5 Sep 2006 06:47:39 +0000 (23:47 -0700)]
pack-objects: run rev-list equivalent internally.

Instead of piping the rev-list output from its standard input,
you can say:

pack-objects --all --unpacked --revs pack

and feed the rev parameters you would otherwise give the
rev-list on its command line from the standard input.
In other words:

echo 'master..next' | pack-objects --revs pack

and

rev-list --objects master..next | pack-objects pack

are equivalent.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoSeparate object listing routines out of rev-list
Junio C Hamano [Tue, 5 Sep 2006 04:50:12 +0000 (21:50 -0700)]
Separate object listing routines out of rev-list

Create a separate file, list-objects.c, and move object listing
routines from rev-list to it.  The next round will use it in
pack-objects directly.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoMerge branch 'jc/daemon'
Junio C Hamano [Thu, 7 Sep 2006 09:37:18 +0000 (02:37 -0700)]
Merge branch 'jc/daemon'

* jc/daemon:
  Revert "daemon: add upload-tar service."
  multi-service daemon: documentation
  daemon: add upload-tar service.

14 years agoRevert "daemon: add upload-tar service."
Junio C Hamano [Thu, 7 Sep 2006 08:40:04 +0000 (01:40 -0700)]
Revert "daemon: add upload-tar service."

This reverts parts of commit 74c0cc2 and part of commit 355f541.

Franck and Rene are working on a unified upload-archive which
would supersede this when done, so better not to get in their
way.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoMerge branch 'pm/diff'
Junio C Hamano [Thu, 7 Sep 2006 08:33:45 +0000 (01:33 -0700)]
Merge branch 'pm/diff'

* pm/diff:
  diff-index --cc shows a 3-way diff between HEAD, index and working tree.

14 years agogit-repack: create new packs inside $GIT_DIR, not cwd
Martin Langhoff [Mon, 4 Sep 2006 05:42:32 +0000 (17:42 +1200)]
git-repack: create new packs inside $GIT_DIR, not cwd

Avoid failing when cwd is !writable by writing the
packfiles in $GIT_DIR, which is more in line with other commands.

Without this, git-repack was failing when run from crontab
by non-root user accounts. For large repositories, this
also makes the mv operation a lot cheaper, and avoids leaving
temp packfiles around the fs upon failure.

Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoTeach rev-list an option to read revs from the standard input.
Junio C Hamano [Wed, 6 Sep 2006 04:39:02 +0000 (21:39 -0700)]
Teach rev-list an option to read revs from the standard input.

When --stdin option is given, in addition to the <rev>s listed
on the command line, the command can read one rev parameter per
line from the standard input.  The list of revs ends at the
first empty line or EOF.

Note that you still have to give all the flags from the command
line; only rev arguments (including A..B, A...B, and A^@ notations)
can be give from the standard input.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agorevision.c: allow injecting revision parameters after setup_revisions().
Junio C Hamano [Wed, 6 Sep 2006 04:28:36 +0000 (21:28 -0700)]
revision.c: allow injecting revision parameters after setup_revisions().

setup_revisions() wants to get all the parameters at once and
then postprocesses the resulting revs structure after it is done
with them.  This code structure is a bit cumbersome to deal with
efficiently when we want to inject revision parameters from the
side (e.g. read from standard input).

Fortunately, the nature of this postprocessing is not affected by
revision parameters; they are affected only by flags.  So it is
Ok to do add_object() after the it returns.

This splits out the code that deals with the revision parameter
out of the main loop of setup_revisions(), so that we can later
call it from elsewhere after it returns.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoFix memory leak in prepend_to_path (git.c).
Christian Couder [Tue, 5 Sep 2006 06:22:16 +0000 (08:22 +0200)]
Fix memory leak in prepend_to_path (git.c).

Some memory was allocated for a new path but not freed
after the path was used.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agosend-pack: remove remote reference limit
Andy Whitcroft [Tue, 5 Sep 2006 19:00:17 +0000 (20:00 +0100)]
send-pack: remove remote reference limit

When build a pack for a push we query the remote copy for existant
heads.  These are used to prune unnecessary objects from the pack.
As we receive the remote references in get_remote_heads() we validate
the reference names via check_ref() which includes a length check;
rejecting those >45 characters in size.

This is a miss converted change, it was originally designed to reject
messages which were less than 45 characters in length (a 40 character
sha1 and refs/) to prevent comparing unitialised memory.  check_ref()
now gets the raw length so check for at least 5 characters.

Signed-off-by: Andy Whitcroft <apw@shadowen.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoautoconf: Fix copy'n'paste error
Jakub Narebski [Tue, 5 Sep 2006 20:03:48 +0000 (22:03 +0200)]
autoconf: Fix copy'n'paste error

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agodiff-index --cc shows a 3-way diff between HEAD, index and working tree.
Paul Mackerras [Mon, 4 Sep 2006 11:38:40 +0000 (21:38 +1000)]
diff-index --cc shows a 3-way diff between HEAD, index and working tree.

This implements a 3-way diff between the HEAD commit, the state in the
index, and the working directory.  This is like the n-way diff for a
merge, and uses much of the same code.  It is invoked with the -c flag
to git-diff-index, which it already accepted and did nothing with.

Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoMerge branch 'jc/pack'
Junio C Hamano [Tue, 5 Sep 2006 01:57:35 +0000 (18:57 -0700)]
Merge branch 'jc/pack'

* jc/pack:
  more lightweight revalidation while reusing deflated stream in packing
  pack-objects: fix thinko in revalidate code
  pack-objects: re-validate data we copy from elsewhere.

14 years agoautoconf: Quote AC_CACHE_CHECK arguments
Jakub Narebski [Mon, 4 Sep 2006 22:58:25 +0000 (00:58 +0200)]
autoconf: Quote AC_CACHE_CHECK arguments

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoautoconf: Check for subprocess.py
Jakub Narebski [Mon, 4 Sep 2006 22:57:45 +0000 (00:57 +0200)]
autoconf: Check for subprocess.py

Add custom test for checking if Python comes with subprocess.py, or
should we use our own subprocess.py by defining WITH_OWN_SUBPROCESS_PY.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoautoconf: Add -liconv to LIBS when NEEDS_LIBICONV
Jakub Narebski [Mon, 4 Sep 2006 22:55:52 +0000 (00:55 +0200)]
autoconf: Add -liconv to LIBS when NEEDS_LIBICONV

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: Divide page path into directories -- path's "breadcrumbs"
Jakub Narebski [Mon, 4 Sep 2006 16:17:58 +0000 (18:17 +0200)]
gitweb: Divide page path into directories -- path's "breadcrumbs"

Divide page path into directories, so that each part of path links to
the "tree" view of the $hash_base (or HEAD, if $hash_base is not set)
version of the directory.

If the entity is blob, final part (basename) links to $hash_base or
HEAD revision of the "raw" blob ("blob_plain" view).  If the entity is
tree, link to the "tree" view.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: Correct typo: '==' instead of 'eq' in git_difftree_body
Jakub Narebski [Mon, 4 Sep 2006 16:19:58 +0000 (18:19 +0200)]
gitweb: Correct typo: '==' instead of 'eq' in git_difftree_body

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: Add GIT favicon, assuming image/png type
Jakub Narebski [Mon, 4 Sep 2006 18:32:13 +0000 (20:32 +0200)]
gitweb: Add GIT favicon, assuming image/png type

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoFix git-fsck-objects SIGSEGV/divide-by-zero
Linus Torvalds [Mon, 4 Sep 2006 15:34:12 +0000 (08:34 -0700)]
Fix git-fsck-objects SIGSEGV/divide-by-zero

If you try to fsck a repository that isn't entirely empty, but that has no
inter-object references (ie all the objects are blobs, and don't refer to
anything else), git-fsck-objects currently fails.

This probably cannot happen in practice, but can be tested with something
like

git init-db
touch dummy
git add dummy
git fsck-objects

where the fsck will die by a divide-by-zero when it tries to look up the
references from the one object it found (hash_obj() will do a modulus by
refs_hash_size).

On some other archiectures (ppc, sparc) the divide-by-zero will go
unnoticed, and we'll instead SIGSEGV when we hit the "refs_hash[j]"
access.

So move the test that should protect against this from mark_reachable()
into lookup_object_refs(), which incidentally in the process also fixes
mark_reachable() itself (it used to not mark the one object that _was_
reachable, because it decided that it had no refs too early).

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agomore lightweight revalidation while reusing deflated stream in packing
Junio C Hamano [Mon, 4 Sep 2006 04:09:18 +0000 (21:09 -0700)]
more lightweight revalidation while reusing deflated stream in packing

When copying from an existing pack and when copying from a loose
object with new style header, the code makes sure that the piece
we are going to copy out inflates well and inflate() consumes
the data in full while doing so.

The check to see if the xdelta really apply is quite expensive
as you described, because you would need to have the image of
the base object which can be represented as a delta against
something else.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: Change the name of diff to parent link in "commit" view to "diff
Jakub Narebski [Sun, 3 Sep 2006 21:43:03 +0000 (23:43 +0200)]
gitweb: Change the name of diff to parent link in "commit" view to "diff

Change the name of diff to parent (current commit to one of parents)
link in "commit" view (git_commit subroutine) from "commitdiff" to
"diff".  Let's leave "commitdiff" for equivalent of git-show, or
git-diff-tree with one revision, i.e. diff for a given commit to its
parent (parents).

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agopack-objects: fix thinko in revalidate code
Junio C Hamano [Sun, 3 Sep 2006 21:44:46 +0000 (14:44 -0700)]
pack-objects: fix thinko in revalidate code

When revalidating an entry from an existing pack entry->size and
entry->type are not necessarily the size of the final object
when the entry is deltified, but for base objects they must
match.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoUpdate GIT_TRACE documentation.
Christian Couder [Sun, 3 Sep 2006 15:32:24 +0000 (17:32 +0200)]
Update GIT_TRACE documentation.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoMerge branch 'master' into cc/trace
Junio C Hamano [Sun, 3 Sep 2006 00:10:16 +0000 (17:10 -0700)]
Merge branch 'master' into cc/trace

* master:
  Trace into a file or an open fd and refactor tracing code.
  Replace uses of strdup with xstrdup.
  consolidate two copies of new style object header parsing code.
  Documentation: Fix howto/revert-branch-rebase.html generation
  fmt-merge-msg: fix off-by-one bug
  git-rev-list(1): group options; reformat; document more options
  Constness tightening for move/link_temp_to_file()
  gitweb: Fix git_blame
  Include config.mak.autogen in the doc Makefile
  Use xmalloc instead of malloc
  git(7): move gitk(1) to the list of porcelain commands
  gitk: Fix some bugs in the new cherry-picking code
  gitk: Improve responsiveness while reading and layout out the graph
  gitk: Update preceding/following tag info when creating a tag
  gitk: Add a menu item for cherry-picking commits
  gitk: Fix a couple of buglets in the branch head menu items
  gitk: Add a context menu for heads
  gitk: Add a row context-menu item for creating a new branch
  gitk: Recompute ancestor/descendent heads/tags when rereading refs
  gitk: Minor cleanups

14 years agopack-objects: re-validate data we copy from elsewhere.
Junio C Hamano [Fri, 1 Sep 2006 22:05:12 +0000 (15:05 -0700)]
pack-objects: re-validate data we copy from elsewhere.

When reusing data from an existing pack and from a new style
loose objects, we used to just copy it staight into the
resulting pack.  Instead make sure they are not corrupt, but
do so only when we are not streaming to stdout, in which case
the receiving end will do the validation either by unpacking
the stream or by constructing the .idx file.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoTrace into a file or an open fd and refactor tracing code.
Christian Couder [Sat, 2 Sep 2006 16:23:48 +0000 (18:23 +0200)]
Trace into a file or an open fd and refactor tracing code.

If GIT_TRACE is set to an absolute path (starting with a
'/' character), we interpret this as a file path and we
trace into it.

Also if GIT_TRACE is set to an integer value greater than
1 and lower than 10, we interpret this as an open fd value
and we trace into it.

Note that this behavior is not compatible with the
previous one.

We also trace whole messages using one write(2) call to
make sure messages from processes do net get mixed up in
the middle.

This patch makes it possible to get trace information when
running "make test".

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoReplace uses of strdup with xstrdup.
Shawn Pearce [Sat, 2 Sep 2006 04:16:31 +0000 (00:16 -0400)]
Replace uses of strdup with xstrdup.

Like xmalloc and xrealloc xstrdup dies with a useful message if
the native strdup() implementation returns NULL rather than a
valid pointer.

I just tried to use xstrdup in new code and found it to be missing.
However I expected it to be present as xmalloc and xrealloc are
already commonly used throughout the code.

[jc: removed the part that deals with last_XXX, which I am
 finding more and more dubious these days.]

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoconsolidate two copies of new style object header parsing code.
Junio C Hamano [Fri, 1 Sep 2006 22:17:01 +0000 (15:17 -0700)]
consolidate two copies of new style object header parsing code.

Also while we are at it, remove redundant typename[] array from
unpack_sha1_header.  The only reason it is different from the
type_names[] array in object.c module is that this code cares
about the subset of object types that are valid in a loose
object, so prepare a separate array of boolean that tells us
which types are valid, and share the name translation with the
others.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoDocumentation: Fix howto/revert-branch-rebase.html generation
Sergey Vlasov [Fri, 1 Sep 2006 18:42:59 +0000 (22:42 +0400)]
Documentation: Fix howto/revert-branch-rebase.html generation

The rule for howto/*.html used "$?", which expands to the list of all
newer prerequisites, including asciidoc.conf added by another rule.
"$<" should be used instead.

Signed-off-by: Sergey Vlasov <vsu@altlinux.ru>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agofmt-merge-msg: fix off-by-one bug
Johannes Schindelin [Fri, 1 Sep 2006 08:49:29 +0000 (10:49 +0200)]
fmt-merge-msg: fix off-by-one bug

Thanks to the recent malloc()->xmalloc() change, and XMALLOC_POISON, this bug
was found.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogit-rev-list(1): group options; reformat; document more options
Jonas Fonseca [Thu, 31 Aug 2006 22:37:15 +0000 (00:37 +0200)]
git-rev-list(1): group options; reformat; document more options

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoMerge git://git.kernel.org/pub/scm/gitk/gitk
Junio C Hamano [Fri, 1 Sep 2006 07:54:01 +0000 (00:54 -0700)]
Merge git://git.kernel.org/pub/scm/gitk/gitk

* git://git.kernel.org/pub/scm/gitk/gitk:
  gitk: Fix some bugs in the new cherry-picking code
  gitk: Improve responsiveness while reading and layout out the graph
  gitk: Update preceding/following tag info when creating a tag
  gitk: Add a menu item for cherry-picking commits
  gitk: Fix a couple of buglets in the branch head menu items
  gitk: Add a context menu for heads
  gitk: Add a row context-menu item for creating a new branch
  gitk: Recompute ancestor/descendent heads/tags when rereading refs
  gitk: Minor cleanups

14 years agoConstness tightening for move/link_temp_to_file()
Junio C Hamano [Fri, 1 Sep 2006 07:17:47 +0000 (00:17 -0700)]
Constness tightening for move/link_temp_to_file()

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: Fix git_blame
Aneesh Kumar K.V [Fri, 1 Sep 2006 03:43:32 +0000 (09:13 +0530)]
gitweb: Fix git_blame

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoInclude config.mak.autogen in the doc Makefile
Jonas Fonseca [Thu, 31 Aug 2006 22:31:08 +0000 (00:31 +0200)]
Include config.mak.autogen in the doc Makefile

... to install documentation relative to the path set with configure's
--prefix option.

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoUse xmalloc instead of malloc
Jonas Fonseca [Thu, 31 Aug 2006 22:32:39 +0000 (00:32 +0200)]
Use xmalloc instead of malloc

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogit(7): move gitk(1) to the list of porcelain commands
Jonas Fonseca [Thu, 31 Aug 2006 23:15:38 +0000 (01:15 +0200)]
git(7): move gitk(1) to the list of porcelain commands

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoTrace into open fd and refactor tracing code.
Christian Couder [Thu, 31 Aug 2006 06:42:11 +0000 (08:42 +0200)]
Trace into open fd and refactor tracing code.

Now if GIT_TRACE is set to an integer value greater than 1
and lower than 10, we interpret this as an open fd value
and we trace into it. Note that this behavior is not
compatible with the previous one.

We also trace whole messages using one write(2) call to
make sure messages from processes do net get mixed up in
the middle.

It's now possible to run the tests like this:

GIT_TRACE=9 make test 9>/var/tmp/trace.log

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agot5710: fix two thinkos.
Junio C Hamano [Thu, 31 Aug 2006 21:14:20 +0000 (14:14 -0700)]
t5710: fix two thinkos.

The intention of the test seems to be to build a long chain of
clones that locally borrow objects from their parents and see the
system give up dereferencing long chains.  There were two problems:

 (1) it did not test the right repository;
 (2) it did not build a chain long enough to trigger the limitation.

I do not think it is a good test to make sure the limitation the
current implementation happens to have still exists, but that is
a topic at a totally different level.

At least this fixes the broken test.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoMerge early part of branch 'jc/daemon'
Junio C Hamano [Thu, 31 Aug 2006 20:00:39 +0000 (13:00 -0700)]
Merge early part of branch 'jc/daemon'

14 years agogitweb: Extend parse_difftree_raw_line to save commit info
Jakub Narebski [Wed, 30 Aug 2006 22:36:04 +0000 (00:36 +0200)]
gitweb: Extend parse_difftree_raw_line to save commit info

Extend parse_difftree_raw_line to save commit info from when
git-diff-tree is given only one <tree-ish>, for example when fed
from git-rev-list using --stdin option.

git-diff-tree outputs a line with the commit ID when applicable.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: Separate printing of git_tree row into git_print_tree_entry
Jakub Narebski [Wed, 30 Aug 2006 22:35:07 +0000 (00:35 +0200)]
gitweb: Separate printing of git_tree row into git_print_tree_entry

This is preparation for "tree blame" (similar to what ViewVC shows)
output, i.e. for each entry give commit where it was changed.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: Move git-ls-tree output parsing to parse_ls_tree_line
Jakub Narebski [Wed, 30 Aug 2006 22:32:15 +0000 (00:32 +0200)]
gitweb: Move git-ls-tree output parsing to parse_ls_tree_line

Add new subroutine parse_ls_tree_line and use it in git_tree.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agouse do() instead of require() to include configuration
Dennis Stosberg [Tue, 29 Aug 2006 07:19:02 +0000 (09:19 +0200)]
use do() instead of require() to include configuration

When run under mod_perl, require() will read and execute the configuration
file on the first invocation only.  On every subsequent invocation, all
configuration variables will be reset to their default values.  do() reads
and executes the configuration file unconditionally.

Signed-off-by: Dennis Stosberg <dennis@stosberg.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: Remove forgotten call to git_to_hash
Dennis Stosberg [Thu, 31 Aug 2006 19:32:45 +0000 (21:32 +0200)]
gitweb: Remove forgotten call to git_to_hash

On Aug 27th, Jakub Narebski sent a patch which removed the git_to_hash()
function and this call to it. The patch did not apply cleanly and had to
be applied manually. Removing the last chunk has obviously been forgotten.

See: commit  0aea33762b1262d11fb43eda9f3fc152b5622cca and
     message <200608272345.26722.jnareb@gmail.com>

Signed-off-by: Dennis Stosberg <dennis@stosberg.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agolog-tree.c: cleanup a bit append_signoff()
Franck Bui-Huu [Tue, 29 Aug 2006 11:37:06 +0000 (13:37 +0200)]
log-tree.c: cleanup a bit append_signoff()

This patch clean up append_signoff() by moving specific code that
looks up for "^[-A-Za-z]+: [^@]+@" pattern into a function.

It also stops the primary search when the cursor oversteps
'buf + at' limit.

This patch changes slightly append_signoff() behaviour too. If we
detect any Signed-off-by pattern during the primary search, we
needn't to do a pattern research after.

Signed-off-by: Franck Bui-Huu <vagabon.xyz@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoRemove uneeded #include
Johannes Schindelin [Tue, 29 Aug 2006 11:02:35 +0000 (13:02 +0200)]
Remove uneeded #include

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoMakefile: fix typo
Johannes Schindelin [Tue, 29 Aug 2006 10:51:14 +0000 (12:51 +0200)]
Makefile: fix typo

We checked NO_SETENV instead of NO_UNSETENV to decide if unsetenv
is available.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agounpack-objects: remove unused variable "eof"
Johannes Schindelin [Tue, 29 Aug 2006 10:50:29 +0000 (12:50 +0200)]
unpack-objects: remove unused variable "eof"

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogit-fsck-objects: lacking default references should not be fatal
Linus Torvalds [Tue, 29 Aug 2006 18:47:30 +0000 (11:47 -0700)]
git-fsck-objects: lacking default references should not be fatal

The comment added says it all: if we have lost all references in a git
archive, git-fsck-objects should still work, so instead of dying it should
just notify the user about that condition.

This change was triggered by me just doing a "git-init-db" and then
populating that empty git archive with a pack/index file to look at it.
Having git-fsck-objects not work just because I didn't have any references
handy was rather irritating, since part of the reason for running
git-fsck-objects in the first place was to _find_ the missing references.

However, "--unreachable" really doesn't make sense in that situation, and
we want to turn it off to protect anybody who uses the old "git prune"
shell-script (rather than the modern built-in). The old pruning script
used to remove all objects that were reported as unreachable, and without
any refs, that obviously means everything - not worth it.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoCheck if pack directory exists prior to descending into it
Matthias Kestenholz [Tue, 29 Aug 2006 09:12:14 +0000 (11:12 +0200)]
Check if pack directory exists prior to descending into it

This fixes the following warning:

git-repack: line 42: cd: .git/objects/pack: No such file or directory

This happens only, when git-repack -a is run without any packs in the
repository.

Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: Add local time and timezone to git_print_authorship
Jakub Narebski [Mon, 28 Aug 2006 21:17:31 +0000 (23:17 +0200)]
gitweb: Add local time and timezone to git_print_authorship

Add local time (hours and minutes) and local timezone to the output of
git_print_authorship command, used by git_commitdiff.  The code was
taken from git_commit subroutine.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: Add diff tree, with links to patches, to commitdiff view
Jakub Narebski [Mon, 28 Aug 2006 12:48:14 +0000 (14:48 +0200)]
gitweb: Add diff tree, with links to patches, to commitdiff view

Added/uncommented git_difftree_body invocation in git_commitdiff.
Added anchors (via 'id' attribute) to patches in patchset.
git_difftree_body is modified to link to patch anchor when called from
git_commitdiff, instead of link to blobdiff.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: git_print_log: signoff line is non-empty line
Jakub Narebski [Mon, 28 Aug 2006 12:48:13 +0000 (14:48 +0200)]
gitweb: git_print_log: signoff line is non-empty line

This correct minor error in git_print_log that didn't add final empty
line when requested, if commit log ended with signoff.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: Add author information to commitdiff view
Jakub Narebski [Mon, 28 Aug 2006 12:48:12 +0000 (14:48 +0200)]
gitweb: Add author information to commitdiff view

Add subroutine git_print_authorship to print author and date of
commit, div.author_date style to CSS, and use them in git_commitdiff.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: Do not remove signoff lines in git_print_simplified_log
Jakub Narebski [Mon, 28 Aug 2006 12:48:11 +0000 (14:48 +0200)]
gitweb: Do not remove signoff lines in git_print_simplified_log

Remove '-remove_signoff => 1' option to git_print_log call in the
git_print_simplified_log subroutine.  This means that in "log" and
"commitdiff" views (git_log and git_commitdiff subroutines) signoff
lines will be shown.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: Make git_print_log generic; git_print_simplified_log uses it
Jakub Narebski [Mon, 28 Aug 2006 12:48:10 +0000 (14:48 +0200)]
gitweb: Make git_print_log generic; git_print_simplified_log uses it

Collapse git_print_log and git_print_simplified_log into one
subroutine git_print_log.  git_print_simplified_log now simply calls
git_print_log with proper options.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: Use --git-dir parameter instead of setting $ENV{'GIT_DIR'}
Dennis Stosberg [Mon, 28 Aug 2006 15:49:58 +0000 (17:49 +0200)]
gitweb: Use --git-dir parameter instead of setting $ENV{'GIT_DIR'}

This makes it possible to run gitweb under mod_perl's Apache::Registry.

It needs a fairly new git version, with --git-dir=<path>
parameter to git wrapper, i.e. post v1.4.2-rc2-g6acbcb9 version.

Signed-off-by: Dennis Stosberg <dennis@stosberg.net>
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoAdd --relative-date option to the revision interface
Jonas Fonseca [Mon, 28 Aug 2006 13:52:13 +0000 (15:52 +0200)]
Add --relative-date option to the revision interface

Exposes the infrastructure from 9a8e35e98793af086f05d1ca9643052df9b44a74.

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoMerge branch 'gl/web'
Junio C Hamano [Mon, 28 Aug 2006 23:20:28 +0000 (16:20 -0700)]
Merge branch 'gl/web'

* gl/web: (46 commits)
  gitweb: Use @diff_opts, default ('M'), as git-diff and git-diff-tree paramete
  gitweb: Remove git_to_hash function
  gitweb: Remove unused git_get_{preceding,following}_references
  gitweb: Fix typo in git_patchset_body
  gitweb: Fix typo in git_difftree_body
  gitweb: blobs defined by non-textual hash ids can be cached
  gitweb: Improve comments about gitweb features configuration
  gitweb: Remove workaround for git-diff bug fixed in f82cd3c
  gitweb: Remove creating directory for temporary files
  gitweb: Remove git_diff_print subroutine
  gitweb: git_blobdiff_plain is git_blobdiff('plain')
  gitweb: Use git-diff-tree or git-diff patch output for blobdiff
  gitweb: Change here-doc back for style consistency in git_blobdiff
  gitweb: Always display link to blobdiff_plain in git_blobdiff
  gitweb: Add invisible hyperlink to from-file/to-file diff header
  gitweb: Parse two-line from-file/to-file diff header in git_patchset_body
  gitweb: Allow for pre-parsed difftree info in git_patchset_body
  gitweb: Add support for hash_parent_base parameter for blobdiffs
  gitweb: Use git_get_name_rev_tags for commitdiff_plain X-Git-Tag: header
  gitweb: Add git_get_rev_name_tags function
  ...

14 years agogitk: Fix some bugs in the new cherry-picking code
Paul Mackerras [Mon, 28 Aug 2006 12:41:09 +0000 (22:41 +1000)]
gitk: Fix some bugs in the new cherry-picking code

When inserting the new commit row for the cherry-picked commit, we weren't
advancing the selected line (if there is one), and we weren't updating
commitlisted properly.

14 years agomulti-service daemon: documentation
Junio C Hamano [Mon, 21 Aug 2006 02:32:43 +0000 (19:32 -0700)]
multi-service daemon: documentation

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agodaemon: add upload-tar service.
Junio C Hamano [Mon, 21 Aug 2006 02:03:50 +0000 (19:03 -0700)]
daemon: add upload-tar service.

This allows clients to ask for tarballs with:

git tar-tree --remote=git://server/repo refname

By default, the upload-tar service is not enabled.  To enable
it server-wide, the server can be started with:

git-daemon --enable=upload-tar

This service is by default overridable per repostiory, so
alternatively, a repository can define "daemon.uploadtar = true"
to enable it.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agodaemon: prepare for multiple services.
Junio C Hamano [Mon, 21 Aug 2006 02:03:13 +0000 (19:03 -0700)]
daemon: prepare for multiple services.

This adds an infrastructure to selectively enable and disable
more than one services in git-daemon.  Currently upload-pack
service, which serves the git-fetch-pack and git-peek-remote
clients, is the only service that is defined.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoAdd git-zip-tree to .gitignore
Rene Scharfe [Sun, 27 Aug 2006 11:19:49 +0000 (13:19 +0200)]
Add git-zip-tree to .gitignore

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agofree(NULL) is perfectly valid.
Junio C Hamano [Mon, 28 Aug 2006 04:19:39 +0000 (21:19 -0700)]
free(NULL) is perfectly valid.

Jonas noticed some places say "if (X) free(X)" which is totally
unnecessary.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoUse xcalloc instead of calloc
Jonas Fonseca [Mon, 28 Aug 2006 00:26:07 +0000 (02:26 +0200)]
Use xcalloc instead of calloc

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoUse fstat instead of fseek
Jonas Fonseca [Sun, 27 Aug 2006 23:55:46 +0000 (01:55 +0200)]
Use fstat instead of fseek

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoMerge branch 'gl/cleanup-next'
Junio C Hamano [Mon, 28 Aug 2006 03:34:09 +0000 (20:34 -0700)]
Merge branch 'gl/cleanup-next'

* gl/cleanup-next:
  hashcpy/hashcmp remaining bits.
  Convert memcpy(a,b,20) to hashcpy(a,b).

14 years agoMerge branch 'js/c-merge-recursive'
Junio C Hamano [Mon, 28 Aug 2006 03:18:58 +0000 (20:18 -0700)]
Merge branch 'js/c-merge-recursive'

* js/c-merge-recursive: (21 commits)
  discard_cache(): discard index, even if no file was mmap()ed
  merge-recur: do not die unnecessarily
  merge-recur: try to merge older merge bases first
  merge-recur: if there is no common ancestor, fake empty one
  merge-recur: do not setenv("GIT_INDEX_FILE")
  merge-recur: do not call git-write-tree
  merge-recursive: fix rename handling
  .gitignore: git-merge-recur is a built file.
  merge-recur: virtual commits shall never be parsed
  merge-recur: use the unpack_trees() interface instead of exec()ing read-tree
  merge-recur: fix thinko in unique_path()
  Makefile: git-merge-recur depends on xdiff libraries.
  merge-recur: Explain why sha_eq() and struct stage_data cannot go
  merge-recur: Cleanup last mixedCase variables...
  merge-recur: Fix compiler warning with -pedantic
  merge-recur: Remove dead code
  merge-recur: Get rid of debug code
  merge-recur: Convert variable names to lower_case
  Cumulative update of merge-recursive in C
  recur vs recursive: help testing without touching too many stuff.
  ...

This is an evil merge that removes TEST script from the toplevel.

14 years agoMerge branch 'ts/daemon'
Junio C Hamano [Mon, 28 Aug 2006 00:51:42 +0000 (17:51 -0700)]
Merge branch 'ts/daemon'

* ts/daemon:
  Added support for dropping privileges to git-daemon.

14 years agoMerge branch 'jc/apply'
Junio C Hamano [Mon, 28 Aug 2006 00:51:05 +0000 (17:51 -0700)]
Merge branch 'jc/apply'

* jc/apply:
  git-apply --reject: finishing touches.
  apply --reject: count hunks starting from 1, not 0
  git-apply --verbose
  git-apply --reject: send rejects to .rej files.
  git-apply --reject
  apply --reverse: tie it all together.
  diff.c: make binary patch reversible.
  builtin-apply --reverse: two bugfixes.

14 years agogit-apply --reject: finishing touches.
Junio C Hamano [Sun, 27 Aug 2006 22:53:20 +0000 (15:53 -0700)]
git-apply --reject: finishing touches.

After a failed "git am" attempt:

git apply --reject --verbose .dotest/patch

applies hunks that are applicable and leaves *.rej files the
rejected hunks, and it reports what it is doing.  With --index,
files with a rejected hunk do not get their index entries
updated at all, so "git diff" will show the hunks that
successfully got applied.

Without --verbose to remind the user that the patch updated some
other paths cleanly, it is very easy to lose track of the status
of the working tree, so --reject implies --verbose.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: Use @diff_opts, default ('M'), as git-diff and git-diff-tree paramete
Jakub Narebski [Sun, 27 Aug 2006 21:49:36 +0000 (23:49 +0200)]
gitweb: Use @diff_opts, default ('M'), as git-diff and git-diff-tree paramete

Added new global configuration variable @diff_opts, which holds
additional options (parameters) to git-diff and git-diff-tree, usually
dealing rename/copying detection.  Default value is '-M', taken from
git_commit subroutine.  Description of options and their approximate
cost by Junio C Hamano.

Changes:
* git_commitdiff, git_blobdiff and git_blobdiff_plain now use '-M'
  instead of '-M', '-C'
* git-diff now uses the same options as git-diff-tree
* git_comittdiff_plain now uses '-M' instead of '-B'
  and is now rename-aware
* git_rss uses now '-M' instead of ()

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogit-reset: remove unused variable
Rene Scharfe [Sun, 27 Aug 2006 11:19:58 +0000 (13:19 +0200)]
git-reset: remove unused variable

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogit-cherry: remove unused variable
Rene Scharfe [Sun, 27 Aug 2006 11:19:45 +0000 (13:19 +0200)]
git-cherry: remove unused variable

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: Remove git_to_hash function
Jakub Narebski [Sun, 27 Aug 2006 21:45:26 +0000 (23:45 +0200)]
gitweb: Remove git_to_hash function

Remove git_to_hash function, which was to translate symbolic reference
to hash, and it's use in git_blobdiff.  We don't try so hard to guess
filename if it was not provided.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: Remove unused git_get_{preceding,following}_references
Jakub Narebski [Sun, 27 Aug 2006 21:44:38 +0000 (23:44 +0200)]
gitweb: Remove unused git_get_{preceding,following}_references

Remove unused (and with errors in implementation)
git_get_{preceding,following}_references subroutines.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: Fix typo in git_patchset_body
Jakub Narebski [Sat, 26 Aug 2006 17:14:23 +0000 (19:14 +0200)]
gitweb: Fix typo in git_patchset_body

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoRelative timestamps in git log
Linus Torvalds [Sat, 26 Aug 2006 22:45:26 +0000 (15:45 -0700)]
Relative timestamps in git log

I noticed that I was looking at the kernel gitweb output at some point
rather than just do "git log", simply because I liked seeing the
simplified date-format, ie the "5 days ago" rather than a full date.

This adds infrastructure to do that for "git log" too. It does NOT add the
actual flag to enable it, though, so right now this patch is a no-op, but
it should now be easy to add a command line flag (and possibly a config
file option) to just turn on the "relative" date format.

The exact cut-off points when it switches from days to weeks etc are
totally arbitrary, but are picked somewhat to avoid the "1 weeks ago"
thing (by making it show "10 days ago" rather than "1 week", or "70
minutes ago" rather than "1 hour ago").

[jc: with minor fix and tweak around "month" and "week" area.]

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoAdd git-zip-tree
Rene Scharfe [Sat, 26 Aug 2006 21:19:21 +0000 (23:19 +0200)]
Add git-zip-tree

In the Windows world ZIP files are better supported than tar files.
Windows even includes built-in support for ZIP files nowadays.

git-zip-tree is similar to git-tar-tree; it creates ZIP files out of
git trees.  It stores the commit ID (if available) in a ZIP file comment
which can be extracted by unzip.

There's still quite some room for improvement: this initial version
supports no symlinks, calls write() way too often (three times per file)
and there is no unit test.

[jc: with a minor typefix to avoid void* arithmetic]

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: Fix typo in git_difftree_body
Jakub Narebski [Sat, 26 Aug 2006 21:33:58 +0000 (23:33 +0200)]
gitweb: Fix typo in git_difftree_body

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogit-svn: stop repeatedly reusing the first commit message with dcommit
Eric Wong [Sat, 26 Aug 2006 16:52:25 +0000 (09:52 -0700)]
git-svn: stop repeatedly reusing the first commit message with dcommit

Excessive use of global variables got me into trouble.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoUse xrealloc instead of realloc
Jonas Fonseca [Sat, 26 Aug 2006 14:16:18 +0000 (16:16 +0200)]
Use xrealloc instead of realloc

Change places that use realloc, without a proper error path, to instead use
xrealloc. Drop an erroneous error path in the daemon code that used errno
in the die message in favour of the simpler xrealloc.

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoUse PATH_MAX instead of MAXPATHLEN
Jonas Fonseca [Sat, 26 Aug 2006 14:09:17 +0000 (16:09 +0200)]
Use PATH_MAX instead of MAXPATHLEN

According to sys/paramh.h it's a "BSD name" for values defined in
<limits.h>. Besides PATH_MAX seems to be more commonly used.

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoConvert unpack_entry_gently and friends to use offsets.
Shawn Pearce [Sat, 26 Aug 2006 08:12:27 +0000 (04:12 -0400)]
Convert unpack_entry_gently and friends to use offsets.

Change unpack_entry_gently and its helper functions to use offsets
rather than addresses and left counts to supply pack position
information.  In most cases this makes the code easier to follow,
and it reduces the number of local variables in a few functions.
It also better prepares this code for mapping partial segments of
packs and altering what regions of a pack are mapped while unpacking
an entry.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoCleanup unpack_object_header to use only offsets.
Shawn Pearce [Sat, 26 Aug 2006 08:12:04 +0000 (04:12 -0400)]
Cleanup unpack_object_header to use only offsets.

If we're always incrementing both the offset and the pointer we
aren't gaining anything by keeping both.  Instead just use the
offset since that's what we were given and what we are expected
to return.  Also using offset is likely to make it easier to remap
the pack in the future should partial mapping of very large packs
get implemented.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoCleanup unpack_entry_gently and friends to use type_name array.
Shawn Pearce [Sat, 26 Aug 2006 08:11:36 +0000 (04:11 -0400)]
Cleanup unpack_entry_gently and friends to use type_name array.

[PATCH 3/5] Cleanup unpack_entry_gently and friends to use type_name array.

This change allows combining all of the non-delta entries into a
single case, as well as to remove an unnecessary local variable
in unpack_entry_gently.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoReuse compression code in unpack_compressed_entry.
Shawn Pearce [Sat, 26 Aug 2006 08:11:02 +0000 (04:11 -0400)]
Reuse compression code in unpack_compressed_entry.

[PATCH 2/5] Reuse compression code in unpack_compressed_entry.

This cleans up the code by reusing a perfectly good decompression
implementation at the expense of 1 extra byte of memory allocated in
temporary memory while the delta is being decompressed and applied
to the base.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoReorganize/rename unpack_non_delta_entry to unpack_compressed_entry.
Shawn Pearce [Sat, 26 Aug 2006 08:10:43 +0000 (04:10 -0400)]
Reorganize/rename unpack_non_delta_entry to unpack_compressed_entry.

This function was moved above unpack_delta_entry so we can call it
from within unpack_delta_entry without a forward declaration.

This change looks worse than it is.  Its really just a relocation
of unpack_non_delta_entry to earlier in the file and renaming the
function to unpack_compressed_entry.  No other changes were made.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: blobs defined by non-textual hash ids can be cached
Jakub Narebski [Sat, 26 Aug 2006 17:14:25 +0000 (19:14 +0200)]
gitweb: blobs defined by non-textual hash ids can be cached

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: Improve comments about gitweb features configuration
Jakub Narebski [Sat, 26 Aug 2006 17:14:22 +0000 (19:14 +0200)]
gitweb: Improve comments about gitweb features configuration

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: Remove workaround for git-diff bug fixed in f82cd3c
Jakub Narebski [Sat, 26 Aug 2006 10:33:17 +0000 (12:33 +0200)]
gitweb: Remove workaround for git-diff bug fixed in f82cd3c

Remove workaround in git_blobdiff for error in git-diff (showing
reversed diff for diff of blobs), corrected in commit f82cd3c
Fix "git diff blob1 blob2" showing the diff in reverse.  which
is post 1.4.2-rc2 commit.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoMerge branch 'master' into gl/web
Junio C Hamano [Sat, 26 Aug 2006 08:08:39 +0000 (01:08 -0700)]
Merge branch 'master' into gl/web

* master: (34 commits)
  gitweb: git_annotate didn't expect negative numeric timezone
  git-svn: add the 'dcommit' command
  git-svn: recommend rebase for syncing against an SVN repo
  git-svn: establish new connections on commit after fork
  describe: fix off-by-one error in --abbrev=40 handling
  git-svn(1): improve asciidoc markup
  gitview.txt: improve asciidoc markup
  git(7): put the synopsis in a verse style paragraph
  gitk(1): expand the manpage to look less like a template
  git-blame(1): mention options in the synopsis and advertise pickaxe
  git-ls-remote(1): document --upload-pack
  git-apply(1): document missing options and improve existing ones
  update-index -g
  n is in fact unused, and is later shadowed.
  use name[len] in switch directly, instead of creating a shadowed variable.
  builtin-grep.c: remove unused debugging piece.
  remove ugly shadowing of loop indexes in subloops.
  missing 'static' keywords
  git_dir holds pointers to local strings, hence MUST be const.
  avoid to use error that shadows the function name, use err instead.
  ...

14 years agoMerge branch 'gl/cleanup'
Junio C Hamano [Sat, 26 Aug 2006 08:06:22 +0000 (01:06 -0700)]
Merge branch 'gl/cleanup'

* gl/cleanup:
  Convert memset(hash,0,20) to hashclr(hash).
  Convert memcpy(a,b,20) to hashcpy(a,b).

14 years agogitweb: git_annotate didn't expect negative numeric timezone
Jakub Narebski [Sat, 26 Aug 2006 00:13:05 +0000 (02:13 +0200)]
gitweb: git_annotate didn't expect negative numeric timezone

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogit-svn: add the 'dcommit' command
Eric Wong [Sat, 26 Aug 2006 07:01:23 +0000 (00:01 -0700)]
git-svn: add the 'dcommit' command

This is a high-level wrapper around the 'commit-diff' command
and used to produce cleaner history against the mirrored repository
through rebase/reset usage.

It's basically a more polished version of this:

for i in `git rev-list --no-merges remotes/git-svn..HEAD | tac`; do
git-svn commit-diff $i~1 $i
done
git reset --hard remotes/git-svn

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>