git/git.git
14 years agogit-fetch: allow updating the current branch in a bare repository.
Junio C Hamano [Sun, 7 Jan 2007 10:17:52 +0000 (02:17 -0800)]
git-fetch: allow updating the current branch in a bare repository.

Sometimes, people have only fetch access into a bare repository
that is used as a back-up location (or a distribution point) but
does not have a push access for networking reasons, e.g. one end
being behind a firewall, and updating the "current branch" in
such a case is perfectly fine.

This allows such a fetch without --update-head-ok, which is a
flag that should never be used by end users otherwise.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoIntroduce is_bare_repository() and core.bare configuration variable
Junio C Hamano [Sun, 7 Jan 2007 10:00:28 +0000 (02:00 -0800)]
Introduce is_bare_repository() and core.bare configuration variable

This removes the old is_bare_git_dir(const char *) to ask if a
directory, if it is a GIT_DIR, is a bare repository, and
replaces it with is_bare_repository(void *).  The function looks
at core.bare configuration variable if exists but uses the old
heuristics: if it is ".git" or ends with "/.git", then it does
not look like a bare repository, otherwise it does.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoMove initialization of log_all_ref_updates
Junio C Hamano [Sun, 7 Jan 2007 09:35:34 +0000 (01:35 -0800)]
Move initialization of log_all_ref_updates

The patches to prevent Porcelainish that require working tree
from doing any damage in a bare repository make a lot of sense,
and I want to make the is_bare_git_dir() function more reliable.

In order to allow the repository owner override the heuristic
implemented in is_bare_git_dir() if/when it misidentifies a
particular repository, it would make sense to introduce a new
configuration variable "[core] bare = true/false", and make
is_bare_git_dir() notice it.

The scripts would do a 'repo-config --bool --get core.bare' and
iff the command fails (i.e. there is no such variable in the
configuration file), it would use the heuristic implemented at
the script level [*1*].

However, setup_git_env() which is called a lot earlier than we
even read from the repository configuration currently makes a
call to is_bare_git_dir(), in order to change the default
setting for log_all_ref_updates.  It somehow feels that this is
a hack.

By the way, [*1*] is another thing I hate about the current
config mechanism.  "git-repo-config --get" does not know what
the possible configuration variables are, let alone what the
default values for them are.  It allows us not to maintain a
centralized configuration table, which makes it easy to
introduce ad-hoc variables and gives a warm fuzzy feeling of
being modular, but my feeling is that it is turning out to be a
rather high price to pay for scripts.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogit-svn: pass an unambiguous ref to rev-list when grafting-branches
Eric Wong [Mon, 8 Jan 2007 03:35:41 +0000 (19:35 -0800)]
git-svn: pass an unambiguous ref to rev-list when grafting-branches

Some users apparently create local heads with the same basename
as the remote branch they're tracking.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogit-svn: add --prefix= option to multi-init
Eric Wong [Mon, 8 Jan 2007 03:35:40 +0000 (19:35 -0800)]
git-svn: add --prefix= option to multi-init

Also, document --{trunk,branches,tags} options while we're
documenting multi-init options.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoDocumentation: clarify definition of "reachable"
J. Bruce Fields [Mon, 8 Jan 2007 00:25:35 +0000 (19:25 -0500)]
Documentation: clarify definition of "reachable"

Clarify definition of "reachable" (what chain?)

Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogit-svnimport: fix edge revisions double importing
Sasha Khapyorsky [Mon, 8 Jan 2007 02:22:42 +0000 (04:22 +0200)]
git-svnimport: fix edge revisions double importing

This fixes newly introduced bug when the incremental cycle edge revisions
are imported twice.

Signed-off-by: Sasha Khapyorsky <sashak@voltaire.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agocvsimport: skip commits that are too recent
Martin Langhoff [Mon, 8 Jan 2007 01:11:23 +0000 (14:11 +1300)]
cvsimport: skip commits that are too recent

With this patch, cvsimport will skip commits made
in the last 10 minutes. The recent-ness test is of
5 minutes + cvsps fuzz window (5 minutes default).

When working with a CVS repository that is in use,
importing commits that are too recent can lead to
partially incorrect trees. This is mainly due to

 - Commits that are within the cvsps fuzz window may later
   be found to have affected more files.

 - When performing incremental imports, clock drift between
   the systems may lead to skipped commits.

This commit helps keep incremental imports of in-use
CVS repositories sane.

Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: Remove superfluous "|" in "commit" view
Jakub Narebski [Mon, 8 Jan 2007 01:10:42 +0000 (02:10 +0100)]
gitweb: Remove superfluous "|" in "commit" view

Remove superfluous trailing "|" separator from difftree part of "commit"
view for new files (created in given commit).

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoRemove unnecessary git-rm --cached reference from status output
Jürgen Rühle [Sun, 7 Jan 2007 19:18:26 +0000 (20:18 +0100)]
Remove unnecessary git-rm --cached reference from status output

Since git-reset has learned restoring the absence of paths git-rm --cached is
no longer necessary. Therefore remove it from the cached content header hint.

Also remove the unfortunate wording 'Cached' from the header itself.

Signed-off-by: Jürgen Rühle <j-r@online.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years ago"init-db" can really be just "init"
Nicolas Pitre [Sun, 7 Jan 2007 17:31:29 +0000 (12:31 -0500)]
"init-db" can really be just "init"

Make "init" the equivalent of "init-db". This should make first GIT
impression a little more friendly.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoMerge branch 'sp/mmap'
Junio C Hamano [Sun, 7 Jan 2007 08:12:47 +0000 (00:12 -0800)]
Merge branch 'sp/mmap'

