git/git.git
15 years agoAdd git-am, applymbox replacement.
Junio C Hamano [Fri, 7 Oct 2005 10:44:18 +0000 (03:44 -0700)]
Add git-am, applymbox replacement.

It reorganizes the code and also has saner command line options
syntax.  Unlike git-applymbox, it can take more than one mailbox
file from the command line, as well as reading from the standard
input when '-' is specified.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoupdate-index: read --show-index-info output from standard input.
Junio C Hamano [Fri, 7 Oct 2005 10:42:00 +0000 (03:42 -0700)]
update-index: read --show-index-info output from standard input.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agogit-apply: parse index information
Junio C Hamano [Fri, 7 Oct 2005 10:42:00 +0000 (03:42 -0700)]
git-apply: parse index information

Add an new option --show-index-info to git-apply command to
summarize the index information new git-diff outputs.  The
command shows something similar to git-ls-files --stage output
for the pre-change image:

    100644 7be5041... apply.c
    100644 ec2a161... cache.h
    ...

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoShow original and resulting blob object info in diff output.
Junio C Hamano [Fri, 7 Oct 2005 10:42:00 +0000 (03:42 -0700)]
Show original and resulting blob object info in diff output.

This adds more cruft to diff --git header to record the blob SHA1 and
the mode the patch/diff is intended to be applied against, to help the
receiving end fall back on a three-way merge.  The new header looks
like this:

    diff --git a/apply.c b/apply.c
    index 7be5041..8366082 100644
    --- a/apply.c
    +++ b/apply.c
    @@ -14,6 +14,7 @@
     //    files that are being modified, but doesn't apply the patch
     //  --stat does just a diffstat, and doesn't actually apply
    +//  --show-index-info shows the old and new index info for...
    ...

Upon receiving such a patch, if the patch did not apply cleanly to the
target tree, the recipient can try to find the matching old objects in
her object database and create a temporary tree, apply the patch to
that temporary tree, and attempt a 3-way merge between the patched
temporary tree and the target tree using the original temporary tree
as the common ancestor.

The patch lifts the code to compute the hash for an on-filesystem
object from update-index.c and makes it available to the diff output
routine.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agomailsplit: allow feeding mbox from standard input.
Junio C Hamano [Thu, 6 Oct 2005 22:55:43 +0000 (15:55 -0700)]
mailsplit: allow feeding mbox from standard input.

When mbox argument is missing, read the mailbox from the standard
input.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoDescribe new options to git-format-patch and git-mailsplit.
Junio C Hamano [Thu, 6 Oct 2005 21:25:52 +0000 (14:25 -0700)]
Describe new options to git-format-patch and git-mailsplit.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agomailsplit: -d<prec>
Junio C Hamano [Thu, 6 Oct 2005 21:25:52 +0000 (14:25 -0700)]
mailsplit: -d<prec>

Instead of the default 4 digits with leading zeros, different precision
can be specified for the generated filenames.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agogit-format-patch: --stdout option.
Junio C Hamano [Thu, 6 Oct 2005 21:25:52 +0000 (14:25 -0700)]
git-format-patch: --stdout option.

This new flag generates the mbox formatted output to the standard
output, instead of saving them into a file per patch and implies --mbox.

It also fixes a corner case where the commit does not have *any* message.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoClean mail files after dealing with them.
Junio C Hamano [Thu, 6 Oct 2005 21:25:52 +0000 (14:25 -0700)]
Clean mail files after dealing with them.

When you are applying 200 mails in sequence, .dotest/ directory
will be littered with many messsages, and when the patch in one
of them fails to apply, it is not obvious which message was
being processed.  Remove the one that has been already dealt
with, so that the last failed one is found typically as the
lowest numbered split message.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoFall back to three-way merge when applying a patch.
Junio C Hamano [Thu, 6 Oct 2005 21:25:52 +0000 (14:25 -0700)]
Fall back to three-way merge when applying a patch.

After git-apply fails, attempt to find a base tree that the patch
cleanly applies to, and do a three-way merge using that base tree into
the current index, if .dotest/.3way file exists.  This flag can be
controlled by giving -m flag to git-applymbox command.

When the fall-back merge fails, the working tree can be resolved the
same way as you would normally hand resolve a conflicting merge.
When making commit, use .dotest/final-commit as the log message
template.  Or you could just choose to 'git-checkout-index -f -a'
to revert the failed merge.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoAllow "-u" flag to tag signing
Linus Torvalds [Thu, 6 Oct 2005 21:10:39 +0000 (14:10 -0700)]
Allow "-u" flag to tag signing

The current "git tag -s" thing always uses the tagger name as the signing
user key, which is very irritating, since my key is under my email
address, but the tagger key obviously contains the actual machine name
too.

Now, I could just use "GIT_COMMITTER_EMAIL" and force it to be my real
email, but I actually think that it's nice to see which machine I use for
my work.

So rather than force my tagger ID to have to match the gpg key name, just
support the "-u" flag to "git tag" instead. It implicitly enables signing,
since it doesn't make any sense without it. Thus:

git tag -u <gpg-key-name> <tag-name> [<tagged-object>]

will use the named gpg key for signing.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoDo not require ls-remote to be run inside a git repository.
Alex Riesen [Thu, 6 Oct 2005 21:10:39 +0000 (14:10 -0700)]
Do not require ls-remote to be run inside a git repository.

The scripts work perfectly without a repository.

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agogit-shortlog: make the mailmap configurable.
Junio C Hamano [Thu, 6 Oct 2005 08:37:17 +0000 (01:37 -0700)]
git-shortlog: make the mailmap configurable.

