Code

git.git
17 years agouser-manual: typo fix
J. Bruce Fields [Mon, 29 Jan 2007 05:33:57 +0000 (00:33 -0500)]
user-manual: typo fix

Oops

Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
17 years agouser-manual: add references to git-config man page
J. Bruce Fields [Mon, 29 Jan 2007 05:17:51 +0000 (00:17 -0500)]
user-manual: add references to git-config man page

Direct editing of config files may be more natural for users than using
the git-config commandline; but we should still reference the
git-config man page when we describe such editing, so people know where
to go for details on the config file syntax and meanings of the
variables.

Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
17 years agouser-manual: repo-config -> config
J. Bruce Fields [Mon, 29 Jan 2007 04:50:22 +0000 (23:50 -0500)]
user-manual: repo-config -> config

Looks like we're going to allow git-config as the preferred alias to
git-repo-config, so let's document that instead.

Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
17 years agouser-manual: fsck-objects -> fsck
J. Bruce Fields [Mon, 29 Jan 2007 04:31:47 +0000 (23:31 -0500)]
user-manual: fsck-objects -> fsck

There seems to be an agreement to rename fsck-objects to fsck.

Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
17 years agouser-manual: git-fsck, dangling objects
J. Bruce Fields [Mon, 29 Jan 2007 04:29:19 +0000 (23:29 -0500)]
user-manual: git-fsck, dangling objects

Initial import of fsck and dangling objects discussion, mostly lifted from
an email from Linus.

Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
17 years agouser-manual: reorganize fetch discussion, add internals, etc.
J. Bruce Fields [Sat, 27 Jan 2007 06:03:07 +0000 (01:03 -0500)]
user-manual: reorganize fetch discussion, add internals, etc.

Keep git remote discussion in the first chapter, but postpone
lower-level git fetch usage (to fetch individual branches) till later.

Import a bunch of slightly modified text from the readme to give an
architectural overview at the end.

Add more discussion of history rewriting.

And a bunch of other miscellaneous changes....

Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
17 years agouser-manual: stub discussion of fsck and reflog
J. Bruce Fields [Fri, 26 Jan 2007 05:17:12 +0000 (00:17 -0500)]
user-manual: stub discussion of fsck and reflog

Have some sort of recovery/reliability section that deals with reflog
and fsck.

Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
17 years agouser-manual: update git-gc discussion
J. Bruce Fields [Mon, 22 Jan 2007 04:03:36 +0000 (23:03 -0500)]
user-manual: update git-gc discussion

It appears git-gc will no longer prune automatically, so we don't
need to tell people not to do other stuff while running it.

Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
17 years agouser-manual: update references discussion
J. Bruce Fields [Mon, 22 Jan 2007 03:31:07 +0000 (22:31 -0500)]
user-manual: update references discussion

Since references may be packed, it's no longer as helpful to
introduce references as paths relative to .git.

Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
17 years agouser-manual: clarify difference between tag and branch
J. Bruce Fields [Mon, 22 Jan 2007 03:14:39 +0000 (22:14 -0500)]
user-manual: clarify difference between tag and branch

Explain the difference (well, one of the differences) between a tag
and a branch.

Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
17 years agouser-manual: minor quickstart reorganization
J. Bruce Fields [Mon, 22 Jan 2007 03:02:34 +0000 (22:02 -0500)]
user-manual: minor quickstart reorganization

Move around some stuff in the quickstart, add "push" examples.

Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
17 years agouser-manual: add "quick start" as chapter 1
J. Bruce Fields [Sun, 21 Jan 2007 02:41:48 +0000 (21:41 -0500)]
user-manual: add "quick start" as chapter 1

Add a "quick start" guide, modelled after Mercurial's, as the
first chapter.

Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
17 years agouser-manual: rewrap, fix heading levels
J. Bruce Fields [Mon, 15 Jan 2007 03:43:47 +0000 (22:43 -0500)]
user-manual:  rewrap, fix heading levels

Fix some heading levels that prevented compile; rewrap some stuff.

Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
17 years agoMerge branch 'master' of git://git.kernel.org/pub/scm/git/git
J. Bruce Fields [Mon, 15 Jan 2007 00:27:28 +0000 (19:27 -0500)]
Merge branch 'master' of git://git./git/git

17 years agouser-manual: reindent
J. Bruce Fields [Sun, 14 Jan 2007 21:29:40 +0000 (16:29 -0500)]
user-manual: reindent

Just some minor reindenting

Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
17 years agoMerge branch 'jc/int'
Junio C Hamano [Sun, 14 Jan 2007 20:04:25 +0000 (12:04 -0800)]
Merge branch 'jc/int'

* jc/int:
  More tests in t3901.
  Consistent message encoding while reusing log from an existing commit.
  t3901: test "format-patch | am" pipe with i18n
  Use log output encoding in --pretty=email headers.

17 years agoMerge branch 'sp/merge' (early part)
Junio C Hamano [Sun, 14 Jan 2007 20:03:53 +0000 (12:03 -0800)]
Merge branch 'sp/merge' (early part)

