OSDN Git Service
Junio C Hamano [Wed, 7 Dec 2005 08:50:33 +0000 (00:50 -0800)]
git-merge-one: new merge world order.
This does two things:
- Use new --stage=2 option to create the working tree file with
leading paths and correct permission bits using
checkout-index, as before.
- Make sure we do not confuse "merge" program when the file
being merged has an unfortunate name, '-L'.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Wed, 7 Dec 2005 08:29:51 +0000 (00:29 -0800)]
checkout-index: allow checking out from higher stages.
The new option, --stage=<n>, lets you copy out from an unmerged,
higher stage. This is to help the new merge world order during
a nontrivial merge.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Jason Riedy [Tue, 6 Dec 2005 22:21:52 +0000 (14:21 -0800)]
Use printf rather than echo -n.
On AIX, there is no -n option to the system's echo. Instead,
it needs the '\c' control character. We could replace
echo -n "foo"
with
echo -e "foo\c"
but printf is recommended by most man pages. Tested on AIX
5.3, Solaris 8, and Debian.
[jc: futureproofed two instances that uses variable with '%s'
so later feeding different messages would not break things too
easily; others are emitting literal so whoever changes the
literal ought to notice more easily so they are safe.]
Signed-off-by: E. Jason Riedy <ejr@cs.berkeley.edu>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Tue, 6 Dec 2005 21:41:48 +0000 (13:41 -0800)]
qsort() ptrdiff_t may be larger than int
Morten Welinder <mwelinder@gmail.com> writes:
> The code looks wrong. It assumes that pointers are no larger than ints.
> If pointers are larger than ints, the code does not necessarily compute
> a consistent ordering and qsort is allowed to do whatever it wants.
>
> Morten
>
> static int compare_object_pointers(const void *a, const void *b)
> {
> const struct object * const *pa = a;
> const struct object * const *pb = b;
> return *pa - *pb;
> }
Signed-off-by: Junio C Hamano <junkio@cox.net>
Jason Riedy [Tue, 6 Dec 2005 22:20:16 +0000 (14:20 -0800)]
[PATCH] Initial AIX portability fixes.
Added an AIX clause in the Makefile; that clause likely
will be wrong for any AIX pre-5.2, but I can only test
on 5.3. mailinfo.c was missing the compat header file,
and convert-objects.c needs to define a specific
_XOPEN_SOURCE as well as _XOPEN_SOURCE_EXTENDED.
Signed-off-by: E. Jason Riedy <ejr@cs.berkeley.edu>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Tue, 6 Dec 2005 08:07:58 +0000 (00:07 -0800)]
git-merge-one-file: resurrect leading path creation.
Since we do not use git-update-index followed by
git-checkout-index -u to create the half-merged file on
conflicting case anymore, we need to make sure the leading
directories are created here.
Maybe a better solution would be to allow update-index to add to
higher stage, and checkout-index to extract from such, but that
is a change slightly bigger than I would like to have so close
to 1.0, so this should do for now.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Tue, 6 Dec 2005 07:26:10 +0000 (23:26 -0800)]
Documentaiton (read-tree): update description of 3-way
The merge-one-file used to leave the working tree intact, but
it has long been changed to leave the merge result there since
2a68a8659f7dc55fd285d235ae2d19e7a8116c30 commit.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Tue, 6 Dec 2005 06:36:22 +0000 (22:36 -0800)]
Documentation: hash-object.
The file parameter is better spelled just "file", not "any file
on the filesystem". We stress that in the description text
later anyway.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Tue, 6 Dec 2005 06:30:07 +0000 (22:30 -0800)]
write-tree: check extra arguments and die but be a bit more helpful.
"git-write-tree junk" complains and dies, but it does not say
what option it supports. Die with the usage string in such a
case.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Tue, 6 Dec 2005 06:29:36 +0000 (22:29 -0800)]
init-db: check extra arguments and complain.
"git-init-db junk" does not complain but just ignores "junk".
Die with the usage string in such a case.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Tue, 6 Dec 2005 06:29:05 +0000 (22:29 -0800)]
hash-object: -- and --help
It was cumbersome to feed hash-object the file '-t' (you could
have said "./-t", though). Teach it '--' that terminates the
option list, like everybody else. There is no way to extract
usage string from the command either, so teach it "--help" as
well.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Jon Loeliger [Tue, 6 Dec 2005 05:13:03 +0000 (23:13 -0600)]
Added documentation for few missing options.
More $ shell prompts in examples.
Minor English grammar improvements.
Added a few "See Also"s.
Use back-ticks on more command examples.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Tue, 6 Dec 2005 02:14:34 +0000 (18:14 -0800)]
git-mv to work with Perl 5.6
List form of pipe open is 5.8 invention.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Tue, 6 Dec 2005 02:13:31 +0000 (18:13 -0800)]
Fix 5501 test
Not everybody can rely on /bin/sh to be sane, and we support
SHELL_PATH for that. Use it.
mktemp(1) is not used anywhere else in the core git. Do not
introduce dependency on it.
Not everybody's "which" gives a sane return value. For example,
on Solaris 'which XXX' says "no XXX in /usr/bin /bin ..." and
exits with zero status. The lesson here is to never use 'which'
in your scripts.
Signed-off-by: Junio C Hamano <junkio@twinsun.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 5 Dec 2005 19:54:29 +0000 (11:54 -0800)]
Clean up compatibility definitions.
This attempts to clean up the way various compatibility
functions are defined and used.
- A new header file, git-compat-util.h, is introduced. This
looks at various NO_XXX and does necessary function name
replacements, equivalent of -Dstrcasestr=gitstrcasestr in the
Makefile.
- Those function name replacements are removed from the Makefile.
- Common features such as usage(), die(), xmalloc() are moved
from cache.h to git-compat-util.h; cache.h includes
git-compat-util.h itself.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Jason Riedy [Mon, 5 Dec 2005 18:38:30 +0000 (10:38 -0800)]
[PATCH] Document config.mak in INSTALL.
The existing config.mak should satisfy almost everyone... You
can change the prefix and other vars catch the new setting
anyways. I had forgotten that ?= acts as = (lazy value binding)
and as not := (immediate value binding).
Signed-off-by: E. Jason Riedy <ejr@cs.berkeley.edu>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Fri, 25 Nov 2005 22:22:27 +0000 (14:22 -0800)]
config.c: remove unnecessary header in minimum configuration file.
It is just silly to start the file called "config" with a
comment that says "This is the config file."
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 5 Dec 2005 19:12:01 +0000 (11:12 -0800)]
server-info.c: and two functions are not used anymore.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 5 Dec 2005 18:39:17 +0000 (10:39 -0800)]
server-info.c: use pack_local like everybody else.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 5 Dec 2005 08:57:48 +0000 (00:57 -0800)]
Documentation: shared repository management in tutorial.
The branch policy script I outlined was improved and polished by
Carl and posted on the list twice since then. It is a shame not
to pick it up, so replace the original outline in
howto/update-hook-example.txt with the latest from Carl.
Also talk about setting up git-shell to allow git-push/git-fetch
only SSH access to a shared repository host in the tutorial.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 5 Dec 2005 08:32:01 +0000 (00:32 -0800)]
Documentation: push/receive hook references.
Mention documentation pages that talk about update and
post-update hooks from git-push, because a frequently asked
question is "I want X to happen when I push" and people would
not know to look at git-receive-pack documentation until they
understand that is what runs on the other end.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 5 Dec 2005 08:22:01 +0000 (00:22 -0800)]
Documentation: git-diff asciidoc table workaround.
The table facility was nice in rendering HTML but was disastrous
for man page. Reword the text and do not use table for now.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 5 Dec 2005 08:15:44 +0000 (00:15 -0800)]
Documentation: git-mv manpage workaround.
Work-around asciidoc manpage trouble that does not seem to allow
more than one line in the SYNOPSIS section.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 5 Dec 2005 08:15:24 +0000 (00:15 -0800)]
Documentation: talk about pathspec in bisect.
Also work-around asciidoc manpage trouble that does not seem to
allow more than one line in the SYNOPSIS section.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 5 Dec 2005 07:12:36 +0000 (23:12 -0800)]
server-info: throw away T computation as well.
Again, dumb transport clients are too dumb to make use of the
top objects information to make a choice among multiple packs,
so computing these lines are useless for now. We could
resurrect them if needed later. Also dumb transport clients
presumably can do their own approximation by downloading idx
files to see how relevant each pack is for their fetch.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 5 Dec 2005 07:02:54 +0000 (23:02 -0800)]
server-info: stop sorting packs by latest date.
This does not seem to buy us much, for the same reason as the
previous change. Dumb clients are still too dumb.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 5 Dec 2005 06:52:19 +0000 (22:52 -0800)]
server-info.c: drop unused D lines.
We tried to compute pack interdependency information in
$GIT_DIR/objects/info/packs, hoping that dumb transports would
make use of it when choosing from multiple choice, but that has
never materialized, so stop computing D lines for now.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 5 Dec 2005 06:48:43 +0000 (22:48 -0800)]
sha1_file.c: make sure packs in an alternate odb is named properly.
We somehow ended up registering packs in alternate object
directories as "dir/object//pack/pack-*", which confusd the
update-server-info code very badly. Also we did not attempt to
detect a mistake of listing the object directory itself as one
of the alternates. This does not lead to incorrect behaviour,
but is simply wasteful, so try to do so when we are trivially
able to.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 5 Dec 2005 05:24:22 +0000 (21:24 -0800)]
git.c: remove excess output for debugging when command is too long.
When the given command name was too long, we exited with a
message with the number of bytes of the final command name
inside parentheses, without saying what that number is. It was
only meant as a debugging aid while development, so remove it.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 5 Dec 2005 05:13:57 +0000 (21:13 -0800)]
struct tree: remove unused field "parent"
The field is not used anymore, after the recent ls-tree rewrite.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 5 Dec 2005 00:38:40 +0000 (16:38 -0800)]
Documentation: rebase does not use cherry-pick anymore.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Petr Baudis [Sat, 26 Nov 2005 22:12:44 +0000 (23:12 +0100)]
Document the --(no-)edit switch of git-revert and git-cherry-pick
This switch was not documented properly. I decided not to mention
the --no-edit switch in the git-cherry-pick documentation since
we always default to no editing.
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sun, 4 Dec 2005 23:58:50 +0000 (15:58 -0800)]
show-branch: allow glob pattern to name branches to show.
With this, you can say "git-show-branch topic/* master" to show
all the topic branches you have under .git/refs/heads/topic/ and
your master branch. Another example is "git-show-branch --list
v1.0*" to show all the v1.0 tags. You can disambiguate by
saying "heads/topic/*" to show only topic branches if you have
tags under .git/refs/tags/topic/ as well.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Petr Baudis [Sun, 4 Dec 2005 23:31:08 +0000 (00:31 +0100)]
Update the git-ls-tree documentation
This patch aims to freshen up a bit the git-ls-tree documentation. It hints
that the list of paths are in fact patterns to be matched, explains the new
-t, --name-only and --name-status options, corrects the original autorship
information to refer to yours sincerely, corrects several grammar mistakes,
etc.
Since the documentation still deserves some significant work (at least
proper description of the pattern matching), I also added the stub notice.
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sun, 4 Dec 2005 22:59:58 +0000 (14:59 -0800)]
git.c: two fixes, gitsetenv type and off-by-one error.
gitsetenv as implemented in compat/setenv.c takes two const char*
and int; match that.
Also fix an incorrect attempt in prepend_to_path() to
NUL-terminate the string which stuffed the NUL character at one
past the end of allocation, and was not needed to begin with (we
copy the old_path string including the NUL which terminates it).
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sun, 4 Dec 2005 22:41:35 +0000 (14:41 -0800)]
compat/setenv: do not free what we fed putenv(3).
Signed-off-by: Junio C Hamano <junkio@cox.net>
Daniel Barkalow [Sun, 4 Dec 2005 16:59:37 +0000 (11:59 -0500)]
Warn when send-pack does nothing
If you try to push into an empty repository with no ref arguments to
git push, it doesn't do anything and doesn't say anything. This adds a
warning when send-pack isn't going to push anything, so you don't
assume that it silently did what you wanted.
Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sat, 3 Dec 2005 09:45:57 +0000 (01:45 -0800)]
[PATCH] daemon.c and path.enter_repo(): revamp path validation.
The whitelist of git-daemon is checked against return value from
enter_repo(), and enter_repo() used to return the value obtained
from getcwd() to avoid directory aliasing issues as discussed
earier (mid October 2005).
Unfortunately, it did not go well as we hoped.
For example, /pub on a kernel.org public machine is a symlink to
its real mountpoint, and it is understandable that the
administrator does not want to adjust the whitelist every time
/pub needs to point at a different partition for storage
allcation or whatever reasons. Being able to keep using
/pub/scm as the whitelist is a desirable property.
So this version of enter_repo() reports what it used to chdir()
and validate, but does not use getcwd() to canonicalize the
directory name. When it sees a user relative path ~user/path,
it internally resolves it to try chdir() there, but it still
reports ~user/path (possibly after appending .git if allowed to
do so, in which case it would report ~user/path.git).
What this means is that if a whitelist wants to allow a user
relative path, it needs to say "~" (for all users) or list user
home directories like "~alice" "~bob". And no, you cannot say
/home if the advertised way to access user home directories are
~alice,~bob, etc. The whole point of this is to avoid
unnecessary aliasing issues.
Anyway, because of this, daemon needs to do a bit more work to
guard itself. Namely, it needs to make sure that the accessor
does not try to exploit its leading path match rule by inserting
/../ in the middle or hanging /.. at the end. I resurrected the
belts and suspender paranoia code HPA did for this purpose.
This check cannot be done in the enter_repo() unconditionally,
because there are valid callers of enter_repo() that want to
honor /../; authorized users coming over ssh to run send-pack
and fetch-pack should be allowed to do so.
Signed-off-by: Junio C Hamano <junkio@cox.net>
H. Peter Anvin [Sun, 4 Dec 2005 01:57:48 +0000 (17:57 -0800)]
A few more options for git-cat-file
This adds '-e' option to git-cat-file, to test for the existence
of the object.
This also cleans up the option-parsing in git-cat-file slightly.
[jc: HPA version had -n option which did rev-parse --verify; the
real value of this patch is the option parsing cleanup.]
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Jason Riedy [Fri, 2 Dec 2005 23:08:28 +0000 (15:08 -0800)]
Add compat/setenv.c, use in git.c.
There is no setenv() in Solaris 5.8. The trivial calls to
setenv() were replaced by putenv() in a much earlier patch,
but setenv() was used again in git.c. This patch just adds
a compat/setenv.c.
The rule for building git$(X) also needs to include compat.
objects and compiler flags. Those are now in makefile vars
COMPAT_OBJS and COMPAT_CFLAGS.
Signed-off-by: E. Jason Riedy <ejr@cs.berkeley.edu>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Fredrik Kuivinen [Sat, 3 Dec 2005 10:41:54 +0000 (11:41 +0100)]
New test case: Criss-cross merge
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Fredrik Kuivinen [Sat, 3 Dec 2005 10:41:20 +0000 (11:41 +0100)]
New test case: merge with directory/file conflicts
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Fredrik Kuivinen [Sat, 3 Dec 2005 10:40:39 +0000 (11:40 +0100)]
test-lib.sh: Add new function, test_expect_code
The test is considered OK if it exits with code $1
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Fredrik Kuivinen [Sat, 3 Dec 2005 10:40:21 +0000 (11:40 +0100)]
git-merge: Exit with code 2 if no strategy was able to handle the merge.
This way it is possible to test in scripts if the merge was non-clean
or if the strategy had other problems with the merge.
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
No name [Fri, 2 Dec 2005 11:37:13 +0000 (06:37 -0500)]
documentation: git-tag
[jc: light edit applied on top of the original]
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Fri, 2 Dec 2005 20:15:23 +0000 (12:15 -0800)]
documentation: git-bisect (help HTML break man)
Use the same trick Josef used to introduce line breaks for
git-mv documentation for now, to help HTML rendering. This
breaks manpages and we need to come up with a better solution.
Noticed by linux@horizon.com (No Name).
Signed-off-by: Junio C Hamano <junkio@cox.net>
No name [Fri, 2 Dec 2005 11:37:13 +0000 (06:37 -0500)]
documentation: clarify read-tree --reset
[jc: light edit applied on top of the original]
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Fri, 2 Dec 2005 09:05:35 +0000 (01:05 -0800)]
git-merge documentation: conflicting merge leaves higher stages in index
This hopefully concludes the latest updates that changes the
behaviour of the merge on an unsuccessful automerge. Instead of
collapsing the conflicted path in the index to show HEAD, we
leave it unmerged, now that diff-files can compare working tree
files with higher stages.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Fri, 2 Dec 2005 08:54:50 +0000 (00:54 -0800)]
merge-one-file: make sure we do not mismerge symbolic links.
We ran "merge" command on O->A, O->B, A!=B case without
verifying the path involved is not a symlink.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Fri, 2 Dec 2005 08:50:59 +0000 (00:50 -0800)]
merge-one-file: make sure we create the merged file.
The "update-index followed by checkout-index" chain served two
purposes -- to collapse the index to "our" version, and make
sure that file exists in the working tree. In the recent update
to leave the index unmerged on conflicting path, we wanted to
stop doing the former, but we still need to do the latter (we
allow merging to work in an un-checked-out working tree).
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Fri, 2 Dec 2005 06:49:52 +0000 (22:49 -0800)]
t3100: add ls-tree -t and -d tests.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Fri, 2 Dec 2005 05:39:41 +0000 (21:39 -0800)]
merge-recursive: adjust git-ls-tree use for the latest.
You need to pass -t flag if you want to see tree objects in
"git-ls-tree -r" output these days. This change broke the tree
structure reading code in git-merge-recursive used to detect D/F
conflicts.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Alex Riesen [Thu, 1 Dec 2005 12:48:35 +0000 (13:48 +0100)]
git wrapper: more careful argument stuffing
- Use stderr for error output
- Build git_command more careful
- ENOENT is good enough for check of failed exec to show usage, no
access() check needed
[jc: Originally from Alex Riesen with inputs from Sven
Verdoolaege mixed in.]
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Fri, 2 Dec 2005 01:02:04 +0000 (17:02 -0800)]
git-merge-one-file: do not worry about 'rmdir -p' not removing directory.
9ae2172aed289f2706a0e88288909fa47eddd7e7 used "rmdir -p"
carelessly, causing the more important "git-update-index
--remove" to be skipped.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Thu, 1 Dec 2005 22:54:00 +0000 (14:54 -0800)]
ls-tree: --name-only
Fingers of some "git diff" users are trained to do --name-only
which git-ls-tree unfortunately does not take. With this,
cd sub/directory && git-ls-tree -r --name-only ..
would show only the names not object names nor modes. I threw
in another synonym --name-status only for usability, but
obviously ls-tree does not do any comparison so what it does is
the same as --name-only.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Thu, 1 Dec 2005 21:15:20 +0000 (13:15 -0800)]
ls-tree: resurrect '-d' to mean 'show trees only'
With this:
git-ls-tree -d HEAD -- drivers/net/
shows only immediate subtrees of drivers/net.
git-ls-tree -d -t HEAD -- drivers/net/
shows drivers, drivers/net and immediate subtrees of
drivers/net.
git-ls-tree -d -r HEAD -- drivers/net/
shows drivers, drivers/net and all subtrees of drivers/net (but
not blobs).
Signed-off-by: Junio C Hamano <junkio@cox.net>
Linus Torvalds [Thu, 1 Dec 2005 18:35:51 +0000 (10:35 -0800)]
git-ls-tree: add "-t" option to always show the tree entries
The old (new) behaviour was that it only shows trees if the object is
specified exactly, and recursive is not set. That makes sense, because
there is obviously nothing else it can show for that case.
However, with the new "-t" option, it will show the tree even with "-r",
as it traverses down into it.
NOTE! This also means that it will show all trees leading up to that tree.
For example, if you do a
git-ls-tree -t HEAD -- drivers/char/this/file/does/not/exist
it will show the trees that lead up to the files that do not exist:
[torvalds@g5 linux]$ git-ls-tree -t HEAD -- drivers/char/this/file/does/not/exist
040000 tree
9cb687b77dcd64bf82e9a73214db467c964c1266 drivers
040000 tree
298e2fadf0ff3867d1ef49936fd2c7bf6ce1eb66 drivers/char
[torvalds@g5 linux]$
and note how this is true even though I didn't specify "-r": the fact that
I supplied a pathspec automatically implies "enough recursion" for that
particular pathspec.
I think the code is cleaner and easier to understand too: the patch looks
bigger, but it's really just splitting up the "should we recurse into this
tree" into a function of its own.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Thu, 1 Dec 2005 20:26:41 +0000 (12:26 -0800)]
Makefile: say the default target upfront.
Alex Riesen wants to keep extra makefile targets in config.mak, but
the file is included before any of our real targets. Having this
at the beginning allows you to do so.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Thu, 1 Dec 2005 20:24:51 +0000 (12:24 -0800)]
Documentation: describe '-f' option to git-fetch.
The option description header was there without body text, confusingly
getting rendered as if the description for --tags applied to the option.
Noticed by Carl Baldwin.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Timo Hirvonen [Thu, 1 Dec 2005 01:32:01 +0000 (03:32 +0200)]
Move couple of ifdefs after "include config.mk"
This makes it possible to define WITH_SEND_EMAIL etc. in config.mak.
Also remove GIT_LIST_TWEAK because it isn't used anymore.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Wed, 30 Nov 2005 19:09:33 +0000 (11:09 -0800)]
Merge branch 'jc/subdir'
Junio C Hamano [Wed, 30 Nov 2005 19:05:48 +0000 (11:05 -0800)]
Merge branches 'jc/apply', 'lt/ls-tree', 'lt/bisect' and 'lt/merge'
Tommi Virtanen [Wed, 30 Nov 2005 15:37:10 +0000 (17:37 +0200)]
Do not attempt to access literal dirname "GIT_OBJECT_DIRECTORY".
Dereference the environment variable before using it.
Signed-off-by: Tommi Virtanen <tv@inoi.fi>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Wed, 30 Nov 2005 10:38:24 +0000 (02:38 -0800)]
Tutorial: adjust merge example to recursive strategy.
Current default, merge-recursive, gives slightly different
message while working from merge-resolve which was used to
prepare the illustration in the tutorial.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Wed, 30 Nov 2005 10:37:06 +0000 (02:37 -0800)]
merge-recursive: match the unmerged index entry behaviour with merge-resolve
This minimally changes merge-recursive to match what happens
when O->A, O->B, A!=B 3-way filelevel merge leaves conflicts to
the new merge-resolve behaviour.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Wed, 30 Nov 2005 10:16:36 +0000 (02:16 -0800)]
diff-files: show diffs with stage0 and unmerged stage at the same time.
After thinking about it more, I realized that much of the change
I did on top of Linus' version does not make much sense. This
commit reverts it so that it by default shows diffs with stage0
paths or stage2 paths with working tree; the unmerged stage to
use can be overridden with -1/-2/-3 option (-2 is the default so
essentially is a no-op).
When the index file is unmerged, we are by definition in the
middle of a conflicting merge, and we should show the diff with
stage 2 by default. More importantly, paths without conflicts
are updated in the working tree and collapsed to stage0 in the
index, so showing diff with stage0 at the same time does not
hurt. In normal cases, stage0 entries should be in sync with
the working tree files and does not clutter the output. It even
helps the user to realize that the working tree has local
changes unrelated to the merge and remember to be careful not to
do a "git-commit -a" after resolving the conflicts.
When there is no unmerged entries, giving diff_unmerged_stage a
default value of 2 does not cause any harm, because it would not
be used anyway. So in all, always showing diff between stage0
paths and unmerged entries from a stage (defaulting to 2) is the
right thing to do, as Linus originally did.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Linus Torvalds [Wed, 30 Nov 2005 05:06:10 +0000 (21:06 -0800)]
merge-one-file: leave unmerged index entries upon automerge failure.
When automerge fails, we used to collapse the path to stage0
from "our" branch, to help "diff-files" users to view the
half-merged state against the current HEAD. Now diff-files has
been taught how to compare with unmerged stage2,leaving them
unmerged is a better thing to do, especially this prevents the
unresolved conflicts to be committed by mistake.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Linus Torvalds [Wed, 30 Nov 2005 05:06:10 +0000 (21:06 -0800)]
diff-files: -1/-2/-3 to diff against unmerged stage.
While resolving conflicted merge, it was not easy to compare the
working tree file with unmerged index entries. This commit
introduces new options -1/-2/-3 (with synonyms --base, --ours,
and --theirs) to compare working tree files with specified
stages.
When none of these options are given, the command defaults to -2
if the index file is unmerged, otherwise it acts as before.
[jc: majorly butchered from the version Linus originally posted.]
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Wed, 30 Nov 2005 05:59:04 +0000 (21:59 -0800)]
git-diff: do not turn off -p/-M with any diff options.
When the user gives a diff option (e.g. --cached) to "git diff",
we turned off the built-in default option -p, which is usually
not what user wants to see.
This commit makes lack of --name-status, --name-only nor -r to
add -p, and lack of -B*, -C* nor -M* to add -M to the flags
given to the underlying diff.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Tue, 29 Nov 2005 23:47:32 +0000 (15:47 -0800)]
Merge http://www.kernel.org/pub/scm/gitk/gitk
Alex Riesen [Tue, 29 Nov 2005 22:10:24 +0000 (23:10 +0100)]
[PATCH] Add tests for git-mv in subdirectories
Junio C Hamano, Sat, Nov 26, 2005 03:45:52 +0100:
> I haven't seriously used git-mv myself, so
> somebody needs to test it, and if it actually works and Ack on
> it, please.
It actually works in subdirs.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Johannes Schindelin [Sat, 26 Nov 2005 02:45:52 +0000 (18:45 -0800)]
[PATCH] Make git-mv work in subdirectories, too
Turns out, all git programs git-mv uses are capable of operating in
a subdirectory just fine. So don't complain about it.
[jc: I think that sounds sane. You need to grab the exit status from
`git-rev-parse --git-dir`, which I added. Alex Riesen says this
worked fine.]
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Paul Mackerras [Tue, 29 Nov 2005 22:28:16 +0000 (09:28 +1100)]
gitk: Add a preferences dialog with some basic stuff
There is a lot more that could be put in, such as a selector for
the font family etc., but this is a start.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Junio C Hamano [Tue, 29 Nov 2005 21:51:27 +0000 (13:51 -0800)]
format-patch: run diff in C locale
Otherwise it would show incomplete line and binary markers in
a locale dependent way.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Tue, 29 Nov 2005 21:51:27 +0000 (13:51 -0800)]
format-patch: do not abuse 3-dash marker line.
Before GIT version at the end of output we used a 3-dash marker;
but 3-dash marker is special and should not be overused.
Instead, use "-- " which is a standard practice in e-mails to
signal the beginning of trailing garbage.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Tue, 29 Nov 2005 21:51:27 +0000 (13:51 -0800)]
format-patch: remove applies-to.
The attempt to help 3-way fallback by recording the tree object
id for the entire pre-image was unnecessary, and we already have
an better alternative in the form of per-blob "index" lines.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Tue, 29 Nov 2005 21:53:30 +0000 (13:53 -0800)]
applypatch: use "index" lines not "applies-to".
This matches the 3-way fallback used by applypatch to use
per-blob "index" lines, not "applies-to" tree object name, to
match what git-am does.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Tue, 29 Nov 2005 22:14:42 +0000 (14:14 -0800)]
applymbox: typofix to enable -m option.
The -m option to fall back on 3-way merge was not honoured at
all because of a typo.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Matthias Urlichs [Tue, 29 Nov 2005 07:13:04 +0000 (08:13 +0100)]
SVN import: Use one log call
One "svn log" (or its equivalent) per revision adds delay and server load.
Instead, open two SVN connections -- one for the log, and one for the files.
Positive side effect: Only those log entries which actually contain data
are committed => no more empty commits.
Also, change the "-l" option to set the maximum revision to be pulled,
not the number of revisions.
Signed-off-by: Junio C Hamano <junkio@cox.net>
jdl@freescale.com [Tue, 29 Nov 2005 14:59:56 +0000 (08:59 -0600)]
Fix typos and minor format issues.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Nick Hengeveld [Tue, 29 Nov 2005 17:33:36 +0000 (09:33 -0800)]
http-push cleanup
The malloc patch from Jan Andres fixed the problem that was causing a
segfault when freeing the lock token, and Johannes Schindelin found
and fixed a problem when no URL is specified on the command line.
Signed-off-by: Nick Hengeveld <nickh@reactrix.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Pavel Roskin [Tue, 29 Nov 2005 06:20:49 +0000 (01:20 -0500)]
git-clone --shared should imply --local
The "--shared" option to git-clone is silently ignored if "--local" is
not specified. The manual doesn't mention such dependency. Make
"--shared" imply "--local".
Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 28 Nov 2005 11:19:03 +0000 (03:19 -0800)]
hash-object.c: type-fix to squelch compiler warnings.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 28 Nov 2005 07:33:54 +0000 (23:33 -0800)]
define die() for scripts that use it.
As a fallout from not using git-sh-setup in scripts that can
operate from a subdirectory, we lost definition of die() from
them. It might make sense to do some cleanup to consolidate
them back again, but this should suffice for now.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 28 Nov 2005 07:19:58 +0000 (23:19 -0800)]
verify-tag: make it operable from a subdirectory.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 28 Nov 2005 07:19:06 +0000 (23:19 -0800)]
tag: make it operable from a subdirectory.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 28 Nov 2005 07:18:04 +0000 (23:18 -0800)]
lost-found: make it operable from a subdirectory.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 28 Nov 2005 07:16:15 +0000 (23:16 -0800)]
branch: make it operable from a subdirectory.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 28 Nov 2005 07:15:02 +0000 (23:15 -0800)]
ls-remote: define die() now we do not use git-sh-setup
Another interesting "property" is that from inside a git managed
tree, "git-ls-remote ." names the current repository no matter
how deep a subdirectory you are in.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 28 Nov 2005 06:53:20 +0000 (22:53 -0800)]
count-objects: make it operable from a subdirectory.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sat, 26 Nov 2005 08:50:02 +0000 (00:50 -0800)]
Make the rest of commands work from a subdirectory.
These commands are converted to run from a subdirectory.
commit-tree convert-objects merge-base merge-index mktag
pack-objects pack-redundant prune-packed read-tree tar-tree
unpack-file unpack-objects update-server-info write-tree
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sat, 26 Nov 2005 08:47:59 +0000 (00:47 -0800)]
Make networking commands to work from a subdirectory.
These are whole-tree operations and there is not much point
making them operable from within a subdirectory, but it is easy
to do so, and using setup_git_directory() upfront helps git://
proxy specification picked up from the correct place.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sat, 26 Nov 2005 08:40:50 +0000 (00:40 -0800)]
ls-tree: work from subdirectory.
This makes ls-tree to work from subdirectory. It defaults to
show the paths under the current subdirectory, and interprets
user-supplied paths as relative to the current subdirectory.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sat, 26 Nov 2005 08:30:07 +0000 (00:30 -0800)]
hash-object: work within subdirectory.
When -w is given, it needs to find out where the .git directory
is, so run the setup_git_directory() when we see a -w.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sat, 26 Nov 2005 08:22:48 +0000 (00:22 -0800)]
checkout-index: work from subdirectory.
With this, git-checkout-index from a subdirectory works as
expected. Note that "git-checkout-index -a" checks out files
only in the current directory and under.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sat, 26 Nov 2005 07:52:04 +0000 (23:52 -0800)]
fsck-objects: work from subdirectory.
Not much point making it work from subdirectory, but for a
consistency make it so.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sat, 26 Nov 2005 07:50:21 +0000 (23:50 -0800)]
peek-remote: honor proxy config even from subdirectory.
Use setup_git_directory_gently() at the beginning of peek-remote
so that git:// proxy can be picked up from the configuration
file.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sat, 26 Nov 2005 07:14:15 +0000 (23:14 -0800)]
git-apply: work from subdirectory.
When applying a patch to index file, we need to know where GIT_DIR is;
use setup_git_directory() to find it out. This also allows us to work
from a subdirectory if we wanted to.
When git-apply is run from a subdirectory, it applies the given patch
only to the files under the current directory and below.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sat, 26 Nov 2005 07:14:15 +0000 (23:14 -0800)]
working from subdirectory: preparation
- prefix_filename() is like prefix_path() but can be used to
name any file on the filesystem, not the files that might go
into the index file.
- setup_git_directory_gently() tries to find the GIT_DIR, but does
not die() if called outside a git repository.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 28 Nov 2005 01:42:05 +0000 (17:42 -0800)]
bisect: quote pathnames for eval safety.
... and make sure they are on the same line.
Signed-off-by: Junio C Hamano <junkio@cox.net>