* sp/mmap: (27 commits)
  Spell default packedgitlimit slightly differently
  Increase packedGit{Limit,WindowSize} on 64 bit systems.
  Update packedGit config option documentation.
  mmap: set FD_CLOEXEC for file descriptors we keep open for mmap()
  pack-objects: fix use of use_pack().
  Fix random segfaults in pack-objects.
  Cleanup read_cache_from error handling.
  Replace mmap with xmmap, better handling MAP_FAILED.
  Release pack windows before reporting out of memory.
  Default core.packdGitWindowSize to 1 MiB if NO_MMAP.
  Test suite for sliding window mmap implementation.
  Create pack_report() as a debugging aid.
  Support unmapping windows on 'temporary' packfiles.
  Improve error message when packfile mmap fails.
  Ensure core.packedGitWindowSize cannot be less than 2 pages.
  Load core configuration in git-verify-pack.
  Fully activate the sliding window pack access.
  Unmap individual windows rather than entire files.
  Document why header parsing won't exceed a window.
  Loop over pack_windows when inflating/accessing data.
  ...

Conflicts:

cache.h
pack-check.c

14 years agoSpell default packedgitlimit slightly differently
Junio C Hamano [Sun, 7 Jan 2007 08:11:11 +0000 (00:11 -0800)]
Spell default packedgitlimit slightly differently

This is shorter and easier to read, and also makes sure the
constant expression does not overflow integer range.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoMerge branch 'jr/status'
Junio C Hamano [Sun, 7 Jan 2007 07:49:24 +0000 (23:49 -0800)]
Merge branch 'jr/status'

* jr/status:
  Improve cached content header of status output
  Support --amend on initial commit in status output
  Improve "nothing to commit" part of status output
  Clarify syntax and role of git-add in status output

14 years agoMerge branch 'jc/remote'
Junio C Hamano [Sun, 7 Jan 2007 07:49:16 +0000 (23:49 -0800)]
Merge branch 'jc/remote'

* jc/remote:
  git-remote

14 years agogit-reset <tree> -- <path> restores absense of <path> in <tree>
Junio C Hamano [Fri, 5 Jan 2007 09:38:56 +0000 (01:38 -0800)]
git-reset <tree> -- <path> restores absense of <path> in <tree>

When <path> exists in the index (either merged or unmerged), and
<tree> does not have it, git-reset should be usable to restore
the absense of it from the tree.  This implements it.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agodiff-index --cached --raw: show tree entry on the LHS for unmerged entries.
Junio C Hamano [Fri, 5 Jan 2007 09:25:18 +0000 (01:25 -0800)]
diff-index --cached --raw: show tree entry on the LHS for unmerged entries.

This updates the way diffcore represents an unmerged pair
somewhat.  It used to be that entries with mode=0 on both sides
were used to represent an unmerged pair, but now it has an
explicit flag.  This is to allow diff-index --cached to report
the entry from the tree when the path is unmerged in the index.

This is used in updating "git reset <tree> -- <path>" to restore
absense of the path in the index from the tree.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: Fix split patches output (e.g. file to symlink)
Jakub Narebski [Sun, 7 Jan 2007 01:52:27 +0000 (02:52 +0100)]
gitweb: Fix split patches output (e.g. file to symlink)

Do not replace /dev/null in two-line from-file/to-file diff header for
split patches ("split" patch mean more than one patch per one
diff-tree raw line) by a/file or b/file link.

Split patches differ from pair of deletion/creation patch in git diff
header: both a/file and b/file are hyperlinks, in all patches in a
split.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoRevert "gitweb: There can be empty patches (in git_patchset_body)"
Jakub Narebski [Sun, 7 Jan 2007 01:52:26 +0000 (02:52 +0100)]
Revert "gitweb: There can be empty patches (in git_patchset_body)"

This reverts commit 1ebb948f656c03a5bdaab4de1a113b9ffcb98bea,
as that patch quieted warning but was not proper solution.
The previous commit was.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: Fix errors in git_patchset_body for empty patches
Jakub Narebski [Sun, 7 Jan 2007 01:52:25 +0000 (02:52 +0100)]
gitweb: Fix errors in git_patchset_body for empty patches

We now do not skip over empty patches in git_patchset_body (where
empty means that they consist only of git diff header, and of extended
diff header, for example "pure rename" patch).  This means that after
extended diff header there can be next patch (i.e. /^diff /) or end of
patchset, and not necessary patch body (i.e. /^--- /).

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: Fix error in "rename to"/"copy to" git diff header output
Jakub Narebski [Sun, 7 Jan 2007 01:52:24 +0000 (02:52 +0100)]
gitweb: Fix error in "rename to"/"copy to" git diff header output

Fix error in git_patchset_body subroutine, which caused "rename to"/"copy
to" line in extended diff header to be displayed incorrectly.

While at it, fix align.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: Fix error in git_patchest_body for file creation/deletion patch
Jakub Narebski [Sun, 7 Jan 2007 01:52:23 +0000 (02:52 +0100)]
gitweb: Fix error in git_patchest_body for file creation/deletion patch

$from_id, $to_id variables should be local per PATCH.

Fix error in git_patchset_body for file creation (deletion) patches,
where instead of /dev/null as from-file (to-file) diff header line, it
had link to previous file with current file name.  This error occured
only if there was another patch before file creation (deletion) patch.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogit-svn: fix show-ignore
Eric Wong [Sun, 7 Jan 2007 06:25:55 +0000 (22:25 -0800)]
git-svn: fix show-ignore

Looks like I broke it in 747fa12cef73b6ca04fffaddaad7326cf546cdea
but never noticed.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoDocumentation: tutorial editing
J. Bruce Fields [Sun, 7 Jan 2007 03:38:38 +0000 (22:38 -0500)]
Documentation: tutorial editing

