Code

git.git
18 years agoMerge branch 'jc/send-insane-refs' into next
Junio C Hamano [Wed, 22 Feb 2006 09:48:49 +0000 (01:48 -0800)]
Merge branch 'jc/send-insane-refs' into next

* jc/send-insane-refs:
  send-pack: do not give up when remote has insanely large number of refs.
  rev-list.c: fix non-grammatical comments.

18 years agosend-pack: do not give up when remote has insanely large number of refs.
Junio C Hamano [Wed, 22 Feb 2006 02:59:37 +0000 (18:59 -0800)]
send-pack: do not give up when remote has insanely large number of refs.

Stephen C. Tweedie noticed that we give up running rev-list when
we see too many refs on the remote side.  Limit the number of
negative references we give to rev-list and continue.

Not sending any negative references to rev-list is very bad --
we may be pushing a ref that is new to the other end.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agorev-list.c: fix non-grammatical comments.
Junio C Hamano [Wed, 22 Feb 2006 09:27:02 +0000 (01:27 -0800)]
rev-list.c: fix non-grammatical comments.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge part of np/delta
Junio C Hamano [Wed, 22 Feb 2006 08:57:43 +0000 (00:57 -0800)]
Merge part of np/delta

18 years agodiff-delta: big code simplification
Nicolas Pitre [Wed, 22 Feb 2006 01:43:17 +0000 (20:43 -0500)]
diff-delta: big code simplification

This is much smaller and hopefully clearer code now.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agodiff-delta: fold two special tests into one plus cleanups
Nicolas Pitre [Wed, 22 Feb 2006 01:41:41 +0000 (20:41 -0500)]
diff-delta: fold two special tests into one plus cleanups

Testing for realloc and size limit can be done with only one test per
loop. Make it so and fix a theoretical off-by-one comparison error in
the process.

The output buffer memory allocation is also bounded by max_size when
specified.

Finally make some variable unsigned to allow the handling of files up to
4GB in size instead of 2GB.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agorelax delta selection filtering in pack-objects
Nicolas Pitre [Wed, 22 Feb 2006 01:39:25 +0000 (20:39 -0500)]
relax delta selection filtering in pack-objects

This change provides a 8% saving on the pack size with a 4% CPU time
increase for git-repack -a on the current git archive.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge git://git.kernel.org/pub/scm/gitk/gitk
Junio C Hamano [Wed, 22 Feb 2006 08:35:18 +0000 (00:35 -0800)]
Merge git://git.kernel.org/pub/scm/gitk/gitk

* git://git.kernel.org/pub/scm/gitk/gitk:
  gitk: Make "find" on "Files" work again.

18 years agoMerge branch 'fix'
Junio C Hamano [Wed, 22 Feb 2006 08:35:07 +0000 (00:35 -0800)]
Merge branch 'fix'

* fix:
  git-push: Update documentation to describe the no-refspec behavior.
  format-patch: pretty-print timestamp correctly.
  git-add: Add support for --, documentation, and test.

18 years agoMerge branch 'jc/perl'
Junio C Hamano [Wed, 22 Feb 2006 06:51:21 +0000 (22:51 -0800)]
Merge branch 'jc/perl'

* jc/perl:
  cvsimport: avoid open "-|" list form for Perl 5.6
  svnimport: avoid open "-|" list form for Perl 5.6
  send-email: avoid open "-|" list form for Perl 5.6
  rerere: avoid open "-|" list form for Perl 5.6
  fmt-merge-msg: avoid open "-|" list form for Perl 5.6

18 years agoMerge branch 'jc/pack-reuse'
Junio C Hamano [Wed, 22 Feb 2006 06:38:43 +0000 (22:38 -0800)]
Merge branch 'jc/pack-reuse'

* jc/pack-reuse:
  pack-objects: avoid delta chains that are too long.
  git-repack: allow passing a couple of flags to pack-objects.
  pack-objects: finishing touches.
  pack-objects: reuse data from existing packs.

18 years agoMerge branch 'jc/nostat'
Junio C Hamano [Wed, 22 Feb 2006 06:33:21 +0000 (22:33 -0800)]
Merge branch 'jc/nostat'

