git/git.git
15 years agoAlso force LC_ALL in test scripts.
Junio C Hamano [Mon, 10 Oct 2005 04:58:02 +0000 (21:58 -0700)]
Also force LC_ALL in test scripts.

Noticed by Junichi Uekawa.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agogit-tag: update usage string and documentation.
Junio C Hamano [Mon, 10 Oct 2005 02:13:47 +0000 (19:13 -0700)]
git-tag: update usage string and documentation.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoignore new git-diff index header when computing patch ids
Kai Ruemmler [Sun, 9 Oct 2005 23:52:50 +0000 (16:52 -0700)]
ignore new git-diff index header when computing patch ids

Two else equal patches should not result in different checksums, only
because they were applied to different versions of the file.

Signed-off-by: Kai Ruemmler <kai.ruemmler@gmx.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoFix git-verify-tag for light-weight tags
Paolo 'Blaisorblade' Giarrusso [Sun, 9 Oct 2005 23:50:34 +0000 (16:50 -0700)]
Fix git-verify-tag for light-weight tags

It currently exits printing "git-cat-file SHA1: bad file", while
instead we must just abort the verification for light-weight
tags (e.g. referring to commit objects).

[jc: tag objects can tag anything not just commits, so I fixed
 up the original patch slightly.  you should be able to validate
 a signed tag that points at a blob object. ]

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoMake sure 'make install' does not have to rebuild templates.
Junio C Hamano [Sun, 9 Oct 2005 01:01:24 +0000 (18:01 -0700)]
Make sure 'make install' does not have to rebuild templates.

The dependency rule in templates directory forced 'make install'
that immediately followed 'make all' to rebuild boilerplates.
This was problematic for a workflow that built first as yourself
and then installed as root, from a working tree that is on an
NFS mounted filesystem that is unwritable by root.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoGive proper prototype to gitstrcasestr.
Junio C Hamano [Sat, 8 Oct 2005 21:54:41 +0000 (14:54 -0700)]
Give proper prototype to gitstrcasestr.

Borrow from NO_MMAP patch by Johannes, squelch compiler warnings by
declaring gitstrcasestr() when we use it.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoteach git-status about spaces in filenames
Kai Ruemmler [Fri, 7 Oct 2005 23:55:00 +0000 (16:55 -0700)]
teach git-status about spaces in filenames

git-status truncates filenames up to the first occurrence of a whitespace
character when displaying.  More precisely, it displays the filename up to any
field seperator defined in $IFS.

This patch fixes it.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoFix wrong filename listing bug in git-ls-tree.
robfitz@273k.net [Fri, 7 Oct 2005 23:54:06 +0000 (16:54 -0700)]
Fix wrong filename listing bug in git-ls-tree.

This patch fixes a bug in git-ls-tree in which the wrong filenames are
listed if the exact same file and directory contents are present in
another location in the tree.

Added a new series of test cases for directory and filename handling.

Signed-off-by: Robert Fitzsimons <robfitz@273k.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agos/checkout-cache/checkout-index/g for Documentation/git-ls-files.txt
Kai Ruemmler [Fri, 7 Oct 2005 21:05:03 +0000 (14:05 -0700)]
s/checkout-cache/checkout-index/g for Documentation/git-ls-files.txt

This updates last place where checkout-cache gets mentioned wrongly
for checkout-index.

Signed-off-by: Kai Ruemmler <kai.ruemmler@gmx.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoFix usage of carets in git-rev-parse(1)
Jonas Fonseca [Wed, 5 Oct 2005 23:56:31 +0000 (16:56 -0700)]
Fix usage of carets in git-rev-parse(1)

... but using a {caret} attribute.

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoclone-pack: use create_symref() instead of raw symlink.
Junio C Hamano [Wed, 5 Oct 2005 22:29:48 +0000 (15:29 -0700)]
clone-pack: use create_symref() instead of raw symlink.

This was the last instance of symlink() in coreish part.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoSome typos and light editing of various manpages
Christian Meder [Wed, 5 Oct 2005 22:08:26 +0000 (15:08 -0700)]
Some typos and light editing of various manpages

Typos, light editing and clarifications.

Signed-off-by: Christian Meder <chris@absolutegiganten.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoupload-pack: Do not choke on too many heads request.
Junio C Hamano [Wed, 5 Oct 2005 21:49:54 +0000 (14:49 -0700)]
upload-pack: Do not choke on too many heads request.