Edit for conciseness.

Add a "Making changes" section header.

When possible, make sure that stuff in text boxes could be entered literally.
(Don't use "..." unless we want a user to type that.)

Move 'commit -a' example into a literal code section, clarify that it finds
modified files automatically.

Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoDocumentation/git-svn: clarify dcommit, rebase vs pull/merge
Eric Wong [Sun, 7 Jan 2007 01:53:40 +0000 (17:53 -0800)]
Documentation/git-svn: clarify dcommit, rebase vs pull/merge

Clarify that dcommit creates a revision in SVN for every commit
in git.  Also, add 'merge' to the rebase vs pull section because
git-merge is now a first-class UI.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogit-svnimport: clean svn path when accessing SVN repo
Sasha Khapyorsky [Sun, 7 Jan 2007 00:22:10 +0000 (02:22 +0200)]
git-svnimport: clean svn path when accessing SVN repo

Clean svn path from leading '/' when accessing SVN repo.

Signed-off-by: Sasha Khapyorsky <sashak@voltaire.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogit-svnimport: support for incremental import
Sasha Khapyorsky [Sun, 7 Jan 2007 00:17:19 +0000 (02:17 +0200)]
git-svnimport: support for incremental import

This adds ability to do import "in chunks" (default 1000 revisions),
after each chunk git repo will be repacked. The option -R is used to
change default value of chunk size (or how often repository will
repacked).

Signed-off-by: Sasha Khapyorsky <sashak@voltaire.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogit.el: Avoid setting font lock keywords before entering log-edit mode.
Alexandre Julliard [Sat, 6 Jan 2007 13:46:47 +0000 (14:46 +0100)]
git.el: Avoid setting font lock keywords before entering log-edit mode.

Instead, reinitialize the keywords after the fact. This avoids
conflicts with other users of log-edit mode, like pcl-cvs.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoinstaweb: Nicer error message when the http daemon isn't found
Fredrik Kuivinen [Sat, 6 Jan 2007 10:40:06 +0000 (11:40 +0100)]
instaweb: Nicer error message when the http daemon isn't found

Signed-off-by: Fredrik Kuivinen <frekui@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogit.el: Don't use --info-only when resolving a file.
Alexandre Julliard [Sat, 6 Jan 2007 10:20:57 +0000 (11:20 +0100)]
git.el: Don't use --info-only when resolving a file.

It doesn't make a difference for git.el, but it helps when interacting
with git-rebase and friends.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogit-clean: Fix the -q option.
Alexandre Julliard [Sat, 6 Jan 2007 10:19:44 +0000 (11:19 +0100)]
git-clean: Fix the -q option.

The 'quiet' flag is set by -q, but it's not used anywhere.
Remove it and set the 'echo1' variable instead.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoPrint a more accurate error message when we fail to create a lock file.
Steven Grimm [Sat, 6 Jan 2007 03:14:04 +0000 (19:14 -0800)]
Print a more accurate error message when we fail to create a lock file.

Signed-off-by: Steven Grimm <koreth@midwinter.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoDescribe git-clone's actual behavior in the summary
Steven Grimm [Sat, 6 Jan 2007 01:52:20 +0000 (17:52 -0800)]
Describe git-clone's actual behavior in the summary

If a branch other than "master" is checked out in the origin repository,
git-clone makes a local copy of that branch rather than the origin's
"master"
branch. This patch describes the actual behavior.

Signed-off-by: Steven Grimm <koreth@midwinter.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoSet default "tar" umask to 002 and owner.group to root.root
René Scharfe [Fri, 5 Jan 2007 22:30:22 +0000 (23:30 +0100)]
Set default "tar" umask to 002 and owner.group to root.root

In order to make the generated tar files more friendly to users who
extract them as root using GNU tar and its implied -p option, change
the default umask to 002 and change the owner name and group name to
root.  This ensures that a) the extracted files and directories are
not world-writable and b) that they belong to user and group root.

Before they would have been assigned to a user and/or group named
git if it existed.  This also answers the question in the removed
comment: uid=0, gid=0, uname=root, gname=root is exactly what we
want.

Normal users who let tar apply their umask while extracting are
only affected if their umask allowed the world to change their
files (e.g. a umask of zero).  This case is so unlikely and strange
that we don't need to support it.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoIncrease packedGit{Limit,WindowSize} on 64 bit systems.
Shawn O. Pearce [Fri, 5 Jan 2007 03:28:08 +0000 (22:28 -0500)]
Increase packedGit{Limit,WindowSize} on 64 bit systems.

If we have a 64 bit address space we can easily afford to commit
a larger amount of virtual address space to pack file access.
So on these platforms we should increase the default settings of
core.packedGit{Limit,WindowSize} to something that will better
handle very large projects.

Thanks to Andy Whitcroft for pointing out that we can safely
increase these defaults on such systems.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoFix timestamp for test-tick
Junio C Hamano [Sat, 6 Jan 2007 10:16:07 +0000 (02:16 -0800)]
Fix timestamp for test-tick

The earlier test timestamp was too old; I forgot that the bare
unixtime integer had to be after Jan 1, 2000.  This changes
test_tick to use the git-epoch timestamp.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agobuiltin-prune: memory diet.
Junio C Hamano [Fri, 5 Jan 2007 21:31:43 +0000 (13:31 -0800)]
builtin-prune: memory diet.

Somehow we forgot to turn save_commit_buffer off while walking
the reachable objects.  Releasing the memory for commit object
data that we do not use matters for large projects (for example,
about 90MB is saved while traversing linux-2.6 history).

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogit-remote
Junio C Hamano [Wed, 3 Jan 2007 20:13:04 +0000 (12:13 -0800)]
git-remote

