OSDN Git Service
Nick Hengeveld [Tue, 11 Oct 2005 06:22:01 +0000 (23:22 -0700)]
[PATCH] Don't fetch objects that exist in the local repository
Be sure not to fetch objects that already exist in the local repository.
The main process loop no longer performs this check, http-fetch now checks
prior to starting a new request queue entry and when fetch_object() is called,
and local-fetch now checks when fetch_object() is called.
As discussed in this thread: http://marc.theaimsgroup.com/?t=
112854890500001
Signed-off-by: Nick Hengeveld <nickh@reactrix.com>
Nick Hengeveld [Tue, 11 Oct 2005 06:22:01 +0000 (23:22 -0700)]
Set the parallel HTTP request limit via an environment variable
Use an environment variable rather than a command-line argument to set the
parallel HTTP request limit. This allows the setting to work whether
git-http-fetch is run directly or via git-fetch.
Signed-off-by: Nick Hengeveld <nickh@reactrix.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Nick Hengeveld [Tue, 11 Oct 2005 06:22:01 +0000 (23:22 -0700)]
Only compile parallel HTTP support with CURL >= 7.9.8
Only compile parallel HTTP support with CURL >= 7.9.8
Signed-off-by: Nick Hengeveld <nickh@reactrix.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Nick Hengeveld [Tue, 11 Oct 2005 06:22:01 +0000 (23:22 -0700)]
Add support for parallel HTTP transfers
Add support for parallel HTTP transfers. Prefetch populates a queue of
objects to transfer and starts feeding requests to an active request
queue for processing; fetch_object keeps the active queue moving
while the specified object is being transferred. The size of the active
queue can be restricted using -r and defaults to 5 concurrent transfers.
Requests for objects that are not prefetched are also processed via the
active queue.
Signed-off-by: Nick Hengeveld <nickh@reactrix.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Tue, 11 Oct 2005 00:34:08 +0000 (17:34 -0700)]
Remove empty directories after read-tree -u.
This fixes everybody's favorite gripe that switching branche with
'git checkout' leaves empty directories.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Linus Torvalds [Mon, 10 Oct 2005 23:31:08 +0000 (16:31 -0700)]
Add ".git/config" file parser
This is a first cut at a very simple parser for a git config file.
The format of the file is a simple ini-file like thing, with simple
variable/value pairs. You can (and should) make the variables have a
simple single-level scope, ie a valid file looks something like this:
#
# This is the config file, and
# a '#' or ';' character indicates
# a comment
#
; core variables
[core]
; Don't trust file modes
filemode = false
; Our diff algorithm
[diff]
external = "/usr/local/bin/gnu-diff -u"
renames = true
which parses into three variables: "core.filemode" is associated with the
string "false", and "diff.external" gets the appropriate quoted value.
Right now we only react to one variable: "core.filemode" is a boolean that
decides if we should care about the 0100 (user-execute) bit of the stat
information. Even that is just a parsing demonstration - this doesn't
actually implement that st_mode compare logic itself.
Different programs can react to different config options, although they
should always fall back to calling "git_default_config()" on any config
option name that they don't recognize.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 10 Oct 2005 23:03:43 +0000 (16:03 -0700)]
Merge branch 'fixes'
Signed-off-by: Junio C Hamano <junkio@cox.net>
Christian Meder [Mon, 10 Oct 2005 23:01:32 +0000 (16:01 -0700)]
The synopsis of the manpages should use the hyphenated version
The synopsis of the manpages should use the hyphenated version of the git
commands. Adapt the remaining offenders.
Signed-off-by: Christian Meder <chris@absolutegiganten.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Christian Meder [Mon, 10 Oct 2005 23:01:31 +0000 (16:01 -0700)]
Convert usage of GIT and Git into git
Convert usage of GIT and Git into git.
Signed-off-by: Christian Meder <chris@absolutegiganten.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 10 Oct 2005 21:49:52 +0000 (14:49 -0700)]
Remove the version tags from the manpages
Signed-off-by: Christian Meder <chris@absolutegiganten.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
H. Peter Anvin [Mon, 10 Oct 2005 21:46:14 +0000 (14:46 -0700)]
Make rsh.c use sq_quote_buf()
Make rsh.c use sq_quote_buf()
Signed-off-by: Junio C Hamano <junkio@cox.net>
H. Peter Anvin [Mon, 10 Oct 2005 21:46:12 +0000 (14:46 -0700)]
Trivial optimization
GIT_DIR_ENVIRONMENT is always a string literal
Signed-off-by: Junio C Hamano <junkio@cox.net>
H. Peter Anvin [Mon, 10 Oct 2005 21:46:10 +0000 (14:46 -0700)]
Enhanced sq_quote()
Create function to sq_quote into a buffer
Handle !'s for csh-based shells
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Johannes Schindelin [Mon, 10 Oct 2005 21:14:22 +0000 (14:14 -0700)]
t5400-send-pack relies on a working cpio
Since cygwin does not install cpio by default, t5400 results in a very
cryptic failure. So, test for cpio explicitely.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Jonas Fonseca [Mon, 10 Oct 2005 21:14:06 +0000 (14:14 -0700)]
git.sh: quote all paths
This makes it handle spaces in paths.
Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Johannes Schindelin [Mon, 10 Oct 2005 20:58:52 +0000 (13:58 -0700)]
Teach git-status about spaces in file names also on MacOSX
Not all sed understands '\t' and consequently cuts off every
file name at the first "t" (or backslash...).
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 10 Oct 2005 20:50:01 +0000 (13:50 -0700)]
Deal with $(bindir) and friends with whitespaces.
... using HPA's shellquote macro.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 10 Oct 2005 18:51:11 +0000 (11:51 -0700)]
OpenBSD needs the strcasestr replacement.
Noticed by Randal L. Schwartz.
Signed-off-by: Junio C Hamano <junkio@cox.net>
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>
Junio C Hamano [Mon, 10 Oct 2005 02:16:33 +0000 (19:16 -0700)]
Merge branch 'fixes'
with minor hand resolving on git-tag.
Signed-off-by: Junio C Hamano <junkio@cox.net>
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>
Santi_Béjar [Mon, 10 Oct 2005 00:30:19 +0000 (17:30 -0700)]
Write .editmsg in GIT_DIR to avoid being in git-status.
It appears in the git-status output during a git-commit if you have
something in info/exclude.
Also for .cmitmsg and .cmitchk to make git-commit work
in read-only working trees.
[jc: while we are at it, I removed the use of .cmitchk temporary
file which was not necessary, and renamed them -- they are out
of way now and do not have to be dotfiles anymore.]
Signed-off-by: Santi Béjar <sbejar@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
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>
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>
Junio C Hamano [Sun, 9 Oct 2005 19:52:35 +0000 (12:52 -0700)]
Makefile: avoid error message from 'uname -o'
The platform specific tweaking part was using 'uname -o' which
is not always available. Squelch error message from it.
It was suggested to chain the if..else, but I chose not to, because
maintaining the nested if..else if..else..endif endif to match is a
pain. If we had "elif", things would have been different, though.
While we are at it, try not to invoke 'uname -s' for each platform
candidate.
Signed-off-by: Junio C Hamano <junkio@cox.net>
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>
Kai Ruemmler [Sat, 8 Oct 2005 22:54:37 +0000 (15:54 -0700)]
make $prefix available for sub-makefiles
exports $prefix and makes Documentation/Makefile following it also.
Signed-off-by: Kai Ruemmler <kai.ruemmler@gmx.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sat, 8 Oct 2005 22:54:36 +0000 (15:54 -0700)]
Yank writing-back support from gitfakemmap.
We do not write through our use of mmap(), so make sure callers pass
MAP_PRIVATE and remove support for writing changes back.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Johannes Schindelin [Sat, 8 Oct 2005 22:54:36 +0000 (15:54 -0700)]
[PATCH] If NO_MMAP is defined, fake mmap() and munmap()
Since some platforms do not support mmap() at all, and others do only just
so, this patch introduces the option to fake mmap() and munmap() by
malloc()ing and read()ing explicitely.
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Junio C Hamano [Sat, 8 Oct 2005 22:54:35 +0000 (15:54 -0700)]
Also use 'track_object_refs = 0' in update-server-info.
Signed-off-by: Junio C Hamano <junkio@cox.net>
robfitz@273k.net [Sat, 8 Oct 2005 22:54:35 +0000 (15:54 -0700)]
Reduce memory usage in git-update-server-info.
Modify parse_object_cheap() to also free all the entries from the tree
data structures.
Signed-off-by: Robert Fitzsimons <robfitz@273k.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Linus Torvalds [Sat, 8 Oct 2005 22:54:01 +0000 (15:54 -0700)]
Create object subdirectories on demand
This makes it possible to have a "sparse" git object subdirectory
structure, something that has become much more attractive now that people
use pack-files all the time.
As a result of pack-files, a git object directory doesn't necessarily have
any individual objects lying around, and in that case it's just wasting
space to keep the empty first-level object directories around: on many
filesystems the 256 empty directories will be aboue 1MB of diskspace.
Even more importantly, after you re-pack a project that _used_ to be
unpacked, you could be left with huge directories that no longer contain
anything, but that waste space and take time to look through.
With this change, "git prune-packed" can just do an rmdir() on the
directories, and they'll get removed if empty, and re-created on demand.
This patch also tries to fix up "write_sha1_from_fd()" to use the new
common infrastructure for creating the object files, closing a hole where
we might otherwise leave half-written objects in the object database.
[jc: I unoptimized the part that really removes the fan-out directories
to ease transition. init-db still wastes 1MB of diskspace to hold 256
empty fan-outs, and prune-packed rmdir()'s the grown but empty directories,
but runs mkdir() immediately after that -- reducing the saving from 150KB
to 146KB. These parts will be re-introduced when everybody has the
on-demand capability.]
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
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>
Junio C Hamano [Sat, 8 Oct 2005 00:06:21 +0000 (17:06 -0700)]
Merge branch 'fixes'
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
Junio C Hamano [Wed, 5 Oct 2005 23:57:23 +0000 (16:57 -0700)]
Merge branch 'fixes'
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>
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>
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>
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>
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>
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>
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>
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>
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>