* 'sp/merge' (early part):
  Improve merge performance by avoiding in-index merges.

17 years agoMerge branch 'jc/subdir'
Junio C Hamano [Sun, 14 Jan 2007 19:41:36 +0000 (11:41 -0800)]
Merge branch 'jc/subdir'

* jc/subdir:
  Allow whole-tree operations to be started from a subdirectory
  Use cd_to_toplevel in scripts that implement it by hand.
  Define cd_to_toplevel shell function in git-sh-setup

17 years agoRemove read_or_die in favor of better error messages.
Shawn O. Pearce [Sun, 14 Jan 2007 06:01:49 +0000 (01:01 -0500)]
Remove read_or_die in favor of better error messages.

Originally I introduced read_or_die for the purpose of reading
the pack header and trailer, and I was too lazy to print proper
error messages.

Linus Torvalds <torvalds@osdl.org>:
> For a read error, at the very least you have to say WHICH FILE
> couldn't be read, because it's usually a matter of some file just
> being too short, not some system-wide problem.

and of course Linus is right. Make it so.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoHide output about SVN::Core not being found during tests.
Shawn O. Pearce [Sun, 14 Jan 2007 08:22:47 +0000 (03:22 -0500)]
Hide output about SVN::Core not being found during tests.

If the user doesn't have SVN::Core installed or working then the
SVN tests properly turn themselves off.  But the user doesn't need
to know that SVN::Core isn't loadable as a Perl module.  Unless of
course they are trying to debug the test, so lets relegate the Perl
failures to --verbose only.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agosimplify the "no changes added to commit" message
Nicolas Pitre [Sun, 14 Jan 2007 02:23:55 +0000 (21:23 -0500)]
simplify the "no changes added to commit" message

