git.git
18 years agoMerge branch 'pb/configure'
Junio C Hamano [Wed, 26 Jul 2006 20:35:35 +0000 (13:35 -0700)]
Merge branch 'pb/configure'

* pb/configure:
  Rename man1 and man7 variables to man1dir and man7dir
  Allow INSTALL, bindir, mandir to be set in main Makefile

18 years agogit-cvsserver: support multiline commit messages
Johannes Schindelin [Wed, 26 Jul 2006 19:59:08 +0000 (21:59 +0200)]
git-cvsserver: support multiline commit messages

Earlier, cvsserver barfed when you tried to check in files with a
multiline commit message.

That is what Argumentx is for... Argument: lines can be followed by
several Argumentx: lines, which means they should be appended.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agot7001: add test for git-mv dir1 dir2/
Johannes Schindelin [Wed, 26 Jul 2006 17:41:05 +0000 (19:41 +0200)]
t7001: add test for git-mv dir1 dir2/

If dir2 already exists, git-mv should move dir1 _into_dir2/.
Noticed by Jon Smirl.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: fix two warnings
Johannes Schindelin [Wed, 26 Jul 2006 14:58:35 +0000 (16:58 +0200)]
gitweb: fix two warnings

These warnings cluttered up my log.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-instaweb: respect bindir from Makefile
Johannes Schindelin [Wed, 26 Jul 2006 14:32:51 +0000 (16:32 +0200)]
git-instaweb: respect bindir from Makefile

Not everybody installs git to /usr/bin/git.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-instaweb: some Apache have mod_cgi builtin
Johannes Schindelin [Wed, 26 Jul 2006 14:33:18 +0000 (16:33 +0200)]
git-instaweb: some Apache have mod_cgi builtin

So test for it, and do not always try to load mod_cgi.o.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agot4112: simplify the test and remove unneeded working tree file.
Junio C Hamano [Wed, 26 Jul 2006 18:01:07 +0000 (11:01 -0700)]
t4112: simplify the test and remove unneeded working tree file.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoExtend testing git-mv for renaming of subdirectories
Josef Weidendorfer [Wed, 26 Jul 2006 13:44:08 +0000 (15:44 +0200)]
Extend testing git-mv for renaming of subdirectories

Signed-off-by: Josef Weidendorfer <Josef.Weidendorfer@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agocvsserver: avoid warning about active db handles v1.4.2-rc2
Johannes Schindelin [Tue, 25 Jul 2006 11:57:57 +0000 (13:57 +0200)]
cvsserver: avoid warning about active db handles

Turns out that DBD::SQLite does not favour preparing statements which are
never executed. So, turn all 4 statements, which were prepared _always_,
into methods, like the other 12 prepared statements.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agocvsserver: suppress warnings
Johannes Schindelin [Tue, 25 Jul 2006 10:48:52 +0000 (12:48 +0200)]
cvsserver: suppress warnings

This patch defines $state->{prependdir} as the empty string, so that
quite a few warnings are avoided.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Acked-by: Martin Langhoff <martin@catalyst.net.nz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoSubstitute xmalloc()+memset(0) with xcalloc().
Peter Eriksen [Tue, 25 Jul 2006 07:30:18 +0000 (09:30 +0200)]
Substitute xmalloc()+memset(0) with xcalloc().

Signed-off-by: Peter Eriksen <s022018@student.dtu.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: escape tag comments
Daniel Drake [Mon, 24 Jul 2006 22:07:23 +0000 (23:07 +0100)]
gitweb: escape tag comments

I have a tag with a comment which includes an & character. Firefox wouldn't
display my gitweb summary page due to malformed XML. This solves the problem.

Signed-off-by: Daniel Drake <dsd@gentoo.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'jc/clone-bind-failure'
Junio C Hamano [Tue, 25 Jul 2006 20:19:54 +0000 (13:19 -0700)]
Merge branch 'jc/clone-bind-failure'

* jc/clone-bind-failure:
  fetch/clone: check return status from ls-remote

18 years agoMerge branch 'jt/format-patch'
Junio C Hamano [Tue, 25 Jul 2006 19:54:57 +0000 (12:54 -0700)]
Merge branch 'jt/format-patch'

* jt/format-patch:
  builtin-log: typefix for recent format-patch changes.
  Add option to set initial In-Reply-To/References
  Add option to enable threading headers
  git-format-patch: Make the second and subsequent mails replies to the first

18 years agoMerge branch 'ew/apply'
Junio C Hamano [Tue, 25 Jul 2006 19:50:23 +0000 (12:50 -0700)]
Merge branch 'ew/apply'

* ew/apply:
  Fix t4114 on cygwin
  apply: handle type-changing patch correctly.
  apply: split out removal and creation into different phases.
  apply: check D/F conflicts more carefully.
  typechange tests for git apply (currently failing)

