Code

git.git
18 years agogit-svn: remove any need for the XML::Simple dependency
Eric Wong [Mon, 20 Feb 2006 18:57:28 +0000 (10:57 -0800)]
git-svn: remove any need for the XML::Simple dependency

XML::Simple was originally required back when I made svn-arch-mirror
because I needed to explictly track renames with Arch.  Then I carried
it over to git-svn because I was afraid somebody could commit an svn
log message that could throw off a non-XML log parser.  Then I noticed
the <n> lines column in the header.  So, no more XML :)

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-svn: Allow for more argument types for commit (from..to)
Eric Wong [Mon, 20 Feb 2006 18:57:26 +0000 (10:57 -0800)]
git-svn: Allow for more argument types for commit (from..to)

Allow 'from..to' notation from the command line.

More liberal sha1 parsing when reading from stdin no longer requires the
sha1 to be the first character, so a leading 'commit ' string is OK.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-svn: allow --find-copies-harder and -l<num> to be passed on commit
Eric Wong [Mon, 20 Feb 2006 18:57:26 +0000 (10:57 -0800)]
git-svn: allow --find-copies-harder and -l<num> to be passed on commit

Both of these options are passed directly to git-diff-tree when
committing to a SVN repository.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-svn: fix a typo in defining the --no-stop-on-copy option
Eric Wong [Mon, 20 Feb 2006 18:57:25 +0000 (10:57 -0800)]
git-svn: fix a typo in defining the --no-stop-on-copy option

Just a typo, I doubt anybody would use (and I highly recommend not
using) this option anyways.  But you never know...

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'jc/merge-msg'
Junio C Hamano [Mon, 20 Feb 2006 05:18:17 +0000 (21:18 -0800)]
Merge branch 'jc/merge-msg'

* jc/merge-msg:
  fmt-merge-msg: do not add excess newline at the end.
  fmt-merge-msg: say which branch things were merged into unless 'master'

18 years agoMerge branch 'jc/mv'
Junio C Hamano [Mon, 20 Feb 2006 05:17:59 +0000 (21:17 -0800)]
Merge branch 'jc/mv'

* jc/mv:
  Allow git-mv to accept ./ in paths.

18 years agofmt-merge-msg: do not add excess newline at the end.
Junio C Hamano [Mon, 20 Feb 2006 05:14:56 +0000 (21:14 -0800)]
fmt-merge-msg: do not add excess newline at the end.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoDocumentation: fix typo in rev-parse --short option description.
Junio C Hamano [Sun, 19 Feb 2006 18:23:17 +0000 (10:23 -0800)]
Documentation: fix typo in rev-parse --short option description.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoAllow git-mv to accept ./ in paths.
Junio C Hamano [Sun, 19 Feb 2006 07:42:03 +0000 (23:42 -0800)]
Allow git-mv to accept ./ in paths.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge fixes up to GIT 1.2.2
Junio C Hamano [Sun, 19 Feb 2006 06:55:42 +0000 (22:55 -0800)]
Merge fixes up to GIT 1.2.2

18 years agofmt-merge-msg: say which branch things were merged into unless 'master'
Junio C Hamano [Sun, 19 Feb 2006 06:37:02 +0000 (22:37 -0800)]
fmt-merge-msg: say which branch things were merged into unless 'master'

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoFix retries in git-cvsimport v1.2.2
Martin Mares [Sat, 18 Feb 2006 20:44:20 +0000 (21:44 +0100)]
Fix retries in git-cvsimport

Fixed a couple of bugs in recovering from broken connections:

The _line() method now returns undef correctly when the connection
is broken instead of falling off the function and returning garbage.

Retries are now reported to stderr and the eventual partially
downloaded file is discarded instead of being appended to.

The "Server gone away" test has been removed, because it was
reachable only if the garbage return bug bit.

Signed-off-by: Martin Mares <mj@ucw.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoarchimport: remove files from the index before adding/updating
Eric Wong [Sat, 18 Feb 2006 11:49:38 +0000 (03:49 -0800)]
archimport: remove files from the index before adding/updating

This fixes a bug when importing where a directory gets removed/renamed
but is immediately replaced by a file of the same name in the same
changeset.

This fix only applies to the accurate (default) strategy the moment.

This patch should also fix the fast strategy if/when it is updated
to handle the cases that would've triggered this bug.

This bug was originally found in git-svn, but I remembered I did the
same thing with archimport as well.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoAdd an Emacs interface in contrib.
Alexandre Julliard [Sat, 18 Feb 2006 16:50:49 +0000 (17:50 +0100)]
Add an Emacs interface in contrib.

This is an Emacs interface for git. The user interface is modeled on
pcl-cvs. It has been developed on Emacs 21 and will probably need some
tweaking to work on XEmacs.

The basic command is 'M-x git-status' which displays a buffer listing
modified files in the selected project tree. In that buffer the
following features are supported:

  - add/remove files
  - list unknown files
  - commit marked files
  - manage .gitignore
  - commit merges based on MERGE_HEAD
  - revert files to the HEAD version
  - resolve conflicts with smerge or ediff
  - diff files against HEAD/base/mine/other or combined diff
  - get a log of the revisions for specified files