It might be handy to have a single command that helps you manage
your configuration that relates to downloading from remote
repositories.  This currently does only about 20% of what I want
it to do.

$ git remote

shows the list of 'remotes' you have defined somewhere, and

$ git remote origin

shows the details about the named remote (in this case
"origin").  How the branches are tracked, if you have a
tracking branch that is stale, etc.

$ git add another git://git.kernel.org/pub/...

defines the default remote.another.url and remote.another.fetch
entries just like a clone does; you can say "git fetch another"
afterwards.

For it to be useful, I think it should be enhanced to:

 - check overlaps of tracking branches and warn;

 - offer to remove stale tracking branches in one go;

 - offer ways to remove or rename remote;

 - offer ways to update an existing remote, perhaps have an
   interactive mode;

Other enhancements might be also possible, but I do not think of
anything that is absolutely necessary other than the above right
now.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoBlame "linenr" link jumps to previous state at "orig_lineno"
Luben Tuikov [Fri, 5 Jan 2007 02:37:45 +0000 (18:37 -0800)]
Blame "linenr" link jumps to previous state at "orig_lineno"

Blame currently displays the commit id which introduced a
block of one or more lines, the line numbers wrt the current
listing of the file and the file's line contents.

The commit id displayed is hyperlinked to the commit.

Currently the linenr links are hyperlinked to the same
commit id displayed to the left, which is _no_ different
than the block of lines displayed, since it is the _same
commit_ that is hyperlinked.  And thus clicking on it leads
to the same state of the file for that chunk of
lines. I.e. data mining is not currently possible with
gitweb given a chunk of lines introduced by a commit.

This patch makes such data mining possible.

The line numbers are now hyperlinked to the parent of the
commit id of the block of lines.  Furthermore they are
linked to the line where that block was introduced.

Thus clicking on a linenr link will show you the file's
line(s) state prior to the commit id you were viewing.

So clicking continually on a linenr link shows you how this
line and its line number changed over time, leading to the
initial commit where it was first introduced.

Signed-off-by: Luben Tuikov <ltuikov@yahoo.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: Fix "Use of uninitialized value" warning in git_tags_body
Jakub Narebski [Wed, 3 Jan 2007 21:54:29 +0000 (22:54 +0100)]
gitweb: Fix "Use of uninitialized value" warning in git_tags_body

Fix "Use of uninitialized value" warning in git_tags_body generated
for lightweight tags of tree and blob object; those don't have age
($tag{'age'}) defined.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogit-svn: make --repack work consistently between fetch and multi-fetch
Eric Wong [Fri, 5 Jan 2007 02:09:56 +0000 (18:09 -0800)]
git-svn: make --repack work consistently between fetch and multi-fetch

Since fetch reforks itself at most every 1000 revisions, we
need to update the counter in the parent process to have a
working count if we set our repack interval to be > ~1000
revisions.  multi-fetch has always done this correctly
because of an extra process; now fetch uses the extra process;
as well.

While we're at it, only compile the $sha1 regex that checks for
repacking once.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogit-svn: update documentation for multi-{init|fetch}
Eric Wong [Fri, 5 Jan 2007 02:04:06 +0000 (18:04 -0800)]
git-svn: update documentation for multi-{init|fetch}

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogit-svn: make multi-init less confusing
Eric Wong [Fri, 5 Jan 2007 02:02:00 +0000 (18:02 -0800)]
git-svn: make multi-init less confusing

It now requires at least one of the (trunk|branch|tags) arguments
(either from the command-line or in .git/config).  Also we make
sure that anything that is passed as a URL ('help') in David's
case is actually a URL.

Thanks to David Kågedal for reporting this issue.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoRemove shadowing variable from traverse_trees()
René Scharfe [Thu, 4 Jan 2007 18:33:36 +0000 (19:33 +0100)]
Remove shadowing variable from traverse_trees()

The variable named entry is allocated using malloc() and then
forgotten, it being shadowed by an automatic variable of the
same name.  Fixing the array size at 3 worked so far because
the only caller of traverse_trees() needed only as much
entries.  Simply remove the shadowing varaible and we're able
to traverse more than three trees and save stack space at the
same time!

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoMake check target depend on common-cmds.h
René Scharfe [Thu, 4 Jan 2007 18:33:48 +0000 (19:33 +0100)]
Make check target depend on common-cmds.h

This fixes sparse complaining about a missing include file
if 'make check' is run on clean sources.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agorerere: Fix removal of already resolved path.
Junio C Hamano [Thu, 4 Jan 2007 08:06:50 +0000 (00:06 -0800)]
rerere: Fix removal of already resolved path.

There was an obvious thinko in memmove() to remove an entry that
was resolved from the in-core data structure.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoMerge branch 'maint'
Junio C Hamano [Fri, 5 Jan 2007 06:28:21 +0000 (22:28 -0800)]
Merge branch 'maint'

* maint:
  pack-check.c::verify_packfile(): don't run SHA-1 update on huge data
  Fix infinite loop when deleting multiple packed refs.

14 years agopack-check.c::verify_packfile(): don't run SHA-1 update on huge data v1.4.4.4
Junio C Hamano [Thu, 4 Jan 2007 07:09:08 +0000 (23:09 -0800)]
pack-check.c::verify_packfile(): don't run SHA-1 update on huge data

Running the SHA1_Update() on the whole packfile in a single call
revealed an overflow problem we had in the SHA-1 implementation
on POWER architecture some time ago, which was fixed with commit
b47f509b (June 19, 2006).  Other SHA-1 implementations may have
a similar problem.

