git.git
18 years agoMove "--parent" parsing into generic revision.c library code
Linus Torvalds [Fri, 31 Mar 2006 00:52:42 +0000 (16:52 -0800)]
Move "--parent" parsing into generic revision.c library code

Not only do we do it in both rev-list.c and git.c, the revision walking
code will soon want to know whether we should rewrite parenthood
information or not.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMakefile: many programs now depend on xdiff/lib.a having been built.
Junio C Hamano [Sat, 1 Apr 2006 00:23:46 +0000 (16:23 -0800)]
Makefile: many programs now depend on xdiff/lib.a having been built.

The dependency was not properly updated when we added this
library, breaking parallel build with $(MAKE) -j.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agorev-list --boundary: fix re-injecting boundary commits.
Junio C Hamano [Fri, 31 Mar 2006 07:59:19 +0000 (23:59 -0800)]
rev-list --boundary: fix re-injecting boundary commits.

Marco reported that

$ git rev-list --boundary --topo-order --parents 5aa44d5..ab57c8d

misses these two boundary commits.

        c649657501bada28794a30102d9c13cc28ca0e5e
        eb38cc689e84a8fd01c1856e889fe8d3b4f1bfb4

Indeed, we can see that gitk shows these two commits at the
bottom, because the --boundary code failed to output them.

The code did not check to avoid pushing the same uninteresting
commit twice to the result list.  I am not sure why this fixes
the reported problem, but this seems to fix it.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge git://git.kernel.org/pub/scm/gitk/gitk
Junio C Hamano [Fri, 31 Mar 2006 00:27:03 +0000 (16:27 -0800)]
Merge git://git.kernel.org/pub/scm/gitk/gitk

* git://git.kernel.org/pub/scm/gitk/gitk:
  gitk: Better workaround for arrows on diagonal line segments
  gitk: Allow top panes to scroll horizontally with mouse button 2
  gitk: Prevent parent link from overwriting commit headline
  gitk: Show diffs for boundary commits
  gitk: Use the new --boundary flag to git-rev-list

18 years agogitk: Better workaround for arrows on diagonal line segments
Paul Mackerras [Thu, 30 Mar 2006 23:45:14 +0000 (10:45 +1100)]
gitk: Better workaround for arrows on diagonal line segments

Instead of adding extra padding to create a vertical line segment at
the lower end of a line that has an arrow, this now just draws a very
short vertical line segment at the lower end.  This alternative
workaround for the Tk8.4 behaviour (not drawing arrows on diagonal
line segments) doesn't have the problem of making the graph very wide
when people do a lot of merges in a row (hi Junio :).

Signed-off-by: Paul Mackerras <paulus@samba.org>
18 years agocontrib/git-svn: force GIT_DIR to an absolute path
Eric Wong [Thu, 30 Mar 2006 06:37:18 +0000 (22:37 -0800)]
contrib/git-svn: force GIT_DIR to an absolute path

We chdir internally, so we need a consistent GIT_DIR variable.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-clone: exit early if repo isn't specified
Yasushi SHOJI [Thu, 30 Mar 2006 17:01:23 +0000 (17:01 +0000)]
git-clone: exit early if repo isn't specified

git-clone without a repo isn't useful at all.  print message and get
out asap.

This patch also move the variable 'local' to where other variables are
initialized.

Signed-off-by: Yasushi SHOJI <yashi@atmark-techno.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMake git-clone to take long double-dashed origin option (--origin)
Yasushi SHOJI [Thu, 30 Mar 2006 17:00:43 +0000 (17:00 +0000)]
Make git-clone to take long double-dashed origin option (--origin)

git-clone currently take option '-o' to specify origin.  this patch
makes git-clone to take double-dashed option '--origin' and other
abbreviations in addtion to the current single-dashed option.

[jc: with minor fixups]

Signed-off-by: Yasushi SHOJI <yashi@atmark-techno.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitk: Allow top panes to scroll horizontally with mouse button 2
Paul Mackerras [Thu, 30 Mar 2006 22:55:11 +0000 (09:55 +1100)]
gitk: Allow top panes to scroll horizontally with mouse button 2

Signed-off-by: Paul Mackerras <paulus@samba.org>
18 years agogitk: Prevent parent link from overwriting commit headline
Paul Mackerras [Thu, 30 Mar 2006 22:54:24 +0000 (09:54 +1100)]
gitk: Prevent parent link from overwriting commit headline

When I made drawlineseg responsible for drawing the link to the first
child rather than drawparentlinks, that meant that the right-most X
value computed by drawparentlinks didn't include those first-child
links, and thus the first-child link could go over the top of the
commit headline.  This fixes it.

Signed-off-by: Paul Mackerras <paulus@samba.org>
18 years agogitk: Show diffs for boundary commits
Paul Mackerras [Thu, 30 Mar 2006 09:50:40 +0000 (20:50 +1100)]
gitk: Show diffs for boundary commits

With this we run git-diff-tree on a commit even if we think it has
no parents, either because it really has no parents or because it
is a boundary commit.  This means that gitk shows the diff for a
boundary commit when it is selected.

Signed-off-by: Paul Mackerras <paulus@samba.org>
18 years agotree/diff header cleanup.
Junio C Hamano [Thu, 30 Mar 2006 06:55:43 +0000 (22:55 -0800)]
tree/diff header cleanup.

Introduce tree-walk.[ch] and move "struct tree_desc" and
associated functions from various places.

Rename DIFF_FILE_CANON_MODE(mode) macro to canon_mode(mode) and
move it to cache.h.  This macro returns the canonicalized
st_mode value in the host byte order for files, symlinks and
directories -- to be compared with a tree_desc entry.
create_ce_mode(mode) in cache.h is similar but is intended to be
used for index entries (so it does not work for directories) and
returns the value in the network byte order.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoassume unchanged git: diff-index fix.
Junio C Hamano [Thu, 30 Mar 2006 07:00:42 +0000 (23:00 -0800)]
assume unchanged git: diff-index fix.