18 years agoMerge branch 'jc/read-tree'
Junio C Hamano [Tue, 25 Jul 2006 04:01:14 +0000 (21:01 -0700)]
Merge branch 'jc/read-tree'

* jc/read-tree:
  checkout -f failed to check out a file if an existing directory interfered.

18 years agoMerge branch 'lt/objformat'
Junio C Hamano [Tue, 25 Jul 2006 00:38:03 +0000 (17:38 -0700)]
Merge branch 'lt/objformat'

* lt/objformat:
  sha1_file: add the ability to parse objects in "pack file format"

18 years agoTrivial path optimization test
Alex Riesen [Mon, 24 Jul 2006 23:23:03 +0000 (01:23 +0200)]
Trivial path optimization test

Linus:
    get_pathspec() does turn '.' into an empty string (which is
    correct - git internally does _not_ ever understand the notion of
    "." as the current working directory), but it doesn't ever do the
    optimization of noticing that a pathspec that consists solely of
    an empty string is "equivalent" to an empty pathspec.

The test is to ensure that this behaviour stays.

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoAlways reset the color _before_ printing out the newline
Johannes Schindelin [Mon, 24 Jul 2006 12:41:41 +0000 (14:41 +0200)]
Always reset the color _before_ printing out the newline

This patch brings the benefits of part of v1.4.1-rc2~37
to the "commit" colorizing patch.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoupload-pack: fix timeout in create_pack_file
Matthias Lederhofer [Tue, 18 Jul 2006 17:14:51 +0000 (19:14 +0200)]
upload-pack: fix timeout in create_pack_file

Signed-off-by: Matthias Lederhofer <matled@gmx.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoDefaulting fetch to origin when set in the repo-config
Santi Béjar [Sat, 22 Jul 2006 22:54:40 +0000 (00:54 +0200)]
Defaulting fetch to origin when set in the repo-config

Signed-off-by: Santi Béjar <sbejar@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoColorize 'commit' lines in log ui
Jeff King [Sun, 23 Jul 2006 09:24:18 +0000 (05:24 -0400)]
Colorize 'commit' lines in log ui

When paging through the output of git-whatchanged, the color cues help to
visually navigate within a diff. However, it is difficult to notice when a
new commit starts, because the commit and log are shown in the "normal"
color. This patch colorizes the 'commit' line, customizable through
diff.colors.commit and defaulting to yellow.

As a side effect, some of the diff color engine (slot enum, get_color) has
become accessible outside of diff.c.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-am: Don't accept an mbox on stdin of we already have a .dotest directory
Lukas Sandström [Wed, 19 Jul 2006 20:28:00 +0000 (22:28 +0200)]
git-am: Don't accept an mbox on stdin of we already have a .dotest directory

It makes no sense to accept an mbox via stdin when we
won't accept it on the commandline.

The patch helps the following scenario:

# git init-db
"add file1 with content"
# git checkout -b apply
"edit file1 && commit"

# git checkout -b conflict master
"edit file1 && commit"

# git checkout -b ok master
"add file2"

# git checkout apply
# git format-patch -k -3 master..conflict | git am -k -3
=> git-am fails with a conflict message
# git reset --hard

# git format-patch -k -3 master..ok | git am -k -3
=> git am fails with the same conflict message as above,
=> since it's trying to apply the old .dotest directory

With the patch it complains about an old .dotest
directory instead.

Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoshow-branch: Fix another performance problem.
Alexandre Julliard [Sun, 23 Jul 2006 17:51:04 +0000 (19:51 +0200)]
show-branch: Fix another performance problem.

When naming commits, stop walking the parent chain as soon as we find
a commit that already has a name. The parent chain of that commit will
be walked later on in any case (or may even have been walked already).
This avoids O(n^2) behavior; on a tree where show-branch displays 6800
commits, the total run time drops from 77 seconds to 5 seconds.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agopack-objects: check pack.window for default window size
Jeff King [Sun, 23 Jul 2006 05:50:30 +0000 (01:50 -0400)]
pack-objects: check pack.window for default window size

For some repositories, deltas simply don't make sense. One can disable
them for git-repack by adding --window, but git-push insists on making
the deltas which can be very CPU-intensive for little benefit.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoDisable linking with Fink or DarwinPorts.
Shawn Pearce [Mon, 24 Jul 2006 04:28:28 +0000 (00:28 -0400)]
Disable linking with Fink or DarwinPorts.

It may be desirable for the compiler to disable linking against Fink
or DarwinPorts, especially if both are installed on the system and
the user wants GIT to be linked specifically to only one of them.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit.el: Put the git customize group in the 'tools' parent group.
Alexandre Julliard [Sat, 22 Jul 2006 13:40:13 +0000 (15:40 +0200)]
git.el: Put the git customize group in the 'tools' parent group.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit.el: Try to reuse an existing buffer when running git-status.
Alexandre Julliard [Sat, 22 Jul 2006 13:39:53 +0000 (15:39 +0200)]
git.el: Try to reuse an existing buffer when running git-status.