In addition to hardcoded list of kernel people, read from .mailmap file
the list of email-to-name translations.  Modernize regexps here and there
minimally while at it.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoMerge branch 'fixes'
Junio C Hamano [Wed, 5 Oct 2005 23:57:23 +0000 (16:57 -0700)]
Merge branch 'fixes'

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 agoRecord which tree the patch applies to.
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>
15 years agogit-applypatch: cleanup.
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>
15 years agogit-apply: retire unused/unimplemented --no-merge flag.
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>
15 years agogit-apply: allow operating in sparsely populated working tree.
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>
15 years agoReturn error when not checking out an entry due to dirtiness.
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>
15 years agoMerge branch 'fixes'
Junio C Hamano [Wed, 5 Oct 2005 00:04:26 +0000 (17:04 -0700)]
Merge branch 'fixes'

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 agoOn Cygwin, use symbolic ref, not a symbolic link, to express .git/HEAD
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>
15 years agoMerge branch 'fixes'
Junio C Hamano [Tue, 4 Oct 2005 02:13:04 +0000 (19:13 -0700)]
Merge branch 'fixes'

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 agoMerge with master.kernel.org:/pub/scm/git/git.git
Peter Anvin [Mon, 3 Oct 2005 23:42:45 +0000 (16:42 -0700)]
Merge with master.kernel.org:/pub/scm/git/git.git

15 years agoMerge branch 'fixes'
Junio C Hamano [Mon, 3 Oct 2005 23:32:57 +0000 (16:32 -0700)]
Merge branch 'fixes'

15 years ago[PATCH] Merging the Cygwin changes
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>
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 agoMerge with master.kernel.org:/pub/scm/git/git.git
Peter Anvin [Mon, 3 Oct 2005 19:04:44 +0000 (12:04 -0700)]
Merge with master.kernel.org:/pub/scm/git/git.git

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 agoPost 0.99.8 master branch
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>
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 agoBetter handling of exec extension in the git wrapper script
H. Peter Anvin [Fri, 30 Sep 2005 18:02:26 +0000 (11:02 -0700)]
Better handling of exec extension in the git wrapper script

15 years agoMove signal setting into service_loop()
H. Peter Anvin [Fri, 30 Sep 2005 18:01:57 +0000 (11:01 -0700)]
Move signal setting into service_loop()

15 years agosocklen_t is unsigned int on most Linux platforms
H. Peter Anvin [Fri, 30 Sep 2005 17:48:21 +0000 (10:48 -0700)]
socklen_t is unsigned int on most Linux platforms

15 years agoUse xmalloc/xcalloc
H. Peter Anvin [Fri, 30 Sep 2005 17:47:50 +0000 (10:47 -0700)]
Use xmalloc/xcalloc

15 years agoDon't need <alloca.h>
H. Peter Anvin [Fri, 30 Sep 2005 17:46:42 +0000 (10:46 -0700)]
Don't need <alloca.h>

15 years agoChange $(X) -> $X to be less annoying.
H. Peter Anvin [Fri, 30 Sep 2005 17:46:25 +0000 (10:46 -0700)]
Change $(X) -> $X to be less annoying.

15 years agoMerge with master.kernel.org:/pub/scm/git/git.git
H. Peter Anvin [Fri, 30 Sep 2005 17:44:21 +0000 (10:44 -0700)]
Merge with master.kernel.org:/pub/scm/git/git.git

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 agoMerge with master.kernel.org:/pub/scm/git/git.git
Peter Anvin [Thu, 29 Sep 2005 21:41:47 +0000 (14:41 -0700)]
Merge with master.kernel.org:/pub/scm/git/git.git

15 years agogit-http-fetch needs $(X)
hpa [Thu, 29 Sep 2005 17:38:26 +0000 (10:38 -0700)]
git-http-fetch needs $(X)

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 agoJust explicitly add $(X) to most programs.
H. Peter Anvin [Thu, 29 Sep 2005 06:31:18 +0000 (23:31 -0700)]
Just explicitly add $(X) to most programs.

15 years agoIgnore *.exe files
Peter Anvin [Thu, 29 Sep 2005 06:22:02 +0000 (23:22 -0700)]
Ignore *.exe files

15 years agoMerge with http://www.kernel.org/pub/scm/git/git.git
Peter Anvin [Thu, 29 Sep 2005 06:20:08 +0000 (23:20 -0700)]
Merge ... www.kernel.org/pub/scm/git/git.git

15 years agoHandle Cygwin .exe extensions
Peter Anvin [Thu, 29 Sep 2005 02:08:37 +0000 (19:08 -0700)]
Handle Cygwin .exe extensions

15 years agoRemove variables not needed when using poll
Peter Anvin [Thu, 29 Sep 2005 01:01:55 +0000 (18:01 -0700)]
Remove variables not needed when using poll

15 years agoRemove *.exe for Cygwin's benefit
Peter Anvin [Thu, 29 Sep 2005 01:00:24 +0000 (18:00 -0700)]
Remove *.exe for Cygwin's benefit

15 years agoNO_IPV6 support for git daemon
Peter Anvin [Thu, 29 Sep 2005 00:26:44 +0000 (17:26 -0700)]
NO_IPV6 support for git daemon

15 years agoFor the benefit of Cygwin, test for git-cmd.exe
Peter Anvin [Wed, 28 Sep 2005 23:56:08 +0000 (16:56 -0700)]
For the benefit of Cygwin, test for git-cmd.exe

15 years ago(no commit message)
Peter Anvin [Wed, 28 Sep 2005 23:53:56 +0000 (16:53 -0700)]

15 years agoCall it NO_IPV6 rather than hard-coding __CYGWIN__
hpa [Wed, 28 Sep 2005 23:52:21 +0000 (16:52 -0700)]
Call it NO_IPV6 rather than hard-coding __CYGWIN__

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>