OSDN Git Service
Josef Weidendorfer [Sun, 27 Nov 2005 21:08:33 +0000 (22:08 +0100)]
Small fixes in Documentation/git-mv.txt
The two synopsis lines have to be prefixed with a space
so that asciidoc inserts a line break inbetween for the
manual page.
Signed-off-by: Josef Weidendorfer <Josef.Weidendorfer@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Josef Weidendorfer [Sun, 27 Nov 2005 21:06:42 +0000 (22:06 +0100)]
git-mv: fully detect 'directory moved into itself'
This gives a better error message when trying to move a directory
into some subdirectory of itself; ie. no real bug fix: renaming
already failed before, but with a strange "invalid argument".
Signed-off-by: Josef Weidendorfer <Josef.Weidendorfer@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Josef Weidendorfer [Sun, 27 Nov 2005 21:04:14 +0000 (22:04 +0100)]
git-mv: keep git index consistent with file system on failed rename
When doing multiple renames, and a rename in the middle fails,
git-mv did not store the successful renames in the git index;
this is fixed by delaying the error message on a failed rename
to after the git updating.
Signed-off-by: Josef Weidendorfer <Josef.Weidendorfer@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Josef Weidendorfer [Sun, 27 Nov 2005 20:58:52 +0000 (21:58 +0100)]
git-mv: shrink usage, no usage on error
Small fixes to be consistent with other git scripts:
- usage message is only about options and arguments
- on error, exit(1) without the usage message
Additionally, "beautifies" output with -n a little bit
Signed-off-by: Josef Weidendorfer <Josef.Weidendorfer@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sat, 26 Nov 2005 00:08:48 +0000 (16:08 -0800)]
setup_git_directory(): check repository format version.
After figuring out the GIT_DIR location, make sure the
repository is of the right vintage, by calling
check_repository_format(). .
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sat, 26 Nov 2005 00:03:56 +0000 (16:03 -0800)]
init-db: check template and repository format.
This makes init-db repository version aware.
It checks if an existing config file says the repository being
reinitialized is of a wrong version and aborts before doing
further harm.
When copying the templates, it makes sure the they are of the
right repository format version. Otherwise the templates are
ignored with an warning message.
It copies the templates before creating the HEAD, and if the
config file is copied from the template directory, reads it,
primarily to pick up the value of core.symrefsonly.
It changes the way the result of the filemode reliability test
is written to the configuration file using git_config_set().
The test is done even if the config file was copied from the
templates.
And finally, our own repository format version is written to the
config file.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Fri, 25 Nov 2005 18:48:26 +0000 (10:48 -0800)]
Check repository format version in enter_repo().
After daemon, upload-pack and receive-pack find out where the
git directory is and chdir() there, make sure that repository is
in a format we understand, after putenv("GIT_DIR=.") so that it
knows to pick up the configuration file from there.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Fri, 25 Nov 2005 23:59:09 +0000 (15:59 -0800)]
Repository format version check.
This adds the repository format version code, first done by
Martin Atukunda.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sat, 26 Nov 2005 20:09:07 +0000 (12:09 -0800)]
format-patch: output filename reported to stdout verbatim.
Prepending asterisk to the output was just adding noise, and
making scripts like proposed git-send-mail by Andreas Ericsson
do unnecessary work.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sat, 26 Nov 2005 07:36:58 +0000 (23:36 -0800)]
name-rev: fix off-by-one error in --stdin.
It dropped the last hexdigit in the object name.
[jc: Noticed and patch supplied by ALASCM, reworked to apply at
the right place by me]
Signed-off-by: Junio C Hamano <junkio@cox.net>
Alexander Litvinov [Wed, 23 Nov 2005 10:19:41 +0000 (16:19 +0600)]
git-mv is not able to handle big directories
Use update-index --stdin to handle large number of files without
breaking exec() argument storage limit.
[jc: with minor cleanup from the version posted on the list]
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sat, 26 Nov 2005 04:57:02 +0000 (20:57 -0800)]
shell.c: complain on insufficient arguments.
Originally noticed by Tommi Virtanen, but done slightly differently.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Fri, 25 Nov 2005 23:52:57 +0000 (15:52 -0800)]
git-sh-setup: move the repository check to a core program.
Any core commands that use setup_git_directory() now check if
given GIT_DIR is really a valid repository, so the same check in
git-sh-setup can use it without reimplementing it in shell.
This commit changes git-sh-setup to use git-var command for
that, although any other commands would do.
Note that we export GIT_DIR explicitly when calling git-var;
without it, the caller of this script would use GIT_DIR that we
return (which is to assume ./.git unless the caller has it
elsewhere) while git-var would go up to find a .git directory in
our parent directories, which would be checking a different
directory from what our callers will be using.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Fri, 25 Nov 2005 23:43:41 +0000 (15:43 -0800)]
setup_git_directory: make sure GIT_DIR is a valid repository.
setup_git_directory() always trusted what the user told where
GIT_DIR was, and assumed that is a valid .git/ directory. This
commit changes it to at least do the same level validation as
is_toplevel_directory() does -- has refs/, has objects/ unless
GIT_OBJECT_DIRECTORY is set, and has valid HEAD symlink or
symref.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Thu, 24 Nov 2005 09:31:01 +0000 (01:31 -0800)]
git-var: make it work in subdirectory.
Use setup_git_directory() so that it can find its .git
directory.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Thu, 24 Nov 2005 08:12:11 +0000 (00:12 -0800)]
git-sh-setup: die if outside git repository.
Now all the users of this script detect its exit status and die,
complaining that it is outside git repository. So move the code
that dies from all callers to git-sh-setup script.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Thu, 24 Nov 2005 07:46:13 +0000 (23:46 -0800)]
parse-remote and ls-remote clean-up.
There is no reason to use git-sh-setup from git-ls-remote.
git-parse-remote can help the caller to use .git/remotes
shortcut if it is run inside a git repository, but can still be
useful outside a git repositoryas long as the caller does not
use any shortcut. Use "git-rev-parse --git-dir" to figure out
where the GIT_DIR is, instead of using git-sh-setup.
This also makes "git-ls-remote origin" to work from inside a
subdirectory of a git managed repository as a side effect.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Fri, 25 Nov 2005 21:33:14 +0000 (13:33 -0800)]
Prevent "git-commit -a path1 path2..."
When you want to create a partial commit, giving -a by mistake
would ignore the given path. Prevent it.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Fri, 25 Nov 2005 19:10:49 +0000 (11:10 -0800)]
config.c: avoid shadowing global.
This is purely cosmetic, but avoid shadowing "FILE *config_file"
global in git_config_set_multivar() function.
Signed-off-by: Junio C Hamano <junkio@cox.net>
YOSHIFUJI Hideaki / 吉藤英明 [Fri, 25 Nov 2005 10:03:05 +0000 (19:03 +0900)]
Fix a warning about unused value.
Fix a warning:
git.c:276: warning: value computed is not used
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Andreas Ericsson [Fri, 25 Nov 2005 01:37:09 +0000 (02:37 +0100)]
cvsimport: Don't let local settings hinder cvs user-migration.
Avoid this by passing "--norc" to cvsps.
Signed-off-by: Andreas Ericsson <ae@op5.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Johannes Schindelin [Thu, 24 Nov 2005 10:36:01 +0000 (11:36 +0100)]
Rename git-config-set to git-repo-config
... and adjust all references.
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Tue, 22 Nov 2005 05:49:06 +0000 (21:49 -0800)]
diff-tree: teach single-commit diff-tree to honour grafts
We used to read the commit objects by hand and ignored the grafts.
Rewrite it using lookup_commit() API, to make it grafts-aware.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Tue, 22 Nov 2005 05:46:57 +0000 (21:46 -0800)]
Teach update-index to read from ls-tree.
git-update-index --index-info can almost be usable to read from ls-tree
output to update the index (and not the working tree file) to HEAD commit,
but not quite. It was designed to read from git-apply --index-info
output, and does not want " blob " in ls-tree output. Accept that as well.
This lets us update "git-checkout <ent> <path>" that used to filter the
extra " blob " string out. Noted by Luben.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Thu, 24 Nov 2005 00:56:55 +0000 (16:56 -0800)]
git-revert: make --edit default.
Revert always should explain why, so make --edit the default,
unless stdin is not a terminal. If you really don't want to say
anything, you can say "git-revert --no-edit $commit", or if you
are really sick, you could also say "git-revert $commit </dev/null".
But please don't.
You can also say "git-cherry-pick --edit $commit". Not editting
the commit log message is the default for cherry-pick.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Linus Torvalds [Wed, 23 Nov 2005 17:57:54 +0000 (09:57 -0800)]
Allow editing of a revert-message
I think all commit operations should allow editing of the message (ie we
should do this for merges too), but that's _particularly_ true of doing a
"git revert".
We should always explain why we needed to revert something.
This patch adds a "-e" or "--edit" flag to "git revert", although I
actually suspect it should be on by default (and we should have a
"--no-edit" flag to disable it, probably together with an automatic
disable if stdin isn't a terminal).
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Josef Weidendorfer [Wed, 23 Nov 2005 11:04:23 +0000 (12:04 +0100)]
Fix git-mv for moving directories with 1 file
This is fixed by putting the file into @changedfiles/@addedfiles,
and not the directory this file is in.
Additionally, this fixes the behavior for attempting to overwrite
a file with a directory, and gives a message for all cases where
overwriting is not possible (file->dir,dir->file,dir->dir).
Thanks for Alexander Litvinov for noting this problem.
Signed-off-by: Josef Weidendorfer <Josef.Weidendorfer@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Thu, 24 Nov 2005 00:23:11 +0000 (16:23 -0800)]
git-merge: make recursive the default strategy
git-pull invoked merge with recursive as the default strategy
for some time now; match it in the git-merge itself. Also avoid
listing more than one strategy on default because we have only
one strategy that can resolve an octopus and we are already
counting heads here. This reduces the need to stash away local
modifications.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Thu, 24 Nov 2005 00:08:36 +0000 (16:08 -0800)]
pack-redundant: type cleanups.
Binary representation of object names are unsigned char[20], not
signed. Also verbose output had %lu format printing size_t
without (unsigned long) cast other places already had, so match
that. Using format %zu was suggested but might not be supported
as widely.
Noted by Morten Welinder, fixed with input from H. Peter Anvin
and Hideaki Yoshifuji.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Paul Serice [Tue, 22 Nov 2005 13:54:23 +0000 (07:54 -0600)]
Fixed git:// IPv4 address problem when compiled with -DNO_IPV6.
Failure to dereference a pointer caused incorrect initialization of
the IPv4 address when calling connect() when compiled with -DNO_IPV6.
With this patch and yesterday's patch for git-daemon, it should now be
possible to use the native git protocol for both the client and server
on Cygwin.
Signed-off-by: Paul Serice <paul@serice.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Alex Riesen [Tue, 22 Nov 2005 14:59:22 +0000 (15:59 +0100)]
arguments cleanup and some formatting
Signed-off-by: Alex Riesen <ariesen@harmanbecker.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Alex Riesen [Tue, 22 Nov 2005 14:58:41 +0000 (15:58 +0100)]
remove unused variable
It is just assigned, nothing more.
Signed-off-by: Alex Riesen <ariesen@harmanbecker.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Alex Riesen [Tue, 22 Nov 2005 14:56:35 +0000 (15:56 +0100)]
speedup allocation in pack-redundant.c
Reuse discarded nodes of llists
Signed-off-by: Alex Riesen <ariesen@harmanbecker.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Lukas Sandström [Fri, 18 Nov 2005 22:17:50 +0000 (23:17 +0100)]
Make git-pack-redundant take a list of unimportant objs on stdin
This lets us do "git-fsck-objects --full --unreachable | cut -d ' ' -f3 |
git-pack-redundant --all", which will keep git-pack-redundant from keeping
packs just because they contain unreachable objects.
Also add some more --verbose output.
Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Tue, 22 Nov 2005 09:55:15 +0000 (01:55 -0800)]
Merge http://www.kernel.org/pub/scm/gitk/gitk
Junio C Hamano [Tue, 22 Nov 2005 07:44:35 +0000 (23:44 -0800)]
git-var: constness and globalness cleanup.
var.c::git_var read function did not have to return writable
strings; make it and the functions it points at return const char *
instead.
ident.c::get_ident() did not need to be global, so make it
static.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Tue, 22 Nov 2005 06:52:37 +0000 (22:52 -0800)]
Move diff.renamelimit out of default configuration.
Otherwise we would end up linking all the unneeded stuff into git-daemon
only to link with git_default_config.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Luben Tuikov [Fri, 18 Nov 2005 21:29:04 +0000 (16:29 -0500)]
max-count in terms of intersection
When a path designation is given, max-count counts the number
of commits therein (intersection), not globally.
This avoids the case where in case path has been inactive
for the last N commits, --max-count=N and path designation
at git-rev-list is given, would give no commits.
Signed-off-by: Luben Tuikov <ltuikov@yahoo.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
YOSHIFUJI Hideaki / 吉藤英明 [Tue, 22 Nov 2005 03:18:23 +0000 (12:18 +0900)]
GIT: Fix compilation error in connect.c
Fix compilation error for gcc-2.95.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Andreas Ericsson [Mon, 21 Nov 2005 23:44:15 +0000 (00:44 +0100)]
Introduce $(ALL_PROGRAMS) for 'all:' and 'install:' to operate on.
Remove $(SIMPLE_PROGRAMS) from $(PROGRAMS) so buildrules don't have
to be overridden.
Put $(SCRIPTS) with the other target-macros so it doesn't get lonely.
Signed-off-by: Andreas Ericsson <ae@op5.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
H. Peter Anvin [Mon, 21 Nov 2005 22:17:12 +0000 (14:17 -0800)]
rename/copy score parsing updates.
Better variant, which handles stuff like "4.5%" and rejects
"192.168.0.1". Additionally, make sure numbers are unsigned (I'm making
them unsigned long just for the hell of it), to make sure that
artificial wraparound scenarios don't cause harm.
-hpa
[jc: with this, -M100 changes its meaning back to 10%. People
wanting to say "pure renames only" should now say -M100% or
-M1.0; sounds a bit like an earthquake, but arguably things are
more consistent this way ;-)]
Signed-off-by: Junio C Hamano <junkio@cox.net>
Paul Serice [Mon, 21 Nov 2005 17:07:23 +0000 (11:07 -0600)]
git-daemon not listening when compiled with -DNO_IPV6
git-daemon was not listening when compiled with -DNO_IPV6.
socksetup() was not returning socket count when compiled with -DNO_IPV6.
Signed-off-by: Paul Serice <paul@serice.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Linus Torvalds [Mon, 21 Nov 2005 20:38:31 +0000 (12:38 -0800)]
git-repack: Properly abort in corrupt repository
In a corrupt repository, git-repack produces a pack that does not
contain needed objects without complaining, and the result of this
combined with -d flag can be very painful -- e.g. a lossage of one
tree object can lead to lossage of blobs reachable only through that
tree.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Johannes Schindelin [Sun, 20 Nov 2005 20:22:19 +0000 (21:22 +0100)]
Allow hierarchical section names
A .git/config like follows becomes valid with this patch:
[remote.junio]
url = git://git.kernel.org/pub/scm/git/git.git
pull = master:junio todo:todo +pu:pu
[remote.ibook]
url = ibook:git/
pull = master:ibook
push = master:quetzal
(This patch only does the ini file thing, git-fetch and friends still
ignore these values).
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Johannes Schindelin [Mon, 21 Nov 2005 10:18:20 +0000 (11:18 +0100)]
git-config-set: Properly terminate strings with '\0'
When a lowercase version of the key was generated, it was not
terminated. Strangely enough, it worked on Linux and macosx anyway.
Just cygwin barfed.
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sat, 19 Nov 2005 11:48:56 +0000 (03:48 -0800)]
git-proxy updates.
This builds on top of the git-proxy mechanism Paul Collins did,
and updates its configuration mechanism.
* GIT_PROXY_COMMAND environment variable is used as the
catch-all fallback, as in the original. This has not
changed.
* Renames proxy configuration variables to core.gitproxy; this
has become a multi-value variable per list discussion, most
notably from suggestion by Linus.
[core]
;# matches www.kernel.org as well
gitproxy = netcatter for kernel.org
gitproxy = netscatter for sample.xz
gitproxy = none for mydomain.xz
gitproxy = netcatter-default
The values are command names, followed by an optional " for "
and domainname; the first tail-match of the domainname
determines which proxy command is used. An entry without "
for " matches any domain and can be used as the default.
The command name "none" is special -- it tells the mechanism
not to use any proxy command and use the native git://
connection.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Paul Collins [Fri, 4 Nov 2005 14:57:16 +0000 (14:57 +0000)]
proxy-command support for git://
Here is an updated patch that first looks for GIT_PROXY_COMMAND
in the environment and then git.proxycommand in the repository's
configuration file. I have left the calling convention the same
argv[1] is the host and argv[2] is the port.
I've taken the hostname parsing verbatim from git_tcp_connect(),
so it should now support an explicit port number and whatever
that business with the square brackets is. (Should I move this
to a helper function?)
Regarding internal vs. external hosts, the proxy command can
simply run netcat locally to internal hosts, so perhaps that is
sufficient.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 21 Nov 2005 09:21:18 +0000 (01:21 -0800)]
daemon: further tweaks.
- Do validation only on canonicalized paths
- Run upload-pack with "." as repository argument
Signed-off-by: Junio C Hamano <junkio@cox.net>
Andreas Ericsson [Thu, 17 Nov 2005 19:37:14 +0000 (20:37 +0100)]
git-daemon support for user-relative paths.
Dropped a fair amount of reundant code in favour of the library code
in path.c
Added option --strict-paths with documentation, with backwards
compatibility for whitelist entries with symlinks.
Everything that worked earlier still works insofar as I have
remembered testing it.
Signed-off-by: Andreas Ericsson <ae@op5.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 21 Nov 2005 21:42:55 +0000 (13:42 -0800)]
tutorial: setting up a tree for subsystem maintainers
The "copying over packs" step is to prevent the objects
available in upstream repository to get expanted in the
subsystem maintainer tree, and is still valid if the upstream
repository do not live on the same machine. But if they are on
the same machine using objects/info/alternates is cleaner.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 21 Nov 2005 20:18:23 +0000 (12:18 -0800)]
rename detection with -M100 means "exact renames only".
When the user is interested in pure renames, there is no point
doing the similarity scores. This changes the score argument
parsing to special case -M100 (otherwise, it is a precision
scaled value 0 <= v < 1 and would mean 0.1, not 1.0 --- if you
do mean 0.1, you can say -M1), and optimizes the diffcore_rename
transformation to only look at pure renames in that case.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 21 Nov 2005 20:17:22 +0000 (12:17 -0800)]
format-patch: fix two-argument special case, and make it easier to pick single commits
Luben Tuikov noticed that sometimes being able to say
'git-format-patch <commit>' to format the change a single commit
introduces relative to its parent is handy.
This patch does not support that directly, but it makes sense to
interpret a single argument "rev" to mean "rev^1..rev".
With this, the backward compatibility syntaxes still apply:
- "format-patch master" means "format-patch master..HEAD"
- "format-patch origin master" means "format-patch origin..master"
- "format-patch origin.." means "format-patch origin..HEAD"
But "format-patch a b c d e" formats the changes these five
commits introduce relative to their respective parents. Earlier
it rejected these arguments not in "one..two" form.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 21 Nov 2005 18:59:31 +0000 (10:59 -0800)]
Fix hooks/update template.
Make the example address RFC2606 (aka BCP0032) compliant. Also
fix a couple of shell script errors.
Noted and fixed by Matthew Wilcox and Andreas Ericsson.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 21 Nov 2005 08:43:12 +0000 (00:43 -0800)]
Make sure heads/foo and tags/foo do not confuse things.
When both heads/foo and tags/foo exist, get_sha1_basic("foo")
picked up the tag without complaining, which is quite confusing.
Make sure we require unambiguous form, "heads/foo" or "tags/foo"
in such cases.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 21 Nov 2005 07:37:13 +0000 (23:37 -0800)]
Fix "do not DWIM" patch to enter_repo"
We wanted --strict to mean "do not DWIM", but the code required to
see absolute path. daemon does its own path verification and chdirs
to the verified repository, so enter_repo() called from upload-pack
will always enter ".". Requiring absolute path does not make any sense.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Andreas Ericsson [Sun, 20 Nov 2005 21:42:11 +0000 (22:42 +0100)]
git-reset.txt: Small fix + clarifications.
This basically translates the man-page from 'git-developerish' to plain
english, adding some almost-sample output from git-status so users can
recognize what will happen.
Also mention explicitly that --mixed updates the index, while --soft
doesn't. I understood the old text to mean "--mixed is exactly like
--soft, but verbose".
Signed-off-by: Andreas Ericsson <ae@op5.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Ryan Anderson [Mon, 21 Nov 2005 05:11:22 +0000 (00:11 -0500)]
Add Python version checks to the Makefile to automatically set WITH_OWN_SUBPROCESS_PY
Also rearrange some path settings in the Makefile in the process.
Signed-off-by: Ryan Anderson <ryan@michonline.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Timo Hirvonen [Mon, 21 Nov 2005 00:52:52 +0000 (02:52 +0200)]
Fix sparse warnings
Make some functions static and convert func() function prototypes to to
func(void). Fix declaration after statement, missing declaration and
redundant declaration warnings.
Signed-off-by: Timo Hirvonen <tihirvon@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Paul Mackerras [Sun, 20 Nov 2005 22:56:07 +0000 (09:56 +1100)]
gitk: Disable fastdate stuff for now
It has a fatal flaw in that it only handles timezones that are a
multiple of an hour. It's really only needed with Tk8.5, where
the clock format command has been reimplemented in Tcl and is much
slower than in Tk8.4.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Junio C Hamano [Sun, 20 Nov 2005 20:18:13 +0000 (12:18 -0800)]
Merge http://www.kernel.org/pub/scm/gitk/gitk
Johannes Schindelin [Sun, 20 Nov 2005 12:24:18 +0000 (13:24 +0100)]
git-config-set: support selecting values by non-matching regex
Extend the regex syntax of value_regex so that prepending an exclamation
mark means non-match:
[core]
quetzal = "Dodo" for Brainf*ck
quetzal = "T. Rex" for Malbolge
quetzal = "cat"
You can match the third line with
git-config-set --get quetzal '! for '
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Fredrik Kuivinen [Sun, 20 Nov 2005 12:14:37 +0000 (13:14 +0100)]
merge-recursive: Replace 'except:'
Plain except:s are evil as they will catch all kinds of exceptions
including NameError and AttrubiteError.
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sun, 20 Nov 2005 18:40:31 +0000 (10:40 -0800)]
merge-one-file: use rmdir -p
The flag is universally available, even on VMS; use it.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Paul Mackerras [Sun, 20 Nov 2005 12:08:22 +0000 (23:08 +1100)]
gitk: Fix some bugs introduced by speedup changes
Commits that weren't read from git-rev-list, i.e. the ones displayed
with an open circle, were displayed incorrectly: the headline was
null if there was only one line, and the commit comment was put all
on one line. Also, the terminal commits weren't displayed when -r
was used.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Junio C Hamano [Sun, 20 Nov 2005 07:50:48 +0000 (23:50 -0800)]
Documentation: add hooks/update example.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Johannes Schindelin [Sun, 20 Nov 2005 05:52:22 +0000 (06:52 +0100)]
git-config-set: add more options
... namely
--replace-all, to replace any amount of matching lines, not just 0 or 1,
--get, to get the value of one key,
--get-all, the multivar version of --get, and
--unset-all, which deletes all matching lines from .git/config
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Andreas Ericsson [Thu, 17 Nov 2005 19:37:14 +0000 (20:37 +0100)]
Documentation update for user-relative paths.
Signed-off-by: Andreas Ericsson <ae@op5.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Andreas Ericsson [Thu, 17 Nov 2005 19:37:14 +0000 (20:37 +0100)]
Client side support for user-relative paths.
With this patch, the client side passes identical paths for these two:
ssh://host.xz/~junio/repo
host.xz:~junio/repo
Signed-off-by: Andreas Ericsson <ae@op5.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Andreas Ericsson [Thu, 17 Nov 2005 19:37:14 +0000 (20:37 +0100)]
Server-side support for user-relative paths.
This patch basically just removes the redundant code from
{receive,upload}-pack.c in favour of the library code in path.c.
Signed-off-by: Andreas Ericsson <ae@op5.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Fri, 18 Nov 2005 22:59:34 +0000 (14:59 -0800)]
Do not DWIM in userpath library under strict mode.
This should force git-daemon administrator's job a bit harder
because the exact paths need to be given in the whitelist, but
at the same time makes the auditing easier.
This moves validate_symref() from refs.c to path.c, because we
need to link path.c with git-daemon for its "enter_repo()", but
we do not want to link the daemon with the rest of git libraries
and its requirements.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Andreas Ericsson [Thu, 17 Nov 2005 19:37:14 +0000 (20:37 +0100)]
Library code for user-relative paths, take three.
This patch provides the work-horse of the user-relative paths feature,
using Linus' idea of a blind chdir() and getcwd() which makes it
remarkably simple.
Signed-off-by: Andreas Ericsson <ae@op5.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Johannes Schindelin [Thu, 17 Nov 2005 21:50:08 +0000 (22:50 +0100)]
Add test case for git-config-set
... includes the mean tests I mentioned on the list.
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Johannes Schindelin [Thu, 17 Nov 2005 21:49:19 +0000 (22:49 +0100)]
Add documentation for git-config-set
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Johannes Schindelin [Thu, 17 Nov 2005 21:44:55 +0000 (22:44 +0100)]
Add git-config-set, a simple helper for scripts to set config variables
This is meant for the end user, who cannot be expected to edit
.git/config by hand.
Example:
git-config-set core.filemode true
will set filemode in the section [core] to true,
git-config-set --unset core.filemode
will remove the entry (failing if it is not there), and
git-config-set --unset diff.twohead ^recar
will remove the unique entry whose value matches the regex "^recar"
(failing if there is no unique such entry).
It is just a light wrapper around git_config_set() and
git_config_set_multivar().
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Johannes Schindelin [Thu, 17 Nov 2005 21:32:36 +0000 (22:32 +0100)]
Add functions git_config_set() and git_config_set_multivar()
The function git_config_set() does exactly what you think it does.
Given a key (in the form "core.filemode") and a value, it sets the
key to the value. Example:
git_config_set("core.filemode", "true");
The function git_config_set_multivar() is meant for setting variables which
can have several values for the same key. Example:
[diff]
twohead = resolve
twohead = recarsive
the typo in the second line can be replaced by
git_config_set_multivar("diff.twohead", "recursive", "^recar");
The third argument of the function is a POSIX extended regex which has to
match the value. If there is no key/value pair with a matching value, a new
key/value pair is added.
These commands are also capable of unsetting (deleting) entries:
git_config_set_multivar("diff.twohead", NULL, "sol");
will delete the entry
twohead = resolve
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Nick Hengeveld [Sat, 19 Nov 2005 01:08:36 +0000 (17:08 -0800)]
Decide whether to build http-push in the Makefile
The decision about whether to build http-push or not belongs in the
Makefile. This follows Junio's suggestion to determine whether curl
is new enough to support http-push.
Signed-off-by: Nick Hengeveld <nickh@reactrix.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sat, 19 Nov 2005 01:06:46 +0000 (17:06 -0800)]
http.c: reorder to avoid compilation failure.
Move the static function get_curl_handle() around to make sure
its definition and declarations are seen by the compiler before
its first use. Also remove an unused variable.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Nick Hengeveld [Fri, 18 Nov 2005 19:03:25 +0000 (11:03 -0800)]
http-push memory/fd cleanup
Clean up memory and file descriptor usage
Signed-off-by: Nick Hengeveld <nickh@reactrix.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Nick Hengeveld [Fri, 18 Nov 2005 19:03:18 +0000 (11:03 -0800)]
Improve XML parsing in http-push
Improved XML parsing - replace specialized doc parser callbacks with generic
functions that track the parser context and use document-specific callbacks
to process that data.
Signed-off-by: Nick Hengeveld <nickh@reactrix.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Nick Hengeveld [Fri, 18 Nov 2005 19:03:11 +0000 (11:03 -0800)]
Improve pack list response handling
Better response handling for pack list requests - a 404 means we do have
the list but it happens to be empty.
Signed-off-by: Nick Hengeveld <nickh@reactrix.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Nick Hengeveld [Fri, 18 Nov 2005 19:03:04 +0000 (11:03 -0800)]
Make http-fetch request types more clear
Rename object request functions and data to make it more clear which type
of request is being processed - this is a response to the introduction of
slot callbacks and the definition of different types of requests such as
alternates_request.
Signed-off-by: Nick Hengeveld <nickh@reactrix.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Nick Hengeveld [Fri, 18 Nov 2005 19:02:58 +0000 (11:02 -0800)]
Isolate shared HTTP request functionality
Move shared HTTP request functionality out of http-fetch and http-push,
and replace the two fwrite_buffer/fwrite_buffer_dynamic functions with
one fwrite_buffer function that does dynamic buffering. Use slot
callbacks to process responses to fetch object transfer requests and
push transfer requests, and put all of http-push into an #ifdef check
for curl multi support.
Signed-off-by: Nick Hengeveld <nickh@reactrix.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sun, 20 Nov 2005 03:50:44 +0000 (19:50 -0800)]
merge-recursive::removeFile: remove empty directories
When the last file in a directory is removed as the result of a
merge, try to rmdir the now-empty directory.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sun, 20 Nov 2005 03:50:44 +0000 (19:50 -0800)]
merge-one-file: remove empty directories
When the last file in a directory is removed as the result of a
merge, try to rmdir the now-empty directory.
[jc: We probably could use "rmdir -p", but for now we do that by
hand for portability.]
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sun, 20 Nov 2005 03:21:11 +0000 (19:21 -0800)]
Documentation: rebase-from-internal minor updates.
git-commit -v flag has been the default for quite some time, so
do not mention it. Also a typofix.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sat, 19 Nov 2005 20:13:53 +0000 (12:13 -0800)]
git-repack: do not do complex redundancy check.
With "-a", redundant pack removal is trivial, and otherwise
redundant pack removal is pointless; do not call
git-redundant-pack from this script.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sat, 19 Nov 2005 10:54:07 +0000 (02:54 -0800)]
git-count-objects: dc replacement
Johannes suggested this earlier but I did not take it so
seriously because this command is not that important. But this
probably matters on Cygwin which does not seem to come with
precompiled dc. It is a mystery for me that anything that
mimics UNIX does not offer a dc, though.
I did the detection for the lack of dc command a bit differently
from the verison Johannes did.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Stefan-W. Hahn [Sat, 5 Nov 2005 19:55:29 +0000 (20:55 +0100)]
gitk: moving all three panes if clicking on an arrow.
Signed-off-by: Stefan-W. Hahn <stefan.hahn@s-hahn.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Pavel Roskin [Fri, 11 Nov 2005 15:09:12 +0000 (10:09 -0500)]
gitk: use git-diff-tree --no-commit-id
gitk switched to use git-diff-tree with one argument in gettreediffs and
getblobdiffs. git-diff-tree with one argument outputs commit ID in from
of the patch. This causes an empty line after "Comments" in the lower
right pane. Also, the diff in the lower left pane has the commit ID,
which is useless there.
This patch makes git use the newly added -no-commit-id option for
git-diff-tree to suppress commit ID. It also removes the p variable in
both functions, since it has become useless after switching to the
one-argument invocation for git-diff-tree.
Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Frank Sorenson [Sun, 30 Oct 2005 09:06:46 +0000 (02:06 -0700)]
gitk: Specify line hover font
Hovering over a line in gitk displays the commit one-liner in a
box, but the text usually overflows the box. The box size is
computed with a specified font, so this patch sets the text font
as well.
Signed-off-by: Frank Sorenson <frank@tuxrocks.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sat, 19 Nov 2005 07:54:17 +0000 (23:54 -0800)]
readrefs: grab all refs with one call to ls-remote.
Instead of reading refs/heads/* and refs/tags/* files ourselves
and missing files in subdirectories of heads/ and tags/, use
ls-remote on local repository and grab all of them. This lets us
also remove the procedure readotherrefs.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sat, 19 Nov 2005 01:43:38 +0000 (17:43 -0800)]
Merge http://www.kernel.org/pub/scm/gitk/gitk
Junio C Hamano [Fri, 18 Nov 2005 23:54:23 +0000 (15:54 -0800)]
Merge branches 'jc/branch' and 'jc/rebase'
Junio C Hamano [Mon, 14 Nov 2005 08:41:53 +0000 (00:41 -0800)]
Rewrite rebase to use git-format-patch piped to git-am.
The current rebase implementation finds commits in our tree but
not in the upstream tree using git-cherry, and tries to apply
them using git-cherry-pick (i.e. always use 3-way) one by one.
Which is fine, but when some of the changes do not apply
cleanly, it punts, and punts badly.
Suppose you have commits A-B-C-D-E since you forked from the
upstream and submitted the changes for inclusion. You fetch
from upstream head U and find that B has been picked up. You
run git-rebase to update your branch, which tries to apply
changes contained in A-C-D-E, in this order, but replaying of C
fails, because the upstream got changes that touch the same area
from elsewhere.
Now what?
It notes that fact, and goes ahead to apply D and E, and at the
very end tells you to deal with C by hand. Even if you somehow
managed to replay C on top of the result, you would now end up
with ...-B-...-U-A-D-E-C.
Breaking the order between B and others was the conscious
decision made by the upstream, so we would not worry about it,
and even if it were worrisome, it is too late for us to fix now.
What D and E do may well depend on having C applied before them,
which is a problem for us.
This rewrites rebase to use git-format-patch piped to git-am,
and when the patch does not apply, have git-am fall back on
3-way merge. The updated diff/patch pair knows how to apply
trivial binary patches as long as the pre- and post-images are
locally available, so this should work on a repository with
binary files as well.
The primary benefit of this change is that it makes rebase
easier to use when some of the changes do not replay cleanly.
In the "unapplicable patch in the middle" case, this "rebase"
works like this:
- A series of patches in e-mail form is created that records
what A-C-D-E do, and is fed to git-am. This is stored in
.dotest/ directory, just like the case you tried to apply
them from your mailbox. Your branch is rewound to the tip of
upstream U, and the original head is kept in .git/ORIG_HEAD,
so you could "git reset --hard ORIG_HEAD" in case the end
result is really messy.
- Patch A applies cleanly. This could either be a clean patch
application on top of rewound head (i.e. same as upstream
head), or git-am might have internally fell back on 3-way
(i.e. it would have done the same thing as git-cherry-pick).
In either case, a rebased commit A is made on top of U.
- Patch C does not apply. git-am stops here, with conflicts to
be resolved in the working tree. Yet-to-be-applied D and E
are still kept in .dotest/ directory at this point. What the
user does is exactly the same as fixing up unapplicable patch
when running git-am:
- Resolve conflict just like any merge conflicts.
- "git am --resolved --3way" to continue applying the patches.
- This applies the fixed-up patch so by definition it had
better apply. "git am" knows the patch after the fixed-up
one is D and then E; it applies them, and you will get the
changes from A-C-D-E commits on top of U, in this order.
I've been using this without noticing any problem, and as people
may know I do a lot of rebases.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Fri, 11 Nov 2005 19:12:50 +0000 (11:12 -0800)]
git-branch: -f to forcibly reset branch head.
A new usage, 'git-branch -f branch [start]', resets the branch head at
start (or current head). Should be considered a dangerous operation,
but if you are like me to keep rewinding branches it is handy.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Fri, 18 Nov 2005 23:40:22 +0000 (15:40 -0800)]
Do not show .exe in git command list.
Truncate the result from readdir() in the exec-path if they end
with .exe, to make it a bit more readable on Cygwin.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Lukas Sandström [Fri, 18 Nov 2005 22:20:15 +0000 (23:20 +0100)]
Document the "ignore objects" feature of git-pack-redundant
Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Lukas Sandström [Fri, 18 Nov 2005 22:00:55 +0000 (23:00 +0100)]
Improve the readability of git-pack-redundant
Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Lukas Sandström [Fri, 18 Nov 2005 20:36:12 +0000 (21:36 +0100)]
Remove all old packfiles when doing "git repack -a -d"
No point in running git-pack-redundant if we already know
which packs are redundant.
Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Luck, Tony [Fri, 18 Nov 2005 22:04:58 +0000 (14:04 -0800)]
Update pull/fetch --tags documentation
When fetching/pulling from a remote repository the "--tags" option
can be used to pull tags too. Document that it will limit the pull
to only commits reachable from the tags.
Signed-off-by: Tony Luck <tony.luck@intel.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>