There are plenty of unimplemented features too, see the TODO list at
the top of the file...

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'jc/topo'
Junio C Hamano [Sat, 18 Feb 2006 09:24:10 +0000 (01:24 -0800)]
Merge branch 'jc/topo'

* jc/topo:
  topo-order: make --date-order optional.

18 years agoMerge branch 'jc/rebase-limit'
Junio C Hamano [Sat, 18 Feb 2006 09:24:01 +0000 (01:24 -0800)]
Merge branch 'jc/rebase-limit'

* jc/rebase-limit:
  rebase: allow rebasing onto different base.

18 years agogitview: typofix
Aneesh Kumar K.V [Sat, 18 Feb 2006 08:24:50 +0000 (13:54 +0530)]
gitview: typofix

Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@gmail.com>
18 years agogit-svn: remove files from the index before adding/updating
Eric Wong [Sat, 18 Feb 2006 05:04:47 +0000 (21:04 -0800)]
git-svn: remove files from the index before adding/updating

This fixes a bug when importing where a directory gets removed/renamed
but is immediately replaced by a file of the same name in the same
revision.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
18 years agoMake git-reset delete empty directories
Shawn Pearce [Fri, 17 Feb 2006 07:26:16 +0000 (02:26 -0500)]
Make git-reset delete empty directories

When git-reset --hard is used and a subdirectory becomes
empty (as it contains no tracked files in the target tree)
the empty subdirectory should be removed.  This matches
the behavior of git-checkout-index and git-read-tree -m
which would not have created the subdirectory or would
have deleted it when updating the working directory.

Subdirectories which are not empty will be left behind.
This may happen if the subdirectory still contains object
files from the user's build process (for example).

[jc: simplified the logic a bit, while keeping the test script.]

18 years agoDocument --short and --git-dir in git-rev-parse(1)
Jonas Fonseca [Sat, 18 Feb 2006 01:11:36 +0000 (02:11 +0100)]
Document --short and --git-dir in git-rev-parse(1)

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
18 years agogit-rev-parse: Fix --short= option parsing
Jonas Fonseca [Sat, 18 Feb 2006 01:10:53 +0000 (02:10 +0100)]
git-rev-parse: Fix --short= option parsing

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
18 years agoPrevent git-upload-pack segfault if object cannot be found
Carl Worth [Sat, 18 Feb 2006 00:14:52 +0000 (16:14 -0800)]
Prevent git-upload-pack segfault if object cannot be found

Signed-off-by: Carl Worth <cworth@cworth.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoAbstract test_create_repo out for use in tests.
Carl Worth [Fri, 17 Feb 2006 21:33:26 +0000 (13:33 -0800)]
Abstract test_create_repo out for use in tests.

Signed-off-by: Carl Worth <cworth@cworth.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoTrap exit to clean up created directory if clone fails.
Carl Worth [Fri, 17 Feb 2006 21:33:24 +0000 (13:33 -0800)]
Trap exit to clean up created directory if clone fails.

Signed-off-by: Carl Worth <cworth@cworth.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoSubmittingPatches: note on whitespaces
Junio C Hamano [Sat, 18 Feb 2006 00:15:26 +0000 (16:15 -0800)]
SubmittingPatches: note on whitespaces

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoAdd a README for gitview
Aneesh Kumar K.V [Fri, 17 Feb 2006 12:48:36 +0000 (18:18 +0530)]
Add a README for gitview

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoAdd contrib/README.
Junio C Hamano [Fri, 17 Feb 2006 21:33:14 +0000 (13:33 -0800)]
Add contrib/README.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-tag: -l to list tags (usability).
Junio C Hamano [Fri, 17 Feb 2006 12:04:39 +0000 (04:04 -0800)]
git-tag: -l to list tags (usability).

git-tag -l lists all tags, and git-tag -l <pattern> filters the
result with <pattern>.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoAdd contrib/gitview from Aneesh.
Aneesh Kumar [Fri, 17 Feb 2006 10:10:31 +0000 (02:10 -0800)]
Add contrib/gitview from Aneesh.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-svn: ensure fetch always works chronologically.
Eric Wong [Fri, 17 Feb 2006 02:13:32 +0000 (18:13 -0800)]
git-svn: ensure fetch always works chronologically.

We run svn log against a URL without a working copy for the first fetch,
so we end up a log that's sorted from highest to lowest.  That's bad, we
always want lowest to highest.  Just default to --revision 0:HEAD now if
-r isn't specified for the first fetch.

Also sort the revisions after we get them just in case somebody
accidentally reverses the argument to --revision for whatever reason.

Thanks again to Emmanuel Guerin for helping me find this.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-svn: fix revision order when XML::Simple is not loaded
Eric Wong [Thu, 16 Feb 2006 19:47:51 +0000 (11:47 -0800)]
git-svn: fix revision order when XML::Simple is not loaded

Thanks to Emmanuel Guerin for finding the bug.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoIntroducing contrib/git-svn.
Eric Wong [Thu, 16 Feb 2006 09:24:16 +0000 (01:24 -0800)]
Introducing contrib/git-svn.

