Code

git.git
17 years agoSuggest use of "git add file1 file2" when there is nothing to commit.
Shawn O. Pearce [Sat, 16 Dec 2006 02:53:09 +0000 (21:53 -0500)]
Suggest use of "git add file1 file2" when there is nothing to commit.

If a user modifies files and runs 'git commit' (without the very
useful -a option) and they have not yet updated the index they
are probably coming from another SCM-like tool which would perform
the same as 'git commit -a' in this case.  Showing the user their
current status and a final line of "nothing to commit" is not very
reassuring, as the user might believe that Git did not recognize
their files were modified.

Instead we can suggest as part of the 'nothing to commit' message
that the user invoke 'git add' to add files to their next commit.

Suggested by Andy Parkins' Git 'niggles' list
(<200612132237.10051.andyparkins@gmail.com>).

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoMake git-diff documentation use [--] when it should.
Brian Gernhardt [Fri, 15 Dec 2006 12:39:33 +0000 (07:39 -0500)]
Make git-diff documentation use [--] when it should.

Two of the cases has "[--] [<path>...]" and two had "-- [<path>...]".
Not terribly consistent and potentially confusing.  Also add "[--]" to
the synopsis so that it's obvious you can use it from the very
beginning.

Signed-off-by: Brian Gernhardt <benji@silverinsanity.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoAdd --add option to git-repo-config
Brian Gernhardt [Fri, 15 Dec 2006 12:39:04 +0000 (07:39 -0500)]
Add --add option to git-repo-config

For multivars, the "git-repo-config name value ^$" is useful but
nonintuitive and troublesome to do repeatedly (since the value is not
at the end of the command line).  This commit simply adds an --add
option that adds a new value to a multivar.  Particularly useful for
tracking a new branch on a remote:

git-repo-config --add remote.origin.fetch +next:origin/next

Includes documentation and test.

Signed-off-by: Brian Gernhardt <benji@silverinsanity.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoTeach bash the new features of 'git show'.
Shawn O. Pearce [Fri, 15 Dec 2006 07:20:03 +0000 (02:20 -0500)]
Teach bash the new features of 'git show'.

Now that 'git show' accepts ref:path as an argument to specify a
tree or blob we should use the same completion logic as we support
for cat-file's object identifier.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoExport PERL_PATH
Luben Tuikov [Fri, 15 Dec 2006 07:03:03 +0000 (23:03 -0800)]
Export PERL_PATH

PERL_PATH is used by perl/Makefile so export it.

Signed-off-by: Luben Tuikov <ltuikov@yahoo.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoEnable reflogs by default in any repository with a working directory.
Shawn O. Pearce [Thu, 14 Dec 2006 22:41:17 +0000 (17:41 -0500)]
Enable reflogs by default in any repository with a working directory.

New and experienced Git users alike are finding out too late that
they forgot to enable reflogs in the current repository, and cannot
use the information stored within it to recover from an incorrectly
entered command such as `git reset --hard HEAD^^^` when they really
meant HEAD^^ (aka HEAD~2).

So enable reflogs by default in all future versions of Git, unless
the user specifically disables it with:

  [core]
    logAllRefUpdates = false

in their .git/config or ~/.gitconfig.

We only enable reflogs in repositories that have a working directory
associated with them, as shared/bare repositories do not have
an easy means to prune away old log entries, or may fail logging
entirely if the user's gecos information is not valid during a push.
This heuristic was suggested on the mailing list by Junio.

Documentation was also updated to indicate the new default behavior.
We probably should start to teach usuing the reflog to recover
from mistakes in some of the tutorial material, as new users are
likely to make a few along the way and will feel better knowing
they can recover from them quickly and easily, without fsck-objects'
lost+found features.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoProvide more meaningful output from 'git init-db'.
Shawn O. Pearce [Fri, 15 Dec 2006 05:44:58 +0000 (00:44 -0500)]
Provide more meaningful output from 'git init-db'.

Back in the old days of Git when people messed around with their
GIT_DIR environment variable more often it was nice to know whether
or not git-init-db created a .git directory or used GIT_DIR.
As most users at that time were rather technical UNIXy folk the
message "defaulting to local storage area" made sense to some and
seemed reasonable.

But it doesn't really convey any meaning to the new Git user,
as they don't know what a 'local storage area is' nor do they
know enough about Git to care.  It also really doesn't tell the
experienced Git user a whole lot about the command they just ran,
especially if they might be reinitializing an existing repository
(e.g. to update hooks).

So now we print out what we did ("Initialized empty" or
"Reinitialized existing"), what type of repository ("" or "shared"),
and what location the repository will be in ("$GIT_DIR").

Suggested in part by Andy Parkins in his Git 'niggles' list
(<200612132237.10051.andyparkins@gmail.com>).

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agomake commit message a little more consistent and conforting
Nicolas Pitre [Fri, 15 Dec 2006 04:15:44 +0000 (23:15 -0500)]
make commit message a little more consistent and conforting

It is nicer to let the user know when a commit succeeded all the time,
not only the first time.  Also the commit sha1 is much more useful than
the tree sha1 in this case.

This patch also introduces a -q switch to supress this message as well
as the summary of created/deleted files.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoAvoid accessing a slow working copy during diffcore operations.
Shawn O. Pearce [Thu, 14 Dec 2006 11:15:57 +0000 (06:15 -0500)]
Avoid accessing a slow working copy during diffcore operations.

The Cygwin folks have done a fine job at creating a POSIX layer
on Windows That Just Works(tm).  However it comes with a penalty;
accessing files in the working tree by way of stat/open/mmap can
be slower for diffcore than inflating the data from a blob which
is stored in a packfile.

This performance problem is especially an issue in merge-recursive
when dealing with nearly 7000 added files, as we are loading
each file's content from the working directory to perform rename
detection.  I have literally seen (and sadly watched) paint dry in
less time than it takes for merge-recursive to finish such a merge.
On the other hand this very same merge runs very fast on Solaris.