* jc/nostat:
  cache_name_compare() compares name and stage, nothing else.
  "assume unchanged" git: documentation.
  ls-files: split "show-valid-bit" into a different option.
  "Assume unchanged" git: --really-refresh fix.
  ls-files: debugging aid for CE_VALID changes.
  "Assume unchanged" git: do not set CE_VALID with --refresh
  "Assume unchanged" git

18 years agoMerge branch 'js/portable'
Junio C Hamano [Wed, 22 Feb 2006 06:28:40 +0000 (22:28 -0800)]
Merge branch 'js/portable'

* js/portable:
  Fix "gmake -j"
  Really honour NO_PYTHON
  avoid makefile override warning
  Fixes for ancient versions of GNU make

18 years agogit-push: Update documentation to describe the no-refspec behavior.
Carl Worth [Wed, 22 Feb 2006 04:28:50 +0000 (20:28 -0800)]
git-push: Update documentation to describe the no-refspec behavior.

It turns out that the git-push documentation didn't describe what it
would do when not given a refspec, (not on the command line, nor in a
remotes file). This is fairly important for the user who is trying to
understand operations such as:

git clone git://something/some/where
# hack, hack, hack
git push origin

I tracked the mystery behavior down to git-send-pack and lifted the
relevant portion of its documentation up to git-push, (namely that all
refs existing both locally and remotely are updated).

Signed-off-by: Carl Worth <cworth@cworth.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitview: Use monospace font to draw the branch and tag name
aneesh.kumar@gmail.com [Tue, 21 Feb 2006 10:30:10 +0000 (16:00 +0530)]
gitview: Use monospace font to draw the branch and tag name

This patch address the below:
Use monospace font to draw branch and tag name
set the font size to 13.
Make the graph column resizable. This helps to accommodate large tag names

Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitview: Read tag and branch information using git ls-remote
aneesh.kumar@gmail.com [Tue, 21 Feb 2006 10:30:04 +0000 (16:00 +0530)]
gitview: Read tag and branch information using git ls-remote

This fix the below bug

Junio C Hamano <junkio@cox.net> writes:

>
> It does not work in my repository, since you do not seem to
> handle branch and tag names with slashes in them.  All of my
> topic branches live in directories with two-letter names
> (e.g. ak/gitview).

Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-ls-files: Fix, document, and add test for --error-unmatch option.
Carl Worth [Tue, 21 Feb 2006 20:48:30 +0000 (12:48 -0800)]
git-ls-files: Fix, document, and add test for --error-unmatch option.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoFix typo in git-rebase.sh.
Jason Riedy [Tue, 21 Feb 2006 20:56:14 +0000 (12:56 -0800)]
Fix typo in git-rebase.sh.

s/upsteram/upstream in git-rebase.sh.

Signed-off-by: Jason Riedy <ejr@cs.berkeley.edu>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoNew test to verify that when git-clone fails it cleans up the new directory.
Carl Worth [Fri, 17 Feb 2006 21:33:28 +0000 (13:33 -0800)]
New test to verify that when git-clone fails it cleans up the new directory.

Signed-off-by: Carl Worth <cworth@cworth.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'pj/portable'
Junio C Hamano [Wed, 22 Feb 2006 02:16:29 +0000 (18:16 -0800)]
Merge branch 'pj/portable'

* pj/portable:
  Makefile tweaks: Solaris 9+ dont need iconv / move up uname variables

18 years agoformat-patch: pretty-print timestamp correctly.
Junio C Hamano [Wed, 22 Feb 2006 02:13:32 +0000 (18:13 -0800)]
format-patch: pretty-print timestamp correctly.

Perl is not C and does not truncate the division result.  Arghh!

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-rebase: Clarify usage statement and copy it into the actual documentation.
Carl Worth [Wed, 22 Feb 2006 01:10:12 +0000 (17:10 -0800)]
git-rebase: Clarify usage statement and copy it into the actual documentation.

I found a paper thin man page for git-rebase, but was quite happy to
see something much more useful in the usage statement of the script
when I went there to find out how this thing worked. Here it is
cleaned up slightly and expanded a bit into the actual documentation.

Signed-off-by: Carl Worth <cworth@cworth.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-add: Add support for --, documentation, and test.
Carl Worth [Tue, 21 Feb 2006 23:33:49 +0000 (15:33 -0800)]
git-add: Add support for --, documentation, and test.

This adds support to git-add to allow the common -- to separate
command-line options and file names. It adds documentation and a new
git-add test case as well.