When the executable bit is untrustworthy and when we are
comparing the tree with the working tree, we tried to reuse the
mode bits recorded in the index incorrectly (the computation was
bogus on little endian architectures).  Just use mode from index
when it is a regular file.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitk: Use the new --boundary flag to git-rev-list
Paul Mackerras [Thu, 30 Mar 2006 07:43:51 +0000 (18:43 +1100)]
gitk: Use the new --boundary flag to git-rev-list

With this, we can show the boundary (open-circle) commits immediately
after their last child, which looks much better than putting all the
boundary commits at the bottom of the graph.

Signed-off-by: Paul Mackerras <paulus@samba.org>
18 years agorevision.c "..B" syntax: constness fix
Junio C Hamano [Thu, 30 Mar 2006 07:30:52 +0000 (23:30 -0800)]
revision.c "..B" syntax: constness fix

The earlier change to make "..B" to mean "HEAD..B" (aka ^HEAD B)
has constness gotcha GCC complains.  Fix it.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agorevision arguments: ..B means HEAD..B, just like A.. means A..HEAD
Junio C Hamano [Thu, 30 Mar 2006 03:41:37 +0000 (19:41 -0800)]
revision arguments: ..B means HEAD..B, just like A.. means A..HEAD

For consistency reasons, we should probably allow that to be written as
just "..branch", the same way we can write "branch.." to mean "everything
in HEAD but not in "branch".

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agorev-list --boundary
Junio C Hamano [Tue, 28 Mar 2006 07:58:34 +0000 (23:58 -0800)]
rev-list --boundary

With the new --boundary flag, the output from rev-list includes
the UNINTERESING commits at the boundary, which are usually not
shown.  Their object names are prefixed with '-'.

For example, with this graph:

              C side
             /
A---B---D master

You would get something like this:

$ git rev-list --boundary --header --parents side..master
D B
        tree D^{tree}
        parent B
        ... log message for commit D here ...
        \0-B A
        tree B^{tree}
        parent A
        ... log message for commit B here ...
        \0

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agorev-list: memory usage reduction.
Junio C Hamano [Wed, 29 Mar 2006 01:28:04 +0000 (17:28 -0800)]
rev-list: memory usage reduction.

We do not need to track object refs, neither we need to save commit
unless we are doing verbose header.  A lot of traversal happens
inside prepare_revision_walk() these days so setting things up before
calling that function is necessary.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Acked-by: Linus Torvalds <torvalds@osdl.org>
18 years agorev-list --no-merges: argument parsing fix.
Junio C Hamano [Tue, 28 Mar 2006 08:04:50 +0000 (00:04 -0800)]
rev-list --no-merges: argument parsing fix.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoxdiff: Show function names in hunk headers.
Mark Wooding [Tue, 28 Mar 2006 02:23:31 +0000 (03:23 +0100)]
xdiff: Show function names in hunk headers.

The speed of the built-in diff generator is nice; but the function names
shown by `diff -p' are /really/ nice.  And I hate having to choose.  So,
we hack xdiff to find the function names and print them.

xdiff has grown a flag to say whether to dig up the function names.  The
builtin_diff function passes this flag unconditionally.  I suppose it
could parse GIT_DIFF_OPTS, but it doesn't at the moment.  I've also
reintroduced the `function name' into the test suite, from which it was
removed in commit 3ce8f089.