18 years agoAllow building Git in systems without iconv
Fernando J. Pereda [Thu, 16 Feb 2006 08:38:01 +0000 (09:38 +0100)]
Allow building Git in systems without iconv

Systems using some uClibc versions do not properly support
iconv stuff. This patch allows Git to be built on those
systems by passing NO_ICONV=YesPlease to make. The only
drawback is mailinfo won't do charset conversion in those
systems.

Signed-off-by: Fernando J. Pereda <ferdy@gentoo.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agotopo-order: make --date-order optional.
Junio C Hamano [Thu, 16 Feb 2006 06:05:33 +0000 (22:05 -0800)]
topo-order: make --date-order optional.

This adds --date-order to rev-list; it is similar to topo order
in the sense that no parent comes before all of its children,
but otherwise things are still ordered in the commit timestamp
order.

The same flag is also added to show-branch.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'jc/add'
Junio C Hamano [Thu, 16 Feb 2006 03:42:15 +0000 (19:42 -0800)]
Merge branch 'jc/add'

* jc/add:
  Detect misspelled pathspec to git-add

18 years agoMerge fixes up to 1.2.1
Junio C Hamano [Thu, 16 Feb 2006 03:39:21 +0000 (19:39 -0800)]
Merge fixes up to 1.2.1

18 years agoMore useful/hinting error messages in git-checkout v1.2.1
Josef Weidendorfer [Wed, 15 Feb 2006 19:22:11 +0000 (20:22 +0100)]
More useful/hinting error messages in git-checkout

Signed-off-by: Josef Weidendorfer <Josef.Weidendorfer@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoPrint an error if cloning a http repo and NO_CURL is set
Fernando J. Pereda [Wed, 15 Feb 2006 11:37:30 +0000 (12:37 +0100)]
Print an error if cloning a http repo and NO_CURL is set

If Git is compiled with NO_CURL=YesPlease and one tries to
clone a http repository, git-clone tries to call the curl
binary. This trivial patch prints an error instead in such
situation.

Signed-off-by: Fernando J. Pereda <ferdy@gentoo.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agopacked objects: minor cleanup
Junio C Hamano [Wed, 15 Feb 2006 20:47:43 +0000 (12:47 -0800)]
packed objects: minor cleanup

The delta depth is unsigned.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoDetect misspelled pathspec to git-add
Junio C Hamano [Wed, 15 Feb 2006 09:05:59 +0000 (01:05 -0800)]
Detect misspelled pathspec to git-add

This is in the same spirit as an earlier patch for git-commit.
It does an extra ls-files to avoid complaining when a fully
tracked directory name is given on the command line (otherwise
--others restriction would say the pathspec does not match).

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agols-files --error-unmatch pathspec error reporting fix.
Junio C Hamano [Wed, 15 Feb 2006 09:10:13 +0000 (01:10 -0800)]
ls-files --error-unmatch pathspec error reporting fix.

Earlier patch mistakenly used prefix_len when it meant
prefix_offset.  The latter is to strip the leading directories
when run from a subdirectory.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'kh/svn'
Junio C Hamano [Wed, 15 Feb 2006 01:51:50 +0000 (17:51 -0800)]
Merge branch 'kh/svn'

* kh/svn:
  git-svnimport: -r adds svn revision number to commit messages

18 years agoMerge branch 'jc/commit'
Junio C Hamano [Wed, 15 Feb 2006 01:51:02 +0000 (17:51 -0800)]
Merge branch 'jc/commit'