The sliding mmap() series already makes chunked calls to
SHA1_Update(), so this patch itself will become moot when it
graduates to "master", but in the meantime, run the hash
function in smaller chunks to prevent possible future problems.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: Fix shortlog only showing HEAD revision.
Robert Fitzsimons [Wed, 3 Jan 2007 20:25:55 +0000 (20:25 +0000)]
gitweb: Fix shortlog only showing HEAD revision.

My change in 190d7fdcf325bb444fa806f09ebbb403a4ae4ee6 had a small bug
found by Michael Krufky which caused the passed in hash value to be
ignored, so shortlog would only show the HEAD revision.

Signed-off-by: Robert Fitzsimons <robfitz@273k.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogit-verify-tag: make sure we remove temporary file.
Junio C Hamano [Wed, 3 Jan 2007 20:34:20 +0000 (12:34 -0800)]
git-verify-tag: make sure we remove temporary file.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogit-tag: add flag to verify a tag
Santi Béjar [Wed, 3 Jan 2007 12:59:00 +0000 (13:59 +0100)]
git-tag: add flag to verify a tag

This way "git tag -v $tag" is the UI for git-verify-tag.

Signed-off-by: Santi Béjar <sbejar@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoRefactor print-functions in builtin-branch
Lars Hjemli [Wed, 3 Jan 2007 20:10:09 +0000 (21:10 +0100)]
Refactor print-functions in builtin-branch

This moves the guts of print_ref_list() into a revamped print_ref_info(),
which at the same time gets renamed to print_ref_item().

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: There can be empty patches (in git_patchset_body)
Jakub Narebski [Wed, 3 Jan 2007 19:47:25 +0000 (20:47 +0100)]
gitweb: There can be empty patches (in git_patchset_body)

We now do not skip over empty patches in git_patchset_body
(where empty means that they consist only of git diff header,
and of extended diff header), so uncomment branch of code dealing
with empty patches (patches which do not have even two-line
from/to header)

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: Fix bug in git_difftree_body (was '!=' instead of 'ne')
Jakub Narebski [Wed, 3 Jan 2007 19:47:24 +0000 (20:47 +0100)]
gitweb: Fix bug in git_difftree_body (was '!=' instead of 'ne')

Fix bug in git_difftree_body subroutine; it was used '!=' comparison
operator for strings (file type) instead of correct 'ne'.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoDocumentation/tutorial: misc updates
Santi Béjar [Wed, 3 Jan 2007 12:53:27 +0000 (13:53 +0100)]
Documentation/tutorial: misc updates

 - Teach how to delete a branch with "git branch -d name".
 - Usually a commit has one parent; merge has more.
 - Teach "git show" instead of "git cat-file -p".

Signed-off-by: Santi Béjar <sbejar@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agotutorial: misc updates.
Junio C Hamano [Wed, 3 Jan 2007 16:38:01 +0000 (08:38 -0800)]
tutorial: misc updates.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoSkip excessive blank lines before commit body
Lars Hjemli [Wed, 3 Jan 2007 13:34:13 +0000 (14:34 +0100)]
Skip excessive blank lines before commit body

This modifies pretty_print_commit() to make the output of git-rev-list and
friends a bit more predictable.

A commit body starting with blank lines might be unheard-of, but still possible
to create using git-commit-tree (so is bound to appear somewhere, sometime).

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoAdd documentation for git-branch's color configuration.
Brian Gernhardt [Wed, 3 Jan 2007 15:36:29 +0000 (10:36 -0500)]
Add documentation for git-branch's color configuration.

Added color.branch and color.branch.<slot> to configuration list.
Style copied from color.status and meanings derived from the code.

Moved the color meanings from color.diff.<slot> to color.branch.<slot>
since the latter comes first alphabetically.

Added --color and --no-color to git-branch's usage and documentation.

Signed-off-by: Brian Gernhardt <benji@silverinsanity.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: Fix error in git_project_index subroutine
Jakub Narebski [Wed, 3 Jan 2007 15:03:01 +0000 (16:03 +0100)]
gitweb: Fix error in git_project_index subroutine

Instead of "$projectroot/$pr->{'path'}" to get the path to project
GIT_DIR, it was used "$projectroot/$project" which is valid only
for actions where project parameter is set, and 'project_index' is not
one of them.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoFix infinite loop when deleting multiple packed refs.
Junio C Hamano [Tue, 2 Jan 2007 19:19:05 +0000 (11:19 -0800)]
Fix infinite loop when deleting multiple packed refs.

It was stupid to link the same element twice to lock_file_list
and end up in a loop, so we certainly need a fix.

But it is not like we are taking a lock on multiple files in
this case.  It is just that we leave the linked element on the
list even after commit_lock_file() successfully removes the
cruft.

We cannot remove the list element in commit_lock_file(); if we
are interrupted in the middle of list manipulation, the call to
remove_lock_file_on_signal() will happen with a broken list
structure pointed by lock_file_list, which would cause the cruft
to remain, so not removing the list element is the right thing
to do.  Instead we should be reusing the element already on the
list.

There is already a code for that in lock_file() function in
lockfile.c.  The code checks lk->next and the element is linked
only when it is not already on the list -- which is incorrect
for the last element on the list (which has NULL in its next
field), but if you read the check as "is this element already on
the list?" it actually makes sense.  We do not want to link it
on the list again, nor we would want to set up signal/atexit
over and over.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoImprove cached content header of status output
Jürgen Rühle [Tue, 2 Jan 2007 19:26:21 +0000 (20:26 +0100)]
Improve cached content header of status output

This tries to be more to the point while also including a pointer on how to
unstage changes from the index.

Since this header is printed in two different code paths and the name of the
reference commit is needed for the unstage part, provide a new printing
function.

Signed-off-by: Jürgen Rühle <j-r@online.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoSupport --amend on initial commit in status output
Jürgen Rühle [Tue, 2 Jan 2007 19:26:23 +0000 (20:26 +0100)]
Support --amend on initial commit in status output