[jc: this should apply to 1.2.X maintenance series, so I reworked
 git-ls-files --error-unmatch test. ]

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoFix "gmake -j"
Johannes Schindelin [Tue, 21 Feb 2006 12:08:21 +0000 (13:08 +0100)]
Fix "gmake -j"

In my attempt to port git to IRIX, I broke it. Sorry.

Signed-off-by: Johannes E. Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'fk/blame' into next
Junio C Hamano [Tue, 21 Feb 2006 09:08:21 +0000 (01:08 -0800)]
Merge branch 'fk/blame' into next

* fk/blame:
  Add git-blame, a tool for assigning blame.

18 years agoMerge branch 'pj/portable' into next
Junio C Hamano [Tue, 21 Feb 2006 09:07:57 +0000 (01:07 -0800)]
Merge branch 'pj/portable' into next

* pj/portable:
  Makefile tweaks: Solaris 9+ dont need iconv / move up uname variables
  Merge part of jc/portable branch
  git-mktree: reverse of git-ls-tree.
  Merge branch 'lt/merge-tree'
  Merge branch 'jc/ident'
  cherry-pick/revert: error-help message rewording.
  Fix fmt-merge-msg counting.

18 years agoMakefile tweaks: Solaris 9+ dont need iconv / move up uname variables
Paul Jakma [Mon, 20 Feb 2006 23:36:28 +0000 (23:36 +0000)]
Makefile tweaks: Solaris 9+ dont need iconv / move up uname variables

- Solaris 9 and up do not need -liconv, so NEEDS_LIBICONV should be set
   only for S8.
- Move the declaration of the uname variables to early in the Makefile
   so they can be referenced by prefix and gitexecdir variables.
- gitexecdir defaults to being same as bindir, it might as well reference
   that variable.

[jc: corrupt patch, sneakily tried to remove inclusion of GIT-VERSION-FILE
 I do not know why I am applying this...]

Signed-off-by: Paul Jakma <paul@quagga.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoAdd git-blame, a tool for assigning blame.
Fredrik Kuivinen [Mon, 20 Feb 2006 23:40:54 +0000 (00:40 +0100)]
Add git-blame, a tool for assigning blame.

I have also been working on a blame program. The algorithm is pretty
much the one described by Junio in his blame.perl. My variant doesn't
handle renames, but it shouldn't be too hard to add that. The output
is minimal, just the line number followed by the commit SHA1.

An interesting observation is that the output from my git-blame and
your git-annotate doesn't match on all files in the git
repository. One example where several lines differ is read-cache.c. I
haven't investigated it further to find out which one is correct.

The code should be considered as a work in progress. It certainly has
a couple of rough edges. The output looks fairly sane on the few files
I have tested it on, but it wouldn't be too surprising if it gets some
cases wrong.

[jc: adding it to pu for wider comments. I did minimum
whitespace fixups but it still needs an indent run and
-Wdeclaration-after-statement fixups.]

Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge part of jc/portable branch
Junio C Hamano [Tue, 21 Feb 2006 08:52:18 +0000 (00:52 -0800)]
Merge part of jc/portable branch

18 years agogit-mktree: reverse of git-ls-tree.
Junio C Hamano [Tue, 21 Feb 2006 05:50:01 +0000 (21:50 -0800)]
git-mktree: reverse of git-ls-tree.

This reads data in the format a (non recursive) ls-tree outputs
and writes a tree object to the object database.  The created
tree object name is output to the standard output.

For convenience, the input data does not need to be sorted; the
command sorts the input lines internally.

By request from Tommi Virtanen.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'lt/merge-tree'
Junio C Hamano [Tue, 21 Feb 2006 08:49:38 +0000 (00:49 -0800)]
Merge branch 'lt/merge-tree'

* lt/merge-tree:
  git-merge-tree: generalize the "traverse <n> trees in sync" functionality
  Handling large files with GIT
  Handling large files with GIT

18 years agoMerge branch 'jc/ident'
Junio C Hamano [Tue, 21 Feb 2006 08:46:07 +0000 (00:46 -0800)]
Merge branch 'jc/ident'

* jc/ident:
  Keep Porcelainish from failing by broken ident after making changes.
  Delay "empty ident" errors until they really matter.
  Make "empty ident" error message a bit more helpful.