The function names are parsed by a particularly stupid algorithm at the
moment: it just tries to find a line in the `old' file, from before the
start of the hunk, whose first character looks plausible.  Still, it's
most definitely a start.

Signed-off-by: Mark Wooding <mdw@distorted.org.uk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoAdd ALL_LDFLAGS to the git target.
Jason Riedy [Tue, 28 Mar 2006 01:15:24 +0000 (17:15 -0800)]
Add ALL_LDFLAGS to the git target.

For some reason, I need ALL_LDFLAGS in the git target only on
AIX.  Once it builds, only one test "fails" on AIX 5.1 with
1.3.0.rc1, t5500-fetch-pack.sh, but it looks like it's some
odd tool problem in the tester + my setup and not a real bug.

Signed-off-by: Jason Riedy <ejr@cs.berkeley.edu>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoGIT 1.3.0 rc1 v1.3.0-rc1
Junio C Hamano [Tue, 28 Mar 2006 00:08:29 +0000 (16:08 -0800)]
GIT 1.3.0 rc1

All of the things that were not in the "master" branch were
either cooked long enough in "next" without causing problems
(e.g. insanely fast rename detector or true built-in diff) or
isolated in a specific subsystem (e.g. tar-tree and svnimport).

So I am clearing the deck to prepare for a 1.3.0.  Remaining
wrinkles, if any, will be ironed in the "master" branch.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch ak/svn
Junio C Hamano [Tue, 28 Mar 2006 00:03:36 +0000 (16:03 -0800)]
Merge branch ak/svn

18 years agoMerge branch 'lt/diffgen' into next
Junio C Hamano [Mon, 27 Mar 2006 07:44:28 +0000 (23:44 -0800)]
Merge branch 'lt/diffgen' into next

* lt/diffgen:
  add clean and ignore rules for xdiff/
  Remove dependency on a file named "-lz"

18 years agoMerge branch 'master' into next
Junio C Hamano [Mon, 27 Mar 2006 07:44:14 +0000 (23:44 -0800)]
Merge branch 'master' into next

* master:
  Optionally do not list empty directories in git-ls-files --others
  Document git-rebase behavior on conflicts.
  Fix error handling for nonexistent names

18 years agoadd clean and ignore rules for xdiff/
Junio C Hamano [Mon, 27 Mar 2006 07:41:22 +0000 (23:41 -0800)]
add clean and ignore rules for xdiff/

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoOptionally do not list empty directories in git-ls-files --others
Petr Baudis [Sun, 26 Mar 2006 14:59:52 +0000 (16:59 +0200)]
Optionally do not list empty directories in git-ls-files --others

Without the --directory flag, git-ls-files wouldn't ever list directories,
producing no output for empty directories, which is good since they cannot
be added and they bear no content, even untracked one (if Git ever starts
tracking directories on their own, this should obviously change since the
content notion will change).

With the --directory flag however, git-ls-files would list even empty
directories. This may be good in some situations but sometimes you want to
prevent that. This patch adds a --no-empty-directory option which makes
git-ls-files omit empty directories.

Signed-off-by: Petr Baudis <pasky@suse.cz>
18 years agoDocument git-rebase behavior on conflicts.
J. Bruce Fields [Sun, 26 Mar 2006 20:29:28 +0000 (15:29 -0500)]
Document git-rebase behavior on conflicts.

18 years agoRemove dependency on a file named "-lz"
Johannes Schindelin [Sun, 26 Mar 2006 23:14:52 +0000 (01:14 +0200)]
Remove dependency on a file named "-lz"

By changing the dependency "$(LIB_H)" to "$(LIBS)", at least one version
of make thought that a file named "-lz" would be needed.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoFix error handling for nonexistent names
Linus Torvalds [Mon, 27 Mar 2006 00:28:20 +0000 (16:28 -0800)]
Fix error handling for nonexistent names

When passing in a pathname pattern without the "--" separator on the
command line, we verify that the pathnames in question exist. However,
there were two bugs in that verification:

 - git-rev-parse would only check the first pathname, and silently allow
   any invalid subsequent pathname, whether it existed or not (which
   defeats the purpose of the check, and is also inconsistent with what
   git-rev-list actually does)

 - git-rev-list (and "git log" etc) would check each filename, but if the
   check failed, it would print the error using the first one, i.e.:

[torvalds@g5 git]$ git log Makefile bad-file
fatal: 'Makefile': No such file or directory

   instead of saying that it's 'bad-file' that doesn't exist.

This fixes both bugs.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'jc/thin' into next
Junio C Hamano [Sun, 26 Mar 2006 08:24:03 +0000 (00:24 -0800)]
Merge branch 'jc/thin' into next

* jc/thin:
  git-push: make --thin pack transfer the default.
  gitk: Fix two bugs reported by users
  gitk: Improve appearance of first child links
  gitk: Make downward-pointing arrows end in vertical line segment
  gitk: Don't change cursor at end of layout if find in progress
  gitk: Make commitdata an array rather than a list
  gitk: Fix display of diff lines beginning with --- or +++
  [PATCH] gitk: Make error_popup react to Return
  gitk: Fix a bug in drawing the selected line as a thick line
  gitk: Further speedups
  gitk: Various speed improvements
  gitk: Fix Update menu item
  gitk: Fix clicks on arrows on line ends
  gitk: New improved gitk
  contrib/git-svn: stabilize memory usage for big fetches

18 years agogit-push: make --thin pack transfer the default.
Junio C Hamano [Sun, 26 Mar 2006 02:27:15 +0000 (18:27 -0800)]
git-push: make --thin pack transfer the default.

Just in case it has problems, you can say "git push --no-thin".

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branches 'jc/clone' and 'jc/name'
Junio C Hamano [Sun, 26 Mar 2006 08:22:53 +0000 (00:22 -0800)]
Merge branches 'jc/clone' and 'jc/name'

* jc/clone:
  git-clone: typofix.
  clone: record the remote primary branch with remotes/$origin/HEAD
  revamp git-clone (take #2).
  revamp git-clone.
  fetch,parse-remote,fmt-merge-msg: refs/remotes/* support

* jc/name:
  sha1_name: make core.warnambiguousrefs the default.
  sha1_name: warning ambiguous refs.
  get_sha1_basic(): try refs/... and finally refs/remotes/$foo/HEAD
  core.warnambiguousrefs: warns when "name" is used and both "name" branch and tag exists.

18 years agoMerge branch 'jc/merge'
Junio C Hamano [Sun, 26 Mar 2006 08:22:48 +0000 (00:22 -0800)]
Merge branch 'jc/merge'

* jc/merge:
  git-merge knows some strategies want to skip trivial merges

18 years agoMerge branch 'lt/diffgen' into next
Junio C Hamano [Sun, 26 Mar 2006 08:15:44 +0000 (00:15 -0800)]
Merge branch 'lt/diffgen' into next

* lt/diffgen:
  true built-in diff: run everything in-core.

18 years agogit-svnimport: if a limit is specified, respect it
Anand Kumria [Sat, 25 Mar 2006 22:43:46 +0000 (09:43 +1100)]
git-svnimport: if a limit is specified, respect it

git-svnimport will import the same revision over and over again if a
limit (-l <rev>) has been specified. Instead if that revision has already
been processed, exit with an up-to-date message.

Signed-off-by: Anand Kumria <wildfire@progsoc.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge git://git.kernel.org/pub/scm/gitk/gitk
Junio C Hamano [Sun, 26 Mar 2006 08:13:25 +0000 (00:13 -0800)]
Merge git://git.kernel.org/pub/scm/gitk/gitk

* git://git.kernel.org/pub/scm/gitk/gitk:
  gitk: Fix two bugs reported by users
  gitk: Improve appearance of first child links
  gitk: Make downward-pointing arrows end in vertical line segment
  gitk: Don't change cursor at end of layout if find in progress
  gitk: Make commitdata an array rather than a list
  gitk: Fix display of diff lines beginning with --- or +++
  [PATCH] gitk: Make error_popup react to Return
  gitk: Fix a bug in drawing the selected line as a thick line
  gitk: Further speedups
  gitk: Various speed improvements
  gitk: Fix Update menu item
  gitk: Fix clicks on arrows on line ends
  gitk: New improved gitk

18 years agotrue built-in diff: run everything in-core.
Junio C Hamano [Sun, 26 Mar 2006 07:12:17 +0000 (23:12 -0800)]
true built-in diff: run everything in-core.

This stops using temporary files when we are using the built-in
diff (including the complete rewrite).

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agocontrib/git-svn: stabilize memory usage for big fetches
Eric Wong [Sun, 26 Mar 2006 02:52:31 +0000 (18:52 -0800)]
contrib/git-svn: stabilize memory usage for big fetches

We should be safely able to import histories with thousands
of revisions without hogging up lots of memory.

With this, we lose the ability to autocorrect mistakes when
people specify revisions in reverse, but it's probably no longer
a problem since we only have one method of log parsing nowadays.

I've added an extra check to ensure that revision numbers do
increment.

Also, increment the version number to 0.11.0.  I really should
just call it 1.0 soon...

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'ew/email' into next
Junio C Hamano [Sun, 26 Mar 2006 01:44:09 +0000 (17:44 -0800)]
Merge branch 'ew/email' into next

* ew/email:
  send-email: lazy-load Email::Valid and make it optional
  send-email: try to order messages in email clients more correctly
  send-email: Change from Mail::Sendmail to Net::SMTP
  send-email: use built-in time() instead of /bin/date '+%s'

18 years agoMerge branch 'lt/diffgen' into next
Junio C Hamano [Sun, 26 Mar 2006 01:44:01 +0000 (17:44 -0800)]
Merge branch 'lt/diffgen' into next

* lt/diffgen:
  built-in diff: minimum tweaks
  builtin-diff: \No newline at end of file.
  Use a *real* built-in diff generator

18 years agoMerge branch 'rs/tar-tree' into next
Junio C Hamano [Sun, 26 Mar 2006 01:43:22 +0000 (17:43 -0800)]
Merge branch 'rs/tar-tree' into next

* rs/tar-tree:
  tar-tree: Use the prefix field of a tar header
  tar-tree: Remove obsolete code
  tar-tree: Use write_entry() to write the archive contents
  tar-tree: Introduce write_entry()
  tar-tree: Use SHA1 of root tree for the basedir
  git-apply: safety fixes
  Removed bogus "<snap>" identifier.
  Clarify and expand some hook documentation.
  commit-tree: check return value from write_sha1_file()
  send-email: Identify author at the top when sending e-mail
  Format tweaks for asciidoc.

18 years agosend-email: lazy-load Email::Valid and make it optional
Eric Wong [Sun, 26 Mar 2006 00:47:12 +0000 (16:47 -0800)]
send-email: lazy-load Email::Valid and make it optional

It's not installed on enough machines, and is overkill most of
the time.  We'll fallback to a very basic regexp just in case,
but nothing like the monster regexp Email::Valid has to offer :)

Small cleanup from Merlyn.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agosend-email: try to order messages in email clients more correctly
Eric Wong [Sat, 25 Mar 2006 11:01:01 +0000 (03:01 -0800)]
send-email: try to order messages in email clients more correctly

If --no-chain-reply-to is set, patches may not always be ordered
correctly in email clients.  This patch makes sure each email
sent from a different second.

I chose to start with a time (slightly) in the past because
those are probably more likely in real-world usage and spam
filters might be more tolerant of them.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agosend-email: Change from Mail::Sendmail to Net::SMTP
Eric Wong [Sun, 26 Mar 2006 01:20:48 +0000 (17:20 -0800)]
send-email: Change from Mail::Sendmail to Net::SMTP

Net::SMTP is in the base Perl distribution, so users are more
likely to have it.  Net::SMTP also allows reusing the SMTP
connection, so sending multiple emails is faster.

[jc: tweaked X-Mailer further while we are at it.]

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agosend-email: use built-in time() instead of /bin/date '+%s'
Eric Wong [Sat, 25 Mar 2006 10:43:31 +0000 (02:43 -0800)]
send-email: use built-in time() instead of /bin/date '+%s'

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agobuilt-in diff: minimum tweaks
Junio C Hamano [Sat, 25 Mar 2006 20:16:17 +0000 (12:16 -0800)]
built-in diff: minimum tweaks

This fixes up a couple of minor issues with the real built-in
diff to be more usable:

 - Omit ---/+++ header unless we emit diff output;

 - Detect and punt binary diff like GNU does;

 - Honor GIT_DIFF_OPTS minimally (only -u<number> and
   --unified=<number> are currently supported);

 - Omit line count of 1 from "@@ -l,k +m,n @@" hunk header
   (i.e. when k == 1 or n == 1)

 - Adjust testsuite for the lack of -p support.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agobuiltin-diff: \No newline at end of file.
Linus Torvalds [Sat, 25 Mar 2006 15:56:03 +0000 (07:56 -0800)]
builtin-diff: \No newline at end of file.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoUse a *real* built-in diff generator
Linus Torvalds [Sat, 25 Mar 2006 04:13:22 +0000 (20:13 -0800)]
Use a *real* built-in diff generator

This uses a simplified libxdiff setup to generate unified diffs _without_
doing  fork/execve of GNU "diff".

This has several huge advantages, for example:

Before:

[torvalds@g5 linux]$ time git diff v2.6.16.. > /dev/null

real    0m24.818s
user    0m13.332s
sys     0m8.664s

After:

[torvalds@g5 linux]$ time git diff v2.6.16.. > /dev/null

real    0m4.563s
user    0m2.944s
sys     0m1.580s

and the fact that this should be a lot more portable (ie we can ignore all
the issues with doing fork/execve under Windows).

Perhaps even more importantly, this allows us to do diffs without actually
ever writing out the git file contents to a temporary file (and without
any of the shell quoting issues on filenames etc etc).

NOTE! THIS PATCH DOES NOT DO THAT OPTIMIZATION YET! I was lazy, and the
current "diff-core" code actually will always write the temp-files,
because it used to be something that you simply had to do. So this current
one actually writes a temp-file like before, and then reads it into memory
again just to do the diff. Stupid.

But if this basic infrastructure is accepted, we can start switching over
diff-core to not write temp-files, which should speed things up even
further, especially when doing big tree-to-tree diffs.

Now, in the interest of full disclosure, I should also point out a few
downsides:

 - the libxdiff algorithm is different, and I bet GNU diff has gotten a
   lot more testing. And the thing is, generating a diff is not an exact
   science - you can get two different diffs (and you will), and they can
   both be perfectly valid. So it's not possible to "validate" the
   libxdiff output by just comparing it against GNU diff.

 - GNU diff does some nice eye-candy, like trying to figure out what the
   last function was, and adding that information to the "@@ .." line.
   libxdiff doesn't do that.

 - The libxdiff thing has some known deficiencies. In particular, it gets
   the "\No newline at end of file" case wrong. So this is currently for
   the experimental branch only. I hope Davide will help fix it.

That said, I think the huge performance advantage, and the fact that it
integrates better is definitely worth it. But it should go into a
development branch at least due to the missing newline issue.

Technical note: this is based on libxdiff-0.17, but I did some surgery to
get rid of the extraneous fat - stuff that git doesn't need, and seriously
cutting down on mmfile_t, which had much more capabilities than the diff
algorithm either needed or used. In this version, "mmfile_t" is just a
trivial <pointer,length> tuple.

That said, I tried to keep the differences to simple removals, so that you
can do a diff between this and the libxdiff origin, and you'll basically
see just things getting deleted. Even the mmfile_t simplifications are
left in a state where the diffs should be readable.

Apologies to Davide, whom I'd love to get feedback on this all from (I
wrote my own "fill_mmfile()" for the new simpler mmfile_t format: the old
complex format had a helper function for that, but I did my surgery with
the goal in mind that eventually we _should_ just do

mmfile_t mf;

buf = read_sha1_file(sha1, type, &size);
mf->ptr = buf;
mf->size = size;
.. use "mf" directly ..

which was really a nightmare with the old "helpful" mmfile_t, and really
is that easy with the new cut-down interfaces).

[ Btw, as any hawk-eye can see from the diff, this was actually generated
  with itself, so it is "self-hosting". That's about all the testing it
  has gotten, along with the above kernel diff, which eye-balls correctly,
  but shows the newline issue when you double-check it with "git-apply" ]

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agotar-tree: Use the prefix field of a tar header
Rene Scharfe [Sat, 25 Mar 2006 22:21:07 +0000 (23:21 +0100)]
tar-tree: Use the prefix field of a tar header

... to store parts of the path, if possible.  This allows us to avoid
writing extended headers in certain cases (long pathes can only be
split at '/' chars).

Also adds a file to the test repo with a 100 chars long directory name.
Even old versions of tar that don't understand POSIX extended headers
should be able to handle this testcase.

Btw.: The longest path in the kernel tree currently has 70 chars.
Together with a 30 chars long prefix this would already cross the
field limit of 100 chars.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agotar-tree: Remove obsolete code
Rene Scharfe [Sat, 25 Mar 2006 22:21:05 +0000 (23:21 +0100)]
tar-tree: Remove obsolete code

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agotar-tree: Use write_entry() to write the archive contents
Rene Scharfe [Sat, 25 Mar 2006 22:21:04 +0000 (23:21 +0100)]
tar-tree: Use write_entry() to write the archive contents

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agotar-tree: Introduce write_entry()
Rene Scharfe [Sat, 25 Mar 2006 22:21:03 +0000 (23:21 +0100)]
tar-tree: Introduce write_entry()

... and use it initially to write global extended header records.
Improvements compared to the old write_header():

  - Uses a struct ustar_header instead of hardcoded offsets.
  - Takes one struct strbuf as path argument instead of a (basedir,
    prefix, name) tuple.
  - Not only writes the tar header, but also the contents of the
    file, if any.
  - Does not write directly into the ring buffer.  This allows the
    code to be layed out more naturally, because there is no more
    ordering constraint.  Before we had to first finish writing the
    extended header, now we can construct the extended and normal
    headers in parallel.
  - The typeflag parameter has been replaced by (reasonable) magic
    values.  path == NULL indicates an extended header, additionally
    sha1 == NULL means it is a global extended header.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agotar-tree: Use SHA1 of root tree for the basedir
Rene Scharfe [Sat, 25 Mar 2006 22:21:02 +0000 (23:21 +0100)]
tar-tree: Use SHA1 of root tree for the basedir

... instead of the made-up "0".

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-apply: safety fixes
Linus Torvalds [Sat, 25 Mar 2006 21:28:28 +0000 (13:28 -0800)]
git-apply: safety fixes

This was triggered by me testing the "@@" numbering shorthand by GNU
patch, which not only showed that git-apply thought it meant the number
was duplicated (when it means that the second number is 1), but my tests
showed than when git-apply mis-understood the number, it would then not
raise an alarm about it if the patch ended early.

Now, this doesn't actually _matter_, since with a three-line context, the
only case that "x,1" will be shorthanded to "x" is when x itself is 1 (in
which case git-apply got it right), but the fact that git-apply would also
silently accept truncated patches was a missed opportunity for additional
sanity-checking.

So make git-apply refuse to look at a patch fragment that ends early.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoRemoved bogus "<snap>" identifier.
Jon Loeliger [Sat, 25 Mar 2006 03:27:13 +0000 (21:27 -0600)]
Removed bogus "<snap>" identifier.

Signed-off-by: Jon Loeliger <jdl@jdl.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoClarify and expand some hook documentation.
Jon Loeliger [Sat, 25 Mar 2006 03:21:07 +0000 (21:21 -0600)]
Clarify and expand some hook documentation.

Clarify update and post-update hooks.
Made a few references to the hooks documentation.

Signed-off-by: Jon Loeliger <jdl@jdl.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agocommit-tree: check return value from write_sha1_file()
Junio C Hamano [Sat, 25 Mar 2006 06:23:25 +0000 (22:23 -0800)]
commit-tree: check return value from write_sha1_file()

... found by Matthias Kestenholz.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'jc/name' into next
Junio C Hamano [Fri, 24 Mar 2006 07:52:42 +0000 (23:52 -0800)]
Merge branch 'jc/name' into next

* jc/name:
  sha1_name: make core.warnambiguousrefs the default.
  sha1_name: warning ambiguous refs.

18 years agoMerge branch 'jc/cvsimport'
Junio C Hamano [Fri, 24 Mar 2006 07:49:07 +0000 (23:49 -0800)]
Merge branch 'jc/cvsimport'

* jc/cvsimport:
  cvsimport: fix reading from rev-parse
  cvsimport: honor -i and non -i upon subsequent imports

18 years agoMerge branch 'jc/pull'
Junio C Hamano [Fri, 24 Mar 2006 07:47:32 +0000 (23:47 -0800)]
Merge branch 'jc/pull'

* jc/pull:
  git-pull: reword "impossible to fast-forward" message.
  git-pull: further safety while on tracking branch.

18 years agoMerge branch 'jc/fetch'
Junio C Hamano [Fri, 24 Mar 2006 07:46:06 +0000 (23:46 -0800)]
Merge branch 'jc/fetch'

* jc/fetch:
  fetch: exit non-zero when fast-forward check fails.

18 years agosend-email: Identify author at the top when sending e-mail
Junio C Hamano [Fri, 24 Mar 2006 07:43:52 +0000 (23:43 -0800)]
send-email: Identify author at the top when sending e-mail

git-send-email did not check if the sender is the same as the
patch author.  Follow the "From: at the beginning" convention to
propagate the patch author correctly.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agosha1_name: make core.warnambiguousrefs the default.
Junio C Hamano [Fri, 24 Mar 2006 07:42:40 +0000 (23:42 -0800)]
sha1_name: make core.warnambiguousrefs the default.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agosha1_name: warning ambiguous refs.
Junio C Hamano [Fri, 24 Mar 2006 07:41:18 +0000 (23:41 -0800)]
sha1_name: warning ambiguous refs.

This makes sure that many commands that take refs on the command
line to honor core.warnambiguousrefs configuration.  Earlier,
the commands affected by this patch did not read the
configuration file.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoFormat tweaks for asciidoc.
Francis Daly [Wed, 22 Mar 2006 09:53:57 +0000 (09:53 +0000)]
Format tweaks for asciidoc.

Some documentation "options" were followed by independent preformatted
paragraphs. Now they are associated plain text paragraphs. The
difference is clear in the generated html.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'jc/pull' into next
Junio C Hamano [Wed, 22 Mar 2006 09:57:24 +0000 (01:57 -0800)]
Merge branch 'jc/pull' into next

* jc/pull:
  git-pull: reword "impossible to fast-forward" message.
  git-pull: further safety while on tracking branch.

18 years agogit-pull: reword "impossible to fast-forward" message.
Junio C Hamano [Wed, 22 Mar 2006 09:57:11 +0000 (01:57 -0800)]
git-pull: reword "impossible to fast-forward" message.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-pull: further safety while on tracking branch.
Junio C Hamano [Wed, 22 Mar 2006 09:09:43 +0000 (01:09 -0800)]
git-pull: further safety while on tracking branch.

Running 'git pull' while on the tracking branch has a built-in
safety valve to fast-forward the index and working tree to match
the branch head, but it errs on the safe side too cautiously.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'jc/revlist' into next
Junio C Hamano [Wed, 22 Mar 2006 08:52:41 +0000 (00:52 -0800)]
Merge branch 'jc/revlist' into next

* jc/revlist:
  rev-list --timestamp
  git-apply: do not barf when updating an originally empty file.
  http-push.c: squelch C90 warnings.
  fix field width/precision warnings in blame.c

18 years agoMerge branch 'jc/clone' into next
Junio C Hamano [Wed, 22 Mar 2006 08:52:36 +0000 (00:52 -0800)]
Merge branch 'jc/clone' into next

* jc/clone:
  git-clone: typofix.

18 years agogit-clone: typofix.
Junio C Hamano [Wed, 22 Mar 2006 08:23:16 +0000 (00:23 -0800)]
git-clone: typofix.

The traditional one created refs/origin by mistake, not
refs/heads/origin.  Also it mistakenly failed to prevent
$origin from being listed twice in remotes/origin file.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agorev-list --timestamp
Junio C Hamano [Wed, 22 Mar 2006 08:22:00 +0000 (00:22 -0800)]
rev-list --timestamp

This prefixes the raw commit timestamp to the output.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-apply: do not barf when updating an originally empty file.
Junio C Hamano [Wed, 22 Mar 2006 08:21:07 +0000 (00:21 -0800)]
git-apply: do not barf when updating an originally empty file.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agohttp-push.c: squelch C90 warnings.
Junio C Hamano [Tue, 21 Mar 2006 23:49:05 +0000 (15:49 -0800)]
http-push.c: squelch C90 warnings.

If you write code after declarations in a block, gcc scolds you
with "warning: ISO C90 forbids mixed declarations and code".

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agofix field width/precision warnings in blame.c
Luck, Tony [Tue, 21 Mar 2006 23:28:06 +0000 (15:28 -0800)]
fix field width/precision warnings in blame.c

Using "size_t" values for printf field width/precision upsets gcc, it
wants to see an "int".

Signed-off-by: Tony Luck <tony.luck@intel.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitk: Fix two bugs reported by users
Paul Mackerras [Tue, 21 Mar 2006 23:21:45 +0000 (10:21 +1100)]
gitk: Fix two bugs reported by users

The first was a simple typo where I put $yc instead of [yc $row].
The second was that I broke the logic for keeping up with fast
movement through the commits, e.g. when you select a commit and then
press down-arrow and let it autorepeat.  That got broken when I
changed the merge diff display to use git-diff-tree --cc.

Signed-off-by: Paul Mackerras <paulus@samba.org>
18 years agoMerge branch 'jc/clone' into next
Junio C Hamano [Tue, 21 Mar 2006 10:04:50 +0000 (02:04 -0800)]
Merge branch 'jc/clone' into next

* jc/clone:
  clone: record the remote primary branch with remotes/$origin/HEAD

18 years agoMerge branch 'jc/name' into next
Junio C Hamano [Tue, 21 Mar 2006 10:04:46 +0000 (02:04 -0800)]
Merge branch 'jc/name' into next

* jc/name:
  get_sha1_basic(): try refs/... and finally refs/remotes/$foo/HEAD

18 years agoclone: record the remote primary branch with remotes/$origin/HEAD
Junio C Hamano [Tue, 21 Mar 2006 09:58:26 +0000 (01:58 -0800)]
clone: record the remote primary branch with remotes/$origin/HEAD

This matches c51d13692d4e451c755dd7da3521c5db395df192 commit to
record the primary branch of the remote with a symbolic ref
remotes/$origin/HEAD.  The user can later change it to point at
different branch to change the meaning of "$origin" shorthand.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoget_sha1_basic(): try refs/... and finally refs/remotes/$foo/HEAD
Junio C Hamano [Tue, 21 Mar 2006 09:42:04 +0000 (01:42 -0800)]
get_sha1_basic(): try refs/... and finally refs/remotes/$foo/HEAD

This implements the suggestion by Jeff King to use
refs/remotes/$foo/HEAD to interpret a shorthand "$foo" to mean
the primary branch head of a tracked remote.  clone needs to be
told about this convention as well.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'jc/name' into next
Junio C Hamano [Tue, 21 Mar 2006 08:15:21 +0000 (00:15 -0800)]
Merge branch 'jc/name' into next

* jc/name:
  core.warnambiguousrefs: warns when "name" is used and both "name" branch and tag exists.
  contrib/git-svn: allow rebuild to work on non-linear remote heads
  http-push: don't assume char is signed
  http-push: add support for deleting remote branches
  Be verbose when !initial commit
  Fix multi-paragraph list items in OPTIONS section
  http-fetch: nicer warning for a server with unreliable 404 status

18 years agoMerge branch 'jc/clone' into next
Junio C Hamano [Tue, 21 Mar 2006 08:15:15 +0000 (00:15 -0800)]
Merge branch 'jc/clone' into next

* jc/clone:
  revamp git-clone (take #2).

18 years agorevamp git-clone (take #2).
Junio C Hamano [Tue, 21 Mar 2006 08:14:13 +0000 (00:14 -0800)]
revamp git-clone (take #2).

This builds on top of the previous one.

 * --use-separate-remote uses .git/refs/remotes/$origin/
   directory to keep track of the upstream branches.

 * The $origin above defaults to "origin" as usual, but the
   existing "-o $origin" option can be used to override it.

I am not yet convinced if we should make "$origin" the synonym to
"refs/remotes/$origin/$name" where $name is the primary branch
name of $origin upstream, nor if so how we should decide which
upstream branch is the primary one, but that is more or less
orthogonal to what the clone does here.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agocore.warnambiguousrefs: warns when "name" is used and both "name" branch and tag...
Junio C Hamano [Tue, 21 Mar 2006 02:45:47 +0000 (18:45 -0800)]
core.warnambiguousrefs: warns when "name" is used and both "name" branch and tag exists.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agocontrib/git-svn: allow rebuild to work on non-linear remote heads
Eric Wong [Tue, 21 Mar 2006 04:51:16 +0000 (20:51 -0800)]
contrib/git-svn: allow rebuild to work on non-linear remote heads

Because committing back to an SVN repository from different
machines can result in different lineages, two different
repositories running git-svn can result in different commit
SHA1s (but of the same tree).  Sometimes trees that are tracked
independently are merged together (usually via children),
resulting in non-unique git-svn-id: lines in rev-list.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agohttp-push: don't assume char is signed
Nick Hengeveld [Mon, 20 Mar 2006 19:50:51 +0000 (11:50 -0800)]
http-push: don't assume char is signed

Declare remote_dir_exists[] as signed char to be sure that values of -1
are valid.

Signed-off-by: Nick Hengeveld <nickh@reactrix.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agohttp-push: add support for deleting remote branches
Nick Hengeveld [Mon, 20 Mar 2006 18:31:06 +0000 (10:31 -0800)]
http-push: add support for deleting remote branches

Processes new command-line arguments -d and -D to remove a remote branch
if the following conditions are met:
- one branch name is present on the command line
- the specified branch name matches exactly one remote branch name
- the remote HEAD is a symref
- the specified branch is not the remote HEAD
- the remote HEAD resolves to an object that exists locally (-d only)
- the specified branch resolves to an object that exists locally (-d only)
- the specified branch is an ancestor of the remote HEAD (-d only)

Signed-off-by: Nick Hengeveld <nickh@reactrix.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoBe verbose when !initial commit
Yasushi SHOJI [Mon, 20 Mar 2006 13:11:12 +0000 (22:11 +0900)]
Be verbose when !initial commit

verbose option in git-commit.sh lead us to run git-diff-index, which
needs a commit-ish we are making diff against.  When we are commiting
the fist set, we obviously don't have any commit-ish in the repo.  So
we just skip the git-diff-index run.

It might be possible to produce diff against empty but do we need
that?

Signed-off-by: Yasushi SHOJI <yashi@atmark-techno.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoFix multi-paragraph list items in OPTIONS section
Francis Daly [Mon, 20 Mar 2006 10:41:18 +0000 (10:41 +0000)]
Fix multi-paragraph list items in OPTIONS section

This patch makes the html docs right, makes the asciidoc docs a bit odd
but consistent with what is there already, and makes the manpages look
OK using docbook-xsl 1.68, but miss a paragraph separator when using 1.69.

For the manpages, current is like

       -A <author_file>
              Read a file with lines on the form

              username = User's Full Name <email@addr.es>

              and use "User's Full Name <email@addr.es>" as the GIT

With this patch, docbook-xsl v1.68 looks like

       -A <author_file>
              Read a file with lines on the form

                      username = User's Full Name <email@addr.es>

              and use "User's Full Name <email@addr.es>" as the GIT author and

while docbook-xsl v1.69 becomes

       -A <author_file>
              Read a file with lines on the form

                        username = User's Full Name <email@addr.es>
              and use "User's Full Name <email@addr.es>" as the GIT author and

The extra indentation is to keep the v1.69 manpage looking sane.

18 years agohttp-fetch: nicer warning for a server with unreliable 404 status
Junio C Hamano [Mon, 20 Mar 2006 22:07:59 +0000 (14:07 -0800)]
http-fetch: nicer warning for a server with unreliable 404 status

When a repository otherwise properly prepared is served by a
dumb HTTP server that sends "No such page" output with 200
status for human consumption to a request for a page that does
not exist, the users will get an alarming "File X corrupt" error
message.  Hint that they might be dealing with such a server at
the end and suggest running fsck-objects to check if the result
is OK (the pack-fallback code does the right thing in this case
so unless a loose object file was actually corrupt the result
should check OK).

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'jc/merge' into next
Junio C Hamano [Mon, 20 Mar 2006 08:51:07 +0000 (00:51 -0800)]
Merge branch 'jc/merge' into next

* jc/merge:
  git-merge knows some strategies want to skip trivial merges
  generate-cmdlist: style cleanups.
  Add missing semicolon to sed command.
  unpack_delta_entry(): reduce memory footprint.
  git.el: Added a function to diff against the other heads in a merge.
  git.el: Get the default user name and email from the repository config.
  git.el: More robust handling of subprocess errors when returning strings.

18 years agoMerge branch 'jc/clone' into next
Junio C Hamano [Mon, 20 Mar 2006 08:50:58 +0000 (00:50 -0800)]
Merge branch 'jc/clone' into next

* jc/clone:
  revamp git-clone.

18 years agogit-merge knows some strategies want to skip trivial merges
Junio C Hamano [Sat, 18 Mar 2006 22:50:53 +0000 (14:50 -0800)]
git-merge knows some strategies want to skip trivial merges

Most notably "ours".  Also this makes sure we do not record
duplicated parents on the parent list of the resulting commit.

This is based on Mark Wooding's work, but does not change the UI
nor introduce new flags.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agorevamp git-clone.
Junio C Hamano [Mon, 20 Mar 2006 08:21:10 +0000 (00:21 -0800)]
revamp git-clone.

This does two things.

 * A new flag --reference can be used to name a local repository
   that is to be used as an alternate.  This is in response to
   an inquiry by James Cloos in the message on the list
   <m3r74ykue7.fsf@lugabout.cloos.reno.nv.us>.

 * A new flag --use-separate-remote stops contaminating local
   branch namespace by upstream branch names.  The upstream
   branch heads are copied in .git/refs/remotes/ instead of
   .git/refs/heads/ and .git/remotes/origin file is set up to
   reflect this as well.  It requires to have fetch/pull update
   to understand .git/refs/remotes by Eric Wong to further
   update the repository cloned this way.

For the former change, git-fetch-pack is taught a new flag --all
to fetch from all the remote heads.  Nobody uses the git-clone-pack
with this change, so we could deprecate the command, but removal
of the command will be left to a separate round.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogenerate-cmdlist: style cleanups.
Junio C Hamano [Mon, 20 Mar 2006 07:54:45 +0000 (23:54 -0800)]
generate-cmdlist: style cleanups.

Instead of giving multiple commands concatenated with semicolon
to sed, write them on separate lines.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoAdd missing semicolon to sed command.
Shawn Pearce [Mon, 20 Mar 2006 00:18:08 +0000 (19:18 -0500)]
Add missing semicolon to sed command.

generate-cmdlist.sh is giving errors messages from sed on Mac OS
10.4 due to a missing semicolon.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agounpack_delta_entry(): reduce memory footprint.
Junio C Hamano [Sun, 19 Mar 2006 21:43:42 +0000 (13:43 -0800)]
unpack_delta_entry(): reduce memory footprint.

Currently we unpack the delta data from the pack and then unpack
the base object to apply that delta data to it.  When getting an
object that is deeply deltified, we can reduce memory footprint
by unpacking the base object first and then unpacking the delta
data, because we will need to keep at most one delta data in
memory that way.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit.el: Added a function to diff against the other heads in a merge.
Alexandre Julliard [Sun, 19 Mar 2006 09:06:10 +0000 (10:06 +0100)]
git.el: Added a function to diff against the other heads in a merge.

git-diff-file-merge-head generates a diff against the first merge
head, or with a prefix argument against the nth head. Bound to `d h'
by default.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit.el: Get the default user name and email from the repository config.
Alexandre Julliard [Sun, 19 Mar 2006 09:05:48 +0000 (10:05 +0100)]
git.el: Get the default user name and email from the repository config.

If user name or email are not set explicitly, get them from the
user.name and user.email configuration values before falling back to
the Emacs defaults.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>