We check the existence of the parent commit to determine whether the status is
requested for an initial commit. Since the parent commit depends on the
presence of the --amend switch do initial commit detection after command line
arguments have been handled.

Signed-off-by: Jürgen Rühle <j-r@online.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoImprove "nothing to commit" part of status output
Jürgen Rühle [Tue, 2 Jan 2007 19:26:22 +0000 (20:26 +0100)]
Improve "nothing to commit" part of status output

Previously git-status in a clean working directory would advice the user to use
git add. This isn't very helpful when there is nothing to add in the working
directory, therefore note a clean working directory while displaying the other
sections and print the appropriate message for each case.

Signed-off-by: Jürgen Rühle <j-r@online.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoClarify syntax and role of git-add in status output
Jürgen Rühle [Tue, 2 Jan 2007 19:26:20 +0000 (20:26 +0100)]
Clarify syntax and role of git-add in status output

This uses the actual (simplified) synopsis line from the git-add man page and
advertises its incremental nature.

Signed-off-by: Jürgen Rühle <j-r@online.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agosend pack check for failure to send revisions list
Andy Whitcroft [Tue, 2 Jan 2007 14:12:09 +0000 (14:12 +0000)]
send pack check for failure to send revisions list

When passing the revisions list to pack-objects we do not check for
errors nor short writes.  Introduce a new write_in_full which will
handle short writes and report errors to the caller.  Use this to
short cut the send on failure, allowing us to wait for and report
the child in case the failure is its fault.

Signed-off-by: Andy Whitcroft <apw@shadowen.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoinstaweb: load Apache mime and dir modules if they are needed
Eric Wong [Tue, 2 Jan 2007 08:57:11 +0000 (00:57 -0800)]
instaweb: load Apache mime and dir modules if they are needed

I've noticed that Apache 2.2 on a Debian etch machine has
these compiled as modules.

Also set ServerName to avoid a warning at startup.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agofetch-pack: do not use lockfile structure on stack.
Junio C Hamano [Tue, 2 Jan 2007 19:22:08 +0000 (11:22 -0800)]
fetch-pack: do not use lockfile structure on stack.

They are used in atexit() for clean-up, and you will be
accessing unallocated memory at that point.

See 31f584c2 for the fix for a similar problem.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoRemove unused variable (git-commit.sh)
Junio C Hamano [Tue, 2 Jan 2007 07:42:53 +0000 (23:42 -0800)]
Remove unused variable (git-commit.sh)

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoUpdate clone/fetch documentation with --depth (shallow clone) option
Junio C Hamano [Mon, 1 Jan 2007 23:08:06 +0000 (15:08 -0800)]
Update clone/fetch documentation with --depth (shallow clone) option

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoStrongly discourage --update-head-ok in fetch-options documentation.
Junio C Hamano [Mon, 1 Jan 2007 23:07:35 +0000 (15:07 -0800)]
Strongly discourage --update-head-ok in fetch-options documentation.

"Use it with care" is a wrong wording to say "this is purely internal
and you are supposed to know what you are doing if you use this".

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoMerge branch 'sp/merge' (early part)
Junio C Hamano [Mon, 1 Jan 2007 22:40:37 +0000 (14:40 -0800)]
Merge branch 'sp/merge' (early part)

* 'sp/merge' (early part):
  Use merge-recursive in git-am -3.
  Allow merging bare trees in merge-recursive.
  Move better_branch_name above get_ref in merge-recursive.

14 years agoDocumentation: remove master:origin example from pull-fetch-param.txt
J. Bruce Fields [Mon, 1 Jan 2007 21:40:23 +0000 (16:40 -0500)]
Documentation: remove master:origin example from pull-fetch-param.txt

This is no longer a useful example.

Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoDocumentation: update git-pull.txt for new clone behavior
J. Bruce Fields [Mon, 1 Jan 2007 21:39:06 +0000 (16:39 -0500)]
Documentation: update git-pull.txt for new clone behavior

Update examples, stop using branch named "origin" as an example.
Remove large example of use of remotes; that particular case is
nicely automated by default, so it's not so pressing to explain, and
we can refer to git-repo-config for the details.

Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogit-fetch: remove .keep file at the end.
Junio C Hamano [Mon, 1 Jan 2007 20:24:15 +0000 (12:24 -0800)]
git-fetch: remove .keep file at the end.

Removal of them is needed regardless of errors.  The original
code had the removal outside of the process which sets the flag
to tell the later step what to remove, but it runs as a
downstream of a pipeline and its effect was lost.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agofail pull/merge early in the middle of conflicted merge
Junio C Hamano [Mon, 1 Jan 2007 07:21:50 +0000 (23:21 -0800)]
fail pull/merge early in the middle of conflicted merge

After a pull that results in a conflicted merge, a new user
often tries another "git pull" in desperation.  When the index
is unmerged, merge backends correctly bail out without touching
either index nor the working tree, so this does not make the
wound any worse.

The user will however see several lines of messsages during this
process, such as "filename: needs merge", "you need to resolve
your current index first", "Merging...", and "Entry ... would be
overwritten by merge. Cannot merge.".  They are unnecessarily
alarming, and cause useful conflict messages from the first pull
scroll off the top of the terminal.

This changes pull and merge to run "git-ls-files -u" upfront and
stop them much earlier than we currently do.  Old timers may
know better and would not to try pulling again before cleaning
things up; this change adds extra overhead that is unnecessary
for them.  But this would be worth paying for to save new people
from needless confusion.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoUpdate send-pack pipeline documentation.
Junio C Hamano [Mon, 1 Jan 2007 20:07:26 +0000 (12:07 -0800)]
Update send-pack pipeline documentation.