18 years agocherry-pick/revert: error-help message rewording.
Junio C Hamano [Tue, 21 Feb 2006 08:28:04 +0000 (00:28 -0800)]
cherry-pick/revert: error-help message rewording.

It said "after fixing up, commit the result using -F .msg", but
it was not clear for new people how "fix up" should be done.
Hint "git-update-index <path>".

We could recommend "git commit -a -F .msg" instead, but I am
hesitant to give that suggestion in the blind -- you could do a
cherry-pick, revert or a merge in general in a dirty working
tree as long as local modifications do not overlap with the
merge, but using "commit -a" would include them in the result.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoFix fmt-merge-msg counting.
Junio C Hamano [Tue, 21 Feb 2006 03:26:21 +0000 (19:26 -0800)]
Fix fmt-merge-msg counting.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'jc/perl' into next
Junio C Hamano [Mon, 20 Feb 2006 22:25:50 +0000 (14:25 -0800)]
Merge branch 'jc/perl' into next

* jc/perl:
  cvsimport: avoid open "-|" list form for Perl 5.6
  svnimport: avoid open "-|" list form for Perl 5.6
  send-email: avoid open "-|" list form for Perl 5.6
  rerere: avoid open "-|" list form for Perl 5.6
  fmt-merge-msg: avoid open "-|" list form for Perl 5.6

18 years agoMerge branch 'ra/anno' into next
Junio C Hamano [Mon, 20 Feb 2006 22:25:46 +0000 (14:25 -0800)]
Merge branch 'ra/anno' into next

* ra/anno:
  Add git-annotate, a tool for assigning blame.
  git-svn: 0.9.1: add --version and copyright/license (GPL v2+) information
  contrib/git-svn: add Makefile, test, and associated ignores
  git-svn: fix several corner-case and rare bugs with 'commit'
  contrib/git-svn.txt: add a note about renamed/copied directory support
  git-svn: change ; to && in addremove()
  git-svn: remove any need for the XML::Simple dependency
  git-svn: Allow for more argument types for commit (from..to)
  git-svn: allow --find-copies-harder and -l<num> to be passed on commit
  git-svn: fix a typo in defining the --no-stop-on-copy option

18 years agocvsimport: avoid open "-|" list form for Perl 5.6
Junio C Hamano [Mon, 20 Feb 2006 22:17:28 +0000 (14:17 -0800)]
cvsimport: avoid open "-|" list form for Perl 5.6

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agosvnimport: avoid open "-|" list form for Perl 5.6
Junio C Hamano [Mon, 20 Feb 2006 22:14:15 +0000 (14:14 -0800)]
svnimport: avoid open "-|" list form for Perl 5.6

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agosend-email: avoid open "-|" list form for Perl 5.6
Junio C Hamano [Mon, 20 Feb 2006 22:23:51 +0000 (14:23 -0800)]
send-email: avoid open "-|" list form for Perl 5.6

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agorerere: avoid open "-|" list form for Perl 5.6
Junio C Hamano [Mon, 20 Feb 2006 22:02:47 +0000 (14:02 -0800)]
rerere: avoid open "-|" list form for Perl 5.6

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agofmt-merge-msg: avoid open "-|" list form for Perl 5.6
Junio C Hamano [Mon, 20 Feb 2006 22:02:25 +0000 (14:02 -0800)]
fmt-merge-msg: avoid open "-|" list form for Perl 5.6

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoAdd git-annotate, a tool for assigning blame.
Ryan Anderson [Mon, 20 Feb 2006 10:46:09 +0000 (05:46 -0500)]
Add git-annotate, a tool for assigning blame.

Signed-off-by: Ryan Anderson <ryan@michonline.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-svn: 0.9.1: add --version and copyright/license (GPL v2+) information
Eric Wong [Mon, 20 Feb 2006 18:57:29 +0000 (10:57 -0800)]
git-svn: 0.9.1: add --version and copyright/license (GPL v2+) information

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agocontrib/git-svn: add Makefile, test, and associated ignores
Eric Wong [Mon, 20 Feb 2006 18:57:29 +0000 (10:57 -0800)]
contrib/git-svn: add Makefile, test, and associated ignores

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-svn: fix several corner-case and rare bugs with 'commit'
Eric Wong [Mon, 20 Feb 2006 18:57:28 +0000 (10:57 -0800)]
git-svn: fix several corner-case and rare bugs with 'commit'

