Code

git.git
17 years agocompat/inet_ntop: do not use u_int
Junio C Hamano [Wed, 20 Dec 2006 21:45:55 +0000 (13:45 -0800)]
compat/inet_ntop: do not use u_int

It is pointless.

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agogit-add: error out when given no arguments.
Junio C Hamano [Wed, 20 Dec 2006 21:06:46 +0000 (13:06 -0800)]
git-add: error out when given no arguments.

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoMerge branch 'maint'
Junio C Hamano [Wed, 20 Dec 2006 19:24:56 +0000 (11:24 -0800)]
Merge branch 'maint'

* maint:
  GIT 1.4.4.3

17 years agoGIT 1.4.4.3 v1.4.4.3
Junio C Hamano [Wed, 20 Dec 2006 19:23:22 +0000 (11:23 -0800)]
GIT 1.4.4.3

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoclarify some error messages wrt unknown object types
Nicolas Pitre [Wed, 20 Dec 2006 18:34:05 +0000 (13:34 -0500)]
clarify some error messages wrt unknown object types

If ever new object types are added for future extensions then better
have current git version report them as "unknown" instead of
"corrupted".

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agosimplify inclusion of system header files.
Junio C Hamano [Tue, 19 Dec 2006 22:34:12 +0000 (14:34 -0800)]
simplify inclusion of system header files.

This is a mechanical clean-up of the way *.c files include
system header files.

 (1) sources under compat/, platform sha-1 implementations, and
     xdelta code are exempt from the following rules;

 (2) the first #include must be "git-compat-util.h" or one of
     our own header file that includes it first (e.g. config.h,
     builtin.h, pkt-line.h);

 (3) system headers that are included in "git-compat-util.h"
     need not be included in individual C source files.

 (4) "git-compat-util.h" does not have to include subsystem
     specific header files (e.g. expat.h).

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoindex-pack usage of mmap() is unacceptably slower on many OSes other than Linux
Nicolas Pitre [Tue, 19 Dec 2006 15:53:08 +0000 (10:53 -0500)]
index-pack usage of mmap() is unacceptably slower on many OSes other than Linux

It was reported by Randal L. Schwartz <merlyn@stonehenge.com> that
indexing the Linux repository ~150MB pack takes about an hour on OS x
while it's a minute on Linux.  It seems that the OS X mmap()
implementation is more than 2 orders of magnitude slower than the Linux
one.

Linus proposed a patch replacing mmap() with pread() bringing index-pack
performance on OS X in line with the Linux one.  The performances on
Linux also improved by a small margin.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agogitweb: Show '...' links in "summary" view only if there are more items
Robert Fitzsimons [Tue, 19 Dec 2006 12:08:54 +0000 (12:08 +0000)]
gitweb: Show '...' links in "summary" view only if there are more items

Show "..." links in "summary" view to shortlog, heads (if there are
any), and tags (if there are any) only if there are more items to show
than shown already.

This means that "..." link is shown below shortened shortlog if there
are more than 16 commits, "..." link below shortened heads list if
there are more than 16 heads refs (16 branches), "..." link below
shortened tags list if there are more than 16 tags.

Modified patch from Jakub to to apply cleanly to master, also preform
the same "..." link logic to the forks list.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Robert Fitzsimons <robfitz@273k.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoconfig_rename_section: fix FILE* leak
Junio C Hamano [Wed, 20 Dec 2006 05:55:27 +0000 (21:55 -0800)]
config_rename_section: fix FILE* leak

Noticed by SungHyun Nam.

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoRemove COLLISION_CHECK from Makefile since it's not used.
Brian Gernhardt [Wed, 20 Dec 2006 03:25:13 +0000 (22:25 -0500)]
Remove COLLISION_CHECK from Makefile since it's not used.

It's rather misleading to have configuration options that don't do
anything.  If someone adds collision checking they might also want to
restore this option.