If Git is compiled with NO_FAST_WORKING_DIRECTORY set then we will
avoid looking at the working directory when the blob in question
is available within a packfile and the caller doesn't need the data
unpacked into a temporary file.

We don't use loose objects as they have the same open/mmap/close
costs as the working directory file access, but have the additional
CPU overhead of needing to inflate the content before use.  So it
is still faster to use the working tree file over the loose object.

If the caller needs the file data unpacked into a temporary file
its likely because they are going to call an external diff program,
passing the file as a parameter.  In this case reusing the working
tree file will be faster as we don't need to inflate the data and
write it out to a temporary file.

The NO_FAST_WORKING_DIRECTORY feature is enabled by default on
Cygwin, as that is the platform which currently appears to benefit
the most from this option.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoMerge branch 'js/show'
Junio C Hamano [Sat, 16 Dec 2006 05:38:26 +0000 (21:38 -0800)]
Merge branch 'js/show'

* js/show:
  git-show: grok blobs, trees and tags, too

17 years agogit-show: grok blobs, trees and tags, too
Johannes Schindelin [Thu, 14 Dec 2006 10:31:05 +0000 (11:31 +0100)]
git-show: grok blobs, trees and tags, too

Since git-show is pure Porcelain, it is the ideal candidate to
pretty print other things than commits, too.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agogit-reset [--mixed] <tree> [--] <paths>...
Junio C Hamano [Thu, 14 Dec 2006 09:19:19 +0000 (01:19 -0800)]
git-reset [--mixed] <tree> [--] <paths>...

Sometimes it is asked on the list how to revert selected path in
the index from a tree, most often HEAD, without affecting the
files in the working tree.  A similar operation that also
affects the working tree files has been available in the form of
"git checkout <tree> -- <paths>...".

By definition --soft would never affect either the index nor the
working tree files, and --hard is the way to make the working
tree files as close to pristine, so this new option is available
only for the default --mixed case.

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agogit-reset: make it work from within a subdirectory.
Junio C Hamano [Thu, 14 Dec 2006 08:40:15 +0000 (00:40 -0800)]
git-reset: make it work from within a subdirectory.

If you typically sit in, say "src/", it's annoying to have to
change directory to do a reset.

This may need to be reworked when we add "git reset -- paths..."
to encapsulate the "ls-tree $tree | update-index --index-info"
pattern.

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agogit-fetch: make it work from within a subdirectory.
Junio C Hamano [Thu, 14 Dec 2006 08:36:23 +0000 (00:36 -0800)]
git-fetch: make it work from within a subdirectory.

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoINSTALL: no need to have GNU diff installed
Johannes Schindelin [Thu, 14 Dec 2006 10:40:21 +0000 (11:40 +0100)]
INSTALL: no need to have GNU diff installed

Since a long time, we have inbuilt diff generation.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoMerge branch 'maint'
Junio C Hamano [Thu, 14 Dec 2006 10:45:12 +0000 (02:45 -0800)]
Merge branch 'maint'

* maint:
  Bypass expensive content comparsion during rename detection.

17 years agoBypass expensive content comparsion during rename detection.
Shawn O. Pearce [Thu, 14 Dec 2006 10:07:46 +0000 (05:07 -0500)]
Bypass expensive content comparsion during rename detection.

When comparing file contents during the second loop through a rename
detection attempt we can skip the expensive byte-by-byte comparsion
if both source and destination files have valid SHA1 values.  This
improves performance by avoiding either an expensive open/mmap to
read the working tree copy, or an expensive inflate of a blob object.

Unfortunately we still have to at least initialize the sizes of the
source and destination files even if the SHA1 values don't match.
Failing to initialize the sizes causes a number of test cases to fail
and start reporting different copy/rename behavior than was expected.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoUpdate git-diff documentation
Junio C Hamano [Thu, 14 Dec 2006 08:03:18 +0000 (00:03 -0800)]
Update git-diff documentation

Porcelain documentation should talk in terms of end-user workflow, not
in terms of implementation details.  Do not suggest update-index, but
git-add instead.  Explain differences among 0-, 1- and 2-tree cases
not as differences of number of trees given to the command, but say
why user would want to give these number of trees to the command in
what situation.

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoMerge branch 'jc/diff--cached'
Junio C Hamano [Thu, 14 Dec 2006 07:55:42 +0000 (23:55 -0800)]
Merge branch 'jc/diff--cached'

* jc/diff--cached:
  Revert "git-diff: Introduce --index and deprecate --cached."

17 years agogit-svn: allow both diff.color and color.diff
Junio C Hamano [Wed, 13 Dec 2006 23:58:41 +0000 (15:58 -0800)]
git-svn: allow both diff.color and color.diff

The list concensus is to group color related configuration under
"color.*" so let's be consistent.

Inspired by Andy Parkins's patch to do the same for diff/log
family.  With fixes from Eric Wong.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agorepacked packs should be read-only
Nicolas Pitre [Wed, 13 Dec 2006 21:25:26 +0000 (16:25 -0500)]
repacked packs should be read-only

... just like the other pack creating tools do.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoconfig documentation: group color items together.
Junio C Hamano [Wed, 13 Dec 2006 20:11:03 +0000 (12:11 -0800)]
config documentation: group color items together.

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agogit-svn: correctly handle "(no author)" when using an authors file
Eric Wong [Tue, 12 Dec 2006 04:25:58 +0000 (20:25 -0800)]
git-svn: correctly handle "(no author)" when using an authors file

The low-level parts of the SVN library return NULL/undef for
author-less revisions, whereas "(no author)" is a (svn) client
convention.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoMerge branch 'jc/read-tree-ignore'
Junio C Hamano [Wed, 13 Dec 2006 19:10:24 +0000 (11:10 -0800)]
Merge branch 'jc/read-tree-ignore'