By default, running git-status again will now reuse an existing buffer
that displays the same directory. The old behavior of always creating
a new buffer can be obtained by customizing the git-reuse-status-buffer
option.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit.el: Prepend a slash to the file name when adding to .gitignore.
Alexandre Julliard [Sat, 22 Jul 2006 13:39:32 +0000 (15:39 +0200)]
git.el: Prepend a slash to the file name when adding to .gitignore.

This way the ignore command will really only ignore the marked files
and not files with the same name in subdirectories.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit.el: Run git-rerere on commits if the rr-cache directory exists.
Alexandre Julliard [Sat, 22 Jul 2006 13:39:02 +0000 (15:39 +0200)]
git.el: Run git-rerere on commits if the rr-cache directory exists.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-svn: fix fetching new directories copies when using SVN:: libs
Eric Wong [Thu, 20 Jul 2006 08:43:01 +0000 (01:43 -0700)]
git-svn: fix fetching new directories copies when using SVN:: libs

Log output from SVN doesn't list all the new files that were
added if a new directory was copied from an existing place in
the repository.  This means we'll have to do some extra work and
traverse new directories ourselves.

This has been updated from the original patch to defer traversed
adds until all removals have been done.  Please disregard the
original.

Thanks to Ben Williamson for the excellent bug report and
testing.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agotar-tree: add the "tar.umask" config option
Willy Tarreau [Thu, 20 Jul 2006 09:30:44 +0000 (11:30 +0200)]
tar-tree: add the "tar.umask" config option

By default, git-tar-tree(1) sets file and directories modes to 0666
or 0777. While this is both useful and acceptable for projects such
as the Linux Kernel, it might be excessive for other projects. With
this variable, it becomes possible to tell git-tar-tree(1) to apply
a specific umask to the modes above. The special value "user"
indicates that the user's current umask will be used. This should be
enough for most projects, as it will lead to the same permissions as
git-checkout(1) would use. The default value remains 0, which means
world read-write.

Signed-off-by: Willy Tarreau <w@1wt.eu>
Acked-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoFix t4114 on cygwin
Johannes Schindelin [Tue, 18 Jul 2006 17:46:34 +0000 (19:46 +0200)]
Fix t4114 on cygwin

On cygwin, when you try to create a symlink over a directory, you do
not get EEXIST, but EACCES.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agocvsexportcommit - add -a (add author line) flag, cleanup warnings
Martin Langhoff [Tue, 18 Jul 2006 02:22:49 +0000 (14:22 +1200)]
cvsexportcommit - add -a (add author line) flag, cleanup warnings

This patch adds support for -a which will add an "Author: " line, and possibly
a "Committer: " line to the bottom of the commit message for CVS.

The commit message parser is now a little bit better, and some warnings
have been cleaned up.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agounpack-objects: remove stale and confusing comment
Junio C Hamano [Mon, 17 Jul 2006 20:08:14 +0000 (13:08 -0700)]
unpack-objects: remove stale and confusing comment

The very initial version of unpack-objects.c::unpack_all() used
to unpack from the end of the pack, but since end of June last
year it was changed to stream from the front and the comment
does not reflect the reality anymore.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-fetch: fix --keep vs --thin
Junio C Hamano [Mon, 17 Jul 2006 20:01:27 +0000 (13:01 -0700)]
git-fetch: fix --keep vs --thin

When --keep is specified there is no reason to pass --thin to git-fetch-pack,
which are mutually exclusive.  This does not hurt because fetch-pack disables
thin transfer when both are given internally, but still is confusing.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'sp/reflog' v1.4.2-rc1
Junio C Hamano [Mon, 17 Jul 2006 08:08:11 +0000 (01:08 -0700)]
Merge branch 'sp/reflog'

* sp/reflog:
  Record rebase changes as 'rebase' in the reflog.
  Log ref changes made by resolve.
  Log ref changes made by quiltimport.
  Log ref changes made by git-merge and git-pull.

18 years agoapply: handle type-changing patch correctly.
Junio C Hamano [Mon, 17 Jul 2006 07:10:47 +0000 (00:10 -0700)]
apply: handle type-changing patch correctly.

A type-change diff is always split into a patch to delete old,
immediately followed by a patch to create new.  check_patch()
routine noticed that the path to be created already exists in
the working tree and/or in the index when looking at the
creation patch and mistakenly thought it to be an error.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoapply: split out removal and creation into different phases.
Junio C Hamano [Mon, 17 Jul 2006 06:52:09 +0000 (23:52 -0700)]
apply: split out removal and creation into different phases.

This reworks write_out_result() loop so we first remove the paths that
are to go away and then create them after finishing all the removal.