Cloning from a repository with more than 256 refs (heads and tags
included) will choke, because upload-pack has a built-in limit of
feeding not more than MAX_NEEDS (currently 256) heads to underlying
git-rev-list.  This is a problem when cloning a repository with many
tags, like http://www.linux-mips.org/pub/scm/linux.git, which has 290+
tags.

This commit introduces a new flag, --all, to git-rev-list, to include
all refs in the repository.  Updated upload-pack detects requests that
ask more than MAX_NEEDS refs, and sends everything back instead.

We may probably want to tweak the definitions of MAX_NEEDS and
MAX_HAS, but that is a separate topic.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years ago[PATCH] Quote the missing GIT_DIR.
Santi_Béjar [Wed, 5 Oct 2005 16:58:10 +0000 (18:58 +0200)]
[PATCH] Quote the missing GIT_DIR.

Signed-off-by: Santi Béjar <sbejar@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years ago[PATCH] Fix symbolic ref validation
Jonas Fonseca [Wed, 5 Oct 2005 15:52:12 +0000 (17:52 +0200)]
[PATCH] Fix symbolic ref validation

Use the correct buffer when validating 'ref: refs/...'

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years ago[PATCH] hold_index_file_for_update should not unlink failed to open .lock files atexit
Alex Riesen [Wed, 5 Oct 2005 14:58:11 +0000 (16:58 +0200)]
[PATCH] hold_index_file_for_update should not unlink failed to open .lock files atexit

Set up atexit only if the .lock-file was opened successfully.

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoFix diff-filter All-Or-None mark.
Junio C Hamano [Wed, 5 Oct 2005 00:44:17 +0000 (17:44 -0700)]
Fix diff-filter All-Or-None mark.

When we updated the marker for new files from 'N' to 'A', we forgot to
notice that the letter is already taken by the All-Or-None mark.
Change the All-Or-None marker to '*' to resolve this conflict.

git-diff-tree -r --diff-filter='R*' -M

shows all the changes (not just renames) that are contained in commits
that have renames, in comparison with:

git-diff-tree -r --diff-filter='R' -M

shows the same set of changes but the diff output are limited only to
renaming changes.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoAdd missing documentation.
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>
15 years agoRemove useless use of sed in git-format-patch.
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>
15 years agoLeave an empty line between log and sign-off.
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>
15 years agoRemove unused external-diff script.
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>
15 years ago[PATCH] Limit the number of requests outstanding in ssh-fetch.
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>
15 years agoAvoid compiler warning.
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>
15 years agoMake sure get_sha1 does not accept ambiguous sha1 prefix (again).
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>
15 years agogit-pull: do not barf on -a flag meant for git-fetch.
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>
15 years ago[PATCH] Random documentation fixes
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>
15 years agoError message from get_sha1() on ambiguous short SHA1.
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>
15 years ago[PATCH] Enable and fix support for base less merges.
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>
15 years agoMake sure get_sha1 does not accept ambiguous sha1 prefix.
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>
15 years agoFix minor DOS in rev-list.
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>
15 years agoGIT 0.99.8 v0.99.8
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>
15 years ago[PATCH] Update git-clone documentation
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>
15 years agoHandle really trivial case inside git-merge.
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>
15 years agoread-tree: --trivial
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>
15 years ago[PATCH] Teach git-ls-files about '--' to denote end of options.
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>
15 years ago[PATCH] Teach the recursive merge strategy about renames.
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>
15 years agoread-tree: remove --head option.
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>
15 years agoCustomize git command for installations that lack certain commands.
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>
15 years ago[PATCH] git on OpenBSD
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>
15 years ago[PATCH] Re-instate index file write optimization
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>
15 years ago[PATCH] Better error reporting for "git status"
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>
15 years agoMore portability.
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>
15 years agoAdd git-symbolic-ref
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>
15 years agoUse resolve_ref() to implement read_ref().
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>
15 years ago[PATCH] Allow reading "symbolic refs" that point to other refs
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>
15 years agoTeach update-ref about a symbolic ref stored in a textfile.
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>
15 years ago[PATCH] git fetch --tags
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>
15 years ago[PATCH] HTTP partial transfer support fix.
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>
15 years agoUpdate partial HTTP transfers.
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>
15 years ago[PATCH] HTTP partial transfer support for object, pack, and index transfers
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>
15 years agoPass CVSps generated A U Thor <author@domain.xz> intact.
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>
15 years ago[PATCH] archimport: Actually cope with merges from "remote" repositories. Plus: Nicer...
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>
15 years agoHonor extractor's umask in git-tar-tree.
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>
15 years agoHonor user's umask.
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>
15 years ago[PATCH] Flag empty patches as errors
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>
15 years agoConsolidate null_sha1[].
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>
15 years agoStill installing the old command names.
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>
15 years agoTell which packfile is corrupt when we die.
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>
15 years ago[PATCH] Make logerror() and loginfo() static
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>
15 years ago[PATCH] Old curl does not know about CURLOPT_SSLKEY
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>
15 years agoUse git-merge in git-pull (second try).
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>
15 years agoUse git-update-ref in scripts.
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>
15 years ago[PATCH] Make some needlessly global stuff static
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>
15 years ago[PATCH] Support for more CURL SSL settings via environment variables
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>
15 years ago[PATCH] Add new programs to .gitignore.
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>
15 years agoFastpath the normal case by not checking that index matches HEAD.
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>
15 years agoFix default pull not to do an unintended Octopus.
Junio C Hamano [Mon, 26 Sep 2005 05:54:23 +0000 (22:54 -0700)]
Fix default pull not to do an unintended Octopus.