None of these were really show-stoppers (or even triggered)
on most of the trees I've tracked.

* Node change prevention for identically named nodes.  This is
  a limitation of SVN, but we find the error and exit before
  it's passed to SVN so we don't dirty our working tree when our
  commit fails.  git-svn will exit with an error code 1 if any
  of the following conditions are found:

  1.  a directory is removed and a file of the same name of the
      removed directory is created
  1a. a file has its parent directory removed and the file is
      takes the name of the removed parent directory::
          baz/zzz    =>  baz
  2.  a file is removed and a directory of the same name of the
      removed file is created.
  2a. a file is moved into a deeper directory that shares the
      previous name of the file::
          dir/$file  =>  dir/file/$file

  Since SVN cannot handle these cases, the user will have to
  manually split the commit into several parts.

* --rmdir now handles nested/deep removals. If dir/a/b/c/d/e/file
  is removed, and everything else is in the dir/ hierarchy is
  otherwise empty, then dir/ will be deleted when file is deleted
  from svn and --rmdir specified.

* Always assert that we have written the tree we want to write
  on commits.  This helped me find several bugs in the symlink
  handling code (which as been fixed).

* Several symlink handling fixes.  We now refuse to set
  permissions on symlinks.  We also always unlink a file
  if we're going to overwrite it.

* Apply changes in a pre-determined order, so we always have
  rename from locations handy before we delete them.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agocontrib/git-svn.txt: add a note about renamed/copied directory support
Eric Wong [Mon, 20 Feb 2006 18:57:28 +0000 (10:57 -0800)]
contrib/git-svn.txt: add a note about renamed/copied directory support

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-svn: change ; to && in addremove()
Eric Wong [Mon, 20 Feb 2006 18:57:28 +0000 (10:57 -0800)]
git-svn: change ; to && in addremove()

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
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/pack-thin' into next
Junio C Hamano [Mon, 20 Feb 2006 08:45:38 +0000 (00:45 -0800)]
Merge branch 'jc/pack-thin' into next

* jc/pack-thin:
  Use thin pack transfer in "git fetch".
  Add git-push --thin.

18 years agoUse thin pack transfer in "git fetch".
Junio C Hamano [Mon, 20 Feb 2006 08:38:39 +0000 (00:38 -0800)]
Use thin pack transfer in "git fetch".

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoAdd git-push --thin.
Junio C Hamano [Mon, 20 Feb 2006 08:09:41 +0000 (00:09 -0800)]
Add git-push --thin.

Maybe we would want to make this default before it graduates to
the master branch, but in the meantime to help testing things,
this allows you to say "git push --thin destination".

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'jc/pack-thin' into next
Junio C Hamano [Mon, 20 Feb 2006 06:28:46 +0000 (22:28 -0800)]
Merge branch 'jc/pack-thin' into next

* jc/pack-thin:
  send-pack --thin: use "thin pack" delta transfer.
  Thin pack - create packfile with missing delta base.

18 years agosend-pack --thin: use "thin pack" delta transfer.
Junio C Hamano [Sun, 19 Feb 2006 23:03:49 +0000 (15:03 -0800)]
send-pack --thin: use "thin pack" delta transfer.

The new flag loosens the usual "self containedness" requirment
of packfiles, and sends deltified representation of objects when
we know the other side has the base objects needed to unpack
them.  This would help reducing the transfer size.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoThin pack - create packfile with missing delta base.
Junio C Hamano [Sun, 19 Feb 2006 22:47:21 +0000 (14:47 -0800)]
Thin pack - create packfile with missing delta base.

This goes together with "rev-list --object-edge" change, to feed
pack-objects list of edge commits in addition to the usual
object list.  Upon seeing such list, pack-objects loosens the
usual "self contained delta" constraints, and can produce delta
against blobs and trees contained in the edge commits without
storing the delta base objects themselves.

The resulting packfile is not usable in .git/object/packs, but
is a good way to implement "delta-only" transfer.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'jc/rev-list' into next
Junio C Hamano [Mon, 20 Feb 2006 05:37:10 +0000 (21:37 -0800)]
Merge branch 'jc/rev-list' into next

* jc/rev-list:
  rev-list --objects-edge
  Merge branch 'jc/merge-msg'
  Merge branch 'jc/mv'
  Documentation: fix typo in rev-parse --short option description.