This is necessary when a patch creates a file "foo" and removes a file
"foo/bar".

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoapply: check D/F conflicts more carefully.
Junio C Hamano [Mon, 17 Jul 2006 06:28:23 +0000 (23:28 -0700)]
apply: check D/F conflicts more carefully.

When creating a new file where a directory used to be (or the user had
an empty directory) the code did not check the result from lstat() closely
enough, and mistakenly thought the path already existed in the working tree.

This does not fix the problem where you have a patch that creates a file
at "foo" and removes a file at "foo/bar" (which presumably is the last file
in "foo/" directory in the original).  For that, we would need to restructure
write_out_results() loop.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agocheckout -f failed to check out a file if an existing directory interfered.
Junio C Hamano [Mon, 17 Jul 2006 06:25:12 +0000 (23:25 -0700)]
checkout -f failed to check out a file if an existing directory interfered.

When path foo/bar existed in the working tree, checkout -f to switch to
a branch that has a file foo silently did a wrong thing.  It failed to
remove the directory foo, did not check out the file foo, and the worst
of all it did not report any errors.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agotypechange tests for git apply (currently failing)
Eric Wong [Sun, 16 Jul 2006 10:38:40 +0000 (03:38 -0700)]
typechange tests for git apply (currently failing)

I've found that git apply is incapable of handling patches
involving object type changes to the same path.

Of course git itself is perfectly capable of making commits that
generate these changes, as it only tracks trees states.  It's
just that the diffs between them are less useful if they can't
be applied.

Some of these are rare, but I've hit one of them (file becoming
a symlink) recently in real-world usage, and was inspired to
find more potential breakages :)

I'm not sure when I'll have time to fix these myself and I'm not
very familiar with the apply code.   So if someone could get
some or all of these cases working, they would be my hero :)

Some of these are what I would refer to as corner-cases from
hell.  Most (if not all) other systems fail some of these.  In
fact, they aren't even capable of representing most of these
changes in their histories; much less being able to handle
patches to that effect.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-svn: don't check for migrations/upgrades on commit-diff
Eric Wong [Sat, 15 Jul 2006 14:10:56 +0000 (07:10 -0700)]
git-svn: don't check for migrations/upgrades on commit-diff

Unlike other git-svn commands, commit-diff is intended to
operate without needing any additional metadata inside .git

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoshow-branch: fix performance problem.
Junio C Hamano [Sun, 16 Jul 2006 07:00:09 +0000 (00:00 -0700)]
show-branch: fix performance problem.

The core function used in show-branch, join_revs(), was supposed
to be exactly the same algorithm as merge_bases(), except that
it was a version enhanced for use with more than two heads.
However, it needed to mark and keep a list of all the commits it
has seen, because it needed them for its semi-graphical output.
The function to implement this list, mark_seen(), stupidly used
insert_by_date(), when it did not need to keep the list sorted
during its processing.  This made "show-branch --merge-base"
more than 20x slower compared to "merge-base --all" in some
cases (e.g. between b5032a5 and 48ce8b0 in the Linux 2.6 kernel
archive).  The performance of "show-branch --independent"
suffered from the same reason.

This patch sorts the resulting list after the list traversal
just once to fix these problems.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agobuiltin-log: typefix for recent format-patch changes.
Junio C Hamano [Sat, 15 Jul 2006 05:47:53 +0000 (22:47 -0700)]
builtin-log: typefix for recent format-patch changes.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoAdd option to set initial In-Reply-To/References
Josh Triplett [Sat, 15 Jul 2006 00:49:08 +0000 (17:49 -0700)]
Add option to set initial In-Reply-To/References

Add the --in-reply-to option to provide a Message-Id for an initial
In-Reply-To/References header, useful for including a new patch series as part
of an existing thread.

Signed-off-by: Josh Triplett <josh@freedesktop.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoAdd option to enable threading headers
Josh Triplett [Sat, 15 Jul 2006 00:49:04 +0000 (17:49 -0700)]
Add option to enable threading headers

Add a --thread option to enable generation of In-Reply-To and References
headers, used to make the second and subsequent mails appear as replies to the
first.

Signed-off-by: Josh Triplett <josh@freedesktop.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-format-patch: Make the second and subsequent mails replies to the first
Josh Triplett [Sat, 15 Jul 2006 00:48:51 +0000 (17:48 -0700)]
git-format-patch: Make the second and subsequent mails replies to the first

Add message_id and ref_message_id fields to struct rev_info, used in show_log
with CMIT_FMT_EMAIL to set Message-Id and In-Reply-To/References respectively.
Use these in git-format-patch to make the second and subsequent patch mails
replies to the first patch mail.

Signed-off-by: Josh Triplett <josh@freedesktop.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoDocumentation/urls.txt: Use substitution to escape square brackets
Jonas Fonseca [Fri, 14 Jul 2006 23:36:00 +0000 (16:36 -0700)]
Documentation/urls.txt: Use substitution to escape square brackets