The refspecs specified in the .git/remotes/<remote> on the "Pull: "
lines are for fetching multiple heads in one go, but most of the time
making an Octopus out of them is not what is wanted.  Make git-fetch
leave the marker in .git/FETCH_HEAD file so that later stages can
tell which heads are for merging and which are not.

Tom Prince made me realize how stupid the original behaviour was.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoUpdate the case table in t/t1000.
Junio C Hamano [Wed, 28 Sep 2005 19:56:18 +0000 (12:56 -0700)]
Update the case table in t/t1000.

It still talked about "the proposed alternative semantics" but we have
used those alternative semantics for quite some time.  Update them to
avoid confusion.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoMerge master.kernel.org:/home/hpa/git/daemon
Junio C Hamano [Wed, 28 Sep 2005 00:05:41 +0000 (17:05 -0700)]
Merge master.kernel.org:/home/hpa/git/daemon

15 years agogit-commit: use update-index --stdin, instead of xargs.
Junio C Hamano [Tue, 27 Sep 2005 01:13:53 +0000 (18:13 -0700)]
git-commit: use update-index --stdin, instead of xargs.

Now update-index supports '-z --stdin', we do not have to rely on
platform xargs to support -0 option.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoupdate-index: document --stdin and -z
Junio C Hamano [Tue, 27 Sep 2005 01:13:32 +0000 (18:13 -0700)]
update-index: document --stdin and -z

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoupdate-index: --stdin and -z
Junio C Hamano [Tue, 27 Sep 2005 01:13:08 +0000 (18:13 -0700)]
update-index: --stdin and -z

The new option --stdin reads list of paths to be updated from the
standard input.  As usual, -z means the paths are terminated with NUL
characters, as opposed to LF without that option.

This is useful to use git-diff-files -z and git-ls-files -z when the
platform xargs does not support -0 option, and obviously saves one
process even when xargs can take -0.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoCOPTS -> CFLAGS
H. Peter Anvin [Tue, 27 Sep 2005 16:02:24 +0000 (09:02 -0700)]
COPTS -> CFLAGS

15 years agoParallelize the build
H. Peter Anvin [Tue, 27 Sep 2005 16:01:08 +0000 (09:01 -0700)]
Parallelize the build

15 years agoMerge with git+ssh://master.kernel.org/pub/scm/git/git.git
H. Peter Anvin [Tue, 27 Sep 2005 15:50:08 +0000 (08:50 -0700)]
Merge ... git+ssh://kernel.org/pub/scm/git/git.git

15 years agoRestore chdir(".git")
H. Peter Anvin [Tue, 27 Sep 2005 15:49:40 +0000 (08:49 -0700)]
Restore chdir(".git")

15 years ago[PATCH] Return CURL error message when object transfer fails
Nick Hengeveld [Mon, 26 Sep 2005 17:52:11 +0000 (10:52 -0700)]
[PATCH] Return CURL error message when object transfer fails

