OSDN Git Service
Matthias Urlichs [Mon, 10 Oct 2005 16:54:53 +0000 (18:54 +0200)]
svn import: unlink downlaoded files
Actually removing the files that have been checked out of SVN,
after checking them into git of course, is a good idea...
Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
Matthias Urlichs [Mon, 10 Oct 2005 16:45:00 +0000 (18:45 +0200)]
svn import: Add a loop limit option
The svn library has a serious memory leak.
Added a new option (-l NUM) which causes git-svnimport to exit cleanly
after fetching that many changes, in order to \1a.
Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
Matthias Urlichs [Mon, 10 Oct 2005 13:28:00 +0000 (15:28 +0200)]
svn import: incremental imports
Incremental imports skipped a revision.
Also improve interrupt safety -- ^C while writing a tag caused the tag
to be skipped.
Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
Matthias Urlichs [Mon, 10 Oct 2005 13:14:21 +0000 (15:14 +0200)]
svn import: skip initial revisions
Add a flag to skip initial revisions: some SVN repositories have
initial setup cruft in their logs which we might want to ignore.
Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
Matthias Urlichs [Mon, 10 Oct 2005 12:51:13 +0000 (14:51 +0200)]
svn import: Do not create empty tags
If a tag is "clean", do not create a commit for it.
Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
Matthias Urlichs [Mon, 10 Oct 2005 12:42:59 +0000 (14:42 +0200)]
svn import: Fix tagging.
Tagging was 100% broken. :-/
Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
Matthias Urlichs [Mon, 10 Oct 2005 12:19:15 +0000 (14:19 +0200)]
svn import: remove debugging
Removed debugging output used to identify the too-many-connections problem.
Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
Matthias Urlichs [Mon, 10 Oct 2005 12:18:38 +0000 (14:18 +0200)]
svn import: wrong file open mode
There are multiple | characters in Unicode. Don't use the wrong one ...
Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
Matthias Urlichs [Mon, 10 Oct 2005 12:14:44 +0000 (14:14 +0200)]
svn import: avoid reconnecting
Perl's eval() sets $@ to empts, not undef, when it succeeds.
That caused excessive reconnect attempts.
Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
Matthias Urlichs [Mon, 10 Oct 2005 11:42:48 +0000 (13:42 +0200)]
svn improt needs SVN::Core 1.2.1 or better
Die with a warning if Perl's svn module is too old.
Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
Matthias Urlichs [Mon, 10 Oct 2005 11:10:01 +0000 (13:10 +0200)]
svn import: add libsvn-core-perl to Debian's control file
Added libsvn-core-perl to debian/control, "Recommends:" section.
Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
Matthias Urlichs [Mon, 10 Oct 2005 10:45:46 +0000 (12:45 +0200)]
svn import: fixed two pipe open calls.
Perl's magic "different semantics of open() based on the number of
arguments" is really annoying at times...
Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
Matthias Urlichs [Mon, 10 Oct 2005 10:41:15 +0000 (12:41 +0200)]
svn import: copy path information
Due to a bug in the SVN library, path information is freed as soon as the
callback returns, even if it still refers to the data.
Workaround: Copy it. (Also fix a wrong-method-name bug while we're at it.)
Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
Matthias Urlichs [Mon, 10 Oct 2005 10:34:32 +0000 (12:34 +0200)]
SVN import: No modes
svn doesn't seem to save file modes:
removed the code that analyzes them.
Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
Matthias Urlichs [Mon, 10 Oct 2005 10:33:22 +0000 (12:33 +0200)]
svn import: add eval()
Trying to downlaod a file that's really a subdirectory doesn't work too well.
Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
Matthias Urlichs [Mon, 10 Oct 2005 09:40:43 +0000 (11:40 +0200)]
New: git-svnimport.
As the name suggests, this script imports from SVN.
Only "normal" SVN repositories (with single trunk/, branches/, and tags/
subdrectories) are supported. Incremental imports require preserving
the file .git/svn2git.
Signed-Off-by: Matthias Urlichs <smurf@smurf.noris.de>
Matthias Urlichs [Mon, 10 Oct 2005 09:15:09 +0000 (11:15 +0200)]
cvsimport: report merge parents
Matching and reporting merge parents happens in a subprocess.
Re-open stdout before redirecting stdout to the pipe, so that printing
verbose messages doesn't go to the wrong place.
Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
Junio C Hamano [Tue, 4 Oct 2005 19:41:35 +0000 (12:41 -0700)]
Record which tree the patch applies to.
Also note which version of GIT produced the patch.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Tue, 4 Oct 2005 08:11:27 +0000 (01:11 -0700)]
git-applypatch: cleanup.
- Defined variable $INFO was not used properly.
- Make sure there is an empty line between the sign-off and the
log message.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Tue, 4 Oct 2005 05:28:45 +0000 (22:28 -0700)]
git-apply: retire unused/unimplemented --no-merge flag.
The original plan was to do 3-way merge between local working tree,
index and the patch being applied, but that was never implemented.
Retire the flag to control its behaviour.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 3 Oct 2005 20:16:39 +0000 (13:16 -0700)]
git-apply: allow operating in sparsely populated working tree.
This patch teaches 'git-apply --index' to automatically check
out a file being patched. This happens only when the working
tree does not have it checked out.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 3 Oct 2005 19:44:48 +0000 (12:44 -0700)]
Return error when not checking out an entry due to dirtiness.
Without -f flag, 'git-checkout-index foo.c' issued an error message
when foo.c already existed in the working tree and did not match index.
However it did not return an error from the underlying checkout_entry()
function and resulted in a successful exit(0).
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Wed, 5 Oct 2005 00:04:26 +0000 (17:04 -0700)]
Merge branch 'fixes'
Junio C Hamano [Tue, 4 Oct 2005 23:45:01 +0000 (16:45 -0700)]
Add missing documentation.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Tue, 4 Oct 2005 07:40:59 +0000 (00:40 -0700)]
Remove useless use of sed in git-format-patch.
There was a leftover use of sed that attempted to remove the commit ID
output from git-diff-tree, which turned into an expensive no-op when
git-diff-tree output header format changed about three months ago.
Drop it.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Tue, 4 Oct 2005 06:49:46 +0000 (23:49 -0700)]
Leave an empty line between log and sign-off.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Tue, 4 Oct 2005 06:47:19 +0000 (23:47 -0700)]
Remove unused external-diff script.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Daniel Barkalow [Tue, 4 Oct 2005 04:24:55 +0000 (00:24 -0400)]
[PATCH] Limit the number of requests outstanding in ssh-fetch.
This completes fetches if there are more than 100 outstanding requests
and there are more to prefetch.
Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Tue, 4 Oct 2005 02:05:01 +0000 (19:05 -0700)]
On Cygwin, use symbolic ref, not a symbolic link, to express .git/HEAD
H. Peter Anvin says that Samba "promotes" symlinks to hardlinks while
Cygwin itself uses .lnk files to emulate symlinks. Avoid using symbolic
link for .git/HEAD on Cygwin.
This does not help the symlinks recorded in trees as user data, but
at least we do not use them for our own bookkeeping.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Tue, 4 Oct 2005 02:13:04 +0000 (19:13 -0700)]
Merge branch 'fixes'
Junio C Hamano [Tue, 4 Oct 2005 02:11:32 +0000 (19:11 -0700)]
Avoid compiler warning.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 3 Oct 2005 04:40:51 +0000 (21:40 -0700)]
Make sure get_sha1 does not accept ambiguous sha1 prefix (again).
The earlier fix incorrectly dropped the code the original had to
ensure the found SHA1 is at least unique within the same pack.
Restore the check.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Peter Anvin [Mon, 3 Oct 2005 23:42:45 +0000 (16:42 -0700)]
Merge with master.kernel.org:/pub/scm/git/git.git
Junio C Hamano [Mon, 3 Oct 2005 23:32:57 +0000 (16:32 -0700)]
Merge branch 'fixes'
Junio C Hamano [Mon, 3 Oct 2005 23:05:50 +0000 (16:05 -0700)]
[PATCH] Merging the Cygwin changes
Fix mismerge typo.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 3 Oct 2005 22:45:44 +0000 (15:45 -0700)]
git-pull: do not barf on -a flag meant for git-fetch.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Jonas Fonseca [Mon, 3 Oct 2005 17:16:30 +0000 (19:16 +0200)]
[PATCH] Random documentation fixes
The fixes focuses on improving the HTML output. Most noteworthy:
- Fix the Makefile to also make various *.html files depend on
included files.
- Consistently use 'NOTE: ...' instead of '[ ... ]' for additional
info.
- Fix ending '::' for description lists in OPTION section etc.
- Fix paragraphs in description lists ending up as preformated text.
- Always use listingblocks (preformatted text wrapped in lines with -----)
for examples that span empty lines, so they are put in only one HTML
block.
- Use '1.' instead of '(1)' for numbered lists.
- Fix linking to other GIT docs.
- git-rev-list.txt: put option descriptions in an OPTION section.
Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Peter Anvin [Mon, 3 Oct 2005 19:04:44 +0000 (12:04 -0700)]
Merge with master.kernel.org:/pub/scm/git/git.git
Junio C Hamano [Mon, 3 Oct 2005 07:36:13 +0000 (00:36 -0700)]
Error message from get_sha1() on ambiguous short SHA1.
Unlike cases where "no such object exists", the case where specified
prefix is ambiguous would confuse the user if we say "no such commit"
or such. Give an extra error message from the uniqueness check if
there are more than one objects that match the given prefix.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Fredrik Kuivinen [Mon, 3 Oct 2005 06:13:09 +0000 (08:13 +0200)]
[PATCH] Enable and fix support for base less merges.
Let the merge strategies handle the base less case if they are able to
do it. It also fixes git-resolve.sh to die if no common ancestors
exists, instead of doing the wrong thing. Furthermore, it contains a
small independent fix for git-merge.sh and a fix for a base less code
path in gitMergeCommon.py.
With this it's possible to use
git merge -s recursive 'merge message' A B
to do a base less merge of A and B.
[jc: Thanks Fredrik for fixing the brown-paper-bag in git-merge.
I fixed a small typo in git-merge-resolve fix; 'test' equality
check is spelled with single equal sign -- C-style double equal
sign is bashism.]
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 3 Oct 2005 04:40:51 +0000 (21:40 -0700)]
Make sure get_sha1 does not accept ambiguous sha1 prefix.
The original code did not even check alternates, and was confused if
an unpacked object was uniquely found when there was another object
that shares the same prefix in the pack.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 3 Oct 2005 00:29:21 +0000 (17:29 -0700)]
Fix minor DOS in rev-list.
A carefully crafted pathname can be used to disrupt downstream git-pack-objects
that uses 'git-rev-list --objects' output. Prevent this.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sun, 2 Oct 2005 23:37:27 +0000 (16:37 -0700)]
Post 0.99.8 master branch
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sun, 2 Oct 2005 19:56:31 +0000 (12:56 -0700)]
GIT 0.99.8
GIT already did everything I wanted it to do since mid 0.99.7,
and it has almost everything I want it to have now, except a
couple of minor tweaks and enhancements.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Eric W. Biederman [Sun, 2 Oct 2005 19:42:57 +0000 (13:42 -0600)]
[PATCH] Update git-clone documentation
The documentation for git-clone is behind the actual command.
I have been getting tired of reading the shell script to see
what the arguments are so here is an update of the actual documentation.
Signed-off-by: Eric Biederman <ebiederman@xmission.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sun, 2 Oct 2005 18:13:44 +0000 (11:13 -0700)]
Handle really trivial case inside git-merge.
Using Linus' --trivial option, this handles really trivial case
inside git-merge itself, without using any strategy modules.
A 'really trivial case' is:
- we are merging one branch into the current branch;
- there is only one merge base between the branches;
- there is no file-level merge required.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Linus Torvalds [Thu, 29 Sep 2005 15:16:12 +0000 (08:16 -0700)]
read-tree: --trivial
This adds an option --trivial to restrict 3-way 'read-tree -m -u'
to happen only if there is no file-level merging required.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Fredrik Kuivinen [Sun, 2 Oct 2005 15:33:38 +0000 (17:33 +0200)]
[PATCH] Teach git-ls-files about '--' to denote end of options.
Useful if you have a file whose name starts with a dash.
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Fredrik Kuivinen [Sun, 2 Oct 2005 15:43:07 +0000 (17:43 +0200)]
[PATCH] Teach the recursive merge strategy about renames.
It will now merge cases where a file was renamed in one branch and
modified in the other branch cleanly. We also detect a couple of
conflict cases now that wasn't detected before.
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sun, 2 Oct 2005 07:50:16 +0000 (00:50 -0700)]
read-tree: remove --head option.
Initially it was to allow specifying more than one remote to
allow creation of an Octopus, but it is not being used.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sun, 2 Oct 2005 07:20:45 +0000 (00:20 -0700)]
Customize git command for installations that lack certain commands.
When the platform lacks certain git subcommands, omit them from the
list of subcommands that are available from "git" wrapper.
Noticed by Geert Bosch.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Han Boetes [Sat, 1 Oct 2005 06:23:26 +0000 (08:23 +0200)]
[PATCH] git on OpenBSD
iconv is installed in /usr/local.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Linus Torvalds [Sat, 1 Oct 2005 20:39:47 +0000 (13:39 -0700)]
[PATCH] Re-instate index file write optimization
This makes "git-update-index" avoid the new index file write if it didn't
make any changes to the index.
It still doesn't make things like "git status" be read-only operations in
general, but if the index file doesn't need refreshing, it now will at
least avoid making unnecessary changes.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Linus Torvalds [Sat, 1 Oct 2005 20:24:27 +0000 (13:24 -0700)]
[PATCH] Better error reporting for "git status"
Instead of "git status" ignoring (and hiding) potential errors from the
"git-update-index" call, make it exit if it fails, and show the error.
In order to do this, use the "-q" flag (to ignore not-up-to-date files)
and add a new "--unmerged" flag that allows unmerged entries in the index
without any errors.
This also avoids marking the index "changed" if an entry isn't actually
modified, and makes sure that we exit with an understandable error message
if the index is corrupt or unreadable. "read_cache()" no longer returns an
error for the caller to check.
Finally, make die() and usage() exit with recognizable error codes, if we
ever want to check the failure reason in scripts.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Fri, 30 Sep 2005 20:31:16 +0000 (13:31 -0700)]
More portability.
- The location of openssl development files got customizable.
- The location of iconv development files got customizable.
- Pass $TAR down to t5000 test so that the user can override with
'gmake TAR=gtar'.
- Solaris 'bc' does not seem to grok "define abs()". There is no
reason to use bc there -- expr would do.
Signed-off-by: Junio C Hamano <junio@twinsun.com>
Junio C Hamano [Fri, 30 Sep 2005 21:26:57 +0000 (14:26 -0700)]
Add git-symbolic-ref
This adds the counterpart of git-update-ref that lets you read
and create "symbolic refs". By default it uses a symbolic link
to represent ".git/HEAD -> refs/heads/master", but it can be compiled
to use the textfile symbolic ref.
The places that did 'readlink .git/HEAD' and 'ln -s refs/heads/blah
.git/HEAD' have been converted to use new git-symbolic-ref command, so
that they can deal with either implementation.
Signed-off-by: Junio C Hamano <junio@twinsun.com>
Junio C Hamano [Fri, 30 Sep 2005 21:08:25 +0000 (14:08 -0700)]
Use resolve_ref() to implement read_ref().
Symbolic refs are understood by resolve_ref(), so existing read_ref()
users will automatically understand them as well.
Signed-off-by: Junio C Hamano <junio@twinsun.com>
Linus Torvalds [Sun, 25 Sep 2005 16:59:37 +0000 (09:59 -0700)]
[PATCH] Allow reading "symbolic refs" that point to other refs
This extends the ref reading to understand a "symbolic ref": a ref file
that starts with "ref: " and points to another ref file, and thus
introduces the notion of ref aliases.
This is in preparation of allowing HEAD to eventually not be a symlink,
but one of these symbolic refs instead.
[jc: Linus originally required the prefix to be "ref: " five bytes
and nothing else, but I changed it to allow and strip any number of
leading whitespaces to match what update-ref.c does.]
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 26 Sep 2005 02:30:24 +0000 (19:30 -0700)]
Teach update-ref about a symbolic ref stored in a textfile.
A symbolic ref is a regular file whose contents is "ref:", followed by
optional leading whitespaces, followed by a GIT_DIR relative pathname,
followed by optional trailing whitespaces (the optional whitespaces
are unconditionally removed, so you cannot have leading nor trailing
whitespaces). This can be used in place of a traditional symbolic
link .git/HEAD that usually points at "refs/heads/master". You can
instead have a regular file .git/HEAD whose contents is
"ref: refs/heads/master".
[jc: currently the code does not enforce the symbolic ref to begin with
refs/, unlike the symbolic link case. It may be worthwhile to require
either case to begin with refs/ and not have any /./ nor /../ in them.]
Signed-off-by: Junio C Hamano <junkio@cox.net>
Linus Torvalds [Thu, 29 Sep 2005 21:35:15 +0000 (14:35 -0700)]
[PATCH] git fetch --tags
You can do
git fetch --tags <linus-kernel-repo>
and it should fetch all my tags automatically.
[jc: The original by Linus fetched and overwrote branch heads with
--all, which felt dangerous and wrong, so I removed it. Also this
version does not use any refs that resulted as --tags for later
merge. ]
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Nick Hengeveld [Fri, 30 Sep 2005 23:27:47 +0000 (16:27 -0700)]
[PATCH] HTTP partial transfer support fix.
Don't unlink the temp file when an object transfer fails, so next attempt
will pick up where the failed transfer left off
Signed-off-by: Nick Hengeveld <nickh@reactrix.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Fri, 30 Sep 2005 07:07:39 +0000 (00:07 -0700)]
Update partial HTTP transfers.
Add the sanity checks discussed on the list with Nick Hengeveld in
<
20050927000931.GA15615@reactrix.com>.
* unlink of previous and rename from temp to previous can fail for
reasons other than benign ones (missing previous and missing temp).
Report these failures when we encounter them, to make diagnosing
problems easier.
* when rewinding the partially written result, make sure to
truncate the file.
Also verify the pack after downloading by calling
verify_packfile().
Signed-off-by: Junio C Hamano <junkio@cox.net>
Nick Hengeveld [Wed, 28 Sep 2005 17:14:04 +0000 (10:14 -0700)]
[PATCH] HTTP partial transfer support for object, pack, and index transfers
HTTP partial transfer support for object, pack, and index transfers
[jc: this should not be placed in "master" -- it does not have any
fixes requested on the list.]
Signed-off-by: Nick Hengeveld <nickh@reactrix.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Fri, 30 Sep 2005 08:48:57 +0000 (01:48 -0700)]
Pass CVSps generated A U Thor <author@domain.xz> intact.
Alexey Nezhdanov updated CVSps to generate author-name and
author-email information in its output.
If the input looks like it has that already properly formatted,
use that without our own munging.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Martin Langhoff [Fri, 30 Sep 2005 07:15:12 +0000 (19:15 +1200)]
[PATCH] archimport: Actually cope with merges from "remote" repositories. Plus: Nicer messages.
archimport was refusing to import commits that had merges from repositories
that it didn't know about. Fixed.
Also brings in nicer messages.
Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sat, 1 Oct 2005 19:01:07 +0000 (12:01 -0700)]
Honor extractor's umask in git-tar-tree.
The archive generated with git-tar-tree had 0755 and 0644 mode bits.
This inconvenienced the extractor with umask 002 by robbing g+w bit
unconditionally. Just write it out with loose permissions bits and
let the umask of the extractor do its job.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sat, 1 Oct 2005 18:58:43 +0000 (11:58 -0700)]
Honor user's umask.
Fix the last two holdouts that forced mode bits stricter than the user's umask.
Noticed by Wolfgang Denk and fixed by Linus.
[jc: applied the same fix to mailsplit just for the sake of consistency.]
Signed-off-by: Junio C Hamano <junkio@cox.net>
Linus Torvalds [Sat, 1 Oct 2005 06:25:23 +0000 (23:25 -0700)]
[PATCH] Flag empty patches as errors
A patch that contains no actual diff, and that doesn't change any
meta-data is bad. It shouldn't be a patch at all, and git-apply shouldn't
just accept it.
This caused a corrupted patch to be silently applied as an empty change in
the kernel, because the corruption ended up making the patch look empty.
An example of such a patch is one that contains the patch header, but
where the initial fragment header (the "@@ -nr,.." line) is missing,
causing us to not parse any fragments.
The real "patch" program will also flag such patches as bad, with the
message
patch: **** Only garbage was found in the patch input.
and we should do likewise.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Fri, 30 Sep 2005 21:02:47 +0000 (14:02 -0700)]
Consolidate null_sha1[].
Signed-off-by: Junio C Hamano <junio@twinsun.com>
H. Peter Anvin [Fri, 30 Sep 2005 18:02:26 +0000 (11:02 -0700)]
Better handling of exec extension in the git wrapper script
H. Peter Anvin [Fri, 30 Sep 2005 18:01:57 +0000 (11:01 -0700)]
Move signal setting into service_loop()
H. Peter Anvin [Fri, 30 Sep 2005 17:48:21 +0000 (10:48 -0700)]
socklen_t is unsigned int on most Linux platforms
H. Peter Anvin [Fri, 30 Sep 2005 17:47:50 +0000 (10:47 -0700)]
Use xmalloc/xcalloc
H. Peter Anvin [Fri, 30 Sep 2005 17:46:42 +0000 (10:46 -0700)]
Don't need <alloca.h>
H. Peter Anvin [Fri, 30 Sep 2005 17:46:25 +0000 (10:46 -0700)]
Change $(X) -> $X to be less annoying.
H. Peter Anvin [Fri, 30 Sep 2005 17:44:21 +0000 (10:44 -0700)]
Merge with master.kernel.org:/pub/scm/git/git.git
Junio C Hamano [Fri, 30 Sep 2005 07:27:11 +0000 (00:27 -0700)]
Still installing the old command names.
After seeing Jeff's guide, I changed my mind about the
big-rename transition plan. Even if Porcelains are kept up to
date, those web documents that describes older world order would
live longer and people will stumble across them via google
searches. And who knows how many mirrored copies there are.
The backward compatible symbolic links *will* be removed before
1.0. But that will not happen in 0.99.8.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Fri, 30 Sep 2005 07:09:04 +0000 (00:09 -0700)]
Tell which packfile is corrupt when we die.
The core part detected and died upon seeing a corrupted packfile, but
did not help the user by telling which packfile is corrupt and how.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Pavel Roskin [Thu, 29 Sep 2005 20:53:14 +0000 (16:53 -0400)]
[PATCH] Make logerror() and loginfo() static
Make logerror() and loginfo() static
logerror() and loginfo() in daemon.c are never declared and never called
from other files, therefore they should be declared static. Found by
sparse.
Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Johannes Schindelin [Thu, 29 Sep 2005 16:19:50 +0000 (18:19 +0200)]
[PATCH] Old curl does not know about CURLOPT_SSLKEY
... so try to set it only in later versions.
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Peter Anvin [Thu, 29 Sep 2005 21:41:47 +0000 (14:41 -0700)]
Merge with master.kernel.org:/pub/scm/git/git.git
hpa [Thu, 29 Sep 2005 17:38:26 +0000 (10:38 -0700)]
git-http-fetch needs $(X)
Junio C Hamano [Mon, 26 Sep 2005 02:43:51 +0000 (19:43 -0700)]
Use git-merge in git-pull (second try).
This again makes git-pull to use git-merge, so that different merge
strategy can be specified from the command line. Without explicit
strategy parameter, it defaults to git-merge-resolve if only one
remote is pulled, and git-merge-octopus otherwise, to keep the
default behaviour of the command the same as the original.
Also this brings another usability measure: -n flag from the command
line, if given, is passed to git-merge to prevent it from running the
diffstat at the end of the merge.
Signed-off-by: Junio C Hamano <junkio@cox.net>
H. Peter Anvin [Thu, 29 Sep 2005 06:31:18 +0000 (23:31 -0700)]
Just explicitly add $(X) to most programs.
Peter Anvin [Thu, 29 Sep 2005 06:22:02 +0000 (23:22 -0700)]
Ignore *.exe files
Peter Anvin [Thu, 29 Sep 2005 06:20:08 +0000 (23:20 -0700)]
Merge ... www.kernel.org/pub/scm/git/git.git
Peter Anvin [Thu, 29 Sep 2005 02:08:37 +0000 (19:08 -0700)]
Handle Cygwin .exe extensions
Peter Anvin [Thu, 29 Sep 2005 01:01:55 +0000 (18:01 -0700)]
Remove variables not needed when using poll
Peter Anvin [Thu, 29 Sep 2005 01:00:24 +0000 (18:00 -0700)]
Remove *.exe for Cygwin's benefit
Peter Anvin [Thu, 29 Sep 2005 00:26:44 +0000 (17:26 -0700)]
NO_IPV6 support for git daemon
Peter Anvin [Wed, 28 Sep 2005 23:56:08 +0000 (16:56 -0700)]
For the benefit of Cygwin, test for git-cmd.exe
Peter Anvin [Wed, 28 Sep 2005 23:53:56 +0000 (16:53 -0700)]
hpa [Wed, 28 Sep 2005 23:52:21 +0000 (16:52 -0700)]
Call it NO_IPV6 rather than hard-coding __CYGWIN__
Junio C Hamano [Wed, 28 Sep 2005 01:14:27 +0000 (18:14 -0700)]
Use git-update-ref in scripts.
This uses the git-update-ref command in scripts for safer updates.
Also places where we used to read HEAD ref by using "cat" were fixed
to use git-rev-parse. This will matter when we start using symbolic
references.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Peter Hagervall [Wed, 28 Sep 2005 12:04:54 +0000 (14:04 +0200)]
[PATCH] Make some needlessly global stuff static
Insert 'static' where appropriate.
Signed-off-by: Peter Hagervall <hager@cs.umu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Nick Hengeveld [Tue, 27 Sep 2005 17:45:27 +0000 (10:45 -0700)]
[PATCH] Support for more CURL SSL settings via environment variables
Added support for additional CURL SSL settings via environment variables.
Client certificate/key files can be specified as well as alternate CA
information.
Signed-off-by: Nick Hengeveld <nickh@reactrix.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Tom Prince [Tue, 27 Sep 2005 07:06:05 +0000 (01:06 -0600)]
[PATCH] Add new programs to .gitignore.
Signed-off-by: Tom Prince <tom.prince@ualberta.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
hpa [Wed, 28 Sep 2005 23:37:58 +0000 (16:37 -0700)]
Cygwin doesn't support IPv6 or getaddrinfo()
hpa [Wed, 28 Sep 2005 23:37:37 +0000 (16:37 -0700)]
Options to compile on Cygwin
Junio C Hamano [Wed, 28 Sep 2005 23:29:11 +0000 (16:29 -0700)]
Fastpath the normal case by not checking that index matches HEAD.
The merge strategy would check this itself and typically does it
by using git-read-tree -m -u 3-way merge.
Signed-off-by: Junio C Hamano <junkio@cox.net>