Signed-off-by: Brian Gernhardt <benji@silverinsanity.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agofix populate-filespec
Junio C Hamano [Wed, 20 Dec 2006 02:26:48 +0000 (18:26 -0800)]
fix populate-filespec

I hand munged the original patch when committing 1510fea78, and
screwed up the conversion.

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agogit-cvsserver: fix breakage when calling git merge-file
Eric Wong [Tue, 19 Dec 2006 22:58:20 +0000 (14:58 -0800)]
git-cvsserver: fix breakage when calling git merge-file

In the same vein as 8336afa563fbeff35e531396273065161181f04c,
this fixes the the RCS merge to git-merge-file conversion in
commit e2b70087.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agorerere: fix breakage of resolving.
Junio C Hamano [Tue, 19 Dec 2006 00:20:53 +0000 (16:20 -0800)]
rerere: fix breakage of resolving.

commit e2b70087 botched the RCS merge to git-merge-file conversion.
There is no command called "git merge-file" (yes, we are using safer
variant of Perl's system(3)).

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoAdd config example with respect to branch
Aneesh Kumar K.V [Thu, 7 Dec 2006 06:36:55 +0000 (12:06 +0530)]
Add config example with respect to branch

Update config.txt with example with respect to branch
config variable. This give a better idea regarding
how branch names are expected.

Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoAdd documentation for show-branch --topics
Brian Gernhardt [Mon, 18 Dec 2006 15:48:33 +0000 (10:48 -0500)]
Add documentation for show-branch --topics

Add a quick paragraph explaining the --topics option for show-branch.
The explanation is an abbreviated version of the commit message from
d320a5437f8304cf9ea3ee1898e49d643e005738.

Signed-off-by: Brian Gernhardt <benji@silverinsanity.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agomake git a bit less cryptic on fetch errors
Nicolas Pitre [Mon, 18 Dec 2006 20:16:58 +0000 (15:16 -0500)]
make git a bit less cryptic on fetch errors

The remote server might not want to tell why it doesn't like us for
security reasons, but let's make the client report such error in a bit
less confusing way.  The remote failure remains a mystery, but the local
message might be a bit less so.

[jc: with a gentle wording updates from Andy Parkins]

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agomake patch_delta() error cases a bit more verbose
Nicolas Pitre [Mon, 18 Dec 2006 21:06:50 +0000 (16:06 -0500)]
make patch_delta() error cases a bit more verbose

It is especially important to distinguish between a malloc() failure
from all the other cases.  An out of memory condition is much less
worrisome than a compatibility/corruption problem.

Also make test-delta compilable again.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoracy-git: documentation updates.
Junio C Hamano [Mon, 18 Dec 2006 22:18:54 +0000 (14:18 -0800)]
racy-git: documentation updates.

We've removed the workaround for runtime penalty that did not
exist in practice some time ago, but the technical paper that
proposed that change still said "we probably should do so".

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoshow-ref: fix --exclude-existing
Junio C Hamano [Mon, 18 Dec 2006 21:33:47 +0000 (13:33 -0800)]
show-ref: fix --exclude-existing

Do not falsely document --filter-invalid which does not even exist.
Also make sure the line is long enough to have ^{} suffix before
checking for it.

Pointed out by Dscho.

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoparse-remote::expand_refs_wildcard()
Junio C Hamano [Mon, 18 Dec 2006 20:13:46 +0000 (12:13 -0800)]
parse-remote::expand_refs_wildcard()

Work around dash incompatibility by not using "${name%'^{}'}".

Noticed by Jeff King; dash seems to mistake the closing brace
inside the single quote as the terminating brace for parameter
expansion.

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agovim syntax: follow recent changes to commit template
Jeff King [Mon, 18 Dec 2006 07:26:42 +0000 (02:26 -0500)]
vim syntax: follow recent changes to commit template

This patch changes the syntax highlighting to correctly match the new
text of the commit message introduced by
  82dca84871637ac9812c0dec27f56d07cfba524c

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoshow-ref: fix --verify --hash=length
Junio C Hamano [Mon, 18 Dec 2006 03:27:49 +0000 (19:27 -0800)]
show-ref: fix --verify --hash=length

An earlier optimization for --verify broke a lot of stuff
because it did not take interaction with other flags into
account.

This also fixes an unrelated argument parsing error; --hash=8
should mean the same as "--hash --abbrev=8".

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoshow-ref: fix --quiet --verify
Junio C Hamano [Mon, 18 Dec 2006 02:53:24 +0000 (18:53 -0800)]
show-ref: fix --quiet --verify

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoMerge branch 'jc/blame-boundary'
Junio C Hamano [Mon, 18 Dec 2006 02:34:51 +0000 (18:34 -0800)]
Merge branch 'jc/blame-boundary'

* jc/blame-boundary:
  git-blame: show lines attributed to boundary commits differently.

17 years agoMerge branch 'jc/reflog' (early part)
Junio C Hamano [Mon, 18 Dec 2006 02:31:24 +0000 (18:31 -0800)]
Merge branch 'jc/reflog' (early part)

* 'jc/reflog' (early part):
  Teach show-branch how to show ref-log data.

17 years agoMerge branch 'js/branch-config'
Junio C Hamano [Mon, 18 Dec 2006 02:27:17 +0000 (18:27 -0800)]
Merge branch 'js/branch-config'

* js/branch-config:
  git-branch: rename config vars branch.<branch>.*, too
  add a function to rename sections in the config

17 years agoMerge branch 'jn/web' (early part)
Junio C Hamano [Mon, 18 Dec 2006 02:27:17 +0000 (18:27 -0800)]
Merge branch 'jn/web' (early part)

* 'jn/web' (early part):
  gitweb: Add "next" link to commit view
  gitweb: Add title attribute to ref marker with full ref name
  gitweb: Do not show difftree for merges in "commit" view
  gitweb: SHA-1 in commit log message links to "object" view
  gitweb: Hyperlink target of symbolic link in "tree" view (if possible)
  gitweb: Add generic git_object subroutine to display object of any type
  gitweb: Show target of symbolic link in "tree" view
  gitweb: Don't use Content-Encoding: header in git_snapshot

17 years agoavoid accessing _all_ loose refs in git-show-ref --verify
Junio C Hamano [Mon, 18 Dec 2006 02:08:52 +0000 (18:08 -0800)]
avoid accessing _all_ loose refs in git-show-ref --verify

If you want to verify a ref, it is overkill to first read all loose refs
into a linked list, and then check if the desired ref is there.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
17 years agogit-fetch: Avoid reading packed refs over and over again
Junio C Hamano [Mon, 18 Dec 2006 01:57:19 +0000 (17:57 -0800)]
git-fetch: Avoid reading packed refs over and over again

When checking which tags to fetch, the old code used to call
git-show-ref --verify for each remote tag. Since reading even
packed refs is not a cheap operation when there are a lot of
local refs, the code became quite slow.

This fixes it by teaching git-show-ref to filter out existing
refs using a new mode of operation of git-show-ref.

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoTeach show-branch how to show ref-log data.
Junio C Hamano [Thu, 14 Dec 2006 23:58:56 +0000 (15:58 -0800)]
Teach show-branch how to show ref-log data.

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agomarkup fix in svnimport documentation.
Junio C Hamano [Sun, 17 Dec 2006 18:33:24 +0000 (10:33 -0800)]
markup fix in svnimport documentation.

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoDocumentation: new option -P for git-svnimport
Quy Tonthat [Sun, 17 Dec 2006 14:50:12 +0000 (01:50 +1100)]
Documentation: new option -P for git-svnimport

Documentation: new option -P for git-svnimport.

Signed-off-by: Quy Tonthat <qtonthat@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoFix mis-mark-up in git-merge-file.txt documentation
Junio C Hamano [Sun, 17 Dec 2006 08:46:35 +0000 (00:46 -0800)]
Fix mis-mark-up in git-merge-file.txt documentation

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoDefault GIT_COMMITTER_NAME to login name in recieve-pack.
Shawn O. Pearce [Sun, 17 Dec 2006 08:15:14 +0000 (03:15 -0500)]
Default GIT_COMMITTER_NAME to login name in recieve-pack.

If GIT_COMMITTER_NAME is not available in receive-pack but reflogs
are enabled we would normally die out with an error message asking
the user to correct their environment settings.

Now that reflogs are enabled by default in (what we guessed to be)
non-bare Git repositories this may cause problems for some users
who don't have their full name in the gecos field and who don't
have access to the remote system to correct the problem.

So rather than die()'ing out in receive-pack when we try to log a
ref change and have no committer name we default to the username,
as obtained from the host's password database.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoFix check_file_directory_conflict().
Junio C Hamano [Sun, 17 Dec 2006 01:39:06 +0000 (17:39 -0800)]
Fix check_file_directory_conflict().

When replacing an existing file A with a directory A that has a
file A/B in it in the index, 'update-index --replace --add A/B'
did not properly remove the file to make room for the new
directory.

There was a trivial logic error, most likely a cut & paste one,
dating back to quite early days of git.

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agogit-add: remove conflicting entry when adding.
Junio C Hamano [Sun, 17 Dec 2006 09:09:41 +0000 (01:09 -0800)]
git-add: remove conflicting entry when adding.

When replacing an existing file A with a directory A that has a
file A/B in it in the index, 'git add' did not succeed because
it forgot to pass the allow-replace flag to add_cache_entry().

It might be safer to leave this as an error and require the user
to explicitly remove the existing A first before adding A/B
since it is an unusual case, but doing that automatically is
much easier to use.

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoupdate-index: make D/F conflict error a bit more verbose.
Junio C Hamano [Sun, 17 Dec 2006 00:23:02 +0000 (16:23 -0800)]
update-index: make D/F conflict error a bit more verbose.

When you remove a directory D that has a tracked file D/F out of the
way to create a file D and try to "git update-index --add D", it used
to say "cannot add" which was not very helpful.  This issues an extra
error message to explain the situation before the final "fatal" message.

Since D/F conflicts are relatively rare event, extra verbosity would
not make things too noisy.

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agogit-branch: rename config vars branch.<branch>.*, too
Johannes Schindelin [Sat, 16 Dec 2006 14:15:02 +0000 (15:15 +0100)]
git-branch: rename config vars branch.<branch>.*, too

When renaming a branch, the corresponding config section should
be renamed, too.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoadd a function to rename sections in the config
Johannes Schindelin [Sat, 16 Dec 2006 14:14:14 +0000 (15:14 +0100)]
add a function to rename sections in the config

Given a config like this:

# A config
[very.interesting.section]
not

The command

$ git repo-config --rename-section very.interesting.section bla.1

will lead to this config:

# A config
[bla "1"]
not

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agomerge: give a bit prettier merge message to "merge branch~$n"
Junio C Hamano [Sat, 16 Dec 2006 20:31:45 +0000 (12:31 -0800)]
merge: give a bit prettier merge message to "merge branch~$n"

This hacks the input to fmt-merge-msg to make the message for
merging early part of a branch a little easier to read.

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agogitweb: Add "next" link to commit view
Jakub Narebski [Fri, 15 Dec 2006 20:57:16 +0000 (21:57 +0100)]
gitweb: Add "next" link to commit view

Add a kind of "next" view in the bottom part of navigation bar for
"commit" view, similar to what was added for "commitdiff" view in
commit 151602df00b8e5c5b4a8193f59a94b85f9b5aebc
  'gitweb: Add "next" link to commitdiff view'

For "commit" view for single parent commit:
  (parent: _commit_)
For "commit" view for merge (multi-parent) commit:
  (merge: _commit_ _commit_ ...)
For "commit" view for root (parentless) commit
  (initial)
where _link_ denotes hyperlink.  SHA1 of commit is shortened
to 7 characters on display.

While at it, remove leftovers from commit cae1862a by Petr Baudis:
  'gitweb: More per-view navigation bar links'
namely the "blame" link if there exist $file_name and commit has a
parent; it was added in git_commit probably by mistake.  The rest
of what mentioned commit added for git_commit was removed in
commit 6e0e92fda893311ff5af91836e5007bf6bbd4a21 by Luben Tuikov:
  'gitweb: Do not print "log" and "shortlog" redundantly in commit view'
(which should have probably removed also this "blame" link removed now).

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agogitweb: Add title attribute to ref marker with full ref name
Jakub Narebski [Fri, 15 Dec 2006 22:49:12 +0000 (23:49 +0100)]
gitweb: Add title attribute to ref marker with full ref name

Add title attribute, which will be shown as popup on mouseover in
graphical web browsers, with full name of ref, including part (type)
removed from the name of ref itself. This is useful to see that this
strange ref is StGIT ref, or it is remote branch, or it is lightweigh
tag (with branch-like name).

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agogitweb: Do not show difftree for merges in "commit" view
Jakub Narebski [Fri, 15 Dec 2006 16:53:45 +0000 (17:53 +0100)]
gitweb: Do not show difftree for merges in "commit" view

Do not show difftree against first parent for merges (commits with
more than one parent) in "commit" view, because it usually is
misleading.  git-show and git-whatchanged doesn't show diff for merges
either.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoDocument git-merge-file
Johannes Schindelin [Sat, 16 Dec 2006 11:22:18 +0000 (12:22 +0100)]
Document git-merge-file

Most of this is derived from the documentation of RCS merge.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agogit-clone documentation
Quy Tonthat [Thu, 14 Dec 2006 14:17:53 +0000 (01:17 +1100)]
git-clone documentation

When --use-separate-remote is used on git-clone, the remote
heads are saved under $GIT_DIR/refs/remotes/origin/, not
"$GIT_DIR/remotes/origin/"

Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agogit-status always says what branch it's on
Andy Parkins [Thu, 14 Dec 2006 15:25:23 +0000 (15:25 +0000)]
git-status always says what branch it's on

If the current branch was "master" then git-status wouldn't say

 # On branch XXXX

In its output.  This patch makes it so that this message is always
output; regardless of branch name.

Signed-off-by: Andy Parkins <andyparkins@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
17 years agoAlign section headers of 'git status' to new 'git add'.
Shawn O. Pearce [Sat, 16 Dec 2006 02:53:13 +0000 (21:53 -0500)]
Align section headers of 'git status' to new 'git add'.

Now that 'git add' is considered a first-class UI for 'update-index'
and that the 'git add' documentation states "Even modified files
must be added to the set of changes about to be committed" we should
make the output of 'git status' align with that documentation and
common usage.

So now we see a status output such as:

  # Added but not yet committed:
  #   (will commit)
  #
  #       new file: x
  #
  # Changed but not added:
  #   (use "git add file1 file2" to include for commit)
  #
  #       modified:   x
  #
  # Untracked files:
  #   (use "git add" on files to include for commit)
  #
  #       y

which just reads better in the context of using 'git add' to
manipulate a commit (and not a checkin, whatever the heck that is).

We also now support 'color.status.added' as an alias for the existing
'color.status.updated', as this alias more closely aligns with the
current output and documentation.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
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 agogit-blame: show lines attributed to boundary commits differently.
Junio C Hamano [Sat, 2 Dec 2006 04:45:45 +0000 (20:45 -0800)]
git-blame: show lines attributed to boundary commits differently.

When blaming with revision ranges, often many lines are attributed
to different commits at the boundary, but they are not interesting
for the purpose of finding project history during that revision range.

This outputs the lines blamed on boundary commits differently. When
showing "human format" output, their SHA-1 are shown with '^' prefixed.
In "porcelain format", the commit will be shown with an extra attribute
line "boundary".

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>