Return CURL error message when object transfer fails

[jc: added similar curl_errorstr errors to places where we
 use curl_easy_perform() to run fetch that _must_ succeed.]

Signed-off-by: Nick Hengeveld <nickh@reactrix.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years ago[PATCH] Implement --recover for git-*-fetch
Daniel Barkalow [Tue, 27 Sep 2005 01:38:08 +0000 (21:38 -0400)]
[PATCH] Implement --recover for git-*-fetch

With the --recover option, we verify that we have absolutely
everything reachable from the target, not assuming that things
reachable from refs will be complete.

Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years ago[PATCH] Provide access to git_dir through get_git_dir().
Sven Verdoolaege [Mon, 26 Sep 2005 20:54:01 +0000 (22:54 +0200)]
[PATCH] Provide access to git_dir through get_git_dir().

Signed-off-by: Sven Verdoolaege <skimo@kotnet.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years ago[PATCH] Make the test more shell generic and fix missing Solaris find option
Peter Eriksen [Sat, 24 Sep 2005 19:50:29 +0000 (21:50 +0200)]
[PATCH] Make the test more shell generic and fix missing Solaris find option

This is from Peter Eriksen, but further fixed.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoReally require tk 8.4 (RPM)
Junio C Hamano [Tue, 27 Sep 2005 07:15:45 +0000 (00:15 -0700)]
Really require tk 8.4 (RPM)

**BLUSH**
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoSupport a modicum of path validation, and allow an export all trees option.
H. Peter Anvin [Tue, 27 Sep 2005 02:10:55 +0000 (19:10 -0700)]
Support a modicum of path validation, and allow an export all trees option.

15 years agoRequire tk 8.4 (RPM)
Junio C Hamano [Tue, 27 Sep 2005 01:29:26 +0000 (18:29 -0700)]
Require tk 8.4 (RPM)
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoMerge http://www.kernel.org/pub/scm/gitk/gitk
Junio C Hamano [Tue, 27 Sep 2005 01:23:47 +0000 (18:23 -0700)]
Merge http://www.kernel.org/pub/scm/gitk/gitk

15 years agogit-fetch: send informational output to >&2 consistently.
Junio C Hamano [Mon, 26 Sep 2005 02:49:49 +0000 (19:49 -0700)]
git-fetch: send informational output to >&2 consistently.

Only the "Fetching ... using http" was leaking to stdout.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoGive default merge message after failed automerge.
Junio C Hamano [Sun, 25 Sep 2005 07:12:06 +0000 (00:12 -0700)]
Give default merge message after failed automerge.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoDo not require clean tree when reverting and cherry-picking.
Junio C Hamano [Sun, 25 Sep 2005 05:52:32 +0000 (22:52 -0700)]
Do not require clean tree when reverting and cherry-picking.

My stupidity deserved to be yelled at by Linus ... there is no reason
to require the working tree to be clean when merging -- the only
requirements are index to match HEAD commit and the paths involved in
merge are up to date in the working tree.  Revert and cherry-pick are
just specialized forms of merge, and the requirements should be the
same.

Remove the 'general purpose routine to make sure tree is clean' from
git-sh-setup, to prevent me from getting tempted again.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoFix overzealous cleanliness check in git-merge
Junio C Hamano [Fri, 23 Sep 2005 07:43:04 +0000 (00:43 -0700)]
Fix overzealous cleanliness check in git-merge

Being able to try multiple strategies and automatically picking one
that seems to give less conflicting result may or may not much sense
in practice.  At least that should not force normal use case to
additionally require the working tree to be fully clean.  As Linus
shouted, local changes do not matter unless they interfere with the
merge.

This commit changes git-merge not to require a clean working tree.
Only when we will iterate through more than one merge strategies,
local changes are stashed away before trying the first merge, and
restored before second and later merges are attempted.

The index file must be in sync with HEAD in any case -- otherwise the
merge result would contain changes since HEAD that was done locally
and registered in the index.  This check is already enforced by
three-way read-tree existing merge strategies use, but is done here as
a safeguard as well.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agogit-clone: check out "master" by default.
Junio C Hamano [Tue, 27 Sep 2005 00:17:09 +0000 (17:17 -0700)]
git-clone: check out "master" by default.