This changes "[user@]" to use {startsb} and {endsb} to insert [ and ],
similar to how {caret} is used in git-rev-parse.txt.

[jc: Removed a well-intentioned comment that broke the final
 formatting from the original patch.  While we are at it,
 updated the paragraph that claims to be equivalent to the
 section that was updated earlier without making matching
 changes.]

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoDocumentation/Makefile: product depends on asciidoc.conf
Junio C Hamano [Fri, 14 Jul 2006 23:32:38 +0000 (16:32 -0700)]
Documentation/Makefile: product depends on asciidoc.conf

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'lt/unitype'
Junio C Hamano [Fri, 14 Jul 2006 22:39:19 +0000 (15:39 -0700)]
Merge branch 'lt/unitype'

* lt/unitype:
  builtin-prune.c: forgot TYPE => OBJ changes.
  Remove TYPE_* constant macros and use object_type enums consistently.

18 years agoMerge branch 'sp/lazy-mkdir'
Junio C Hamano [Fri, 14 Jul 2006 22:38:37 +0000 (15:38 -0700)]
Merge branch 'sp/lazy-mkdir'

* sp/lazy-mkdir:
  Make lazy mkdir more robust.

18 years agoFix "git-fetch --tags" exit status when nothing has been changed
Sergey Vlasov [Fri, 14 Jul 2006 15:06:57 +0000 (19:06 +0400)]
Fix "git-fetch --tags" exit status when nothing has been changed

After commit 55b7835e1b81a6debc7648149d2b8a4c5c64ddba git-fetch --tags
exits with status 1 when no tags have been changed, which breaks calling
git-fetch from scripts.

Signed-off-by: Sergey Vlasov <vsu@altlinux.ru>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoargv created by handle_alias should be NULL terminated
Matthias Lederhofer [Fri, 14 Jul 2006 16:37:06 +0000 (18:37 +0200)]
argv created by handle_alias should be NULL terminated

Signed-off-by: Matthias Lederhofer <matled@gmx.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agodocumentation (urls.txt) typofix
Alp Toker [Fri, 14 Jul 2006 18:31:50 +0000 (11:31 -0700)]
documentation (urls.txt) typofix

18 years agobuiltin-prune.c: forgot TYPE => OBJ changes.
Junio C Hamano [Fri, 14 Jul 2006 06:37:52 +0000 (23:37 -0700)]
builtin-prune.c: forgot TYPE => OBJ changes.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agosha1_file: add the ability to parse objects in "pack file format"
Linus Torvalds [Tue, 11 Jul 2006 19:48:08 +0000 (12:48 -0700)]
sha1_file: add the ability to parse objects in "pack file format"

The pack-file format is slightly different from the traditional git
object format, in that it has a much denser binary header encoding.
The traditional format uses an ASCII string with type and length
information, which is somewhat wasteful.

A new object format starts with uncompressed binary header
followed by compressed payload -- this will allow us later to
copy the payload straight to packfiles.

Obviously they cannot be read by older versions of git, so for
now new object files are created with the traditional format.
core.legacyheaders configuration item, when set to false makes
the code write in new format for people to experiment with.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agofetch/clone: check return status from ls-remote
Junio C Hamano [Mon, 10 Jul 2006 10:34:34 +0000 (03:34 -0700)]
fetch/clone: check return status from ls-remote

Some callers of ls-remote did not check its return status.

18 years agoRecord rebase changes as 'rebase' in the reflog.
Shawn Pearce [Fri, 14 Jul 2006 04:47:23 +0000 (00:47 -0400)]
Record rebase changes as 'rebase' in the reflog.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb.css: Use monospace fonts for commits and tree-diff.
Luben Tuikov [Thu, 13 Jul 2006 19:36:22 +0000 (12:36 -0700)]
gitweb.css: Use monospace fonts for commits and tree-diff.

Use monospace fonts for the commit header, commit message,
and tree-diff.  This helps viewing commit logs with ASCII art.

Signed-off-by: Luben Tuikov <ltuikov@yahoo.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoDo not use perl in git-commit.sh
Alex Riesen [Thu, 13 Jul 2006 08:30:43 +0000 (10:30 +0200)]
Do not use perl in git-commit.sh

git-commit.sh has the only one place where perl is used
and there it can quite trivially be done in sh.

git-ls-files without "-z" produces quoted output, even if
is different from that produced by perl code it is good
enough.

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agodiff: Support 256 colors
Timo Hirvonen [Thu, 13 Jul 2006 16:08:06 +0000 (19:08 +0300)]
diff: Support 256 colors

Add support for more than 8 colors.  Colors can be specified as numbers
-1..255.  -1 is same as "normal".

Signed-off-by: Timo Hirvonen <tihirvon@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agodiff: Support both attributes and colors
Timo Hirvonen [Thu, 13 Jul 2006 16:06:12 +0000 (19:06 +0300)]
diff: Support both attributes and colors