* jc/read-tree-ignore:
  read-tree: document --exclude-per-directory
  Loosen "working file will be lost" check in Porcelain-ish
  read-tree: further loosen "working file will be lost" check.

17 years agoMerge branch 'ew/rerere'
Junio C Hamano [Wed, 13 Dec 2006 19:08:35 +0000 (11:08 -0800)]
Merge branch 'ew/rerere'

* ew/rerere:
  rerere: record (or avoid misrecording) resolved, skipped or aborted rebase/am
  git-rerere: add 'gc' command.
  rerere: add clear, diff, and status commands

17 years agoMerge branch 'np/addcommit'
Junio C Hamano [Wed, 13 Dec 2006 19:08:20 +0000 (11:08 -0800)]
Merge branch 'np/addcommit'

* np/addcommit:
  git-commit: allow --only to lose what was staged earlier.
  Documentation/git-commit: rewrite to make it more end-user friendly.
  make 'git add' a first class user friendly interface to the index

17 years agoMerge branch 'lh/branch-rename'
Junio C Hamano [Wed, 13 Dec 2006 19:07:51 +0000 (11:07 -0800)]
Merge branch 'lh/branch-rename'

* lh/branch-rename:
  git-branch: let caller specify logmsg
  rename_ref: use lstat(2) when testing for symlink
  git-branch: add options and tests for branch renaming

Conflicts:

builtin-branch.c

17 years agoMerge branch 'jc/commit-careful'
Junio C Hamano [Wed, 13 Dec 2006 19:03:46 +0000 (11:03 -0800)]
Merge branch 'jc/commit-careful'

* jc/commit-careful:
  git-commit: show --summary after successful commit.

17 years agoMerge branch 'ap/clone-origin'
Junio C Hamano [Wed, 13 Dec 2006 19:03:33 +0000 (11:03 -0800)]
Merge branch 'ap/clone-origin'

* ap/clone-origin:
  Explicitly add the default "git pull" behaviour to .git/config on clone

17 years agoMerge branch 'jc/numstat'
Junio C Hamano [Wed, 13 Dec 2006 19:00:32 +0000 (11:00 -0800)]
Merge branch 'jc/numstat'

* jc/numstat:
  diff --numstat: show binary with '-' to match "apply --numstat"

17 years agoMerge branch 'rr/cvsexportcommit'
Junio C Hamano [Wed, 13 Dec 2006 19:00:27 +0000 (11:00 -0800)]
Merge branch 'rr/cvsexportcommit'

* rr/cvsexportcommit:
  Make cvsexportcommit work with filenames with spaces and non-ascii characters.

17 years agoMerge branch 'ap/branch'
Junio C Hamano [Wed, 13 Dec 2006 18:57:02 +0000 (10:57 -0800)]
Merge branch 'ap/branch'

* ap/branch:
  branch --color: change default color selection.
  Colourise git-branch output

17 years agobranch --color: change default color selection.
Junio C Hamano [Wed, 13 Dec 2006 18:55:21 +0000 (10:55 -0800)]
branch --color: change default color selection.

