OSDN Git Service
Junio C Hamano [Sun, 5 Mar 2006 04:36:28 +0000 (20:36 -0800)]
git-commit --amend: allow empty commit.
When amending a commit only to update the commit log message, git-status
would rightly say "Nothing to commit." Do not let this prevent commit to
be made.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sun, 5 Mar 2006 00:18:43 +0000 (16:18 -0800)]
Cauterize dropped or duplicate bits from next.
I am very sorry to do this, but without this funky octopus, "git
log --no-merges master..next" will show commits already merged
into "master" forever.
There are some commits on the next branch (which is never to be
rewound) that are reverts of other commits on the next branch.
They are to revert the finer grained delta experiments that
turned out to have undesirable performance effects. Also there
are some other commits that were first done as a merge into
"next" (a pull request based on next) and then cherry picked
into master. Since they are not going to be merged into
"master" ever, they will stay forever in "log master..next".
Yuck.
So this commit records the fact that the commits currently shown
by "git log --no-merges master..next" to be merged into "master"
are already in the master, either because they really are (in
the case of git-cvsserver bits, which needed cherry-picking into
"master"), or because they are fully reverted in "next" (in the
case of finer-grained delta bits).
Here is the way I made this commit:
(1) Inspect "gitk --no-merges --parents master..next"
This shows what git thinks are missing from master. It
shows chain of commits that are already merged and chain of
commits whose net effect should amount to a no-op.
Look at each commits and make sure they are either unwanted
or already merged by cherry-picking.
(2) Record the tip of branches that I do not want. In this
case, the following were unwanted:
cfcbd3427e67056a00ec832645b057eaf33888d9 cvsserver
c436eb8cf1efa3fe2c70100ae0cbc48f0feaf5af diff-delta
38fd0721d0a2a1a723bc28fc0817e3571987b1ef diff-delta
f0bcd511ee3a00b7fd3975a386aa1165c07a0721 cvsserver
2b8d9347aa1a11f1ac13591f89ca9f984d467c77 diff-delta
(3) Shorten the list by finding independent ones from the
above.
$ git show-branch --independent $the $above $tips
cfcbd3427e67056a00ec832645b057eaf33888d9
c436eb8cf1efa3fe2c70100ae0cbc48f0feaf5af
(4) Checkout "master" and cauterize them with "ours" strategy:
$ git merge -s ours "`cat $this-file`" HEAD cfcbd3 c436eb
Junio C Hamano [Sat, 4 Mar 2006 22:58:11 +0000 (14:58 -0800)]
Merge part of 'sp/checkout'
Francis Daly [Sat, 4 Mar 2006 16:35:27 +0000 (16:35 +0000)]
AsciiDoc fix for tutorial
RE \^.+\^ becomes <sup>. Not wanted here
Signed-off-by: Junio C Hamano <junkio@cox.net>
Alexandre Julliard [Sat, 4 Mar 2006 16:38:58 +0000 (17:38 +0100)]
git.el: Added customize support for all parameters.
Also fixed quoting of git-log-msg-separator.
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Alexandre Julliard [Sat, 4 Mar 2006 16:38:41 +0000 (17:38 +0100)]
git.el: Added support for Signed-off-by.
If `git-append-signed-off-by' is non-nil, automatically append a
sign-off line to the log message when editing it.
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Alexandre Julliard [Sat, 4 Mar 2006 16:38:20 +0000 (17:38 +0100)]
git.el: Automatically update .gitignore status.
Update .gitignore files in the status list as they are created or
modified.
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Alexandre Julliard [Sat, 4 Mar 2006 16:38:05 +0000 (17:38 +0100)]
git.el: Set default directory before running the status mode setup hooks.
Also set the list-buffers-directory variable for nicer buffer list
display.
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Alexandre Julliard [Sat, 4 Mar 2006 16:37:42 +0000 (17:37 +0100)]
git.el: Portability fixes for XEmacs and Emacs CVS.
Fixed octal constants for XEmacs.
Added highlighting support in log-edit buffer for Emacs CVS.
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Alexandre Julliard [Sat, 4 Mar 2006 14:32:19 +0000 (15:32 +0100)]
contrib/emacs: Add an Emacs VC backend.
Add a basic Emacs VC backend. It currently supports the following
commands: checkin, checkout, diff, log, revert, and annotate. There is
only limited support for working with revisions other than HEAD.
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sat, 4 Mar 2006 21:22:01 +0000 (13:22 -0800)]
Merge branch 'fk/blame'
* fk/blame:
git-blame, take 2
Merge part of 'lt/rev-list' into 'fk/blame'
Add git-blame, a tool for assigning blame.
Junio C Hamano [Sat, 4 Mar 2006 21:21:17 +0000 (13:21 -0800)]
Merge branch 'lt/rev-list'
* lt/rev-list:
setup_revisions(): handle -n<n> and -<n> internally.
git-log (internal): more options.
git-log (internal): add approxidate.
Rip out merge-order and make "git log <paths>..." work again.
Tie it all together: "git log"
Introduce trivial new pager.c helper infrastructure
git-rev-list libification: rev-list walking
Splitting rev-list into revisions lib, end of beginning.
rev-list split: minimum fixup.
First cut at libifying revlist generation
Marco Costalba [Sat, 4 Mar 2006 06:42:09 +0000 (07:42 +0100)]
Add a Documentation/git-tools.txt
A brief survey of useful git tools, including third-party
and external projects.
Signed-off-by: Marco Costalba <mcostalba@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Martin Langhoff [Sat, 4 Mar 2006 07:30:04 +0000 (20:30 +1300)]
cvsserver: anonymous cvs via pserver support
git-cvsserver now knows how to do the pserver auth chat when the user
is anonymous. To get it to work, add a line to your inetd.conf like
cvspserver stream tcp nowait nobody git-cvsserver pserver
(On some inetd implementations you may have to put the pserver parameter twice.)
Commits are blocked. Naively, git-cvsserver assumes non-malicious users. Please
review the code before setting this up on an internet-accessible server.
NOTE: the <nobody> user above will need write access to the .git directory
to maintain the sqlite database. Updating of the sqlite database should be
put in an update hook to avoid this problem, so that it is maintained by
users with write access.
Junio C Hamano [Sat, 4 Mar 2006 06:29:17 +0000 (22:29 -0800)]
Merge branch 'tl/anno'
* tl/anno:
annotate should number lines starting with 1
Martin Langhoff [Sat, 4 Mar 2006 04:47:22 +0000 (17:47 +1300)]
cvsserver: better error messages
We now have different error messages when the repo is not found vs repo is
not configured to allow gitcvs. Should help users during initial checkouts.
Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Martin Langhoff [Sat, 4 Mar 2006 04:47:29 +0000 (17:47 +1300)]
cvsserver: nested directory creation fixups for Eclipse clients
To create nested directories without (or before) sending file entries
is rather tricky. Most clients just work. Eclipse, however, expects
a very specific sequence of events. With this patch, cvsserver meets
those expectations.
Note: we may want to reuse prepdir() in req_update -- should move it
outside of req_co. Right now prepdir() is tied to how req_co() works.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sat, 4 Mar 2006 05:36:52 +0000 (21:36 -0800)]
Merge branch 'maint'
* maint:
tar-tree: file/dirmode fix.
Junio C Hamano [Sat, 4 Mar 2006 05:34:14 +0000 (21:34 -0800)]
tar-tree: file/dirmode fix.
This fixes two bugs introduced when we switched to generic tree
traversal code.
(1) directory mode recorded silently became 0755, not 0777
(2) if passed a tree object (not a commit), it emitted an
alarming error message (but proceeded anyway).
Signed-off-by: Junio C Hamano <junkio@cox.net>
Luck, Tony [Thu, 2 Mar 2006 23:27:31 +0000 (15:27 -0800)]
annotate should number lines starting with 1
C programmers are well used to counting from zero, but every
other text file tool starts counting from 1.
Signed-off-by: Tony Luck <tony.luck@intel.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Eric Wong [Fri, 3 Mar 2006 21:35:48 +0000 (13:35 -0800)]
contrib/git-svn: fix a copied-tree bug in an overzealous assertion
I thought passing --stop-on-copy to svn would save us from all
the trouble svn-arch-mirror had with directory (project) copies.
I was wrong, there was one thing I overlooked.
If a tree was moved from /foo/trunk to /bar/foo/trunk with no
other changes in r10, but the last change was done in r5, the
Last Changed Rev (from svn info) in /bar/foo/trunk will still be
r5, even though the copy in the repository didn't exist until
r10.
Now, if we ever detect that the Last Changed Rev isn't what
we're expecting, we'll run svn diff and only croak if there are
differences between them.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Fri, 3 Mar 2006 22:34:40 +0000 (14:34 -0800)]
show-branch --topics: omit more uninteresting commits.
When inspecting contents of topic branches for yet-to-be-merged
commits, a commit that is in the release/master branch is
uninteresting. Previous round still showed them, especially,
the ones before a topic branch that was forked from the
release/master later than other topic branches.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Alex Riesen [Fri, 3 Mar 2006 10:20:18 +0000 (11:20 +0100)]
workaround fat/ntfs deficiencies for t3600-rm.sh (git-rm)
Signed-off-by: Alex Riesen <ariesen@harmanbecker.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Josef Weidendorfer [Fri, 3 Mar 2006 16:23:32 +0000 (17:23 +0100)]
git-mv: fix moves into a subdir from outside
git-mv needs to be run from the base directory so that
the check if a file is under revision also covers files
outside of a subdirectory. Previously, e.g. in the git repo,
cd Documentation; git-mv ../README .
produced the error
Error: '../README' not under version control
The test is extended for this case; it previously only tested
one direction.
Signed-off-by: Josef Weidendorfer <Josef.Weidendorfer@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Eric Wong [Fri, 3 Mar 2006 09:28:48 +0000 (01:28 -0800)]
send-email: accept --no-signed-off-by-cc as the documentation states
--no-signed-off-cc is still supported, for backwards compatibility
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Eric Wong [Fri, 3 Mar 2006 09:20:09 +0000 (01:20 -0800)]
contrib/git-svn: better documenting of CLI switches
Also, fix a asciidoc formatting error
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Eric Wong [Fri, 3 Mar 2006 09:20:09 +0000 (01:20 -0800)]
contrib/git-svn: add --id/-i=$GIT_SVN_ID command-line switch
I ended up using GIT_SVN_ID far more than I ever thought I
would. Typing less is good.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Eric Wong [Fri, 3 Mar 2006 09:20:09 +0000 (01:20 -0800)]
contrib/git-svn: avoid re-reading the repository uuid, it never changes
If it does change, we're screwed anyways as SVN will refuse to
commit or update. We also never access more than one SVN
repository per-invocation, so we can store it as a global, too.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Eric Wong [Fri, 3 Mar 2006 09:20:09 +0000 (01:20 -0800)]
contrib/git-svn: create a more recent master if one does not exist
In a new repository, the initial fetch creates a master branch
if one does not exist so HEAD has something to point to.
It now creates a master at the end of the initial fetch run,
pointing to the latest revision. Previously it pointed to the
first revision imported, which is generally less useful.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Eric Wong [Fri, 3 Mar 2006 09:20:08 +0000 (01:20 -0800)]
contrib/git-svn: cleanup option parsing
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Eric Wong [Fri, 3 Mar 2006 09:20:08 +0000 (01:20 -0800)]
contrib/git-svn: allow --authors-file to be specified
Syntax is compatible with git-svnimport and git-cvsimport:
normalperson = Eric Wong <normalperson@yhbt.net>
If this option is specified and git-svn encounters an SVN
committer name that it cannot parse, it git-svn will abort.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Eric Wong [Fri, 3 Mar 2006 09:20:08 +0000 (01:20 -0800)]
contrib/git-svn: strip 'git-svn-id:' when commiting to SVN
We regenerate and use git-svn-id: whenever we fetch or otherwise
commit to remotes/git-svn. We don't actually know what revision
number we'll commit to SVN at commit time, so this is useless.
It won't throw off things like 'rebuild', though, which knows to
only use the last instance of git-svn-id: in a log message
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Eric Wong [Fri, 3 Mar 2006 09:20:07 +0000 (01:20 -0800)]
contrib/git-svn: several small bug fixes and changes
* Fixed manually-edited commit messages not going to
remotes/git-svn on sequential commits after the sequential
commit optimization.
* format help correctly after adding 'show-ignore'
* sha1_short regexp matches down to 4 hex characters
(from git-rev-parse --short documentation)
* Print the first line of the commit message when we commit to
SVN next to the sha1.
* Document 'T' (type change) in the comments
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Eric Wong [Fri, 3 Mar 2006 09:20:07 +0000 (01:20 -0800)]
contrib/git-svn: add -b/--branch switch for branch detection
I've said I don't like branches in Subversion, and I still don't.
This is a bit more flexible, though, as the argument for -b is any
arbitrary git head/tag reference.
This makes some things easier:
* Importing git history into a brand new SVN branch.
* Tracking multiple SVN branches via GIT_SVN_ID, even from multiple
repositories.
* Adding tags from SVN (still need to use GIT_SVN_ID, though).
* Even merge tracking is supported, if and only the heads end up with
100% equivalent tree objects. This is more stricter but more robust
and foolproof than parsing commit messages, imho.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Shawn Pearce [Thu, 2 Mar 2006 17:21:33 +0000 (12:21 -0500)]
Prevent --index-info from ignoring -z.
If git-update-index --index-info -z is used only the first
record given to the process will actually be updated as
the -z option is ignored until after all index records
have been read and processed. This meant that multiple
null terminated records were seen as a single record which
was lacking a trailing LF, however since the first record
ended in a null the C string handling functions ignored the
trailing garbage. So --index-info should be required to be
the last command line option, much as --stdin is required
to be the last command line option. Because --index-info
implies --stdin this isn't an issue as the user shouldn't
be passing --stdin when also passing --index-info.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Jonas Fonseca [Thu, 2 Mar 2006 16:10:49 +0000 (17:10 +0100)]
manpages: insert two missing [verse] markers for multi-line SYNOPSIS
Found with:
for i in *.txt; do
grep -A 2 "SYNOPSIS" "$i" | grep -q "^\[verse\]$" && continue
multiline=$(grep -A 3 "SYNOPSIS" "$i" | tail -n 1)
test -n "$multiline" && echo "$i: $multiline"
done
Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Aneesh Kumar K.V [Thu, 2 Mar 2006 11:47:39 +0000 (17:17 +0530)]
gitview: pass the missing argument _show_clicked_cb.
In our last update to use the encoding while showing the commit
diff we added a new argument to this function. But we missed
updating all the callers.
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Johannes Schindelin [Thu, 2 Mar 2006 11:43:51 +0000 (12:43 +0100)]
Fix test case for some sed
Some versions of sed lack the "-i" option.
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Eric Wong [Thu, 2 Mar 2006 20:23:17 +0000 (12:23 -0800)]
git-branch: add -r switch to list refs/remotes/*
If we decide to use refs/remotes/, having a convenient way to
list them would be nice.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Martin Langhoff [Fri, 3 Mar 2006 03:57:03 +0000 (16:57 +1300)]
cvsserver: fix checkouts with -d <somedir>
A recent Eclipse compat fix broke checkouts with -d. Fix it so that the server
sends the correct module name instead of the destination directory name.
Martin Langhoff [Fri, 3 Mar 2006 03:38:03 +0000 (16:38 +1300)]
cvsserver: checkout faster by sending files in a sensible order
Just by sending the files in an ordered fashion, clients can process them
much faster. And we can optimize our check of whether we created this
directory already -- faster.
Timings for a checkout on a commandline cvs client for a project with
~13K files totalling ~100MB:
Unsorted:
603.12 real 16.89 user 42.88 sys
Sorted:
298.19 real 26.37 user 42.42 sys
Junio C Hamano [Fri, 3 Mar 2006 05:13:24 +0000 (21:13 -0800)]
git-commit: make sure we protect against races.
An earlier commit
8098a178b26dc7a158d129a092a5b78da6d12b72
accidentally lost race protection from git-commit command.
This commit reinstates it. When something else updates HEAD
pointer while you were editing your commit message, the command
would notice and abort the commit.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Fri, 3 Mar 2006 05:04:05 +0000 (21:04 -0800)]
git-commit --amend
The new flag is used to amend the tip of the current branch. Prepare
the tree object you would want to replace the latest commit as usual
(this includes the usual -i/-o and explicit paths), and the commit log
editor is seeded with the commit message from the tip of the current
branch. The commit you create replaces the current tip -- if it was a
merge, it will have the parents of the current tip as parents -- so the
current top commit is discarded.
It is a rough equivalent for:
$ git reset --soft HEAD^
$ ... do something else to come up with the right tree ...
$ git commit -c ORIG_HEAD
but can be used to amend a merge commit.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Martin Langhoff [Fri, 3 Mar 2006 03:57:03 +0000 (16:57 +1300)]
cvsserver: fix checkouts with -d <somedir>
A recent Eclipse compat fix broke checkouts with -d. Fix it so that the server
sends the correct module name instead of the destination directory name.
Martin Langhoff [Fri, 3 Mar 2006 03:38:03 +0000 (16:38 +1300)]
cvsserver: checkout faster by sending files in a sensible order
Just by sending the files in an ordered fashion, clients can process them
much faster. And we can optimize our check of whether we created this
directory already -- faster.
Timings for a checkout on a commandline cvs client for a project with
~13K files totalling ~100MB:
Unsorted:
603.12 real 16.89 user 42.88 sys
Sorted:
298.19 real 26.37 user 42.42 sys
Junio C Hamano [Fri, 3 Mar 2006 01:14:00 +0000 (17:14 -0800)]
show-branch --topics
This adds a new flag, --topics, to help managing topic
branches. When you have topic branches forked some time ago
from your primary line of development, show-branch would show
many "uninteresting" things that happend on the primary line of
development when trying to see what are still not merged from
the topic branches.
With this flag, the first ref given to show-branch is taken as
the primary branch, and the rest are taken as the topic
branches. Output from the command is modified so that commits
only on the primary branch are not shown. In other words,
$ git show-branch --topics master topic1 topic2 ...
shows an (almost) equivalent of
$ git rev-list ^master topic1 topic2 ...
The major differences are that (1) you can tell which commits
are on which branch, and (2) the commit at the fork point is
shown.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Thu, 2 Mar 2006 22:38:44 +0000 (14:38 -0800)]
GIT-VERSION-GEN: squelch unneeded error from "cat version"
Now this is really a corner case, but if you have the git source
tree from somewhere other than the official tarball, you do not
have version file. And if git-describe does not work for you
(maybe you do not have git yet), we spilled an error message
from "cat version".
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Thu, 2 Mar 2006 23:24:01 +0000 (15:24 -0800)]
setup_revisions(): handle -n<n> and -<n> internally.
This moves the handling of max-count shorthand from the internal
implementation of "git log" to setup_revisions() so other users
of setup_revisions() can use it.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Fredrik Kuivinen [Thu, 2 Mar 2006 21:28:17 +0000 (22:28 +0100)]
git-blame, take 2
Here is an updated version of git-blame. The main changes compared to
the first version are:
* Use the new revision.h interface to do the revision walking
* Do the right thing in a lot of more cases than before. In particular
parallel development tracks are hopefully handled sanely.
* Lots of clean-up
It still won't follow file renames though.
There are still some differences in the output between git-blame and
git-annotate. For example, in 'Makefile' git-blame assigns lines
354-358 to
455a7f3275d264f6e66045b92c83747ec461dda5 and git-annotate
assigns the same lines to
79a9d8ea0d88a3667ad19be8e705405ab5d896f1.
I think git-blame is correct in this case. This patterns occur in
several other places, git-annotate seems to sometimes assign lines to
merge commits when the lines actually changed in some other commit
which precedes the merge.
[jc: I have conned Ryan into doing test cases, so that it would
help development and fixes on both implementations. Let the
battle begin! ;-) ]
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Thu, 2 Mar 2006 23:10:05 +0000 (15:10 -0800)]
Merge part of 'lt/rev-list' into 'fk/blame'
Now blame will depend on the new revision walker infrastructure,
we need to make it depend on earlier parts of Linus' rev-list
topic branch, hence this merge.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Thu, 2 Mar 2006 22:19:33 +0000 (14:19 -0800)]
Merge branch 'ml/cvsserver'
* ml/cvsserver:
cvsserver: Eclipse compat -- now "compare with latest from HEAD" works
cvsserver: Checkout correctly on Eclipse
Junio C Hamano [Thu, 2 Mar 2006 09:50:09 +0000 (01:50 -0800)]
annotate: resurrect raw timestamps.
For scripted use this is quite useful.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Thu, 2 Mar 2006 09:11:31 +0000 (01:11 -0800)]
Documentation: rev-list --objects-edge
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Thu, 2 Mar 2006 09:11:05 +0000 (01:11 -0800)]
Documentation: read-tree --aggressive
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Thu, 2 Mar 2006 08:45:48 +0000 (00:45 -0800)]
war on whitespaces: documentation.
We were missing the --whitespace option in the usage string for
git-apply and git-am, so this commit adds them.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Thu, 2 Mar 2006 08:02:27 +0000 (00:02 -0800)]
Merge branch 'master' into next
* master:
contrib/git-svn: use refs/remotes/git-svn instead of git-svn-HEAD
Merge branch 'maint'
read-tree --aggressive: remove deleted entry from the working tree.
Merge branch 'jc/tag'
Merge part of 'jc/diff'
Eric Wong [Thu, 2 Mar 2006 05:58:31 +0000 (21:58 -0800)]
contrib/git-svn: use refs/remotes/git-svn instead of git-svn-HEAD
After reading a lengthy discussion on the list, I've come to the
conclusion that creating a 'remotes' directory in refs isn't
such a bad idea.
You can still branch from it by specifying remotes/git-svn (not
needing the leading 'refs/'), and the documentation has been
updated to reflect that.
The 'git-svn' part of the ref can of course be set to whatever
you want by using the GIT_SVN_ID environment variable, as
before.
I'm using refs/remotes/git-svn, and not going with something
like refs/remotes/git-svn/HEAD as it's redundant for Subversion
where there's zero distinction between branches and directories.
Run git-svn rebuild --upgrade to upgrade your repository to use
the new head. git-svn-HEAD must be manually deleted for safety
reasons.
Side note: if you ever (and I hope you never) want to run
git-update-refs on a 'remotes/' ref, make sure you have the
'refs/' prefix as you don't want to be clobbering your
'remotes/' in $GIT_DIR (where remote URLs are stored).
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Thu, 2 Mar 2006 07:20:31 +0000 (23:20 -0800)]
Merge branch 'maint'
* maint:
read-tree --aggressive: remove deleted entry from the working tree.
Junio C Hamano [Thu, 2 Mar 2006 07:10:00 +0000 (23:10 -0800)]
read-tree --aggressive: remove deleted entry from the working tree.
When both heads deleted, or our side deleted while the other
side did not touch, we did not have to update the working tree.
However, we forgot to remove existing working tree file when we
did not touch and the other side did.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Thu, 2 Mar 2006 06:27:06 +0000 (22:27 -0800)]
Merge branch 'ml/cvsserver' into next
* ml/cvsserver:
cvsserver: Eclipse compat -- now "compare with latest from HEAD" works
Junio C Hamano [Thu, 2 Mar 2006 06:17:44 +0000 (22:17 -0800)]
Merge branch 'jc/tag'
* jc/tag:
Pretty-print tagger dates.
Junio C Hamano [Thu, 2 Mar 2006 06:15:38 +0000 (22:15 -0800)]
Merge part of 'jc/diff'
Junio C Hamano [Thu, 2 Mar 2006 06:08:12 +0000 (22:08 -0800)]
Merge branch 'np/delta' into next
* np/delta:
diff-delta: allow reusing of the reference buffer index
diff-delta: bound hash list length to avoid O(m*n) behavior
diff-delta: produce optimal pack data
Merge branch 'kh/svnimport'
Merge branch 'js/refs'
annotate: fix -S parameter to take a string
annotate: Add a basic set of test cases.
annotate: handle \No newline at end of file.
gitview: Use horizontal scroll bar in the tree view
Nicolas Pitre [Tue, 28 Feb 2006 04:38:28 +0000 (23:38 -0500)]
diff-delta: allow reusing of the reference buffer index
When a reference buffer is used multiple times then its index can be
computed only once and reused multiple times. This patch adds an extra
pointer to a pointer argument (from_index) to diff_delta() for this.
If from_index is NULL then everything is like before.
If from_index is non NULL and *from_index is NULL then the index is
created and its location stored to *from_index. In this case the caller
has the responsibility to free the memory pointed to by *from_index.
If from_index and *from_index are non NULL then the index is reused as
is.
This currently saves about 10% of CPU time to repack the git archive.
Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Nicolas Pitre [Tue, 28 Feb 2006 04:09:55 +0000 (23:09 -0500)]
diff-delta: bound hash list length to avoid O(m*n) behavior
The diff-delta code can exhibit O(m*n) behavior with some patological
data set where most hash entries end up in the same hash bucket.
The latest code rework reduced the block size making it particularly
vulnerable to this issue, but the issue was always there and can be
triggered regardless of the block size.
This patch does two things:
1) the hashing has been reworked to offer a better distribution to
atenuate the problem a bit, and
2) a limit is imposed to the number of entries that can exist in the
same hash bucket.
Because of the above the code is a bit more expensive on average, but
the problematic samples used to diagnoze the issue are now orders of
magnitude less expensive to process with only a slight loss in
compression.
Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Nicolas Pitre [Wed, 22 Feb 2006 01:45:36 +0000 (20:45 -0500)]
diff-delta: produce optimal pack data
Indexing based on adler32 has a match precision based on the block size
(currently 16). Lowering the block size would produce smaller deltas
but the indexing memory and computing cost increases significantly.
For optimal delta result the indexing block size should be 3 with an
increment of 1 (instead of 16 and 16). With such low params the adler32
becomes a clear overhead increasing the time for git-repack by a factor
of 3. And with such small blocks the adler 32 is not very useful as the
whole of the block bits can be used directly.
This patch replaces the adler32 with an open coded index value based on
3 characters directly. This gives sufficient bits for hashing and
allows for optimal delta with reasonable CPU cycles.
The resulting packs are 6% smaller on average. The increase in CPU time
is about 25%. But this cost is now hidden by the delta reuse patch
while the saving on data transfers is always there.
Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Thu, 2 Mar 2006 05:46:01 +0000 (21:46 -0800)]
Merge branch 'kh/svnimport'
* kh/svnimport:
Save username -> Full Name <email@addr.es> map file
Junio C Hamano [Thu, 2 Mar 2006 05:45:56 +0000 (21:45 -0800)]
Merge branch 'js/refs'
* js/refs:
Warn about invalid refs
Martin Langhoff [Thu, 2 Mar 2006 05:42:01 +0000 (18:42 +1300)]
cvsserver: Eclipse compat -- now "compare with latest from HEAD" works
The Eclipse client uses cvs update when that menu option is triggered.
And doesn't like the standard cvs update response. Give it *exactly* what
it wants.
And hope the other clients don't lose the plot too badly.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Martin Langhoff [Thu, 2 Mar 2006 04:24:30 +0000 (17:24 +1300)]
annotate: fix -S parameter to take a string
In the conversion to Getopt::Long, the -S / --rev-list parameter stopped
working. We need to tell Getopt::Long that it is a string.
As a bonus, the open() now does some useful error handling.
Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Ryan Anderson [Thu, 2 Mar 2006 05:23:37 +0000 (00:23 -0500)]
annotate: Add a basic set of test cases.
Signed-off-by: Ryan Anderson <ryan@michonline.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Ryan Anderson [Thu, 2 Mar 2006 05:23:37 +0000 (00:23 -0500)]
annotate: handle \No newline at end of file.
Signed-off-by: Ryan Anderson <ryan@michonline.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Aneesh Kumar K.V [Thu, 2 Mar 2006 04:29:53 +0000 (09:59 +0530)]
gitview: Use horizontal scroll bar in the tree view
Earlier we set up the window to never scroll
horizontally, which made it harder to use on a narrow screen.
This patch allows scrollbar to be used as needed by Gtk
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Thu, 2 Mar 2006 01:45:09 +0000 (17:45 -0800)]
Merge branch 'ml/cvsserver' into next
* ml/cvsserver:
cvsserver: Checkout correctly on Eclipse
Martin Langhoff [Thu, 2 Mar 2006 00:58:57 +0000 (13:58 +1300)]
cvsserver: Checkout correctly on Eclipse
Initial checkouts were failing to create Entries files under Eclipse.
Eclipse was waiting for two non-standard directory-resets to prepare for a new
directory from the server.
This patch is tricky, because the same directory resets tend to confuse other
clients. It's taken a bit of fiddling to get the commandline cvs client and
Eclipse to get a good, clean checkout.
Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Thu, 2 Mar 2006 01:43:02 +0000 (17:43 -0800)]
Merge branch 'jc/tag' into next
* jc/tag:
Pretty-print tagger dates.
Junio C Hamano [Thu, 2 Mar 2006 01:42:30 +0000 (17:42 -0800)]
Pull GIT 1.2.4 fixes from master
Luck, Tony [Wed, 1 Mar 2006 23:01:53 +0000 (15:01 -0800)]
Re-fix compilation warnings.
Commit
8fcf1ad9c68e15d881194c8544e7c11d33529c2b has a
combination of double cast and Andreas' switch to using
unsigned long ... just the latter is sufficient (and a lot less
ugly than using the double cast).
Signed-off-by: Tony Luck <tony.luck@intel.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Thu, 2 Mar 2006 01:09:50 +0000 (17:09 -0800)]
Merge branch 'jc/diff' into next
* jc/diff:
diffcore-delta: stop using deltifier for packing.
Junio C Hamano [Thu, 2 Mar 2006 01:07:42 +0000 (17:07 -0800)]
Up to date with GIT 1.2.4 fixes
Junio C Hamano [Thu, 2 Mar 2006 00:43:19 +0000 (16:43 -0800)]
Pretty-print tagger dates.
We can show commit objects with human readable dates using
various --pretty options, but there was no way to do so with
tags. This introduces two such ways:
$ git-cat-file -p v1.2.3
shows the tag object with tagger dates in human readable format.
$ git-verify-tag --verbose v1.2.3
uses it to show the contents of the tag object as well as doing
GPG verification.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Thu, 2 Mar 2006 01:06:12 +0000 (17:06 -0800)]
Merge branch 'lt/fix-apply' into maint
* lt/fix-apply:
git-am: --whitespace=x option.
git-apply: war on whitespace -- finishing touches.
git-apply --whitespace=nowarn
apply --whitespace: configuration option.
apply: squelch excessive errors and --whitespace=error-all
apply --whitespace fixes and enhancements.
The war on trailing whitespace
Junio C Hamano [Thu, 2 Mar 2006 01:05:57 +0000 (17:05 -0800)]
Merge branch 'lt/apply'
* lt/apply:
git-am: --whitespace=x option.
git-apply: war on whitespace -- finishing touches.
git-apply --whitespace=nowarn
apply --whitespace: configuration option.
apply: squelch excessive errors and --whitespace=error-all
apply --whitespace fixes and enhancements.
The war on trailing whitespace
Junio C Hamano [Thu, 2 Mar 2006 00:55:51 +0000 (16:55 -0800)]
Merge early parts of 'np/delta' branch
Junio C Hamano [Wed, 1 Mar 2006 20:16:25 +0000 (12:16 -0800)]
Merge git-mv fixes from 'maint'
Josef Weidendorfer [Wed, 1 Mar 2006 18:09:23 +0000 (19:09 +0100)]
git-mv: fixes for path handling
Moving a directory ending in a slash was not working as the
destination was not calculated correctly.
E.g. in the git repo,
git-mv t/ Documentation
gave the error
Error: destination 'Documentation' already exists
To get rid of this problem, strip trailing slashes from all arguments.
The comment in cg-mv made me curious about this issue; Pasky, thanks!
As result, the workaround in cg-mv is not needed any more.
Also, another bug was shown by cg-mv. When moving files outside of
a subdirectory, it typically calls git-mv with something like
git-mv Documentation/git.txt Documentation/../git-mv.txt
which triggers the following error from git-update-index:
Ignoring path Documentation/../git-mv.txt
The result is a moved file, removed from git revisioning, but not
added again. To fix this, the paths have to be normalized not have ".."
in the middle. This was already done in git-mv, but only for
a better visual appearance :(
Signed-off-by: Josef Weidendorfer <Josef.Weidendorfer@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Josef Weidendorfer [Wed, 1 Mar 2006 17:16:36 +0000 (18:16 +0100)]
git-mv: Allow -h without repo & fix error message
This fixes "git-mv -h" to output the usage without the need
to be in a git repository.
Additionally:
- fix confusing error message when only one arg was given
- fix typo in error message
Signed-off-by: Josef Weidendorfer <Josef.Weidendorfer@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
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>
(cherry picked from
9a0e6731c632c841cd2de9dec0b9091b2f10c6fd commit)
Mark Wooding [Mon, 27 Feb 2006 12:52:52 +0000 (12:52 +0000)]
combine-diff: Honour -z option correctly.
Combined diffs don't null terminate things in the same way as standard
diffs. This is presumably wrong.
Signed-off-by: Mark Wooding <mdw@distorted.org.uk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
(cherry picked from
6baf0484efcd29bb5e58ccd5ea0379481d4a83f4 commit)
Mark Wooding [Mon, 27 Feb 2006 12:52:50 +0000 (12:52 +0000)]
combine-diff: Honour --full-index.
For some reason, combined diffs don't honour the --full-index flag when
emitting patches. Fix this.
Signed-off-by: Mark Wooding <mdw@distorted.org.uk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
(cherry picked from
e70c6b35749c316f6e97099bd6bdac895c9d6f68 commit)
Junio C Hamano [Wed, 1 Mar 2006 04:19:47 +0000 (20:19 -0800)]
diffcore-break: micro-optimize by avoiding delta between identical files.
We did not check if we have the same file on both sides when
computing break score. This is usually not a problem, but if
the user said --find-copies-harde with -B, we ended up trying a
delta between the same data even when we know the SHA1 hash of
both sides match.
Signed-off-by: Junio C Hamano <junkio@cox.net>
(cherry picked from
aeecd23ae2785a0462d42191974e9d9a8e439fbe commit)
Junio C Hamano [Wed, 1 Mar 2006 11:17:13 +0000 (03:17 -0800)]
Merge branch 'lt/rev-list' into next
* lt/rev-list:
git-log (internal): more options.
git-log (internal): add approxidate.
Junio C Hamano [Wed, 1 Mar 2006 08:58:56 +0000 (00:58 -0800)]
git-log (internal): more options.
This ports the following options from rev-list based git-log
implementation:
* -<n>, -n<n>, and -n <n>. I am still wondering if we want
this natively supported by setup_revisions(), which already
takes --max-count. We may want to move them in the next
round. Also I am not sure if we can get away with not
setting revs->limited when we set max-count. The latest
rev-list.c and revision.c in this series do not, so I left
them as they are.
* --pretty and --pretty=<fmt>.
* --abbrev=<n> and --no-abbrev.
The previous commit already handles time-based limiters
(--since, --until and friends). The remaining things that
rev-list based git-log happens to do are not useful in a pure
log-viewing purposes, and not ported:
* --bisect (obviously).
* --header. I am actually in favor of doing the NUL
terminated record format, but rev-list based one always
passed --pretty, which defeated this option. Maybe next
round.
* --parents. I do not think of a reason a log viewer wants
this. The flag is primarily for feeding squashed history
via pipe to downstream tools.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Wed, 1 Mar 2006 08:12:37 +0000 (00:12 -0800)]
git-log (internal): add approxidate.
Next will be the pretty-print format.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Wed, 1 Mar 2006 10:55:56 +0000 (02:55 -0800)]
Merge branch 'lt/rev-list' into next
* lt/rev-list:
Rip out merge-order and make "git log <paths>..." work again.
Tie it all together: "git log"
Introduce trivial new pager.c helper infrastructure
git-rev-list libification: rev-list walking
blame.c #include's epoch.h; it needed to be killed.
Junio C Hamano [Tue, 28 Feb 2006 07:38:50 +0000 (23:38 -0800)]
diff-delta: cull collided hash bucket more aggressively.
This tries to limit collided hash buckets by removing identical
three-byte prefix from the same hashbucket.
Linus Torvalds [Tue, 28 Feb 2006 23:07:20 +0000 (15:07 -0800)]
Rip out merge-order and make "git log <paths>..." work again.
Well, assuming breaking --merge-order is fine, here's a patch (on top of
the other ones) that makes
git log <filename>
actually work, as far as I can tell.
I didn't add the logic for --before/--after flags, but that should be
pretty trivial, and is independent of this anyway.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Wed, 1 Mar 2006 09:36:29 +0000 (01:36 -0800)]
Merge part of 'jc/diff' into next
Junio C Hamano [Wed, 1 Mar 2006 09:35:51 +0000 (01:35 -0800)]
Merge part of 'sp/checkout' into next
Junio C Hamano [Wed, 1 Mar 2006 09:35:00 +0000 (01:35 -0800)]
Merge branch 'lt/apply' into next
* lt/apply:
git-am: --whitespace=x option.