Suggesting the use of [-a|-i|-o] with git-commit is unnecessarily
complex and confusing.  In this context -o is totally useless and -i
requires extra arguments which are not mentioned.  The only sensible
hint (besides reading the man page but let's not go there) is
"commit -a".

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoMore tests in t3901.
Junio C Hamano [Sat, 13 Jan 2007 21:34:44 +0000 (13:34 -0800)]
More tests in t3901.

This adds tests for "cherry-pick" and "rebase --merge" (and
indirectly "commit -C" since it is used in the latter) to make
sure they create a new commit with correct encoding.

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoConsistent message encoding while reusing log from an existing commit.
Junio C Hamano [Sat, 13 Jan 2007 21:33:07 +0000 (13:33 -0800)]
Consistent message encoding while reusing log from an existing commit.

The following commands can reuse log message from an existing
commit while creating a new commit:

git-cherry-pick
git-rebase (both with and without --merge)
git-commit (-c and -C)

When the original commit was made in a different encoding from
the current i18n.commitencoding, "cat-file commit" would give a
string that is inconsistent with what the resulting commit will
claim to be in.  Replace them with "git show -s --encoding".

"git-rebase" without --merge is "git format-patch" piped to "git
am" in essence, and has been taken care of before this commit.

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agogit-commit documentation: -a adds and also removes
Junio C Hamano [Sat, 13 Jan 2007 20:26:13 +0000 (12:26 -0800)]
git-commit documentation: -a adds and also removes

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agot3901: test "format-patch | am" pipe with i18n
Junio C Hamano [Sat, 13 Jan 2007 09:20:53 +0000 (01:20 -0800)]
t3901: test "format-patch | am" pipe with i18n

This checks combinations of i18n.commitencoding (declares what
encoding you are feeding commit-tree to make commits) and
i18n.logoutputencoding (instructs what encoding to emit the
commit message out to log output, including e-mail format) to
make sure the "format-patch | am" pipe used in git-rebase works
correctly.

I suspect "git cherry-pick" and "git rebase --merge" may fail
similar tests.  We'll see.

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoUse log output encoding in --pretty=email headers.
Junio C Hamano [Sat, 13 Jan 2007 01:32:38 +0000 (17:32 -0800)]
Use log output encoding in --pretty=email headers.

Private functions add_rfc2047() and pretty_print_commit() assumed
they are only emitting UTF-8.

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agogit-remote: no longer silent on unknown commands.
Quy Tonthat [Sat, 13 Jan 2007 11:55:21 +0000 (22:55 +1100)]
git-remote: no longer silent on unknown commands.

Signed-off-by: Quy Tonthat <qtonthat@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agogit-svn: fix tests to work with older svn
Eric Wong [Sat, 13 Jan 2007 10:47:53 +0000 (02:47 -0800)]
git-svn: fix tests to work with older svn

Some of the recent changes and shortcuts to the tests broke
things for people using older versions of svn:

t9104-git-svn-follow-parent.sh:
  v1.2.3 (from SuSE 10.0 as reported by riddochc on #git
  (thanks!)) required an extra 'svn up'.  I was also able to
  reproduce this with v1.1.4 (Debian Sarge).

lib-git-svn.sh:
  SVN::Repos bindings in versions up to and including 1.1.4
  (Sarge again) do not pass fs-config options to the underlying
  library.  BerkeleyDB repositories also seem completely broken
  on all my Sarge machines; so not using FSFS does not seem to
  be an option for most people.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoAllow whole-tree operations to be started from a subdirectory
Junio C Hamano [Fri, 12 Jan 2007 20:52:03 +0000 (12:52 -0800)]
Allow whole-tree operations to be started from a subdirectory

This updates five commands (merge, pull, rebase, revert and cherry-pick)
so that they can be started from a subdirectory.

This may not actually be what we want to do.  These commands are
inherently whole-tree operations, and an inexperienced user may
mistakenly expect a "git pull" from a subdirectory would merge
only the subdirectory the command started from.

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoUse cd_to_toplevel in scripts that implement it by hand.
Junio C Hamano [Fri, 12 Jan 2007 20:49:05 +0000 (12:49 -0800)]
Use cd_to_toplevel in scripts that implement it by hand.

This converts scripts that do "cd $(rev-parse --show-cdup)" by
hand to use cd_to_toplevel.

I think git-fetch does not have to go to the toplevel, but that
should be dealt with in a separate patch.

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoDefine cd_to_toplevel shell function in git-sh-setup
Junio C Hamano [Fri, 12 Jan 2007 20:44:08 +0000 (12:44 -0800)]
Define cd_to_toplevel shell function in git-sh-setup

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoMake git-prune-packed a bit more chatty.
Junio C Hamano [Fri, 12 Jan 2007 23:00:13 +0000 (15:00 -0800)]
Make git-prune-packed a bit more chatty.

Steven Grimm noticed that git-repack's verbosity is inconsistent
because pack-objects is chatty and prune-packed is not.  This
makes the latter a bit more chatty and gives -q option to
squelch it.

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoglossary typofix
Junio C Hamano [Fri, 12 Jan 2007 22:13:53 +0000 (14:13 -0800)]
glossary typofix

Pointed out by Paul Witt <paul.witt@oxix.org>

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agouse 'init' instead of 'init-db' for shipped docs and tools
Nicolas Pitre [Fri, 12 Jan 2007 21:01:46 +0000 (16:01 -0500)]
use 'init' instead of 'init-db' for shipped docs and tools

While 'init-db' still is and probably will always remain a valid git
command for obvious backward compatibility reasons, it would be a good
idea to move shipped tools and docs to using 'init' instead.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoExplain "Not a git repository: '.git'".
Junio C Hamano [Fri, 12 Jan 2007 20:24:16 +0000 (12:24 -0800)]
Explain "Not a git repository: '.git'".

Andy Parkins noticed that the error message some "whole tree"
oriented commands emit is stated misleadingly when they refused
to run from a subdirectory.

We could probably allow some of them to work from a subdirectory
but that is a semantic change that could have unintended side
effects, so let's start at first by rewording the error message
to be easier to read without doing anything else to be safe.

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agomerge-recursive: do not report the resulting tree object name
Junio C Hamano [Fri, 12 Jan 2007 20:05:58 +0000 (12:05 -0800)]
merge-recursive: do not report the resulting tree object name

It is not available in the outermost merge, and it is only
useful for debugging merge-recursive in the inner merges.

Sergey Vlasov noticed that the old code accesses an
uninitialized location.

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agogit-revert: Fix die before git-sh-setup defines it.
Bob Proulx [Fri, 12 Jan 2007 06:45:38 +0000 (23:45 -0700)]
git-revert: Fix die before git-sh-setup defines it.

The code previously checked it's own name and called 'die' upon
an error.  However 'die' was not yet defined because git-sh-setup
had not been sourced yet.  Instead simply write the error message
to stderr and exit with an error as was originally desired.

Signed-off-by: Bob Proulx <bob@proulx.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agofix documentation for git-commit --no-verify
Michael S. Tsirkin [Fri, 12 Jan 2007 07:49:35 +0000 (09:49 +0200)]
fix documentation for git-commit --no-verify

Despite what the documentation claims, git-commit does not check commit
for suspicious lines: all hooks are disabled by default,
and the pre-comit hook could be changed to do something else.

Signed-off-by: Michael S. Tsirkin <mst@mellanox.co.il>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoFix up totally buggered read_or_die()
Linus Torvalds [Fri, 12 Jan 2007 04:37:38 +0000 (20:37 -0800)]
Fix up totally buggered read_or_die()

The "read_or_die()" function would silently NOT die for a partial read,
and since it was of type "void" it obviously couldn't even return the
partial number of bytes read.

IOW, it was totally broken. This hopefully fixes it up.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoClean up write_in_full() users
Linus Torvalds [Fri, 12 Jan 2007 04:23:00 +0000 (20:23 -0800)]
Clean up write_in_full() users

With the new-and-improved write_in_full() semantics, where a partial write
simply always returns a real error (and always sets 'errno' when that
happens, including for the disk full case), a lot of the callers of
write_in_full() were just unnecessarily complex.

In particular, there's no reason to ever check for a zero length or
return: if the length was zero, we'll return zero, otherwise, if a disk
full resulted in the actual write() system call returning zero the
write_in_full() logic would have correctly turned that into a negative
return value, with 'errno' set to ENOSPC.

I really wish every "write_in_full()" user would just check against "<0"
now, but this fixes the nasty and stupid ones.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoreflog-expire: brown paper bag fix.
Junio C Hamano [Fri, 12 Jan 2007 03:56:43 +0000 (19:56 -0800)]
reflog-expire: brown paper bag fix.

When --stale-fix is not passed, the code did not initialize the
two commit objects properly.

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoGIT v1.5.0-rc1 v1.5.0-rc1
Junio C Hamano [Fri, 12 Jan 2007 02:22:48 +0000 (18:22 -0800)]
GIT v1.5.0-rc1

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoplug a few leaks in revision walking used in describe.
Junio C Hamano [Thu, 11 Jan 2007 06:36:16 +0000 (22:36 -0800)]
plug a few leaks in revision walking used in describe.

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoChose better tag names in git-describe after merges.
Shawn O. Pearce [Wed, 10 Jan 2007 11:39:47 +0000 (06:39 -0500)]
Chose better tag names in git-describe after merges.

Recently git.git itself encountered a situation on its master and
next branches where git-describe stopped reporting 'v1.5.0-rc0-gN'
and instead started reporting 'v1.4.4.4-gN'.  This appeared to be
a backward jump in version numbering.

  maint     o-------------------4
            \                    \
  master     o-o-o-o-o-o-o-5-o-C-o-W

The issue is that commit C in the diagram claims it is version
1.5.0, as the tag v1.5.0 is placed on commit 5.  Yet commit W
claims it is version 1.4.4.4 as the tag v1.5.0 has an older tag
date than the v1.4.4.4 tag.

As it turns out this situation is very common.  A bug fix applied
to maint and later merged into master occurs frequently enough that
it should Just Work Right(tm).

Rather than taking the first tag that gets found git-describe will
now generate a list of all possible tags and select the one which
has the most number of commits in common with HEAD (or whatever
revision the user requested the description of).

This rule is based on the principle shown in the diagram above.
There are a large number of commits on the primary development branch
'master' which do not appear in the 'maint' branch, and many of
these are already tagged as part of v1.5.0-rc0.  Additionally these
commits are not in v1.4.4.4, as they are part of the v1.5.0 release
still being developed.  The v1.5.0-rc0 tag is more descriptive of
W than v1.4.4.4 is, and therefore should be used.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoMerge branch 'jc/bare'
Junio C Hamano [Fri, 12 Jan 2007 00:50:36 +0000 (16:50 -0800)]
Merge branch 'jc/bare'

* jc/bare:
  Disallow working directory commands in a bare repository.
  git-fetch: allow updating the current branch in a bare repository.
  Introduce is_bare_repository() and core.bare configuration variable
  Move initialization of log_all_ref_updates

17 years agoMerge branch 'ar/merge-recursive'
Junio C Hamano [Fri, 12 Jan 2007 00:48:28 +0000 (16:48 -0800)]
Merge branch 'ar/merge-recursive'

* ar/merge-recursive:
  merge-recursive: do not use on-file index when not needed.
  Speed-up recursive by flushing index only once for all entries

17 years agoMerge branch 'jc/detached-head'
Junio C Hamano [Fri, 12 Jan 2007 00:47:34 +0000 (16:47 -0800)]
Merge branch 'jc/detached-head'

* jc/detached-head:
  git-checkout: handle local changes sanely when detaching HEAD
  git-checkout: safety check for detached HEAD checks existing refs
  git-checkout: fix branch name output from the command
  git-checkout: safety when coming back from the detached HEAD state.
  git-checkout: rewording comments regarding detached HEAD.
  git-checkout: do not warn detaching HEAD when it is already detached.
  Detached HEAD (experimental)
  git-branch: show detached HEAD
  git-status: show detached HEAD

17 years agogit-status: wording update to deal with deleted files.
Junio C Hamano [Thu, 11 Jan 2007 23:34:41 +0000 (15:34 -0800)]
git-status: wording update to deal with deleted files.

If you do:

$ /bin/rm foo
$ git status

we used to say "git add ... to add content to commit".  But
suggsting "git add" to record the deletion of a file is simply
insane.

So this rewords various things:

 - The section header is the old "Changed but not updated",
   instead of "Changed but not added";

 - Suggestion is "git add ... to update what will be committed",
   instead of "... to add content to commit";

 - If there are removed paths, the above suggestion becomes "git
   add/rm ... to update what will be committed";

 - For untracked files, the suggestion is "git add ... to
   include in what will be committed".

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agogit-rm: do not fail on already removed file.
Junio C Hamano [Thu, 11 Jan 2007 22:58:47 +0000 (14:58 -0800)]
git-rm: do not fail on already removed file.

Often the user would do "/bin/rm foo" before telling git, but
then want to tell git about it.  "git rm foo" however would fail
because it cannot unlink(2) foo.

Treat ENOENT error return from unlink(2) as if a successful
removal happened.

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoAvoid errors and warnings when attempting to do I/O on zero bytes
Eric Wong [Thu, 11 Jan 2007 21:43:40 +0000 (13:43 -0800)]
Avoid errors and warnings when attempting to do I/O on zero bytes

Unfortunately, while {read,write}_in_full do take into account
zero-sized reads/writes; their die and whine variants do not.

I have a repository where there are zero-sized files in
the history that was triggering these things.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoBetter error messages for corrupt databases
Linus Torvalds [Thu, 11 Jan 2007 22:09:31 +0000 (14:09 -0800)]
Better error messages for corrupt databases

This fixes another problem that Andy's case showed: git-fsck-objects
reports nonsensical results for corrupt objects.

There were actually two independent and confusing problems:

 - when we had a zero-sized file and used map_sha1_file, mmap() would
   return EINVAL, and git-fsck-objects would report that as an insane and
   confusing error. I don't know when this was introduced, it might have
   been there forever.

 - when "parse_object()" returned NULL, fsck would say "object not found",
   which can be very confusing, since obviously the object might "exist",
   it's just unparseable because it's totally corrupt.

So this just makes "xmmap()" return NULL for a zero-sized object (which is
a valid thing pointer, exactly the same way "malloc()" can return NULL for
a zero-sized allocation). That fixes the first problem (but we could have
fixed it in the caller too - I don't personally much care whichever way it
goes, but maybe somebody should check that the NO_MMAP case does
something sane in this case too?).

And the second problem is solved by just making the error message slightly
clearer - the failure to parse an object may be because it's missing or
corrupt, not necessarily because it's not "found".

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoconfig-set: check write-in-full returns in set_multivar
Junio C Hamano [Thu, 11 Jan 2007 21:16:26 +0000 (13:16 -0800)]
config-set: check write-in-full returns in set_multivar

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoindex-pack: write-or-die instead of unchecked write-in-full.
Junio C Hamano [Thu, 11 Jan 2007 21:15:51 +0000 (13:15 -0800)]
index-pack: write-or-die instead of unchecked write-in-full.

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agowrite_in_full: really write in full or return error on disk full.
Linus Torvalds [Thu, 11 Jan 2007 21:04:11 +0000 (13:04 -0800)]
write_in_full: really write in full or return error on disk full.

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoDocument git-init
Junio C Hamano [Thu, 11 Jan 2007 20:58:10 +0000 (12:58 -0800)]
Document git-init

These days, the command does a lot more than just initialise the
object database (such as setting default config-variables,
installing template hooks...), and "git init" is actually a more
sensible name nowadays.

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agowrite-cache: do not leak the serialized cache-tree data.
Linus Torvalds [Thu, 11 Jan 2007 20:25:16 +0000 (12:25 -0800)]
write-cache: do not leak the serialized cache-tree data.

It is not used after getting written, and just is leaking every time
we write the index out.

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agouser-manual: replace init-db by init
J. Bruce Fields [Thu, 11 Jan 2007 17:44:08 +0000 (12:44 -0500)]
user-manual: replace init-db by init

Replace mentions of init-db by mentions of init.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
17 years agouser manual: answer some comments from Junio
J. Bruce Fields [Thu, 11 Jan 2007 04:23:37 +0000 (23:23 -0500)]
user manual: answer some comments from Junio

Junio left a few comments in his previous patch; deal with
each of them.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
17 years agoUser manual: fix typos in examples
Junio C Hamano [Thu, 11 Jan 2007 02:11:53 +0000 (18:11 -0800)]
User manual: fix typos in examples

Correct command line examples of repo-config, format-patch and am.

A full object name is 40-hexdigit; it may be 20-byte but
20-digit is misleading.

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoDocumentation: rev-list -> rev-parse, other typos, start examples
J. Bruce Fields [Thu, 11 Jan 2007 04:17:00 +0000 (23:17 -0500)]
Documentation: rev-list -> rev-parse, other typos, start examples

Fix some typos, start adding some more simple examples.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
17 years agoImprove merge performance by avoiding in-index merges.
Shawn O. Pearce [Thu, 28 Dec 2006 07:35:34 +0000 (02:35 -0500)]
Improve merge performance by avoiding in-index merges.

In the early days of Git we performed a 3-way read-tree based merge
before attempting any specific merge strategy, as our core merge
strategies of merge-one-file and merge-recursive were slower script
based programs which took far longer to execute.  This was a good
performance optimization in the past, as most merges were able to
be handled strictly by `read-tree -m -u`.

However now that merge-recursive is a C based program which performs
a full 3-way read-tree before it starts running we need to pay the
cost of the 3-way read-tree twice if we have to do any sort of file
level merging.  This slows down some classes of simple merges which
`read-tree -m -u` could not handle but which merge-recursive does
automatically.

For a really trivial merge which can be handled entirely by
`read-tree -m -u`, skipping the read-tree and just going directly
into merge-recursive saves on average 50 ms on my PowerPC G4 system.
May sound odd, but it does appear to be true.

In a really simple merge which needs to use merge-recursive to handle
a file that was modified on both branches, skipping the read-tree
in git-merge saves on average almost 100 ms (on the same PowerPC G4)
as we avoid doing some work twice.

We only avoid `read-tree -m -u` if the only strategy to use is
merge-recursive, as not all merge strategies perform as well as
merge-recursive does.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoDisallow working directory commands in a bare repository.
Shawn O. Pearce [Sun, 31 Dec 2006 04:32:38 +0000 (23:32 -0500)]
Disallow working directory commands in a bare repository.

If the user tries to run a porcelainish command which requires
a working directory in a bare repository they may get unexpected
results which are difficult to predict and may differ from command
to command.

Instead we should detect that the current repository is a bare
repository and refuse to run the command there, as there is no
working directory associated with it.

[jc: updated Shawn's original somewhat -- bugs are mine.]

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agomerge-recursive: do not use on-file index when not needed.
Junio C Hamano [Wed, 10 Jan 2007 19:20:58 +0000 (11:20 -0800)]
merge-recursive: do not use on-file index when not needed.

This revamps the merge-recursive implementation following the
outline in:

Message-ID: <7v8xgileza.fsf@assigned-by-dhcp.cox.net>

There is no need to write out the index until the very end just
once from merge-recursive.  Also there is no need to write out
the resulting tree object for the simple case of merging with a
single merge base.

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoSpeed-up recursive by flushing index only once for all entries
Alex Riesen [Thu, 4 Jan 2007 10:22:47 +0000 (11:22 +0100)]
Speed-up recursive by flushing index only once for all entries

The merge-recursive implementation in C inherited the invariant
that the on-file index file is written out and later read back
after any index operations and writing trees from the original
Python implementation.  But it was only because the original
implementation worked at the scripting level.

There is no need to write out the index file after handling
every path.

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoProvide better feedback for the untracked only case in status output
Jürgen Rühle [Wed, 10 Jan 2007 22:25:03 +0000 (23:25 +0100)]
Provide better feedback for the untracked only case in status output

Since 98bf8a47c296f51ea9722fef4bb81dbfb70cd4bb status would claim that
git-commit could be useful even if there are no changes except untracked files.

Since wt-status is already computing all the information needed go the whole
way and actually track the (non-)emptiness of all three sections separately,
unify the code, and provide useful messages for each individual case.

Thanks to Junio and Michael Loeffler for suggestions.

Signed-off-by: Jürgen Rühle <j-r@online.de>
17 years agoMerge branch 'js/reflog'
Junio C Hamano [Wed, 10 Jan 2007 22:16:16 +0000 (14:16 -0800)]
Merge branch 'js/reflog'

* js/reflog:
  Sanitize for_each_reflog_ent()

17 years agoMakefile: remove $foo when $foo.exe is built/installed.
Junio C Hamano [Wed, 10 Jan 2007 20:24:54 +0000 (12:24 -0800)]
Makefile: remove $foo when $foo.exe is built/installed.

On Cygwin, newly builtins are not recognized, because there exist both
the executable binaries (with .exe extension) _and_ the now-obsolete
scripts (without extension), but the script is executed.

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agosend-email: work around double encoding of in-body From field.
Jürgen Rühle [Wed, 10 Jan 2007 21:36:39 +0000 (13:36 -0800)]
send-email: work around double encoding of in-body From field.

git-send-email sends out the message taken from format-patch
output without quoting nor encoding.  When copying the From:
line to form in-body From: field, it should not copy it
verbatim, because the From: for the header is quoted according
to RFC 2047 when not ASCII.

The original came from Jürgen Rühle, but I moved the
string munging into a separate function so that later other
people can tweak it more easily.  Bugs introduced during the
translation are mine.

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoAdd git-init documentation.
Nicolas Pitre [Wed, 10 Jan 2007 17:56:41 +0000 (12:56 -0500)]
Add git-init documentation.

Oops. Commit 515377ea9ec6192f82a2fa5c5b5b7651d9d6cf6c missed one
file, git-init documentation.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoFix t1410 for core.filemode==false
Johannes Schindelin [Wed, 10 Jan 2007 12:22:50 +0000 (13:22 +0100)]
Fix t1410 for core.filemode==false

Since c869753e, core.filemode is hardwired to false on Cygwin.
So this test had no chance to succeed, since an early commit
(changing just the filemode) failed, and therefore all subsequent
tests.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoMake git-describe a builtin.
Shawn O. Pearce [Wed, 10 Jan 2007 11:36:36 +0000 (06:36 -0500)]
Make git-describe a builtin.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoDon't save the commit buffer in git-describe.
Shawn O. Pearce [Wed, 10 Jan 2007 11:36:29 +0000 (06:36 -0500)]
Don't save the commit buffer in git-describe.

The commit buffer (message of the commit) is not actually
used by the git-describe process.  We can save some memory
by not keeping it around.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoFix warnings in sha1_file.c - use C99 printf format if available
Pavel Roskin [Wed, 10 Jan 2007 04:07:11 +0000 (23:07 -0500)]
Fix warnings in sha1_file.c - use C99 printf format if available

Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years ago-u is now default for 'git-mailinfo'.
Junio C Hamano [Wed, 10 Jan 2007 05:31:36 +0000 (21:31 -0800)]
-u is now default for 'git-mailinfo'.

Originally from David Woodhouse, but also adjusts the callers of
mailinfo to the new default.

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years ago-u is now default for 'git-applymbox'
Junio C Hamano [Wed, 10 Jan 2007 05:20:01 +0000 (21:20 -0800)]
-u is now default for 'git-applymbox'

It has '-n' to disable it just in case, but do not even bother
documenting it.

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agogit-am: should work when "--no-utf8 --utf8" is given
Junio C Hamano [Wed, 10 Jan 2007 05:16:45 +0000 (21:16 -0800)]
git-am: should work when "--no-utf8 --utf8" is given

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agogit-checkout: handle local changes sanely when detaching HEAD
Junio C Hamano [Wed, 10 Jan 2007 04:39:09 +0000 (20:39 -0800)]
git-checkout: handle local changes sanely when detaching HEAD

When switching branches, we usually first try read-tree to make
sure that we do not lose the local changes and then updated the
HEAD using update-ref.  However, we detached and updated HEAD
before these checks, which was quite bad in a repository with
local changes.

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoDon't die in git-http-fetch when fetching packs.
Shawn O. Pearce [Wed, 10 Jan 2007 01:04:52 +0000 (20:04 -0500)]
Don't die in git-http-fetch when fetching packs.

My sp/mmap changes to pack-check.c modified the function such that
it expects packed_git.pack_size to be populated with the total
bytecount of the packfile by the caller.

But that isn't the case for packs obtained by git-http-fetch as
pack_size was not initialized before being accessed.  This caused
verify_pack to think it had 2^32-21 bytes available when the
downloaded pack perhaps was only 305 bytes in length.  The use_pack
function then later dies with "offset beyond end of packfile"
when computing the overall file checksum.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agogit-checkout: safety check for detached HEAD checks existing refs
Junio C Hamano [Wed, 10 Jan 2007 01:37:50 +0000 (17:37 -0800)]
git-checkout: safety check for detached HEAD checks existing refs

Checking for reachability from refs does not help much if the
state we are currently on is somewhere in the middle.  We will
lose where we were.

So this makes sureh that HEAD is something directly pointed at
by one of the existing refs (most likely a tag for a user who
has been "sightseeing").

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoUpdate git-svn manpage to remove the implication that SVN::* is optional.
Steven Grimm [Wed, 10 Jan 2007 00:20:17 +0000 (16:20 -0800)]
Update git-svn manpage to remove the implication that SVN::* is optional.

Now that git-svn requires the SVN::* Perl library, the manpage doesn't need
to describe what happens when you don't have it.

Signed-off-by: Steven Grimm <koreth@midwinter.com>
Acked-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoReplacing the system call pread() with lseek()/xread()/lseek() sequence.
Stefan-W. Hahn [Tue, 9 Jan 2007 21:04:12 +0000 (22:04 +0100)]
Replacing the system call pread() with lseek()/xread()/lseek() sequence.

Using cygwin with cygwin.dll before 1.5.22 the system call pread() is buggy.
This patch introduces NO_PREAD. If NO_PREAD is set git uses a sequence of
lseek()/xread()/lseek() to emulate pread.

Signed-off-by: Stefan-W. Hahn <stefan.hahn@s-hahn.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agogitweb: Fix git_patchset_body not closing <div class="patch">
Jakub Narebski [Tue, 9 Jan 2007 23:07:43 +0000 (00:07 +0100)]
gitweb: Fix git_patchset_body not closing <div class="patch">

Fix case when git_patchset_body didn't close <div class="patch">,
for patchsets with last patch empty.

This patch also removes some commented out code in git_patchset_body.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Acked-by: Luben Tuikov <ltuikov@yahoo.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agogit.el: Define the propertize function if needed, for XEmacs compatibility.
Alexandre Julliard [Tue, 9 Jan 2007 20:27:40 +0000 (21:27 +0100)]
git.el: Define the propertize function if needed, for XEmacs compatibility.

Also use `concat' instead of `format' in the pretty-printer since
format doesn't preserve properties under XEmacs.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agogit-clone: Make sure the master branch exists before running cat on it.
Alexandre Julliard [Tue, 9 Jan 2007 20:26:52 +0000 (21:26 +0100)]
git-clone: Make sure the master branch exists before running cat on it.

Otherwise we get an error like this on stderr:

  cat: [...]/.git/refs/remotes/origin/master: No such file or directory

which makes it look like git-clone failed.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agogit-apply: Remove directories that have become empty after deleting a file.
Alexandre Julliard [Tue, 9 Jan 2007 20:25:46 +0000 (21:25 +0100)]
git-apply: Remove directories that have become empty after deleting a file.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoget_tree_entry: map blank requested entry to tree root
Jeff King [Tue, 9 Jan 2007 16:11:47 +0000 (11:11 -0500)]
get_tree_entry: map blank requested entry to tree root

This means that
  git show HEAD:
will now return HEAD^{tree}, which is logically consistent with
  git show HEAD:Documentation

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agobuiltin-archive: do not free a tree held by the object layer.
Junio C Hamano [Tue, 9 Jan 2007 22:07:59 +0000 (14:07 -0800)]
builtin-archive: do not free a tree held by the object layer.

Found by running "git archive --format=tar HEAD" in Documentation/
directory.

It's surprising that nobody has noticed this from the beginning...

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoMerge branch 'maint'
Junio C Hamano [Tue, 9 Jan 2007 20:04:30 +0000 (12:04 -0800)]
Merge branch 'maint'

* maint:
  Fix "Do not ignore a detected patchfile brokenness."
  Do not ignore a detected patchfile brokenness.

17 years agoFix "Do not ignore a detected patchfile brokenness."
Junio C Hamano [Tue, 9 Jan 2007 19:50:53 +0000 (11:50 -0800)]
Fix "Do not ignore a detected patchfile brokenness."

Returning negative value from there does not stop the caller from using
the earlier part.

Noticed by Linus.

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoSanitize for_each_reflog_ent()
Johannes Schindelin [Mon, 8 Jan 2007 00:59:54 +0000 (01:59 +0100)]
Sanitize for_each_reflog_ent()

It used to ignore the return value of the helper function; now, it
expects it to return 0, and stops iteration upon non-zero return
values; this value is then passed on as the return value of
for_each_reflog_ent().

Further, it makes no sense to force the parsing upon the helper
functions; for_each_reflog_ent() now calls the helper function with
old and new sha1, the email, the timestamp & timezone, and the message.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoDo not ignore a detected patchfile brokenness.
Junio C Hamano [Tue, 9 Jan 2007 10:52:31 +0000 (02:52 -0800)]
Do not ignore a detected patchfile brokenness.

find_header() function is used to read and parse the patchfile
and it detects errors in the patch, but one place ignored the
error and went ahead, which was quite bad.

Noticed by Jeff Garzik.

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agomerge-base: do not leak commit list
Junio C Hamano [Tue, 9 Jan 2007 07:10:49 +0000 (23:10 -0800)]
merge-base: do not leak commit list

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoAuto-quote config values in config.c:store_write_pair()
Brian Gernhardt [Tue, 9 Jan 2007 05:27:41 +0000 (00:27 -0500)]
Auto-quote config values in config.c:store_write_pair()

Suggested by Jakub Narebski <jnareb@gmail.com> on the list.

When we send a value to store_write_pair(), make sure that the value
that gets read out matches the one passed in.  This means that for any
value that contains leading or trailing whitespace or any comment
character (# and ;), we need to surround it in quotes.

Signed-off-by: Brian Gernhardt <benji@silverinsanity.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoIgnore git-init and git-remote
Brian Gernhardt [Tue, 9 Jan 2007 05:27:33 +0000 (00:27 -0500)]
Ignore git-init and git-remote

These new commands weren't added to .gitignore.  Add them so we don't
end up with copies of them in the repo.

Signed-off-by: Brian Gernhardt <benji@silverinsanity.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agorm git-rerere.perl -- it is now a built-in.
Junio C Hamano [Tue, 9 Jan 2007 05:52:38 +0000 (21:52 -0800)]
rm git-rerere.perl -- it is now a built-in.

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agocvsserver: fix revision number during file adds
Martin Langhoff [Tue, 9 Jan 2007 02:10:41 +0000 (15:10 +1300)]
cvsserver: fix revision number during file adds

With this patch, cvs add / cvs commit echoes back to the client
the correct file version (1.1) so that the file in the checkout
is recognised as up-to-date.

Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agocvsserver: detect early of we are up to date and avoid costly rev-list
Martin Langhoff [Tue, 9 Jan 2007 02:10:32 +0000 (15:10 +1300)]
cvsserver: detect early of we are up to date and avoid costly rev-list

if the SHA1 of our head matches the last SHA1 seen in the DB, avoid further
processing.

[jc: an "Oops, please amend" patch rolled in]

Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoDocumentation: add git-remote man page
J. Bruce Fields [Tue, 9 Jan 2007 04:28:51 +0000 (23:28 -0500)]
Documentation: add git-remote man page

Add a preliminary man page for git-remote.

Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoDocumentation: begin discussion of git-remote in user manual
J. Bruce Fields [Tue, 9 Jan 2007 05:18:09 +0000 (00:18 -0500)]
Documentation: begin discussion of git-remote in user manual

Start discussion of git-remote.

Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
17 years agoDocumentation: reorder development section, todo's
J. Bruce Fields [Tue, 9 Jan 2007 04:42:36 +0000 (23:42 -0500)]
Documentation: reorder development section, todo's

Update todo's.  Split out "sharing development" section into a separate
chapter, reorder.

Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>