18 years agorev-list --objects-edge
Junio C Hamano [Sun, 19 Feb 2006 11:32:31 +0000 (03:32 -0800)]
rev-list --objects-edge

This new flag is similar to --objects, but causes rev-list to
show list of "uninteresting" commits that appear on the edge
commit prefixed with '-'.

Downstream pack-objects will be changed to take these as hints
to use the trees and blobs contained with them as base objects
of resulting pack, producing an incomplete (not self-contained)
pack.

Such a pack cannot be used in .git/objects/pack (it is prevented
by git-index-pack erroring out if it is fed to git-fetch-pack -k
or git-clone-pack), but would be useful when transferring only
small changes to huge blobs.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'js/portable' into next
Junio C Hamano [Mon, 20 Feb 2006 05:19:39 +0000 (21:19 -0800)]
Merge branch 'js/portable' into next

* js/portable:
  Really honour NO_PYTHON
  avoid makefile override warning
  Fixes for ancient versions of GNU make

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 agoMerge branch 'jc/merge-msg' into next
Junio C Hamano [Mon, 20 Feb 2006 05:17:06 +0000 (21:17 -0800)]
Merge branch 'jc/merge-msg' into next

* jc/merge-msg:
  fmt-merge-msg: do not add excess newline at the end.

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 agoReally honour NO_PYTHON
Johannes Schindelin [Sun, 19 Feb 2006 20:13:48 +0000 (21:13 +0100)]
Really honour NO_PYTHON

Do not even test for subprocess (trying to execute python).

Signed-off-by: Johannes E. Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoavoid makefile override warning
Johannes Schindelin [Sun, 19 Feb 2006 20:16:08 +0000 (21:16 +0100)]
avoid makefile override warning

Signed-off-by: Johannes E. Schindelin <Johannes.Schindelin@gmx.de>
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 agoMerge branch 'jc/mv' into next
Junio C Hamano [Sun, 19 Feb 2006 07:43:54 +0000 (23:43 -0800)]
Merge branch 'jc/mv' into next

* jc/mv:
  Allow git-mv to accept ./ in paths.
  Merge fixes up to GIT 1.2.2
  Fix retries in git-cvsimport
  archimport: remove files from the index before adding/updating

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 part of js/portable into next
Junio C Hamano [Sun, 19 Feb 2006 07:19:33 +0000 (23:19 -0800)]
Merge part of js/portable into next

18 years agoFixes for ancient versions of GNU make
Johannes Schindelin [Sat, 18 Feb 2006 11:40:22 +0000 (12:40 +0100)]
Fixes for ancient versions of GNU make

Some versions of GNU make do not understand $(call), and have problems to
interpret rules like this:

some_target: CFLAGS += -Dsome=defs

[jc: simplified substitution a bit. ]

Signed-off-by: Johannes E. Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoOptionally work without python
Johannes Schindelin [Sat, 18 Feb 2006 12:01:18 +0000 (13:01 +0100)]
Optionally work without python

In some setups (notably server setups) you do not need that dependency.
Gracefully handle the absence of python when NO_PYTHON is defined.

Signed-off-by: Johannes E. Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'jc/ident' into next
Junio C Hamano [Sun, 19 Feb 2006 07:15:13 +0000 (23:15 -0800)]
Merge branch 'jc/ident' into next

* jc/ident:
  Keep Porcelainish from failing by broken ident after making changes.
  Delay "empty ident" errors until they really matter.

18 years agoMerge branch 'jc/merge-msg' into next
Junio C Hamano [Sun, 19 Feb 2006 07:15:12 +0000 (23:15 -0800)]
Merge branch 'jc/merge-msg' into next

* jc/merge-msg:
  fmt-merge-msg: say which branch things were merged into unless 'master'
  Add an Emacs interface in contrib.

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 agoKeep Porcelainish from failing by broken ident after making changes.
Junio C Hamano [Sun, 19 Feb 2006 04:51:26 +0000 (20:51 -0800)]
Keep Porcelainish from failing by broken ident after making changes.

"empty ident not allowed" error makes commit-tree fail, so we
are already safer in that we would not end up with commit
objects that have bogus names on the author or committer fields.
However, before commit-tree is called there are already changes
made to the index file and the working tree.  The operation can
be resumed after fixing the environment problem, but when this
triggers to a newcomer with unusable gecos, the first question
becomes "what did I lose and how would I recover".