Make it possible to set both colors and a attribute for diff colors.
Background colors are supported too.

Syntax is now:

[attr] [fg [bg]]
[fg [bg]] [attr]

Empty value is same as "normal normal", ie use default colors.  The new
syntax is backwards compatible.

Signed-off-by: Timo Hirvonen <tihirvon@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoDocumentation about exclude/ignore files
Matthias Lederhofer [Wed, 12 Jul 2006 19:54:51 +0000 (21:54 +0200)]
Documentation about exclude/ignore files

Use .git/info/exclude in the example in git-ls-files.txt,
instead of .git/ignore, and update the list of commands looking
at .git/info/exclude in repository-layout.txt.

Signed-off-by: Matthias Lederhofer <matled@gmx.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agodaemon: new option --detach to run git-daemon in background
Matthias Lederhofer [Thu, 13 Jul 2006 16:47:13 +0000 (18:47 +0200)]
daemon: new option --detach to run git-daemon in background

Signed-off-by: Matthias Lederhofer <matled@gmx.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agodaemon: new option --pid-file=<path> to store the pid
Matthias Lederhofer [Thu, 13 Jul 2006 10:18:08 +0000 (12:18 +0200)]
daemon: new option --pid-file=<path> to store the pid

Signed-off-by: Matthias Lederhofer <matled@gmx.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoupload-pack: ignore write errors to stderr
Matthias Lederhofer [Thu, 13 Jul 2006 11:07:59 +0000 (13:07 +0200)]
upload-pack: ignore write errors to stderr

Signed-off-by: Matthias Lederhofer <matled@gmx.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agodaemon: if one of the standard fds is missing open it to /dev/null
Matthias Lederhofer [Thu, 13 Jul 2006 16:32:11 +0000 (18:32 +0200)]
daemon: if one of the standard fds is missing open it to /dev/null

Signed-off-by: Matthias Lederhofer <matled@gmx.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agodaemon: use a custom die routine with syslog
Matthias Lederhofer [Thu, 13 Jul 2006 10:02:29 +0000 (12:02 +0200)]
daemon: use a custom die routine with syslog

Removed the git-daemon prefix from die() because no other call to die
does this.

Signed-off-by: Matthias Lederhofer <matled@gmx.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoDocumentation: Fix ssh://[user@]host.xz URL
Junio C Hamano [Fri, 14 Jul 2006 04:48:45 +0000 (21:48 -0700)]
Documentation: Fix ssh://[user@]host.xz URL

Earlier commit c3f17061 broke asciidoc markup.

Noticed by Alp Toker with a fix, but fixed up in a way with smaller
formatting impact.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoAdjust t4013 tests to corrected format-patch.
Junio C Hamano [Fri, 14 Jul 2006 04:39:13 +0000 (21:39 -0700)]
Adjust t4013 tests to corrected format-patch.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoformat-patch: Generate a newline between the subject header and the message body
Robert Shearman [Thu, 13 Jul 2006 22:17:22 +0000 (23:17 +0100)]
format-patch: Generate a newline between the subject header and the message body

format-patch previously didn't generate a newline after a subject. This
caused the diffstat to not be displayed in messages with only one line
for the commit message.
This patch fixes this by adding a newline after the headers if a body
hasn't been added.
Signed-off-by: Robert Shearman <rob@codeweavers.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agot4013 diff format tests update
Junio C Hamano [Fri, 14 Jul 2006 02:51:12 +0000 (19:51 -0700)]
t4013 diff format tests update

This changes one test commit in the sequence to have more than
one lines of commit log.  A few output formats (--pretty=email
aka format-patch and --pretty=oneline) need to behave
differently on single and multi-line log, and this change will
help catching breakages.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoDisplay help for Git mode after pressing `h' or `?' in *git-status*
Jakub Narebski [Thu, 13 Jul 2006 20:22:14 +0000 (22:22 +0200)]
Display help for Git mode after pressing `h' or `?' in *git-status*