Showing local and remote branches in green and red was simply
overkill, as all we wanted was to make it easy to tell them
apart (local ones can be built on top by committing, but the
remote tracking ones can't).

Use plain coloring for local branches and paint remotes in red.

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoMerge branch 'js/merge'
Junio C Hamano [Wed, 13 Dec 2006 18:46:23 +0000 (10:46 -0800)]
Merge branch 'js/merge'

* js/merge:
  merge-recursive: add/add really is modify/modify with an empty base
  Get rid of the dependency on RCS' merge program
  merge-file: support -p and -q; fix compile warnings
  Add builtin merge-file, a minimal replacement for RCS merge
  xdl_merge(): fix and simplify conflict handling
  xdl_merge(): fix thinko
  xdl_merge(): fix an off-by-one bug
  merge-recursive: use xdl_merge().
  xmerge: make return value from xdl_merge() more usable.
  xdiff: add xdl_merge()

17 years agosend-pack: tighten checks for remote names
Junio C Hamano [Wed, 13 Dec 2006 18:30:11 +0000 (10:30 -0800)]
send-pack: tighten checks for remote names

"git push $URL HEAD~6" created a bogus ref HEAD~6 immediately
under $GIT_DIR of the remote repository.  While we should keep
refspecs that have arbitrary extended SHA-1 expression on the
source side working (e.g. "HEAD~6:refs/tags/yesterday"), we
should not create bogus ref on the other end.

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agogit-push: accept tag <tag> as advertised.
Junio C Hamano [Wed, 13 Dec 2006 18:03:39 +0000 (10:03 -0800)]
git-push: accept tag <tag> as advertised.

The documentation talked about "git push $URL tag <tag>" as a short-hand
for refs/tags/<tag>:refs/tags/<tag> for a long time but that was never
the case (the short-hand was for "git fetch").  Instead of fixing the
documentation, just add a bit of code to match it since it is easy to do
and would make it more consistent.

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agospurious .sp in manpages
Junio C Hamano [Wed, 13 Dec 2006 08:58:28 +0000 (00:58 -0800)]
spurious .sp in manpages

This is just a random hack to work around problems people seem
to be seeing in manpage backend of xmlto (it appears we are
getting ".sp" at the end of line without line break).

Could people test this out?

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agogit merge: reword failure message.
Junio C Hamano [Wed, 13 Dec 2006 17:32:40 +0000 (09:32 -0800)]
git merge: reword failure message.

99.9999% of the time, the command is used with a single
strategy; after a merge failure, saying "No strategy handled the
merge" is technically correct, but there is no point stressing
we tried and failed all the possibilities the user has given.

Just say that it failed.

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoRemove uncontested renamed files during merge.
Shawn Pearce [Wed, 13 Dec 2006 10:42:44 +0000 (05:42 -0500)]
Remove uncontested renamed files during merge.

Prior to 65ac6e9c3f47807cb603af07a6a9e1a43bc119ae we deleted a file
from the working directory during a merge if the file existed before
the merge started but was renamed by the branch being merged in.
This broke in 65ac6e as git-merge-recursive did not actually update
the working directory on an uncontested rename.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoRevert "git-diff: Introduce --index and deprecate --cached."
Junio C Hamano [Wed, 13 Dec 2006 09:33:43 +0000 (01:33 -0800)]
Revert "git-diff: Introduce --index and deprecate --cached."

This reverts commit 4c81c213a479e4aae0653a56ad6e8db5c31f019c.

Although --cached and --index are confusing wording, the use of
word --cached for git-diff is consistent with git-apply.  It means
"work with index without looking at the working tree".

We should probably come up with better wording for --cached, if
somebody wants to deprecate it.  But making --index and --cached
synonyms for diff while leaving them mean different things for
apply is no good.

17 years agoMerge branch 'maint'
Junio C Hamano [Wed, 13 Dec 2006 10:00:39 +0000 (02:00 -0800)]
Merge branch 'maint'

* maint:
  git-svn: correctly display fatal() error messages
  git-svn: exit with status 1 for test failures

Conflicts:

git-svn.perl

nothing to commit

17 years agogit-svn: correctly display fatal() error messages
Eric Wong [Tue, 12 Dec 2006 22:47:02 +0000 (14:47 -0800)]
git-svn: correctly display fatal() error messages

If I wanted to print $@, I'd pass $@ to fatal().  This looks like
a stupid typo on my part.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agogit-svn: exit with status 1 for test failures
Eric Wong [Sat, 25 Nov 2006 06:38:18 +0000 (22:38 -0800)]
git-svn: exit with status 1 for test failures

Some versions of the SVN libraries cause die() to exit with 255,
and 40cf043389ef4cdf3e56e7c4268d6f302e387fa0 tightened up
test_expect_failure to reject return values >128.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoAllow subcommand.color and color.subcommand color configuration
Andy Parkins [Wed, 13 Dec 2006 09:13:28 +0000 (09:13 +0000)]
Allow subcommand.color and color.subcommand color configuration

While adding colour to the branch command it was pointed out that a
config option like "branch.color" conflicts with the pre-existing
"branch.something" namespace used for specifying default merge urls and
branches.  The suggested solution was to flip the order of the
components to "color.branch", which I did for colourising branch.

This patch does the same thing for
  - git-log (color.diff)
  - git-status (color.status)
  - git-diff (color.diff)
  - pager (color.pager)

I haven't removed the old config options; but they should probably be
deprecated and eventually removed to prevent future namespace
collisions.  I've done this deprecation by changing the documentation
for the config file to match the new names; and adding the "color.XXX"
options to contrib/completion/git-completion.bash.

Unfortunately git-svn reads "diff.color" and "pager.color"; which I
don't like to change unilaterally.

Signed-off-by: Andy Parkins <andyparkins@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agogit-push: document removal of remote ref with :<dst> pathspec
Junio C Hamano [Wed, 13 Dec 2006 08:59:58 +0000 (00:59 -0800)]
git-push: document removal of remote ref with :<dst> pathspec

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agomerge-recursive: add/add really is modify/modify with an empty base
Johannes Schindelin [Wed, 13 Dec 2006 03:05:39 +0000 (04:05 +0100)]
merge-recursive: add/add really is modify/modify with an empty base

Unify the handling for cases C (add/add) and D (modify/modify).

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoMerge branch 'master' into js/merge
Junio C Hamano [Wed, 13 Dec 2006 05:52:19 +0000 (21:52 -0800)]
Merge branch 'master' into js/merge

* master: (42 commits)
  git-svn: correctly handle packed-refs in refs/remotes/
  add test case for recursive merge
  git-svn: correctly display fatal() error messages
  git-svn: allow dcommit to take an alternate head
  git-svn: enable logging of information not supported by git
  Clarify fetch error for missing objects.
  Move Fink and Ports check to after config file
  shortlog: fix segfault on empty authorname
  shortlog: remove "[PATCH]" prefix from shortlog output
  Make sure the empty tree exists when needed in merge-recursive.
  Don't use memcpy when source and dest. buffers may overlap
  no need to install manpages as executable
  Documentation: simpler shared repository creation
  shortlog: fix segfault on empty authorname
  Add branch.*.merge warning and documentation update
  Fix perl/ build.
  git-svn: use do_switch for --follow-parent if the SVN library supports it
  Fix documentation copy&paste typo
  git-svn: extra error check to ensure we open a file correctly
  Documentation: update git-clone man page with new behavior
  ...

17 years agoGet rid of the dependency on RCS' merge program
Johannes Schindelin [Tue, 12 Dec 2006 23:01:41 +0000 (00:01 +0100)]
Get rid of the dependency on RCS' merge program

Now that we have git-merge-file, an RCS merge lookalike, we no longer
need it. So long, merge, and thanks for all the fish!

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agogit-svn: correctly handle packed-refs in refs/remotes/
Eric Wong [Wed, 13 Dec 2006 00:45:00 +0000 (16:45 -0800)]
git-svn: correctly handle packed-refs in refs/remotes/

We now use git-rev-parse universally to read refs, instead
of our own file_to_s function (which I plan on removing).

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoMerge branch 'maint'
Junio C Hamano [Wed, 13 Dec 2006 01:07:33 +0000 (17:07 -0800)]
Merge branch 'maint'

* maint:
  Clarify fetch error for missing objects.
  Move Fink and Ports check to after config file

Conflicts:

Makefile

17 years agoadd test case for recursive merge
Junio C Hamano [Wed, 13 Dec 2006 00:36:16 +0000 (16:36 -0800)]
add test case for recursive merge

This test case is based on the bug report by Shawn Pearce.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agogit-svn: correctly display fatal() error messages
Eric Wong [Tue, 12 Dec 2006 22:47:02 +0000 (14:47 -0800)]
git-svn: correctly display fatal() error messages

If I wanted to print $@, I'd pass $@ to fatal().  This looks like
a stupid typo on my part.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agogit-svn: allow dcommit to take an alternate head
Eric Wong [Tue, 12 Dec 2006 22:47:01 +0000 (14:47 -0800)]
git-svn: allow dcommit to take an alternate head

Previously dcommit would unconditionally commit all patches
up-to and including the current HEAD.  Now if an optional
command-line argument is specified, it will only commit
up to the specified revision.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agogit-svn: enable logging of information not supported by git
Eric Wong [Tue, 12 Dec 2006 22:47:00 +0000 (14:47 -0800)]
git-svn: enable logging of information not supported by git

The changes are now tracked in
  $GIT_DIR/svn/$GIT_SVN_ID/untracked.log

Information in the untracked.log include:
  * the addition and removal of empty directories
    (changes of these will also warn the user)
  * file and directory property changes, including (but not
    limited to) svk:merge and svn:externals
  * revision properties (revprops) are also tracked
  * users will be warned of 'absent' file and directories
    (if users are forbidden access)

Fields in entries are separated by spaces; "unsafe" characters
are URI-encoded so that each entry takes exactly one line.

There is currently no automated parser for dealing with the data
in untracked.log, but it should be possible to write one to
create empty directories on checkout and manage
externals/subprojects.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoClarify fetch error for missing objects.
Alex Riesen [Tue, 12 Dec 2006 17:34:02 +0000 (18:34 +0100)]
Clarify fetch error for missing objects.

Otherwise there're such things like:

    Cannot obtain needed none 9a6e87b60dbd2305c95cecce7d9d60f849a0658d
    while processing commit 0000000000000000000000000000000000000000.

which while looks weird. What is the none needed for?

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoMove Fink and Ports check to after config file
Brian Gernhardt [Tue, 12 Dec 2006 17:01:47 +0000 (12:01 -0500)]
Move Fink and Ports check to after config file

Putting NO_FINK or NO_DARWIN_PORTS in config.mak is ignored because the
checks are done before the config is included.

Signed-off-by: Brian Gernhardt <benji@silverinsanity.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoColourise git-branch output
Andy Parkins [Tue, 12 Dec 2006 06:41:52 +0000 (06:41 +0000)]
Colourise git-branch output

I wanted to have a visual indication of which branches are local and
which are remote in git-branch -a output; however Junio was concerned
that someone might be using the output in a script.  This patch
addresses the problem by colouring the git-branch output - which in
"auto" mode won't be activated.

I've based it off the colouring code for builtin-diff.c; which means
there is a branch color configuration variable that needs setting to
something before the color will appear.

The colour parameter is "color.branch" rather than "branch.color" to
avoid clashing with the default namespace for default branch merge
definitions.

This patch chooses green for local, red for remote and bold green for
current.

Signed-off-by: Andy Parkins <andyparkins@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agodiff --numstat: show binary with '-' to match "apply --numstat"
Junio C Hamano [Sun, 10 Dec 2006 21:50:59 +0000 (13:50 -0800)]
diff --numstat: show binary with '-' to match "apply --numstat"

This changes the --numstat output for binary files from "0 0" to
"- -" to match what "apply --numstat" does.

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoMake cvsexportcommit work with filenames with spaces and non-ascii characters.
Robin Rosenberg [Sun, 10 Dec 2006 23:30:06 +0000 (00:30 +0100)]
Make cvsexportcommit work with filenames with spaces and non-ascii characters.

This patch uses git-apply to do the patching which simplifies the code a lot
and also uses one pass to git-diff. git-apply gives information on added,
removed files as well as which files are binary.

Removed the test for checking for matching binary files when deleting them
since git-apply happily deletes the file. This is matter of taste since we
allow some fuzz for text patches also.

Error handling was cleaned up, but not much tested.

Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoshortlog: fix segfault on empty authorname
Junio C Hamano [Sun, 10 Dec 2006 23:51:54 +0000 (15:51 -0800)]
shortlog: fix segfault on empty authorname

The old code looked backwards from the email address to parse
the name, allowing an arbitrary number of spaces between the
two. However, in the case of no name, we looked back too far to
the 'author' (or 'Author:') header.

The bug was triggered by commit febf7ea4bed from linux-2.6.

Jeff King originally fixed it by looking back only one
character; Johannes Schindelin pointed out that we could try
harder while at it to cope with commits with broken headers.

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoshortlog: remove "[PATCH]" prefix from shortlog output
Junio C Hamano [Sun, 10 Dec 2006 23:55:07 +0000 (15:55 -0800)]
shortlog: remove "[PATCH]" prefix from shortlog output

Originally noticed by Nicolas Pitre; the real cause was the code
was prepared to deal with [PATCH] (and [PATCH n/m whatever])
prefixes but forgot that the string can be indented while acting
as a filter.

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoMerge branch 'maint'
Junio C Hamano [Mon, 11 Dec 2006 22:12:12 +0000 (14:12 -0800)]
Merge branch 'maint'

* maint:
  Make sure the empty tree exists when needed in merge-recursive.
  Don't use memcpy when source and dest. buffers may overlap
  no need to install manpages as executable

17 years agoMake sure the empty tree exists when needed in merge-recursive.
Shawn O. Pearce [Thu, 7 Dec 2006 10:17:07 +0000 (05:17 -0500)]
Make sure the empty tree exists when needed in merge-recursive.

There are some baseless merge cases where git-merge-recursive will
try to compare one of the branches against the empty tree.  However
most projects won't have the empty tree object in their object database
as Git does not normally create empty tree objects.  If the empty tree
object is missing then the merge process will die, as it cannot load the
object from the database.  The error message may make the user think that
their database is corrupt when its actually not.

So instead we should just create the empty tree object whenever it is
needed.  If the object already exists as a loose object then no harm
done.  Otherwise that loose object will be pruned away later by either
git-prune or git-prune-packed.

Thanks goes to Junio for suggesting this fix.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoDon't use memcpy when source and dest. buffers may overlap
Jim Meyering [Mon, 11 Dec 2006 18:06:34 +0000 (19:06 +0100)]
Don't use memcpy when source and dest. buffers may overlap

git-index-pack can call memcpy with overlapping source and destination
buffers.  The patch below makes it use memmove instead.

If you want to demonstrate a failure, add the following two lines

+               if (input_offset < input_len)
+                 abort ();

before the existing memcpy call (shown in the patch below),
and then run this:

  (cd t; sh ./t5500-fetch-pack.sh)

Signed-off-by: Jim Meyering <jim@meyering.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agono need to install manpages as executable
Chris Wright [Mon, 11 Dec 2006 07:39:32 +0000 (23:39 -0800)]
no need to install manpages as executable

No need to install manpages as executable.  Noticed by Ville Skytt\e,Ad\e(B.

Signed-off-by: Chris Wright <chrisw@sous-sol.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agogit-commit: allow --only to lose what was staged earlier.
Junio C Hamano [Sun, 10 Dec 2006 06:32:43 +0000 (22:32 -0800)]
git-commit: allow --only to lose what was staged earlier.

The command used to have a safety valve to prevent this sequence:

edit foo
git update-index foo
edit foo
git diff foo
git commit --only foo

The reason for this was because an inexperienced user might
mistakenly think what is shown with the last-minute diff
contains all the change that is being committed (instead, what
the user asked to check was an incremental diff since what has
been staged so far).  However, this turns out to only annoy
people who know what they are doing.  Inexperienced people
would not be using the first "update-index" anyway, in which
case they would see the full changes in the "git diff".

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoDocumentation/git-commit: rewrite to make it more end-user friendly.
Junio C Hamano [Sat, 9 Dec 2006 05:48:07 +0000 (21:48 -0800)]
Documentation/git-commit: rewrite to make it more end-user friendly.

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agorerere: record (or avoid misrecording) resolved, skipped or aborted rebase/am
Eric Wong [Fri, 8 Dec 2006 21:29:56 +0000 (13:29 -0800)]
rerere: record (or avoid misrecording) resolved, skipped or aborted rebase/am

Data in rr-cache isn't valid after a patch application is
skipped or and aborted, so our next commit could be misrecorded
as a resolution of that skipped/failed commit, which is wrong.

git-am --skip, git-rebase --skip/--abort will automatically
invoke git-rerere clear to avoid this.

Also, since git-am --resolved indicates a resolution was
succesful, remember to run git-rerere to record the resolution
(and not surprise the user when the next commit is made).

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agogit-rerere: add 'gc' command.
Junio C Hamano [Fri, 8 Dec 2006 21:03:12 +0000 (13:03 -0800)]
git-rerere: add 'gc' command.

Over time, unresolved rr-cache entries are accumulated and they
tend to get less and less likely to be useful as the tips of
branches advance.

Reorder documentation page to show the subcommand section earlier
than the discussion section.

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agorerere: add clear, diff, and status commands
Eric Wong [Fri, 8 Dec 2006 21:29:55 +0000 (13:29 -0800)]
rerere: add clear, diff, and status commands

git-am and git-rebase will be updated to use 'clear', and
diff/status can be used to aid the user in tracking progress in
the resolution process.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoDocumentation: simpler shared repository creation
J. Bruce Fields [Sat, 9 Dec 2006 03:58:50 +0000 (22:58 -0500)]
Documentation: simpler shared repository creation

Take Johannes Schindelin's suggestions for a further simplification of
the shared repository creation using git --bare init-db --shared, and
for a simplified cvsimport using an existing CVS working directory.

Also insert more man page references.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
 cvs-migration.txt |   27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoshortlog: fix segfault on empty authorname
Jeff King [Sat, 9 Dec 2006 04:04:21 +0000 (23:04 -0500)]
shortlog: fix segfault on empty authorname

The old code looked backwards from the email address to parse the name,
allowing an arbitrary number of spaces between the two. However, in the case
of no name, we looked back too far to the 'author' (or 'Author:') header.
Instead, remove at most one space between name and address.

The bug was triggered by commit febf7ea4bed from linux-2.6.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoAdd branch.*.merge warning and documentation update
Josef Weidendorfer [Sat, 9 Dec 2006 01:28:26 +0000 (02:28 +0100)]
Add branch.*.merge warning and documentation update

This patch clarifies the meaning of the branch.*.merge option.
Previously, if branch.*.merge was specified but did not match any
ref, the message "No changes." was not really helpful regarding
the misconfiguration. This patch adds a warning for this.

Signed-off-by: Josef Weidendorfer <Josef.Weidendorfer@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoFix perl/ build.
Junio C Hamano [Fri, 8 Dec 2006 22:07:45 +0000 (14:07 -0800)]
Fix perl/ build.

An earlier commit f848718a broke the build in perl/ directory by
allowing the Makefile.PL to overwrite the now-tracked Makefile.
Fix this by forcing Makefile.PL to produce its output in
perl.mak as the broken commit originally intended.

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agogit-svn: use do_switch for --follow-parent if the SVN library supports it
Eric Wong [Fri, 8 Dec 2006 10:20:17 +0000 (02:20 -0800)]
git-svn: use do_switch for --follow-parent if the SVN library supports it

do_switch works with the SVN Perl bindings after r22312 in the
Subversion trunk.  Since no released version of SVN currently
supports it; we'll just autodetect it and enable its usage
when a user has a recent-enough version of SVN.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoFix documentation copy&paste typo
Uwe Zeisberger [Fri, 8 Dec 2006 11:44:31 +0000 (12:44 +0100)]
Fix documentation copy&paste typo

This was introduced in 45a3b12cfd3eaa05bbb0954790d5be5b8240a7b5

Signed-off-by: Uwe Kleine-K\e,AC6\e(Bnig <zeisberg@informatik.uni-freiburg.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agogit-svn: extra error check to ensure we open a file correctly
Eric Wong [Fri, 8 Dec 2006 09:55:19 +0000 (01:55 -0800)]
git-svn: extra error check to ensure we open a file correctly

This may be an issue with repositories imported with commit
27a1a8014b842c0d70fdc91c68dd361ca2dfb34c or later, but before
commit dad73c0bb9f33323ec1aacf560a6263f1d85f81a.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoDocumentation: update git-clone man page with new behavior
J. Bruce Fields [Fri, 8 Dec 2006 06:27:21 +0000 (01:27 -0500)]
Documentation: update git-clone man page with new behavior

Update git-clone man page to reflect recent changes
(--use-separate-remote default and use of .git/config instead of
remotes files), and rewrite introduction.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoMerge branch 'maint'
Junio C Hamano [Thu, 7 Dec 2006 05:53:32 +0000 (21:53 -0800)]
Merge branch 'maint'

* maint:
  cvsserver: Avoid miscounting bytes in Perl v5.8.x

17 years agocvsserver: Avoid miscounting bytes in Perl v5.8.x
Martin Langhoff [Thu, 7 Dec 2006 03:38:50 +0000 (16:38 +1300)]
cvsserver: Avoid miscounting bytes in Perl v5.8.x

At some point between v5.6 and 5.8 Perl started to assume its input,
output and filehandles are UTF-8. This breaks the counting of bytes
for the CVS protocol, resulting in the client expecting less data
than we actually send, and storing truncated files.

Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agochange the unpack limit treshold to a saner value
Nicolas Pitre [Thu, 7 Dec 2006 04:01:00 +0000 (23:01 -0500)]
change the unpack limit treshold to a saner value

Currently the treshold is 5000.  The likelihood of this value to ever be
crossed for a single push is really small making it not really useful.

The optimal treshold for a pure space saving on a filesystem with 4kb
blocks is 3.  However this is likely to create many small packs
concentrating a large number of files in a single directory compared to
the same objects which are spread over 256 directories when loose.  This
means we would need 512 objects per pack on average to approximagte the
same directory cost (a pack has 2 files because of the index).

But 512 is a really high value just like 5000 since most pushes are
unlikely to have that many objects.  So let's try with a value of 100
which should have a good balance between small pushes going to be
exploded into loose objects and large pushes kept as whole packs.

This is not a replacement for periodic repacks of course.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoDocumentation: reorganize cvs-migration.txt
J. Bruce Fields [Thu, 7 Dec 2006 04:18:05 +0000 (23:18 -0500)]
Documentation: reorganize cvs-migration.txt

Modify cvs-migration.txt so it explains first how to develop against a
shared repository, then how to set up a shared repository, then how to
import a repository from cvs.  Though this seems chronologically
backwards, it's still readable in this order, and it puts the more
commonly needed material closer to the front.

Remove the annotate/pickaxe section; perhaps it can find a place elsewhere
in the future.  Remove most of the "why git is better than cvs" stuff from
the introduction.

Add some minor clarifications, including two that have come up several
times on the mailing list:

1. Recommend committing any changes before running pull.
2. Note that changes must be commited before they can be pushed.

Update the clone discussion to reflect the new --use-separate-remotes
default, and add a brief mention of git-cvsserver.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoExplicitly add the default "git pull" behaviour to .git/config on clone
Andy Parkins [Wed, 6 Dec 2006 12:07:23 +0000 (12:07 +0000)]
Explicitly add the default "git pull" behaviour to .git/config on clone

Without any specification in the .git/config file, git-pull will execute
"git-pull origin"; which in turn defaults to pull from the first "pull"
definition for the remote, "origin".

This is a difficult set of defaults to track for a new user, and it's
difficult to see what tells git to do this (especially when it is
actually hard-coded behaviour).  To ameliorate this slightly, this patch
explicitly specifies the default behaviour during a clone using the
"branch" section of the config.

For example, a clone of a typical repository would create a .git/config
containing:
  [remote "origin"]
  url = proto://host/repo.git
  fetch = refs/heads/master:refs/remotes/origin/master
  [branch "master"]
  remote = origin
  merge = refs/heads/master

The [branch "master"] section is such that there is no change to the
functionality of git-pull, but that functionality is now explicitly
documented.

Signed-off-by: Andy Parkins <andyparkins@gmail.com>
17 years agogit-merge: fix "fix confusion between tag and branch" for real
Junio C Hamano [Wed, 6 Dec 2006 19:22:55 +0000 (11:22 -0800)]
git-merge: fix "fix confusion between tag and branch" for real

An earlier commit 3683dc5a broke the merge message generation with
a careless use of && where it was not needed, breaking the merge
message for cases where non branches are given.

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agogit-svn: avoid network timeouts for long-running fetches
Eric Wong [Mon, 4 Dec 2006 08:51:16 +0000 (00:51 -0800)]
git-svn: avoid network timeouts for long-running fetches

Long-running fetches run inside children to avoid memory leaks.
When we refork, the connection in the parent can be idle for a
long time; attempting to reuse it in the next child can result
in timeouts.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agogitweb: Allow PNG, GIF, JPEG images to be displayed in "blob" view
Jakub Narebski [Mon, 4 Dec 2006 22:47:22 +0000 (23:47 +0100)]
gitweb: Allow PNG, GIF, JPEG images to be displayed in "blob" view

Allow images in one of web formats (PNG, GIF, JPEG) - actually files
with mimetype of image/png, image/git, image/jpeg - to be displayed in
"blob" view using <img /> element, instead of using "blob_plain" view
for them, like for all other files except also text/* mimetype files.

This makes possible to easily go to file history, to HEAD version of
the file, to appropriate commit etc; all of those are not available
in "blob_plain" (raw) view.

Only text files can have "blame" view link in the formats part of
navbar.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agogit-merge: squelch needless error message.
Junio C Hamano [Wed, 6 Dec 2006 18:52:04 +0000 (10:52 -0800)]
git-merge: squelch needless error message.

While deciding if the new style command line argument is a tag
or a branch, we checked it with "git show-ref -s --verify" to
see if results in an error, but when it is not a branch, the
check leaked the error message out, which was not needed to be
shown to the end user.

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoMerge
Junio C Hamano [Wed, 6 Dec 2006 18:48:08 +0000 (10:48 -0800)]
Merge

17 years agoMerge branch 'maint'
Junio C Hamano [Wed, 6 Dec 2006 18:47:37 +0000 (10:47 -0800)]
Merge branch 'maint'

* maint:
  git-reset to remove "$GIT_DIR/MERGE_MSG"
  unpack-trees: make sure "df_conflict_entry.name" is NUL terminated.

17 years agogit-reset to remove "$GIT_DIR/MERGE_MSG" v1.4.4.2
Junio C Hamano [Tue, 5 Dec 2006 03:44:40 +0000 (19:44 -0800)]
git-reset to remove "$GIT_DIR/MERGE_MSG"

An earlier commit a9cb3c6e changed git-commit to use the
contents of MERGE_MSG even when we do not have MERGE_HEAD (the
rationale is in its log message).

However, the change tricks the following sequence to include a
merge message in a completely unrelated commit:

$ git pull somewhere
: oops, the conflicts are too much.  forget it.
        $ git reset --hard
        : work work work
        $ git commit

To fix this confusion, this patch makes "git reset" to remove
the leftover MERGE_MSG that was prepared when the user abandoned
the merge.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Acked-by: Luben Tuikov <ltuikov@yahoo.com
17 years agomerge-file: support -p and -q; fix compile warnings
Johannes Schindelin [Wed, 6 Dec 2006 15:45:42 +0000 (16:45 +0100)]
merge-file: support -p and -q; fix compile warnings

Now merge-file also understands --stdout and --quiet options. While
at it, two compile warnings were fixed.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoAdd builtin merge-file, a minimal replacement for RCS merge
Johannes Schindelin [Wed, 6 Dec 2006 15:26:06 +0000 (16:26 +0100)]
Add builtin merge-file, a minimal replacement for RCS merge

merge-file has the same syntax as RCS merge, but supports only the
"-L" option.

For good measure, a test is added, which is quite minimal, though.

[jc: further fix for compliation errors included.]

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agocvs-migration: improved section titles, better push/commit explanation
J. Bruce Fields [Wed, 6 Dec 2006 17:19:50 +0000 (12:19 -0500)]
cvs-migration: improved section titles, better push/commit explanation

Rename the section titles to make the "how-to" content of the section
obvious.  Also clarify that changes have to be commited before they can
be pushed.

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agocvs-migration document: make the need for "push" more obvious
Johannes Schindelin [Wed, 6 Dec 2006 12:27:40 +0000 (13:27 +0100)]
cvs-migration document: make the need for "push" more obvious

It really is an important concept to grasp for people coming
from CVS. Even if it is briefly mentioned, it is not obvious
enough to sink in.

[jc: with wording updates from J. Bruce Fields]

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agogit-branch: let caller specify logmsg
Lars Hjemli [Thu, 30 Nov 2006 02:16:56 +0000 (03:16 +0100)]
git-branch: let caller specify logmsg

This changes the signature of rename_ref() in refs.[hc] to include a
logmessage for the reflogs.

Also, builtin-branch.c is modified to provide a proper logmessage + call
setup_ident() before any logmessages are written.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agorename_ref: use lstat(2) when testing for symlink
Lars Hjemli [Wed, 29 Nov 2006 20:44:56 +0000 (21:44 +0100)]
rename_ref: use lstat(2) when testing for symlink

The current check for symlinked reflogs was based on stat(2), which is
utterly embarrassing.

Fix it, and add a matching testcase.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agogit-branch: add options and tests for branch renaming
Lars Hjemli [Tue, 28 Nov 2006 14:47:40 +0000 (15:47 +0100)]
git-branch: add options and tests for branch renaming

Extend git-branch with the following options:

  git-branch -m|-M [<oldbranch>] newbranch

The -M variation is required to force renaming over an exsisting
branchname.

This also indroduces $GIT_DIR/RENAME_REF which is a "metabranch"
used when renaming branches. It will always hold the original sha1
for the latest renamed branch.

Additionally, if $GIT_DIR/logs/RENAME_REF exists, all branch rename
events are logged there.

Finally, some testcases are added to verify the new options.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoread-tree: document --exclude-per-directory
Junio C Hamano [Wed, 6 Dec 2006 07:44:23 +0000 (23:44 -0800)]
read-tree: document --exclude-per-directory

This documents the new option to read-tree that is used for the
improved "branch switching" code.

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoLoosen "working file will be lost" check in Porcelain-ish
Junio C Hamano [Tue, 5 Dec 2006 00:07:57 +0000 (16:07 -0800)]
Loosen "working file will be lost" check in Porcelain-ish

This uses the previous update to read-tree in Porcelain-ish
commands "git checkout" and "git merge" to loosen the check
when switching branches.

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoread-tree: further loosen "working file will be lost" check.
Junio C Hamano [Tue, 5 Dec 2006 00:00:46 +0000 (16:00 -0800)]
read-tree: further loosen "working file will be lost" check.

This follows up commit ed93b449 where we removed overcautious
"working file will be lost" check.

A new option "--exclude-per-directory=.gitignore" can be used to
tell the "git-read-tree" command that the user does not mind
losing contents in untracked files in the working tree, if they
need to be overwritten by a merge (either a two-way "switch
branches" merge, or a three-way merge).

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