And with -n flag you can tell it not to.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoUse "$@" rather than "${1+$@}" when invoking wish.
Paul Mackerras [Tue, 27 Sep 2005 00:29:41 +0000 (10:29 +1000)]
Use "$@" rather than "${1+$@}" when invoking wish.

15 years agoPlug a small race in update-ref.c.
Junio C Hamano [Sun, 25 Sep 2005 23:28:51 +0000 (16:28 -0700)]
Plug a small race in update-ref.c.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoChange wish8.4 back to wish
Paul Mackerras [Mon, 26 Sep 2005 00:22:43 +0000 (10:22 +1000)]
Change wish8.4 back to wish

Checking in the change from wish to wish8.4 was a mistake; I had
changed it for a test but forgot to change it back before checking
in a patch.

15 years ago[PATCH] Add "git-update-ref" to update the HEAD (or other) ref
Linus Torvalds [Sun, 25 Sep 2005 18:43:05 +0000 (11:43 -0700)]
[PATCH] Add "git-update-ref" to update the HEAD (or other) ref

This is a careful version of the script stuff that currently just
blindly writes HEAD with a new value.

You can use

git-update-ref HEAD <newhead>

or

git-update-ref HEAD <newhead> <oldhead>

where the latter version verifies that the old value of HEAD matches
oldhead.

It basically allows a "ref" file to be a symbolic pointer to another ref
file by starting with the four-byte header sequence of "ref:".

More importantly, it allows the update of a ref file to follow these
symbolic pointers, whether they are symlinks or these "regular file
symbolic refs".

NOTE! It follows _real_ symlinks only if they start with "refs/":
otherwise it will just try to read them and update them as a regular file
(ie it will allow the filesystem to follow them, but will overwrite such a
symlink to somewhere else with a regular filename).

In general, using

git-update-ref HEAD "$head"

should be a _lot_ safer than doing

echo "$head" > "$GIT_DIR/HEAD"

both from a symlink following standpoint _and_ an error checking
standpoint.  The "refs/" rule for symlinks means that symlinks that point
to "outside" the tree are safe: they'll be followed for reading but not
for writing (so we'll never write through a ref symlink to some other
tree, if you have copied a whole archive by creating a symlink tree).

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years ago[PATCH] More descriptive messages for conflict cases in merges
Fredrik Kuivinen [Sun, 25 Sep 2005 14:49:02 +0000 (16:49 +0200)]
[PATCH] More descriptive messages for conflict cases in merges

The merge strategies can give more descriptive error messages for
conflict cases if they are given the actual branch names instead of
the SHA1s.

Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years ago[PATCH] recursive-merge: Don't print a stack trace when read-tree fails.
Fredrik Kuivinen [Sun, 25 Sep 2005 14:48:24 +0000 (16:48 +0200)]
[PATCH] recursive-merge: Don't print a stack trace when read-tree fails.

If the working tree is dirty read-tree will fail, and we don't want an
ugly stack trace in that case. Also make sure we don't print stack
traces when we use 'die'.

Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoDiff: --name-status output format.
Junio C Hamano [Wed, 21 Sep 2005 07:20:06 +0000 (00:20 -0700)]
Diff: --name-status output format.

The new output format shows only the status letter and paths.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoDiff: -l<num> to limit rename/copy detection.
Junio C Hamano [Wed, 21 Sep 2005 07:18:27 +0000 (00:18 -0700)]
Diff: -l<num> to limit rename/copy detection.

When many paths are modified, rename detection takes a lot of time.
The new option -l<num> can be used to disable rename detection when
more than <num> paths are possibly created as renames.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoDiff clean-up.
Junio C Hamano [Wed, 21 Sep 2005 07:00:47 +0000 (00:00 -0700)]
Diff clean-up.

This is a long overdue clean-up to the code for parsing and passing
diff options.  It also tightens some constness issues.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoMerge branch 'fixes'
Junio C Hamano [Sun, 25 Sep 2005 06:50:36 +0000 (23:50 -0700)]
Merge branch 'fixes'

15 years agoClean generated files a bit more.
Junio C Hamano [Sun, 25 Sep 2005 06:48:29 +0000 (23:48 -0700)]
Clean generated files a bit more.

Now we conditionally compile things in compat/, so we should remove
object files there.  Python execution can leave *.pyc and *.pyo, which
need to be cleaned as well.

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