Add bindings for "h" and "?" in git-status-mode to display help about the mode,
including keymap via (describe-function 'git-status-mode), like in PCL-CVS.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoWrap long lines in docstrings in contrib/emacs/git.el
Jakub Narebski [Thu, 13 Jul 2006 20:22:13 +0000 (22:22 +0200)]
Wrap long lines in docstrings in contrib/emacs/git.el

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoRemove TYPE_* constant macros and use object_type enums consistently.
Linus Torvalds [Wed, 12 Jul 2006 03:45:31 +0000 (20:45 -0700)]
Remove TYPE_* constant macros and use object_type enums consistently.

This updates the type-enumeration constants introduced to reduce
the memory footprint of "struct object" to match the type bits
already used in the packfile format, by removing the former
(i.e. TYPE_* constant macros) and using the latter (i.e. enum
object_type) throughout the code for consistency.

Eventually we can stop passing around the "type strings"
entirely, and this will help - no confusion about two different
integer enumeration.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMake lazy mkdir more robust.
Shawn Pearce [Wed, 12 Jul 2006 05:00:16 +0000 (01:00 -0400)]
Make lazy mkdir more robust.

Linus Torvalds <torvalds@osdl.org> wrote:

  It's entirely possible that we should just make that whole

  if (ret == ENOENT)

  go away. Yes, it's the right error code if a subdirectory is missing, and
  yes, POSIX requires it, and yes, WXP is probably just a horrible piece of
  sh*t, but on the other hand, I don't think git really has any serious
  reason to even care.

18 years agoMerge branch 'ml/trace'
Junio C Hamano [Thu, 13 Jul 2006 06:09:10 +0000 (23:09 -0700)]
Merge branch 'ml/trace'

* ml/trace:
  test-lib: unset GIT_TRACE
  GIT_TRACE: fix a mixed declarations and code warning
  GIT_TRACE: show which built-in/external commands are executed

18 years agotest-lib: unset GIT_TRACE
Junio C Hamano [Thu, 13 Jul 2006 06:09:00 +0000 (23:09 -0700)]
test-lib: unset GIT_TRACE

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-repack: avoid redirecting stderr into git-pack-objects
Junio C Hamano [Thu, 13 Jul 2006 06:00:46 +0000 (23:00 -0700)]
git-repack: avoid redirecting stderr into git-pack-objects

We are trying to catch error condition of git-rev-list and cause
the downstream pack-objects to barf, but if you run rev-list
with anything that mucks with its stderr (such as GIT_TRACE),
any stderr output would cause the pipeline to fail.

[jc: originally from Matthias Lederhofer, with a reworded error message.]

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoFix grammatical error in git-revert
Junio C Hamano [Thu, 13 Jul 2006 05:51:25 +0000 (22:51 -0700)]
Fix grammatical error in git-revert

We always talk about "commit xyz".

We never talk about "xyz commit", except when we end up talking
about a commit as a branch head (notably, I would say "the HEAD
commit", or possibly "the top-of-master commit", but here
$commit is a SHA1 name, not anything else).

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'js/merge-base'
Junio C Hamano [Thu, 13 Jul 2006 05:44:59 +0000 (22:44 -0700)]
Merge branch 'js/merge-base'

* js/merge-base:
  Additional merge-base tests (revised)
  merge-base: update the clean-up postprocessing

18 years agoMerge branch 'lt/prune'
Junio C Hamano [Thu, 13 Jul 2006 05:31:55 +0000 (22:31 -0700)]
Merge branch 'lt/prune'

* lt/prune:
  builtin "git prune"

18 years agoMerge branch 'lt/merge-tree'
Junio C Hamano [Thu, 13 Jul 2006 05:31:22 +0000 (22:31 -0700)]
Merge branch 'lt/merge-tree'

* lt/merge-tree:
  Improved three-way blob merging code
  Prepare "git-merge-tree" for future work
  xdiff: generate "anti-diffs" aka what is common to two files

18 years agofmt-merge-msg fix
Junio C Hamano [Thu, 13 Jul 2006 05:21:05 +0000 (22:21 -0700)]
fmt-merge-msg fix

The new C version mistranslated the original Perl version in the
case to pull from the HEAD.  This made it to say nonsense like
this:

Merge commit ...url... of HEAD

        * HEAD:
        ...

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: Make command invocations go through the git wrapper
Alp Toker [Wed, 12 Jul 2006 22:55:10 +0000 (23:55 +0100)]
gitweb: Make command invocations go through the git wrapper

This patch makes invocations of core git commands go through the 'git'
binary itself, which improves readability and might help system
administrators lock down their CGI environment for security.

Signed-off-by: Alp Toker <alp@atoker.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: Include a site name in page titles
Alp Toker [Tue, 11 Jul 2006 20:10:26 +0000 (21:10 +0100)]
gitweb: Include a site name in page titles

This helps users tell one 'git' bookmark apart from the other in their
browser and improves the indexing of gitweb sites in Web search engines.
The title defaults to the SERVER_NAME environment variable, often given
by the webserver.

Signed-off-by: Alp Toker <alp@atoker.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: Send XHTML as 'application/xhtml+xml' where possible
Alp Toker [Tue, 11 Jul 2006 10:19:34 +0000 (11:19 +0100)]
gitweb: Send XHTML as 'application/xhtml+xml' where possible

"The 'text/html' media type [RFC2854] is primarily for HTML, not for
XHTML. In general, this media type is NOT suitable for XHTML."

This patch makes gitweb use content negotiation to conservatively send
pages as Content-Type 'application/xhtml+xml' when the user agent
explicitly claims to support it.

It falls back to 'text/html' even if the user agent appears to
implicitly support 'application/xhtml+xml' due to a '*/*' glob, working
around an insidious bug in Internet Explorer where sending the correct
media type prevents the page from being displayed.

Signed-off-by: Alp Toker <alp@atoker.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoLog ref changes made by resolve.
Shawn Pearce [Tue, 11 Jul 2006 06:25:09 +0000 (02:25 -0400)]
Log ref changes made by resolve.

Since git-resolve is essentially a form of git-merge record any
ref updates it makes similiar to how git-merge would record them.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoLog ref changes made by quiltimport.
Shawn Pearce [Tue, 11 Jul 2006 06:10:19 +0000 (02:10 -0400)]
Log ref changes made by quiltimport.

When importing a quilt patch to a branch which has a reflog record
the update to HEAD with a log message indicating the change was
made by quiltimport and what patch caused the change.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoLog ref changes made by git-merge and git-pull.
Shawn Pearce [Tue, 11 Jul 2006 05:52:54 +0000 (01:52 -0400)]
Log ref changes made by git-merge and git-pull.

When git-merge updates HEAD as a result of a merge record what
happened during the merge into the reflog associated with HEAD
(if any).  The log reports who caused the update (git-merge or
git-pull, by invoking git-merge), what the remote ref names were
and the type of merge process used.

The merge information can be useful when reviewing a reflog for
a branch such as `master` where fast forward and trivial in index
merges might be common as the user tracks an upstream.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-fetch: fix a bashism (==)
Eric Wong [Tue, 11 Jul 2006 21:06:39 +0000 (14:06 -0700)]
git-fetch: fix a bashism (==)

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMake the unpacked object header functions static to sha1_file.c
Linus Torvalds [Tue, 11 Jul 2006 17:10:29 +0000 (10:10 -0700)]
Make the unpacked object header functions static to sha1_file.c

Nobody else uses them, and I'm going to start changing them.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-send-email: Remove redundant Reply-To header
Alp Toker [Tue, 11 Jul 2006 10:19:37 +0000 (11:19 +0100)]
git-send-email: Remove redundant Reply-To header

There is no sense in duplicating the sender address in Reply-To as it's
already provided in the From header.

Signed-off-by: Alp Toker <alp@atoker.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agotypofix (git-name-rev documentation)
Alp Toker [Tue, 11 Jul 2006 10:19:33 +0000 (11:19 +0100)]
typofix (git-name-rev documentation)

Signed-off-by: Alp Toker <alp@atoker.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMention the [user@] part in documentation of ssh:// urls.
Yakov Lerner [Tue, 11 Jul 2006 21:02:00 +0000 (21:02 +0000)]
Mention the [user@] part in documentation of ssh:// urls.

Signed-off-by: Yakov Lerner <iler.ml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agotests: Set EDITOR=: and VISUAL=: globally
Eric Wong [Tue, 11 Jul 2006 19:01:54 +0000 (12:01 -0700)]
tests: Set EDITOR=: and VISUAL=: globally

This way we don't have to remember to set it for each test; and
if we forget, we won't cause interactive editors to be spawned
for non-interactive tests.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoLog ref changes made by git-fetch and git-pull.
Shawn Pearce [Tue, 11 Jul 2006 03:38:35 +0000 (23:38 -0400)]
Log ref changes made by git-fetch and git-pull.

When git-fetch updates a reference record in the associated reflog
what type of update took place and who caused it (git-fetch or
git-pull, by invoking git-fetch).

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoRecord the type of commit operation in the reflog.
Shawn Pearce [Tue, 11 Jul 2006 02:48:47 +0000 (22:48 -0400)]
Record the type of commit operation in the reflog.

If committing a merge (.git/MERGE_HEAD exists), an initial tree
(no HEAD) or using --amend to amend the prior commit then denote
the subtype of commit in the reflog.  This helps to distinguish
amended or merge commits from normal commits.

In the case of --amend the prior sha1 is probably the commit which
is being thrown away in favor of the new commit.  Since it is likely
that the old commit doesn't have any ref pointing to it anymore
it can be interesting to know why that the commit was replaced
and orphaned.

In the case of a merge the prior sha1 is probably the first parent
of the new merge commit.  Consequently having its prior sha1 in the
reflog is slightly less interesting but its still informative to
know the commit was the result of a merge which had to be completed
by hand.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoAllow user.name and user.email to drive reflog entry.
Shawn Pearce [Tue, 11 Jul 2006 00:27:54 +0000 (20:27 -0400)]
Allow user.name and user.email to drive reflog entry.

Apparently calling setup_ident() after git_config causes the
user.name and user.email values read from the config file to be
replaced with the data obtained from the host.  This means that
users who have setup their email address in user.email will instead
be writing reflog entries with their hostname.

Moving setup_ident() to before git_config in update-ref resolves
this ordering problem.

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