This patch modifies some Porcelainish commands to verify
GIT_COMMITTER_IDENT as soon as we know we are going to make some
commits before doing much damage to prevent confusion.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoDelay "empty ident" errors until they really matter.
Junio C Hamano [Sun, 19 Feb 2006 04:31:05 +0000 (20:31 -0800)]
Delay "empty ident" errors until they really matter.

Previous one warned people upfront to encourage fixing their
environment early, but some people just use repositories and git
tools read-only without making any changes, and in such a case
there is not much point insisting on them having a usable ident.

This round attempts to move the error until either "git-var"
asks for the ident explicitly or "commit-tree" wants to use it.

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 'fix'
Junio C Hamano [Sat, 18 Feb 2006 09:26:14 +0000 (01:26 -0800)]
Merge branch 'fix'

* fix:
  Make git-reset delete empty directories

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

* jc/ident:
  Make "empty ident" error message a bit more helpful.
  Merge branch 'jc/topo'
  Merge branch 'jc/rebase-limit'
  gitview: typofix
  git-svn: remove files from the index before adding/updating

18 years agoMake "empty ident" error message a bit more helpful.
Junio C Hamano [Sat, 18 Feb 2006 09:20:06 +0000 (01:20 -0800)]
Make "empty ident" error message a bit more helpful.

It appears that some people who did not care about having bogus
names in their own commit messages are bitten by the recent
change to require a sane environment [*1*].

While it was a good idea to prevent people from using bogus
names to create commits and doing sign-offs, the error message
is not very informative.  This patch attempts to warn things
upfront and hint people how to fix their environments.

[Footnote]

*1* The thread is this one.

    http://marc.theaimsgroup.com/?t=113868084800004

    Especially this message.

    http://marc.theaimsgroup.com/?m=113932830015032

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 agoMerge branch 'jc/pack-reuse'
Junio C Hamano [Sat, 18 Feb 2006 06:05:40 +0000 (22:05 -0800)]
Merge branch 'jc/pack-reuse'

* jc/pack-reuse:
  pack-objects: avoid delta chains that are too long.

18 years agopack-objects: avoid delta chains that are too long.
Junio C Hamano [Sat, 18 Feb 2006 04:58:45 +0000 (20:58 -0800)]
pack-objects: avoid delta chains that are too long.

This tries to rework the solution for the excess delta chain
problem. An earlier commit worked it around ``cheaply'', but
repeated repacking risks unbound growth of delta chains.

This version counts the length of delta chain we are reusing
from the existing pack, and makes sure a base object that has
sufficiently long delta chain does not get deltified.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'js/portable'
Junio C Hamano [Sat, 18 Feb 2006 01:34:51 +0000 (17:34 -0800)]
Merge branch 'js/portable'

* js/portable:
  Support Irix
  Optionally support old diffs
  Fix cpio call
  SubmittingPatches: note on whitespaces
  Add a README for gitview
  Add contrib/README.
  git-tag: -l to list tags (usability).

18 years agoMerge branch 'fix'
Junio C Hamano [Sat, 18 Feb 2006 01:34:31 +0000 (17:34 -0800)]
Merge branch 'fix'

* fix:
  Document --short and --git-dir in git-rev-parse(1)
  git-rev-parse: Fix --short= option parsing
  Prevent git-upload-pack segfault if object cannot be found
  Abstract test_create_repo out for use in tests.
  Trap exit to clean up created directory if clone fails.

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 agoSupport Irix
Johannes Schindelin [Fri, 17 Feb 2006 14:23:41 +0000 (15:23 +0100)]
Support Irix

Signed-off-by: Johannes E. Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoOptionally support old diffs
Johannes Schindelin [Fri, 17 Feb 2006 14:23:16 +0000 (15:23 +0100)]
Optionally support old diffs

Some versions of diff do not correctly detect a missing new-line at the end
of the file under certain circumstances.

When defining NO_ACCURATE_DIFF, work around this bug.

Signed-off-by: Johannes E. Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoFix cpio call
Johannes Schindelin [Fri, 17 Feb 2006 14:22:45 +0000 (15:22 +0100)]
Fix cpio call

To some cpio's, -a and -m options are mutually exclusive. Use only -m.

Signed-off-by: Johannes E. Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
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>