The pipeline was much more complex and needed documentation, but
now it is trivial and straightforward.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogit-svn: t/t91??-*: optimize the tests a bit
Eric Wong [Mon, 1 Jan 2007 05:49:47 +0000 (21:49 -0800)]
git-svn: t/t91??-*: optimize the tests a bit

This removes some unnecessary 'svn up' calls throughout

t9103-git-svn-graft-branches.sh:
  * removed an 'svn log' call that was leftover from debugging
  * removed multiple git-svn calls with a multi-init / multi-fetch
    combination (which weren't tested before, either)
  * replaced `rev-list ... | head -n1` with `rev-parse ...`
    (not sure what I was thinking when I wrote that)

All this saves about 9 seconds from a test run
(53s -> 44s for 'make t91*') on my 1.3GHz Athlon

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogit-svn: t/t9100-git-svn-basic: remove old check for NO_SYMLINK
Eric Wong [Mon, 1 Jan 2007 05:49:46 +0000 (21:49 -0800)]
git-svn: t/t9100-git-svn-basic: remove old check for NO_SYMLINK

We don't support the svn command-line client anymore; nor
do we support anything before SVN 1.1.0, so we can be certain
symlinks will be supported in the SVN repository.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogit-svn: remove svnadmin dependency from the tests
Eric Wong [Mon, 1 Jan 2007 05:49:45 +0000 (21:49 -0800)]
git-svn: remove svnadmin dependency from the tests

We require the libraries now, so we can create repositories
using them (and save some executable load time while we're at
it).

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoi18n: do not leak 'encoding' header even when we cheat the conversion.
Junio C Hamano [Mon, 1 Jan 2007 02:18:23 +0000 (18:18 -0800)]
i18n: do not leak 'encoding' header even when we cheat the conversion.

We special case the case where encoding recorded in the commit
and the output encoding are the same and do not call iconv().
But we should drop 'encoding' header for this case as well for
consistency.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoDo not merge random set of refs out of wildcarded refs
Junio C Hamano [Mon, 1 Jan 2007 01:44:37 +0000 (17:44 -0800)]
Do not merge random set of refs out of wildcarded refs

When your fetch configuration has only the wildcards, we would
pick the lexicographically first ref from the remote side for
merging, which was complete nonsense.  Make sure nothing except
the one that is specified with branch.*.merge is merged in this
case.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoFix formatting for urls section of fetch, pull, and push manpages
Theodore Tso [Sun, 31 Dec 2006 04:11:52 +0000 (23:11 -0500)]
Fix formatting for urls section of fetch, pull, and push manpages

Updated to make the nroff'ed man pages look nicer.

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoDocumentation: update tutorial's discussion of origin
J. Bruce Fields [Sun, 31 Dec 2006 23:47:38 +0000 (18:47 -0500)]
Documentation: update tutorial's discussion of origin

Update tutorial's discussion of origin branch to reflect new defaults,
and include a brief mention of git-repo-config.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoDocumentation: update glossary entry for "origin"
J. Bruce Fields [Sun, 31 Dec 2006 23:47:36 +0000 (18:47 -0500)]
Documentation: update glossary entry for "origin"

Update glossary entry for "origin" to reflect fact that it normally now refers
to a remote repository, not a branch.

Also, warning not to work on remote-tracking branches is no longer necessary
since git doesn't allow that.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoDocumentation: update git-clone.txt for clone's new default behavior
J. Bruce Fields [Sun, 31 Dec 2006 23:47:34 +0000 (18:47 -0500)]
Documentation: update git-clone.txt for clone's new default behavior

Fix a couple remaining references to the origin branch.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoDocs: update cvs-migration.txt to reflect clone's new default behavior
J. Bruce Fields [Sun, 31 Dec 2006 23:47:33 +0000 (18:47 -0500)]
Docs: update cvs-migration.txt to reflect clone's new default behavior

I couldn't think of a really quick way to give all the details, so just refer
readers to the git-repo-config man page instead.

I haven't tested recent cvs import behavior--some time presumably it should be
updated to do something more similar to clone.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agosend-pack: tell pack-objects to use its internal rev-list.
Junio C Hamano [Sun, 31 Dec 2006 09:26:53 +0000 (01:26 -0800)]
send-pack: tell pack-objects to use its internal rev-list.

This means one less process in the pipeline to worry about, and
removes about 1/8 of the code.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agosend-pack.c: use is_null_sha1()
Junio C Hamano [Sun, 31 Dec 2006 08:59:53 +0000 (00:59 -0800)]
send-pack.c: use is_null_sha1()

Everybody else uses is_null_sha1() -- there is no point to have its
own is_zero_sha1() anymore.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoUpdate documentation for update hook.
Junio C Hamano [Sun, 31 Dec 2006 08:52:25 +0000 (00:52 -0800)]
Update documentation for update hook.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoMerge branch 'jc/send-pack-pipeline'
Junio C Hamano [Sun, 31 Dec 2006 08:31:26 +0000 (00:31 -0800)]
Merge branch 'jc/send-pack-pipeline'

* jc/send-pack-pipeline:
  Documentation: illustrate send-pack pipeline.
  send-pack: fix pipeline.

14 years agoAdd test case for update hooks in receive-pack.
Shawn O. Pearce [Sun, 31 Dec 2006 07:20:23 +0000 (02:20 -0500)]
Add test case for update hooks in receive-pack.

Verify that the update hooks work as documented/advertised.  This is
a simple set of tests to check that the update hooks run with the
parameters expected, have their STDOUT and STDERR redirected to
the client side of the connection, and that their STDIN does not
contain any data (as its actually /dev/null).

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoUpdate packedGit config option documentation.
Shawn O. Pearce [Sun, 31 Dec 2006 03:13:43 +0000 (22:13 -0500)]
Update packedGit config option documentation.

Corrected minor typos and documented the new k/m/g suffix for
core.packedGitWindowSize and core.packedGitLimit.

[jc: with a minor markup fix.]

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoMerge branch 'master' into sp/mmap
Junio C Hamano [Sun, 31 Dec 2006 06:42:43 +0000 (22:42 -0800)]
Merge branch 'master' into sp/mmap

* master:
  Documentation/config.txt (and repo-config manpage): mark-up fix.
  Teach Git how to parse standard power of 2 suffixes.
  Use /dev/null for update hook stdin.
  Redirect update hook stdout to stderr.
  Remove unnecessary argc parameter from run_command_v.
  Automatically detect a bare git repository.
  Replace "GIT_DIR" with GIT_DIR_ENVIRONMENT.
  Use PATH_MAX constant for --bare.
  Force core.filemode to false on Cygwin.
  Fix formatting for urls section of fetch, pull, and push manpages
  Fix yet another subtle xdl_merge() bug
  i18n: drop "encoding" header in the output after re-coding.
  commit-tree: cope with different ways "utf-8" can be spelled.
  Move commit reencoding parameter parsing to revision.c
  Documentation: minor rewording for git-log and git-show pages.
  Documentation: i18n commit log message notes.
  t3900: test log --encoding=none
  commit re-encoding: fix confusion between no and default conversion.

14 years agoDocumentation/config.txt (and repo-config manpage): mark-up fix.
Junio C Hamano [Sun, 31 Dec 2006 06:39:24 +0000 (22:39 -0800)]
Documentation/config.txt (and repo-config manpage): mark-up fix.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoTeach Git how to parse standard power of 2 suffixes.
Shawn O. Pearce [Sun, 31 Dec 2006 03:13:05 +0000 (22:13 -0500)]
Teach Git how to parse standard power of 2 suffixes.

Sometimes its necessary to supply a value as a power of two in a
configuration parameter.  In this case the user may want to use the
standard suffixes such as K, M, or G to indicate that the numerical
value should be multiplied by a constant base before being used.

Shell scripts/etc. can also benefit from this automatic option
parsing with `git repo-config --int`.

[jc: with a couple of test and a slight input tightening]

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoUse /dev/null for update hook stdin.
Shawn O. Pearce [Sun, 31 Dec 2006 02:55:22 +0000 (21:55 -0500)]
Use /dev/null for update hook stdin.

Currently the update hook invoked by receive-pack has its stdin
connected to the pushing client.  The hook shouldn't attempt to
read from this stream, and doing so may consume data that was
meant for receive-pack.  Instead we should give the update hook
/dev/null as its stdin, ensuring that it always receives EOF and
doesn't disrupt the protocol if it attempts to read any data.

The post-update hook is similar, as it gets invoked with /dev/null
on stdin to prevent the hook from reading data from the client.
Previously we had invoked it with stdout also connected to /dev/null,
throwing away anything on stdout, to prevent client protocol errors.
Instead we should redirect stdout to stderr, like we do with the
update hook.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoRedirect update hook stdout to stderr.
Shawn O. Pearce [Sun, 31 Dec 2006 02:55:19 +0000 (21:55 -0500)]
Redirect update hook stdout to stderr.

If an update hook outputs to stdout then that output will be sent
back over the wire to the push client as though it were part of
the git protocol.  This tends to cause protocol errors on the
client end of the connection, as the hook output is not expected
in that context.  Most hook developers work around this by making
sure their hook outputs everything to stderr.

But hooks shouldn't need to perform such special behavior.  Instead
we can just dup stderr to stdout prior to invoking the update hook.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoRemove unnecessary argc parameter from run_command_v.
Shawn O. Pearce [Sun, 31 Dec 2006 02:55:15 +0000 (21:55 -0500)]
Remove unnecessary argc parameter from run_command_v.

The argc parameter is never used by the run_command_v family of
functions.  Instead they require that the passed argv[] be NULL
terminated so they can rely on the operating system's execvp
function to correctly pass the arguments to the new process.

Making the caller pass the argc is just confusing, as the caller
could be mislead into believing that the argc might take precendece
over the argv, or that the argv does not need to be NULL terminated.
So goodbye argc.  Don't come back.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoAutomatically detect a bare git repository.
Shawn O. Pearce [Sun, 31 Dec 2006 04:30:19 +0000 (23:30 -0500)]
Automatically detect a bare git repository.

Many users find it unfriendly that they can create a bare git
repository easily with `git clone --bare` but are then unable to
run simple commands like `git log` once they cd into that newly
created bare repository.  This occurs because we do not check to
see if the current working directory is a git repository.

Instead of failing out with "fatal: Not a git repository" we should
try to automatically detect if the current working directory is
a bare repository and use that for GIT_DIR, and fail out only if
that doesn't appear to be true.

We test the current working directory only after we have tried
searching up the directory tree.  This is to retain backwards
compatibility with our previous behavior on the off chance that
a user has a 'refs' and 'objects' subdirectories and a 'HEAD'
file that looks like a symref, all stored within a repository's
associated working directory.

This change also consolidates the validation logic between the case
of GIT_DIR being supplied and GIT_DIR not being supplied, cleaning
up the code.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoReplace "GIT_DIR" with GIT_DIR_ENVIRONMENT.
Shawn O. Pearce [Sun, 31 Dec 2006 04:29:11 +0000 (23:29 -0500)]
Replace "GIT_DIR" with GIT_DIR_ENVIRONMENT.

We tend to use the nice constant GIT_DIR_ENVIRONMENT when we
are referring to the "GIT_DIR" constant, but git.c didn't do
so.  Now it does.

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