* jc/commit:
  commit: detect misspelled pathspec while making a partial commit.
  combine-diff: diff-files fix (#2)
  combine-diff: diff-files fix.

18 years agoMerge branch 'jc/rebase'
Junio C Hamano [Wed, 15 Feb 2006 01:49:00 +0000 (17:49 -0800)]
Merge branch 'jc/rebase'

* jc/rebase:
  rebase: allow a hook to refuse rebasing.

18 years agoMerge branch 'ra/email'
Junio C Hamano [Wed, 15 Feb 2006 01:46:41 +0000 (17:46 -0800)]
Merge branch 'ra/email'

* ra/email:
  send-email: Add --cc
  send-email: Add some options for controlling how addresses are automatically added to the cc: list.

18 years agorebase: allow rebasing onto different base.
Junio C Hamano [Tue, 14 Feb 2006 22:42:05 +0000 (14:42 -0800)]
rebase: allow rebasing onto different base.

This allows you to rewrite history a bit more flexibly, by
separating the other branch name and new branch point.  By
default, the new branch point is the same as the tip of the
other branch as before, but you can specify where you graft the
rebased branch onto.

When you have this ancestry graph:

          A---B---C topic
         /
    D---E---F---G master

$ git rebase --onto master~1 master topic

would rewrite the history to look like this:

      A'\''--B'\''--C'\'' topic
     /
    D---E---F---G master

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agocheckout: fix dirty-file display.
Junio C Hamano [Wed, 15 Feb 2006 00:05:57 +0000 (16:05 -0800)]
checkout: fix dirty-file display.

When we refused to switch branches, we incorrectly showed
differences from the branch we would have switched to.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agocommit: detect misspelled pathspec while making a partial commit.
Junio C Hamano [Tue, 14 Feb 2006 20:40:20 +0000 (12:40 -0800)]
commit: detect misspelled pathspec while making a partial commit.

When you say "git commit Documentaiton" to make partial commit
for the files only in that directory, we did not detect that as
a misspelled pathname and attempted to commit index without
change.  If nothing matched, there is no harm done, but if the
index gets modified otherwise by having another valid pathspec
or after an explicit update-index, a user will not notice
without paying attention to the "git status" preview.

This introduces --error-unmatch option to ls-files, and uses it
to detect this common user error.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-svnimport: -r adds svn revision number to commit messages
Karl Hasselström [Tue, 14 Feb 2006 02:43:34 +0000 (03:43 +0100)]
git-svnimport: -r adds svn revision number to commit messages

New -r flag for prepending the corresponding Subversion revision
number to each commit message.

Signed-off-by: Karl Hasselström <kha@treskal.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agocombine-diff: diff-files fix (#2)
Junio C Hamano [Tue, 14 Feb 2006 09:11:42 +0000 (01:11 -0800)]
combine-diff: diff-files fix (#2)

The raw format "git-diff-files -c" to show unmerged state forgot
to initialize the status fields from parents, causing NUL
characters to be emitted.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge some proposed fixes
Junio C Hamano [Tue, 14 Feb 2006 07:34:58 +0000 (23:34 -0800)]
Merge some proposed fixes

Conflicts:

Documentation/git-commit.txt - taking the post 1.2.0 semantics.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'pb/bisect'
Junio C Hamano [Tue, 14 Feb 2006 07:26:53 +0000 (23:26 -0800)]
Merge branch 'pb/bisect'

* pb/bisect:
  Properly git-bisect reset after bisecting from non-master head

18 years agocombine-diff: diff-files fix.
Junio C Hamano [Tue, 14 Feb 2006 07:07:04 +0000 (23:07 -0800)]
combine-diff: diff-files fix.

When showing a conflicted merge from index stages and working
tree file, we did not fetch the mode from the working tree,
and mistook that as a deleted file.  Also if the manual
resolution (or automated resolution by git rerere) ended up
taking either parent's version, we did not show _anything_ for
that path.  Either was quite bad and confusing.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agos/SHELL/SHELL_PATH/ in Makefile
Fredrik Kuivinen [Mon, 13 Feb 2006 23:15:14 +0000 (00:15 +0100)]
s/SHELL/SHELL_PATH/ in Makefile

With the current Makefile we don't use the shell chosen by the
platform specific defines when we invoke GIT-VERSION-GEN.

Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agobisect: remove BISECT_NAMES after done.
Junio C Hamano [Tue, 14 Feb 2006 05:25:38 +0000 (21:25 -0800)]
bisect: remove BISECT_NAMES after done.

I noticed that we forgot to clean this file and kept it that
way, while trying to help with Andrew's bisect problem.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoDocumentation: git-ls-files asciidocco.
Junio C Hamano [Tue, 14 Feb 2006 05:52:10 +0000 (21:52 -0800)]
Documentation: git-ls-files asciidocco.

Noticed by Jon Nelson.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agosend-email: Add --cc
Ryan Anderson [Mon, 13 Feb 2006 08:05:15 +0000 (03:05 -0500)]
send-email: Add --cc

Since Junio used this in an example, and I've personally tried to use it, I
suppose the option should actually exist.

Signed-off-by: Ryan Anderson <ryan@michonline.com>
18 years agoDocumentation: git-commit in 1.2.X series defaults to --include.
Junio C Hamano [Mon, 13 Feb 2006 08:26:14 +0000 (00:26 -0800)]
Documentation: git-commit in 1.2.X series defaults to --include.

The documentation was mistakenly describing the --only semantics to
be default.  The 1.2.0 release and its maintenance series 1.2.X will
keep the traditional --include semantics as the default.  Clarify the
situation.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agosend-email: Add some options for controlling how addresses are automatically added...
Ryan Anderson [Mon, 13 Feb 2006 07:57:09 +0000 (02:57 -0500)]
send-email: Add some options for controlling how addresses are automatically added to the cc: list.

Signed-off-by: Ryan Anderson <ryan@michonline.com>
18 years agorebase: allow a hook to refuse rebasing.
Junio C Hamano [Mon, 13 Feb 2006 07:17:04 +0000 (23:17 -0800)]
rebase: allow a hook to refuse rebasing.

This lets a hook to interfere a rebase and help prevent certain
branches from being rebased by mistake.  A sample hook to show
how to prevent a topic branch that has already been merged into
publish branch.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-commit: Now --only semantics is the default.
Junio C Hamano [Mon, 13 Feb 2006 07:55:07 +0000 (23:55 -0800)]
git-commit: Now --only semantics is the default.

This changes the "git commit paths..." to default to --only
semantics from traditional --include semantics, as agreed on the
list.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoGIT 1.2.0 v1.2.0
Junio C Hamano [Sun, 12 Feb 2006 21:14:53 +0000 (13:14 -0800)]
GIT 1.2.0

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoFix "test: unexpected operator" on bsd
Junio C Hamano [Sun, 12 Feb 2006 21:13:12 +0000 (13:13 -0800)]
Fix "test: unexpected operator" on bsd

This fixes the same issue as a previous fix by Alex Riesen does.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoProperly git-bisect reset after bisecting from non-master head
Petr Baudis [Sun, 12 Feb 2006 16:06:14 +0000 (17:06 +0100)]
Properly git-bisect reset after bisecting from non-master head

git-bisect reset without an argument would return to master even
if the bisecting started at a non-master branch. This patch makes
it save the original branch name to .git/head-name and restore it
afterwards.

This is also compatible with Cogito and cg-seek, so cg-status will
show that we are seeked on the bisect branch and cg-reset will
properly restore the original branch.

git-bisect start will refuse to work if it is not on a bisect but
.git/head-name exists; this is to protect against conflicts with
other seeking tools.

Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-commit: show dirtiness including index.
Junio C Hamano [Sun, 12 Feb 2006 21:05:53 +0000 (13:05 -0800)]
git-commit: show dirtiness including index.

Earlier, when we switched a branch we used diff-files to show
paths that are dirty in the working tree.  But we allow switching
branches with updated index ("read-tree -m -u $old $new" works that
way), and only showing paths that have differences in the working
tree but not paths that are different in index was confusing.

This shows both as modified from the top commit of the branch we
just have switched to.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMake pack-objects chattier.
Junio C Hamano [Sun, 12 Feb 2006 21:01:54 +0000 (13:01 -0800)]
Make pack-objects chattier.

You could give -q to squelch it, but currently no tool does it.
This would make 'git clone host:repo here' over ssh not silent
again.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoavoid echo -e, there are systems where it does not work
Alex Riesen [Sun, 12 Feb 2006 18:05:34 +0000 (19:05 +0100)]
avoid echo -e, there are systems where it does not work

FreeBSD 4.11 being one example: the built-in echo doesn't have -e,
and the installed /bin/echo does not do "-e" as well.
"printf" works, laking just "\e" and "\xAB'.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agofix "test: 2: unexpected operator" on bsd
Alex Riesen [Sun, 12 Feb 2006 18:03:16 +0000 (19:03 +0100)]
fix "test: 2: unexpected operator" on bsd

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoFix object re-hashing
Linus Torvalds [Sun, 12 Feb 2006 19:24:50 +0000 (11:24 -0800)]
Fix object re-hashing

The hashed object lookup had a subtle bug in re-hashing: it did

for (i = 0; i < count; i++)
if (objs[i]) {
.. rehash ..

where "count" was the old hash couny. Oon the face of it is obvious, since
it clearly re-hashes all the old objects.

However, it's wrong.

If the last old hash entry before re-hashing was in use (or became in use
by the re-hashing), then when re-hashing could have inserted an object
into the hash entries with idx >= count due to overflow. When we then
rehash the last old entry, that old entry might become empty, which means
that the overflow entries should be re-hashed again.

In other words, the loop has to be fixed to either traverse the whole
array, rather than just the old count.

(There's room for a slight optimization: instead of counting all the way
up, we can break when we see the first empty slot that is above the old
"count". At that point we know we don't have any collissions that we might
have to fix up any more. This patch only does the trivial fix)

[jc: with trivial fix on trivial fix]

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agohashtable-based objects: minimum fixups.
Junio C Hamano [Sun, 12 Feb 2006 02:51:19 +0000 (18:51 -0800)]
hashtable-based objects: minimum fixups.

Calling hashtable_index from find_object before objs is created
would result in division by zero failure.  Avoid it.

Also the given object name may not be aligned suitably for
unsigned int; avoid dereferencing casted pointer.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoUse a hashtable for objects instead of a sorted list
Johannes Schindelin [Sun, 12 Feb 2006 01:57:57 +0000 (02:57 +0100)]
Use a hashtable for objects instead of a sorted list

In a simple test, this brings down the CPU time from 47 sec to 22 sec.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoAdd howto about separating topics.
kent@lysator.liu.se [Sun, 12 Feb 2006 12:00:52 +0000 (13:00 +0100)]
Add howto about separating topics.

This howto consists of a footnote from an email by JC to the git
mailing list (<7vfyms0x4p.fsf@assigned-by-dhcp.cox.net>).

Signed-off-by: Kent Engstrom <kent@lysator.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'pb/repo'
Junio C Hamano [Sun, 12 Feb 2006 13:02:30 +0000 (05:02 -0800)]
Merge branch 'pb/repo'

* pb/repo:
  Add support for explicit type specifiers when calling git-repo-config

18 years agoMerge branch 'jc/fixdiff'
Junio C Hamano [Sun, 12 Feb 2006 13:02:25 +0000 (05:02 -0800)]
Merge branch 'jc/fixdiff'

* jc/fixdiff:
  diff-tree: do not default to -c

18 years agoAvoid using "git-var -l" until it gets fixed.
Junio C Hamano [Sat, 11 Feb 2006 20:39:11 +0000 (12:39 -0800)]
Avoid using "git-var -l" until it gets fixed.

This is to be nicer to people with unusable GECOS field.

"git-var -l" is currently broken in that when used by a user who
does not have a usable GECOS field and has not corrected it by
exporting GIT_COMMITTER_NAME environment variable it dies when
it tries to output GIT_COMMITTER_IDENT (same thing for AUTHOR).

"git-pull" used "git-var -l" only because it needed to get a
configuration variable before "git-repo-config --get" was
introduced.  Use the latter tool designed exactly for this
purpose.

"git-sh-setup" used "git-var GIT_AUTHOR_IDENT" without actually
wanting to use its value.  The only purpose was to cause the
command to check and barf if the repository format version
recorded in the $GIT_DIR/config file is too new for us to deal
with correctly.  Instead, use "repo-config --get" on a random
property and see if it die()s, and check if the exit status is
128 (comes from die -- missing variable is reported with exit
status 1, so we can tell that case apart).

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoAdd support for explicit type specifiers when calling git-repo-config
Petr Baudis [Sun, 12 Feb 2006 03:14:48 +0000 (04:14 +0100)]
Add support for explicit type specifiers when calling git-repo-config

Currently, git-repo-config will just return the raw value of option
as specified in the config file; this makes things difficult for scripts
calling it, especially if the value is supposed to be boolean.

This patch makes it possible to ask git-repo-config to check if the option
is of the given type (int or bool) and write out the value in its
canonical form. If you do not pass --int or --bool, the behaviour stays
unchanged and the raw value is emitted.

This also incidentally fixes the segfault when option with no value is
encountered.

[jc: tweaked the option parsing a bit to make it easier to see
 that the patch does not change anything but the type stuff in
 the diff output.  Also changed to avoid "foo ? : bar" construct. ]

Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agodiff-tree: do not default to -c
Junio C Hamano [Sun, 12 Feb 2006 00:43:30 +0000 (16:43 -0800)]
diff-tree: do not default to -c

Marco says it breaks qgit.  This makes the flags a bit more
orthogonal.

  $ git-diff-tree -r --abbrev ca18

    No output from this command because you asked to skip merge by
    not having -m there.

  $ git-diff-tree -r -m --abbrev ca18
  ca182053c7710a286d72102f4576cf32e0dafcfb
  :100644 100644 538d21d... 59042d1... M Makefile
  :100644 100644 410b758... 6c47c3a... M entry.c
  ca182053c7710a286d72102f4576cf32e0dafcfb
  :100644 100644 30479b4... 59042d1... M Makefile

    The same "independent sets of diff" as before without -c.

  $ git-diff-tree -r -m -c --abbrev ca18
  ca182053c7710a286d72102f4576cf32e0dafcfb
  ::100644 100644 100644 538d21d... 30479b4... 59042d1... MM Makefile

    Combined.

  $ git-diff-tree -r -c --abbrev ca18
  ca182053c7710a286d72102f4576cf32e0dafcfb
  ::100644 100644 100644 538d21d... 30479b4... 59042d1... MM Makefile

    Asking for combined without -m does not make sense, so -c
    implies -m.

We need to supply -c as default to whatchanged, which is a
one-liner.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agot5500: adjust to change in pack-object reporting behaviour.
Junio C Hamano [Sun, 12 Feb 2006 07:08:23 +0000 (23:08 -0800)]
t5500: adjust to change in pack-object reporting behaviour.

Now pack-object is not as chatty when its stderr is not connected
to a terminal, so the test needs to be adjusted for that.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoOnly call git-rerere if $GIT_DIR/rr-cache exists.
Junio C Hamano [Sun, 12 Feb 2006 02:55:43 +0000 (18:55 -0800)]
Only call git-rerere if $GIT_DIR/rr-cache exists.

Johannes noticed that git-rerere depends on Digest.pm, and if
one does not use the command, one can live without it.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoUse a relative path for SVN importing
Christian Biesinger [Sat, 11 Feb 2006 15:44:11 +0000 (16:44 +0100)]
Use a relative path for SVN importing

The absolute path (with the leading slash) breaks SVN importing,
because it then looks for /trunk/... instead of /svn/trunk/...
(in my case, the repository URL was https://servername/svn/)

Signed-off-by: Christian Biesinger <cbiesinger@web.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agofetch-clone progress: finishing touches.
Junio C Hamano [Sun, 12 Feb 2006 01:54:18 +0000 (17:54 -0800)]
fetch-clone progress: finishing touches.

This makes fetch-pack also report the progress of packing part.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoFix fetch-clone in the presense of signals
Linus Torvalds [Sat, 11 Feb 2006 18:41:22 +0000 (10:41 -0800)]
Fix fetch-clone in the presense of signals

We shouldn't fail a fetch just because a signal might have interrupted
the read.

Normally, we don't install any signal handlers, so EINTR really shouldn't
happen. That said, really old versions of Linux will interrupt an
interruptible system call even for signals that turn out to be ignored
(SIGWINCH is the classic example - resizing your xterm would cause it).
The same might well be true elsewhere too.

Also, since receive_keep_pack() doesn't control the caller, it can't know
that no signal handlers exist.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMake "git clone" pack-fetching download statistics better
Linus Torvalds [Sat, 11 Feb 2006 18:43:56 +0000 (10:43 -0800)]
Make "git clone" pack-fetching download statistics better

Average it out over a few events to make the numbers stable, and fix the
silly usec->binary-ms conversion.

Yeah, yeah, it's arguably eye-candy to keep the user calm, but let's do
that right.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMake "git clone" less of a deathly quiet experience
Linus Torvalds [Sat, 11 Feb 2006 04:31:09 +0000 (20:31 -0800)]
Make "git clone" less of a deathly quiet experience

It used to be that "git-unpack-objects" would give nice percentages, but
now that we don't unpack the initial clone pack any more, it doesn't. And
I'd love to do that nice percentage view in the pack objects downloader
too, but the thing doesn't even read the pack header, much less know how
much it's going to get, so I was lazy and didn't.

Instead, it at least prints out how much data it's gotten, and what the
packing speed is. Which makes the user realize that it's actually doing
something useful instead of sitting there silently (and if the recipient
knows how large the final result is, he can at least make a guess about
when it migt be done).

So with this patch, I get something like this on my DSL line:

[torvalds@g5 ~]$ time git clone master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 clone-test
Packing 188543 objects
  48.398MB  (154 kB/s)

where even the speed approximation seems to be roughtly correct (even
though my algorithm is a truly stupid one, and only really gives "speed in
the last half second or so").

Anyway, _something_ like this is definitely needed. It could certainly be
better (if it showed the same kind of thing that git-unpack-objects did,
that would be much nicer, but would require parsing the object stream as
it comes in). But this is  big step forward, I think.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoDefine GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL) to known values.
Junio C Hamano [Sat, 11 Feb 2006 03:11:23 +0000 (19:11 -0800)]
Define GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL) to known values.

Without these, running tests with an account with empty gecos
field would fail.

We might want to loosen error from "git-var -l" (but not
"git-var GIT_AUTHOR_NAME") later, but that is more or less an
independent issue.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'lt/diff-tree'
Junio C Hamano [Sat, 11 Feb 2006 02:47:41 +0000 (18:47 -0800)]
Merge branch 'lt/diff-tree'

* lt/diff-tree:
  combine-diff: Record diff status a bit more faithfully
  find_unique_abbrev() simplification.
  combine-diff: move formatting logic to show_combined_diff()
  combined-diff: use diffcore before intersecting paths.
  diff-tree -c raw output

18 years agogit-commit -v: have patch at the end.
Junio C Hamano [Sat, 11 Feb 2006 02:38:24 +0000 (18:38 -0800)]
git-commit -v: have patch at the end.

It was pointed out that otherwise more important summary
information prefixed with '#' would become prone to be missed.

Also instead of chopping at the first '^---$' line, stop at the
first 'diff --git a/' line.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agorev-list: default to abbreviate merge parent names under --pretty.
Junio C Hamano [Fri, 10 Feb 2006 19:56:42 +0000 (11:56 -0800)]
rev-list: default to abbreviate merge parent names under --pretty.

When we prettyprint commit log messages, merge parent names were
often very long and there was no way to abbreviate it.

This changes them to be abbreviated by default, and non-default
abbreviations can be specified with --no-abbrev or --abbrev=<n>
options.

Note that this affects only the prettyprinted parent names.  The
output from --show-parents is meant for machine consumption and
is not affected by this flag.

18 years agodelta micro optimization
Nicolas Pitre [Fri, 10 Feb 2006 18:42:05 +0000 (13:42 -0500)]
delta micro optimization

My kernel work habit made me look at the generated assembly for the
delta code, and one obvious albeit small improvement is this patch.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agocount-delta.c: comment fixes
Nicolas Pitre [Fri, 10 Feb 2006 15:20:40 +0000 (10:20 -0500)]
count-delta.c: comment fixes

There was a stale comment that explains why the old code could
undercount when delta data copied things around inside detination
buffer.  We do not use that kind of delta, so the comment does
not apply.

18 years agoMerge branch 'jc/empty-commit'
Junio C Hamano [Fri, 10 Feb 2006 15:14:55 +0000 (07:14 -0800)]
Merge branch 'jc/empty-commit'

* jc/empty-commit:
  t6000: fix a careless test library add-on.
  Do not allow empty name or email.

18 years agocombine-diff: Record diff status a bit more faithfully
Junio C Hamano [Fri, 10 Feb 2006 10:30:52 +0000 (02:30 -0800)]
combine-diff: Record diff status a bit more faithfully

This shows "new file mode XXXX" and "deleted file mode XXXX"
lines like two-way diff-patch output does, by checking the
status from each parent.

The diff-raw output for combined diff is made a bit uglier by
showing diff status letters with each parent.  While most of the
case you would see "MM" in the output, an Evil Merge that
touches a path that was added by inheriting from one parent is
possible and it would be shown like these:

    $ git-diff-tree --abbrev -c HEAD
    2d7ca89675eb8888b0b88a91102f096d4471f09f
    ::000000 000000 100644 0000000... 0000000... 31dd686... AA b
    ::000000 100644 100644 0000000... 6c884ae... c6d4fa8... AM d
    ::100644 100644 100644 4f7cbe7... f8c295c... 19d5d80... RR e

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agofind_unique_abbrev() simplification.
Junio C Hamano [Fri, 10 Feb 2006 09:51:12 +0000 (01:51 -0800)]
find_unique_abbrev() simplification.

Earlier it did not grok the 0{40} SHA1 very well, but what it
needed to do was to find the shortest 0{N} that is not used as a
valid object name to be consistent with the way names of valid
objects are abbreviated.  This makes some users simpler.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-status -v
Junio C Hamano [Fri, 10 Feb 2006 08:45:59 +0000 (00:45 -0800)]
git-status -v

This revamps the git-status command to take the same set of
parameters as git commit.  It gives a preview of what is being
committed with that command.  With -v flag, it shows the diff
output between the HEAD commit and the index that would be
committed if these flags were given to git-commit command.

git-commit also acquires -v flag (it used to mean "verify" but
that is the default anyway and there is --no-verify to turn it
off, so not much is lost), which uses the updated git-status -v
to seed the commit log buffer.  This is handy for writing a log
message while reviewing the changes one last time.

Now, git-commit and git-status are internally share the same
implementation.

Unlike previous git-commit change, this uses a temporary index
to prepare the index file that would become the real index file
after a successful commit, and moves it to the real index file
once the commit is actually made.  This makes it safer than the
previous scheme, which stashed away the original index file and
restored it after an aborted commit.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'jc/ls-files-o'
Junio C Hamano [Fri, 10 Feb 2006 06:19:07 +0000 (22:19 -0800)]
Merge branch 'jc/ls-files-o'

* jc/ls-files-o:
  ls-files: honour per-directory ignore file from higher directories.

18 years agocount-delta.c: Match the delta data semantics change in version 3.
Junio C Hamano [Fri, 10 Feb 2006 01:15:59 +0000 (17:15 -0800)]
count-delta.c: Match the delta data semantics change in version 3.

This matches the count_delta() logic to the change previous
commit introduces to patch_delta().

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoremove delta-against-self bit
Nicolas Pitre [Thu, 9 Feb 2006 22:50:04 +0000 (17:50 -0500)]
remove delta-against-self bit

After experimenting with code to add the ability to encode a delta
against part of the deltified file, it turns out that resulting packs
are _bigger_ than when this ability is not used.  The raw delta output
might be smaller, but it doesn't compress as well using gzip with a
negative net saving on average.

Said bit would in fact be more useful to allow for encoding the copying
of chunks larger than 64KB providing more savings with large files.
This will correspond to packs version 3.

While the current code still produces packs version 2, it is made future
proof so pack versions 2 and 3 are accepted.  Any pack version 2 are
compatible with version 3 since the redefined bit was never used before.
When enough time has passed, code to use that bit to produce version 3
packs could be added.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agostat() for existence in safe_create_leading_directories()
Jason Riedy [Fri, 10 Feb 2006 01:56:13 +0000 (17:56 -0800)]
stat() for existence in safe_create_leading_directories()

Use stat() to explicitly check for existence rather than
relying on the non-portable EEXIST error in sha1_file.c's
safe_create_leading_directories().  There certainly are
optimizations possible, but then the code becomes almost
the same as that in coreutil's lib/mkdir-p.c.

Other uses of EEXIST seem ok.  Tested on Solaris 8, AIX 5.2L,
and a few Linux versions.  AIX has some unrelated (I think)
failures right now; I haven't tried many recent gits there.
Anyone have an old Ultrix box to break everything?  ;)

Also remove extraneous #includes.  Everything's already in
git-compat-util.h, included through cache.h.

Signed-off-by: Jason Riedy <ejr@cs.berkeley.edu>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agocombine-diff: move formatting logic to show_combined_diff()
Junio C Hamano [Thu, 9 Feb 2006 23:23:06 +0000 (15:23 -0800)]
combine-diff: move formatting logic to show_combined_diff()

This way, diff-files can make use of it.  Also implement the
full suite of what diff_flush_raw() supports just for
consistency.  With this, 'diff-tree -c -r --name-status' would
show what is expected.

There is no way to get the historical output (useful for
debugging and low-level Plumbing work) anymore, so tentatively
it makes '-m' to mean "do not combine and show individual diffs
with parents".

diff-files matches diff-tree to produce raw output for -c.  For
textual combined diff, use -p -c.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agocall git_config() after setup_git_directory()
Junio C Hamano [Thu, 9 Feb 2006 22:41:39 +0000 (14:41 -0800)]
call git_config() after setup_git_directory()

If you call setup_git_directory() to work from a subdirectory,
that should be run first before running git_config().  Otherwise
you would not read the configuration file from the correct place.

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