git.git
12 years agoGIT 1.4.2v1.4.2
Junio C Hamano [Sun, 13 Aug 2006 01:32:31 +0000 (12 18:32 -0700)]
GIT 1.4.2

12 years agoMerge git://git.kernel.org/pub/scm/gitk/gitk
Junio C Hamano [Sun, 13 Aug 2006 01:32:17 +0000 (12 18:32 -0700)]
Merge git://git.kernel.org/pub/scm/gitk/gitk

* git://git.kernel.org/pub/scm/gitk/gitk:
  gitk: Show the currently checked-out head in bold font
  gitk: Allow the user to set some colors

12 years agot/t4013: fix futzing with the version string.
Junio C Hamano [Sun, 13 Aug 2006 01:04:07 +0000 (12 18:04 -0700)]
t/t4013: fix futzing with the version string.

Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agoBetter error message when we are unable to lock the index file
Junio C Hamano [Sat, 12 Aug 2006 08:03:47 +0000 (12 01:03 -0700)]
Better error message when we are unable to lock the index file

Most of the callers except the one in refs.c use the function to
update the index file.  Among the index writers, everybody
except write-tree dies if they cannot open it for writing.

This gives the function an extra argument, to tell it to die
when it cannot create a new file as the lockfile.

The only caller that does not have to die is write-tree, because
updating the index for the cache-tree part is optional and not
being able to do so does not affect the correctness.  I think we
do not have to be so careful and make the failure into die() the
same way as other callers, but that would be a different patch.

Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agogit-am: give better diagnostics when the patch does not apply during --3way
Junio C Hamano [Sat, 12 Aug 2006 23:16:47 +0000 (12 16:16 -0700)]
git-am: give better diagnostics when the patch does not apply during --3way

If the user tries to apply a patch that was hand-edited in such
a way that it does not apply to the original file recorded on
its "index" line anymore, we did detect the situation but did
not issue an error message that is specific enough.

Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agoMerge branch 'rj/header'
Junio C Hamano [Sat, 12 Aug 2006 23:09:19 +0000 (12 16:09 -0700)]
Merge branch 'rj/header'

* rj/header:
  Fix header breakage with _XOPEN_SOURCE.

12 years agogit-svn: split the path from the url correctly with limited perms
Eric Wong [Sat, 12 Aug 2006 06:21:41 +0000 (11 23:21 -0700)]
git-svn: split the path from the url correctly with limited perms

This version of the splitter (that only affects SVN:: library
users) works when one only has limited read-permissions to
the repository they're fetching from.

Updated from the original patch to workaround some SVN bug
somewhere, which only seems to happen against file://
repositories...  Here's the diff against the original patch I
submitted:

@@ -1159,8 +1159,8 @@ sub repo_path_split {
  }

  if ($_use_lib) {
- $SVN = libsvn_connect($full_url);
- my $url = $SVN->get_repos_root;
+ my $tmp = libsvn_connect($full_url);
+ my $url = $tmp->get_repos_root;
  $full_url =~ s#^\Q$url\E/*##;
  push @repo_path_split_cache, qr/^(\Q$url\E)/;
  return ($url, $full_url);

Somehow connecting to a repository with the full url makes the
returned SVN::Ra object act strangely and break things, so now
we just drop the SVN::Ra object that we made our initial
connection with.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agogit-sh-setup: do not use repo-config to test the git directory
Junio C Hamano [Sat, 12 Aug 2006 01:47:50 +0000 (11 18:47 -0700)]
git-sh-setup: do not use repo-config to test the git directory

Since repo-config does not fail in non-git directory, it is not
a good command to use to test the git-ness nor validate the
repository revision of $GIT_DIR.

Original patch by Robert Shearman but with minor fixes.

Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agogit-svn: bugfix: allow SVN:: lib users to track the root of the repository
Eric Wong [Fri, 11 Aug 2006 18:11:29 +0000 (11 11:11 -0700)]
git-svn: bugfix: allow SVN:: lib users to track the root of the repository

I'm not sure if anybody has hit this (besides me), but this
fixes the problem where I ran into while attempting to import a
small repo at the root level:  I ended up with all the commits, but
with no file/tree changes at all throughout the entire history.

Also, fix a warning if the commit message is not defined for revision 0.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agogit-svn: correctly kill keyword expansion without munging EOLs
Eric Wong [Fri, 11 Aug 2006 11:34:07 +0000 (11 04:34 -0700)]
git-svn: correctly kill keyword expansion without munging EOLs

This bugfix applies to users of the svn command-line client only.

We no longer muck with newlines when killing keyword expansion.
This tended to generate unintended diffs in commits because svn
revert -R would destroy the manual EOL changes we were doing. Of
course, we didn't need the EOL munging in the first place, as
svn seems to do it for us even in the text-base files.

Now we set the mtime and atime the files changed by keyword
expansion killing to avoid triggering a change on svn revert,
which svn still seems to want to do.

Thanks to Seth Falcon for reporting this bug.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agodrop length argument of has_extension
Rene Scharfe [Fri, 11 Aug 2006 12:01:45 +0000 (11 14:01 +0200)]
drop length argument of has_extension

As Fredrik points out the current interface of has_extension() is
potentially confusing.  Its parameters include both a nul-terminated
string and a length-limited string.

This patch drops the length argument, requiring two nul-terminated
strings; all callsites are updated.  I checked that all of them indeed
provide nul-terminated strings.  Filenames need to be nul-terminated
anyway if they are to be passed to open() etc.  The performance penalty
of the additional strlen() is negligible compared to the system calls
which inevitably surround has_extension() calls.

Additionally, change has_extension() to use size_t inside instead of
int, as that is the exact type strlen() returns and memcmp() expects.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agoMerge branch 'rn/push-dav'
Junio C Hamano [Fri, 11 Aug 2006 06:13:50 +0000 (10 23:13 -0700)]
Merge branch 'rn/push-dav'

* rn/push-dav:
  http-push: Make WebDAV work with (broken?) default apache2 WebDAV module

12 years agoAdd Documentation/howto/setup-git-server-over-http.txt
Rutger Nijlunsing [Thu, 10 Aug 2006 20:00:26 +0000 (10 22:00 +0200)]
Add Documentation/howto/setup-git-server-over-http.txt

A small howto on how to setup GIT over HTTP transport protocol by
setting up WebDAV access on apache2.

[jc: minimum ispell fixes applied]

Signed-off-by: Rutger Nijlunsing <git@tux.tmfweb.nl>
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agogit-verify-pack: no need to count errors
Rene Scharfe [Thu, 10 Aug 2006 15:02:37 +0000 (10 17:02 +0200)]
git-verify-pack: no need to count errors

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agogit-verify-pack: buffer overrun paranoia
Rene Scharfe [Thu, 10 Aug 2006 15:02:36 +0000 (10 17:02 +0200)]
git-verify-pack: buffer overrun paranoia

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agogit-verify-pack: free pack after use and a cleanup
Rene Scharfe [Thu, 10 Aug 2006 15:02:35 +0000 (10 17:02 +0200)]
git-verify-pack: free pack after use and a cleanup

Plug memory leak in verify_one_pack() by freeing the struct packed_git
we got from add_packed_git().  Also rename g to pack and pull an
assignment out of an if statement while we're at it.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agogit-verify-pack: get rid of while loop
Rene Scharfe [Thu, 10 Aug 2006 15:02:34 +0000 (10 17:02 +0200)]
git-verify-pack: get rid of while loop

Get rid of that while loop which was apparently used as a way to avoid
goto's (why?).  It's easy now because there is only one break left at
the end of it.  Also make the comment clearer.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agogit-verify-pack: insist on .idx extension
Rene Scharfe [Thu, 10 Aug 2006 15:02:33 +0000 (10 17:02 +0200)]
git-verify-pack: insist on .idx extension

git-verify-pack can be called with a filename without .idx extension.
add_packed_git() on the other hand depends on its presence.  So
instead of trying to call it with whatever the user gave us check for
that extension and add it if it's missing.

That means that you can't name your index file "blah" and your pack
file ".pack" anymore ("git-verify-pack blah" currently works in that
case).  I think this regression is a good change. ;-)

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agogit-verify-pack: more careful path handling
Rene Scharfe [Thu, 10 Aug 2006 15:02:32 +0000 (10 17:02 +0200)]
git-verify-pack: more careful path handling

Use strlcpy() to copy the filename into a buffer and complain if it
doesn't fit.  Also move the path buffer into verify_one_pack(); it is
used only there.  Now we can const'ify the first argument of this
function.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agogit-verify-pack: show usage when no pack was specified
Rene Scharfe [Thu, 10 Aug 2006 15:02:31 +0000 (10 17:02 +0200)]
git-verify-pack: show usage when no pack was specified

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agoAdd has_extension()
Rene Scharfe [Thu, 10 Aug 2006 15:02:30 +0000 (10 17:02 +0200)]
Add has_extension()

The little helper has_extension() documents through its name what we are
trying to do and makes sure we don't forget the underrun check.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agobuiltin-apply: remove unused increment
Junio C Hamano [Thu, 10 Aug 2006 07:56:40 +0000 (10 00:56 -0700)]
builtin-apply: remove unused increment

We do not use desc.alloc after assigning desc.buffer to patch->result;
do not bother to increment it.

Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agoFix git-diff A...B
Junio C Hamano [Thu, 10 Aug 2006 07:50:15 +0000 (10 00:50 -0700)]
Fix git-diff A...B

Commit 9919f41 meant to make git-diff A...B to (usually) mean
"git-diff `git-merge-base A B` B", but it got the parameters wrong
and ended up showing "git-diff `git-merge-base A B` A" by mistake.

Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agocombine-diff: use color
Junio C Hamano [Thu, 10 Aug 2006 07:30:33 +0000 (10 00:30 -0700)]
combine-diff: use color

Using the same mechanism as the regular diffs, color combined diff
output.

Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agohttp-push: Make WebDAV work with (broken?) default apache2 WebDAV module
Rutger Nijlunsing [Wed, 9 Aug 2006 18:54:23 +0000 (9 20:54 +0200)]
http-push: Make WebDAV work with (broken?) default apache2 WebDAV module

WebDAV on Debian unstable cannot handle renames on WebDAV from
file.ext to newfile (without ext) when newfile* already
exists. Normally, git creates a file like 'objects/xx/sha1.token',
which is renamed to 'objects/xx/sha1' when transferred completely.

Just use '_' instead of '.' so WebDAV doesn't see it as an extension
change.

Signed-off-by: Rutger Nijlunsing <git@tux.tmfweb.nl>
Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agogit-apply: applying a patch to make a symlink shorter.
Junio C Hamano [Thu, 10 Aug 2006 05:47:25 +0000 (9 22:47 -0700)]
git-apply: applying a patch to make a symlink shorter.

The internal representation of the result is counted string
(i.e. char *buf and ulong size), which is fine for writing out
to regular file, but throwing the buf at symlink(2) was a
no-no.

Reported by Willy Tarreau.

Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agoallow diff.renamelimit to be set regardless of -M/-Cv1.4.2-rc4
Junio C Hamano [Wed, 9 Aug 2006 21:05:23 +0000 (9 14:05 -0700)]
allow diff.renamelimit to be set regardless of -M/-C

Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agomake --find-copies-harder imply -C
Junio C Hamano [Wed, 9 Aug 2006 20:17:19 +0000 (9 13:17 -0700)]
make --find-copies-harder imply -C

Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agofind_unique_abbrev() with len=0 should not abbreviate
Junio C Hamano [Wed, 9 Aug 2006 20:17:04 +0000 (9 13:17 -0700)]
find_unique_abbrev() with len=0 should not abbreviate

Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agocheck return value from diff_setup_done()
Junio C Hamano [Wed, 9 Aug 2006 19:45:27 +0000 (9 12:45 -0700)]
check return value from diff_setup_done()

Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agoFix tutorial-2.html
Junio C Hamano [Wed, 9 Aug 2006 07:57:01 +0000 (9 00:57 -0700)]
Fix tutorial-2.html

Honza Pazdziora noticed that one example did not match reality.

Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agoDocumentation: git-status takes the same options as git-commit
Junio C Hamano [Tue, 8 Aug 2006 05:41:32 +0000 (7 22:41 -0700)]
Documentation: git-status takes the same options as git-commit

Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agoUpdate git-init-db(1) and documentation of core.sharedRepository
Jonas Fonseca [Wed, 9 Aug 2006 00:26:23 +0000 (9 02:26 +0200)]
Update git-init-db(1) and documentation of core.sharedRepository

Combine option descriptions in git-init-db(1). Reflect the changes to
additionally allow all users to read the created git repository.

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agogit-push: allow pushing from subdirectories
Jeff King [Tue, 8 Aug 2006 20:01:32 +0000 (8 16:01 -0400)]
git-push: allow pushing from subdirectories

The semantics are equivalent to pushing from the root; we just try harder to
find the .git directory.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agoGIT-VERSION-GEN: adjust for ancient git
Junio C Hamano [Tue, 8 Aug 2006 20:11:16 +0000 (8 13:11 -0700)]
GIT-VERSION-GEN: adjust for ancient git

When an ancient "git" that does not understand "describe"
command is on the $PATH, "git describe" emitted a Usage message
without exiting non-zero status (which is a mistake we cannot
fix retroactively).  Catch this case to make sure we do not try
using phoney multi-line string as a version number.

Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agobuiltin-mv: fix use of uninitialized memory.
Junio C Hamano [Tue, 8 Aug 2006 19:21:33 +0000 (8 12:21 -0700)]
builtin-mv: fix use of uninitialized memory.

Juergen Ruehle noticed that add_slash() tries to strcat()
into uninitialized memory and fails.

Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agodebugging: XMALLOC_POISON
Junio C Hamano [Tue, 8 Aug 2006 19:23:47 +0000 (8 12:23 -0700)]
debugging: XMALLOC_POISON

Compile with -DXMALLOC_POISON=1 to catch errors from using uninitialized
memory returned by xmalloc.

Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agoannotate: Fix bug when parsing merges with differing real and logical parents.
Ryan Anderson [Mon, 7 Aug 2006 12:11:24 +0000 (7 05:11 -0700)]
annotate: Fix bug when parsing merges with differing real and logical parents.

Signed-off-by: Ryan Anderson <ryan@michonline.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agolog-tree: show_log() should respect the setting of diffopt->line_termination
Ryan Anderson [Mon, 7 Aug 2006 12:11:23 +0000 (7 05:11 -0700)]
log-tree: show_log() should respect the setting of diffopt->line_termination

Signed-off-by: Ryan Anderson <ryan@michonline.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agohandle https:// protocol in git-clone
Michael Krelin [Mon, 7 Aug 2006 15:10:21 +0000 (7 17:10 +0200)]
handle https:// protocol in git-clone

Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agoFix "grep -w"
Junio C Hamano [Sat, 5 Aug 2006 05:16:42 +0000 (4 22:16 -0700)]
Fix "grep -w"

We used to find the first match of the pattern and then if the
match is not for the entire word, declared that the whole line
does not match.

But that is wrong.  The command "git grep -w -e mmap" should
find that a line "foo_mmap bar mmap baz" matches, by tring the
second instance of pattern "mmap" on the same line.

Problems an earlier round of "fix" had were pointed out by Morten
Welinder, which have been incorporated in the t7002 tests.

Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agoMakefile: Cygwin does not seem to need NO_STRLCPY
Junio C Hamano [Sat, 5 Aug 2006 07:20:51 +0000 (5 00:20 -0700)]
Makefile: Cygwin does not seem to need NO_STRLCPY

Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agocommit walkers: setup_ident() to record correct committer in ref-log.
Ramsay Jones [Fri, 4 Aug 2006 21:01:34 +0000 (4 22:01 +0100)]
commit walkers: setup_ident() to record correct committer in ref-log.

The function pull() in fetch.c calls write_ref_sha1(), which may
need committer identity to update the ref-log, so they need to
call setup_ident() before calling git_config() function.

Acked-by: Shawn Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agoAllow config file to specify Signed-off-by identity in format-patch.
Ramsay Jones [Fri, 4 Aug 2006 21:01:30 +0000 (4 22:01 +0100)]
Allow config file to specify Signed-off-by identity in format-patch.

Unlike git-commit, git-format-patch was not picking up and using the
user.email config variable for the email part of the committer info.
I was forced to use the GIT_COMMITTER_EMAIL environment variable to
override the default <user@localhost.localdomain>. The fix was to
simply move the call to setup_ident() to come before the git_config()
call.

Signed-off-by: Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agoMerge branch 'jc/c99'
Junio C Hamano [Fri, 4 Aug 2006 19:09:53 +0000 (4 12:09 -0700)]
Merge branch 'jc/c99'

* jc/c99:
  Cygwin needs NO_C99_FORMAT???

12 years agoFix crash when GIT_DIR is invalid
Johannes Schindelin [Fri, 4 Aug 2006 15:46:19 +0000 (4 17:46 +0200)]
Fix crash when GIT_DIR is invalid

We used to test if a pointer was NULL, and if it was, try to access it.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agogit-tar-tree: fix minor memory leak
Rene Scharfe [Fri, 4 Aug 2006 08:54:08 +0000 (4 10:54 +0200)]
git-tar-tree: fix minor memory leak

Free the root tree object buffer when we're done, plugging a minor leak
in generate_tar().  Note: we cannot simply free(tree.buf) because this
pointer is modified by tree_entry() calls in traverse_tree().

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agoDocument rev-list's option --merge
Uwe Zeisberger [Fri, 4 Aug 2006 08:11:15 +0000 (4 10:11 +0200)]
Document rev-list's option --merge

Signed-off-by: Uwe Zeisberger <Uwe_Zeisberger@digi.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agoFurther clean-up: usage() vs die()
Junio C Hamano [Fri, 4 Aug 2006 04:55:41 +0000 (3 21:55 -0700)]
Further clean-up: usage() vs die()

This hopefully finishes the clean-up Ramsay started with recent
commit 15e593e4d37d1d350fef20ab666d58f6881c7f5f and commit
8cdf33643dc0b21d9ea922a3fdd7f64226c421aa.

Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agoReplace some calls to die(usage_str) with usage(usage_str).
Ramsay Allan Jones [Thu, 3 Aug 2006 15:48:41 +0000 (3 16:48 +0100)]
Replace some calls to die(usage_str) with usage(usage_str).

The only change in behaviour should be having a "usage: " prefix
on the output string rather than "fatal: ", and an exit code of
129 rather than 128.

Signed-off-by: Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agoFixup command names in some usage strings.
Ramsay Allan Jones [Thu, 3 Aug 2006 15:38:39 +0000 (3 16:38 +0100)]
Fixup command names in some usage strings.

Most usage strings, such as for command xxx, start with "git-xxx".
This updates the rebels to conform to the general pattern.
(The git wrapper is an exception to this, of course ...)

Signed-off-by: Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agoGIT 1.4.2-rc3v1.4.2-rc3
Junio C Hamano [Thu, 3 Aug 2006 23:40:20 +0000 (3 16:40 -0700)]
GIT 1.4.2-rc3

We ended up merging too many stuff after -rc2, so here is
another round of release candidate.  Non bugfixes will be
queued to "next" from now on until a real 1.4.2 happens.

Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agoDocumentation/git.txt: link git-svn and git-instaweb from the main page.
Junio C Hamano [Thu, 3 Aug 2006 23:28:24 +0000 (3 16:28 -0700)]
Documentation/git.txt: link git-svn and git-instaweb from the main page.

Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agoMerge branch 'jc/sideband'
Junio C Hamano [Thu, 3 Aug 2006 23:02:14 +0000 (3 16:02 -0700)]
Merge branch 'jc/sideband'

* jc/sideband:
  sideband: do not use color, just say "remote:"
  fetch/clone: mark messages from remote side stand out.

12 years agosideband: do not use color, just say "remote:"
Junio C Hamano [Thu, 3 Aug 2006 23:01:58 +0000 (3 16:01 -0700)]
sideband: do not use color, just say "remote:"

... per suggestion by Andrew.

Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agoShow both blob names from "git diff blob1 blob2"
Junio C Hamano [Thu, 3 Aug 2006 18:57:11 +0000 (3 11:57 -0700)]
Show both blob names from "git diff blob1 blob2"

Earlier we deliberately showed only blob1's name because showing
both names labeled the output as a renaming patch.  Now the output
routine (namely, diff.c::resolve_rename_copy()) is taught not to
use pathname comparison to tell if a filepair is a rename, we can
safely do this change.

Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agodiff.c: do not use pathname comparison to tell renames
Junio C Hamano [Thu, 3 Aug 2006 19:01:01 +0000 (3 12:01 -0700)]
diff.c: do not use pathname comparison to tell renames

The final output from diff used to compare pathnames between
preimage and postimage to tell if the filepair is a rename/copy.
By explicitly marking the filepair created by diffcore_rename(),
the output routine, resolve_rename_copy(), does not have to do
so anymore.  This helps feeding a filepair that has different
pathnames in one and two elements to the diff machinery (most
notably, comparing two blobs).

Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agoAdd a couple of subdirectory tests.
Junio C Hamano [Thu, 3 Aug 2006 21:41:29 +0000 (3 14:41 -0700)]
Add a couple of subdirectory tests.

We still have too few of them, but we have to start from somewhere.
The general rule is to make tests easy to debug when run with -v (notice
use of seemingly useless echo everywhere in the new tests).

Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agoread-tree: shadowed variable fix.
Junio C Hamano [Thu, 3 Aug 2006 20:44:09 +0000 (3 13:44 -0700)]
read-tree: shadowed variable fix.

Recent changes to built-ins broke committing from subdirectory,
because the unused parameter "prefix" shadowed a global variable.

Spotted by Jeff King.

Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agofixed variable declaration in gitk
Michael [Thu, 3 Aug 2006 15:42:44 +0000 (3 17:42 +0200)]
fixed variable declaration in gitk

Signed-off-by: Michael <barra_cuda@katamail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agoFix "git diff blob1 blob2" showing the diff in reverse.
Junio C Hamano [Thu, 3 Aug 2006 18:50:10 +0000 (3 11:50 -0700)]
Fix "git diff blob1 blob2" showing the diff in reverse.

This was introduced by mistake when revision.c::add_pending_object()
was modified to use object-array instead of object-list.

Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agoCygwin needs NO_C99_FORMAT???
Junio C Hamano [Wed, 2 Aug 2006 22:44:07 +0000 (2 15:44 -0700)]
Cygwin needs NO_C99_FORMAT???

I noticed that t3800 test breaks with git built without this
option.

Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agogit-grep: document --and, --or, --not, ( and )
Matthias Lederhofer [Wed, 2 Aug 2006 22:04:56 +0000 (3 00:04 +0200)]
git-grep: document --and, --or, --not, ( and )

[jc: added an example section.]

Signed-off-by: Matthias Lederhofer <matled@gmx.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agouse declarations from builtin.h for builtin commands
Matthias Kestenholz [Wed, 2 Aug 2006 21:52:00 +0000 (2 23:52 +0200)]
use declarations from builtin.h for builtin commands

Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch>
Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agoMake git-repo-config a builtin
Matthias Kestenholz [Wed, 2 Aug 2006 21:51:59 +0000 (2 23:51 +0200)]
Make git-repo-config a builtin

Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch>
Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agoMake git-prune-packed a builtin
Matthias Kestenholz [Wed, 2 Aug 2006 16:32:32 +0000 (2 18:32 +0200)]
Make git-prune-packed a builtin

Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch>
Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agogit-annotate: remove extraneous debugging line
Jeff King [Wed, 2 Aug 2006 16:34:44 +0000 (2 12:34 -0400)]
git-annotate: remove extraneous debugging line

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agoDocumentation: convert uses of git-link macro to gitlink
Jeff King [Wed, 2 Aug 2006 16:32:32 +0000 (2 12:32 -0400)]
Documentation: convert uses of git-link macro to gitlink

There isn't and never was such a macro; all uses are typos.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agogit-push: remove obsolete git-push.sh
Jeff King [Wed, 2 Aug 2006 15:37:42 +0000 (2 11:37 -0400)]
git-push: remove obsolete git-push.sh

This was converted to a C builtin over three months ago.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agogit-push: allow -f as an alias for --force
Jeff King [Wed, 2 Aug 2006 15:28:16 +0000 (2 11:28 -0400)]
git-push: allow -f as an alias for --force

This was already documented in the options section of the manpage. This
patch implements it, adds it to the usage message, and mentions it at the
top of the manpage.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agoFix header breakage with _XOPEN_SOURCE.
Ramsay Allan Jones [Sun, 30 Jul 2006 15:52:09 +0000 (30 16:52 +0100)]
Fix header breakage with _XOPEN_SOURCE.

convert-objects.c sets _XOPEN_SOURCE and _XOPEN_SOURCE_EXTENDED before
including <time.h>, in order to get the declaration of strptime().
This leads to breakage in cache.h, due to S_ISLNK and S_IFLNK no longer
being defined by <sys/stat.h>.  These definitions are protected by the
__USE_BSD symbol, which is not set when _XOPEN_SOURCE is set.  Moving
the #defines and #include <time.h> below all other #includes does not
fix the problem, however, since now _USE_XOPEN, which protects the
declaration of strptime(), is now not defined (don't ask!).

The fix is to #define _GNU_SOURCE, which enables the definition of
practically everything.

Signed-off-by: Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agoRemove cmd_usage() routine and re-organize the help/usage code.
Ramsay Allan Jones [Sun, 30 Jul 2006 21:42:25 +0000 (30 22:42 +0100)]
Remove cmd_usage() routine and re-organize the help/usage code.

The cmd_usage() routine was causing warning messages due to a NULL
format parameter being passed in three out of four calls. This is a
problem if you want to compile with -Werror. A simple solution is to
simply remove the GNU __attribute__ format pragma from the cmd_usage()
declaration in the header file. The function interface was somewhat
muddled anyway, so re-write the code to finesse the problem.

[jc: this incidentally revealed that t9100 test assumed that the output
 from "git help" to be fixed in stone, but this patch lower-cases
 "Usage" to "usage".  Update the test not to rely on "git help" output.]

Signed-off-by: Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agoFix header breakage due to redefining PATH_MAX.
Ramsay Allan Jones [Sun, 30 Jul 2006 16:00:40 +0000 (30 17:00 +0100)]
Fix header breakage due to redefining PATH_MAX.

The header builtin.h was, incorrectly, redefining PATH_MAX which
causes a header order dependency in builtin-write-tree.c.  The fix
is to simply include <limits.h> directly to obtain the correct
definition of PATH_MAX.

Signed-off-by: Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agoAdd NO_C99_FORMAT to support older compilers.
Ramsay Allan Jones [Sun, 30 Jul 2006 15:38:28 +0000 (30 16:38 +0100)]
Add NO_C99_FORMAT to support older compilers.

The NO_C99_FORMAT macro allows compilers that lack support for the
ll,hh,j,z,t size specifiers (eg. gcc 2.95.2) to adapt the code to avoid
runtime errors in the formatted IO functions.

Signed-off-by: Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agoNew tests and en-passant modifications to mktag.
Ramsay Allan Jones [Sat, 29 Jul 2006 17:15:47 +0000 (29 18:15 +0100)]
New tests and en-passant modifications to mktag.

These changes were originally part of the next patch, but have been
split out since they were peripheral to the main purpose of that patch.

  - update comment describing the signature format to reflect
    the current code.
  - remove trailing \n in calls to error(), since a \n is already
    provided by error().
  - remove redundant call to get_sha1_hex().
  - call sha1_to_hex(sha1) to convert to ascii, rather than attempting
    to print the raw sha1.

The new tests provide a regression suite to support the modifications
to git-mktag in this and the next patch.

Signed-off-by: Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agoFix installation of templates on ancient systems.
Ramsay Allan Jones [Sat, 29 Jul 2006 16:25:03 +0000 (29 17:25 +0100)]
Fix installation of templates on ancient systems.

Do not use $(call) for 'shell quoting' paths, and pass DESTDIR down
to the templates makefile.

[jc: we have fixed the main Makefile long time ago, but somehow
 forgot to apply the same fix to templates Makefile.]

Signed-off-by: Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agoFix annotate test script; notice when git-annotate fails.
Ramsay Allan Jones [Sat, 29 Jul 2006 16:20:41 +0000 (29 17:20 +0100)]
Fix annotate test script; notice when git-annotate fails.

The t8001-annotate.sh test claimed all tests pass, when in fact
the git-annotate perl script failed to run! (prior to fixing the
script to work with perl 5.5).

Signed-off-by: Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agoEnsure git-clone exits with error if perl script fails.
Ramsay Allan Jones [Sat, 29 Jul 2006 16:12:34 +0000 (29 17:12 +0100)]
Ensure git-clone exits with error if perl script fails.

This helps tests 5400,5600,5700,5710 "fail correctly" rather than
give some false positives.  Also ensure cleanup actions in exit trap
work correctly even if user has alias rm='rm -i'.

Signed-off-by: Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agofetch/clone: mark messages from remote side stand out.
Junio C Hamano [Tue, 1 Aug 2006 08:34:53 +0000 (1 01:34 -0700)]
fetch/clone: mark messages from remote side stand out.

When dealing with a corrupt or out of sync remote repository,
the user often gets error messages like this:

error: refs/heads/devel does not point to a valid commit object!

which leaves the user wondering if the breakage is on the local
end or on the remote end.  This is unnecessarily alarming.

This patch changes the way we display messages received from the
remote side over the git protocol sideband (i.e. stderr stream
of the remote process).  It shows them with blue background with
white letters, but this presentation is subject to proposals of
better ways from the list.

The problem was pointed out by Andrew Morton.

Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agoMerge branch 'rs/rebase'
Junio C Hamano [Tue, 1 Aug 2006 06:02:28 +0000 (31 23:02 -0700)]
Merge branch 'rs/rebase'

* rs/rebase:
  rebase: Make the fast-fowarding message more user-friendly by using branch names instead of SHA1 IDs.
  rebase: Fix the detection of fast-forwarding of the current branch to upstream.

12 years agoMerge branch 'ml/pager'
Junio C Hamano [Tue, 1 Aug 2006 06:00:51 +0000 (31 23:00 -0700)]
Merge branch 'ml/pager'

12 years agoMerge branch 'jc/checkout'
Junio C Hamano [Tue, 1 Aug 2006 05:59:33 +0000 (31 22:59 -0700)]
Merge branch 'jc/checkout'

* jc/checkout:
  git-checkout: allow "checkout HEAD -- path"

12 years agopager: config variable pager.color
Matthias Lederhofer [Sat, 29 Jul 2006 22:27:43 +0000 (30 00:27 +0200)]
pager: config variable pager.color

enable/disable colored output when the pager is in use

Signed-off-by: Matthias Lederhofer <matled@gmx.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agoBuiltins: control the use of pager from the command table.
Junio C Hamano [Mon, 31 Jul 2006 09:53:46 +0000 (31 02:53 -0700)]
Builtins: control the use of pager from the command table.

This moves the built-in "always-use-pager" logic for log family
to the command dispatch table of git wrapper.  This makes it
easier to change the default use of pager, and has an added
benefit that we fork and exec the pager early before packs are
mmapped.

Pointed out by Juergen Ruehle <j.ruehle@bmiag.de>.

Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agoFix up some fallout from "setup_git_directory()" cleanups
Linus Torvalds [Mon, 31 Jul 2006 20:13:55 +0000 (31 13:13 -0700)]
Fix up some fallout from "setup_git_directory()" cleanups

git-ls-files was broken by the setup_git_directory() calling changes,
because I had missed the fact that the "prefix" variable in that file was
static to the whole file, and unlike git-ls-tree (where I had fixed it
up), it ended up using two different variables with the same name
depending on what the scoping happened to be.

This fixes it up properly (by just removing the static variable, and
passing the automatic one around properly), and git-ls-files should work
again.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agoFix double "close()" in ce_compare_data
Linus Torvalds [Mon, 31 Jul 2006 16:55:15 +0000 (31 09:55 -0700)]
Fix double "close()" in ce_compare_data

Doing an "strace" on "git diff" shows that we close() a file descriptor
twice (getting EBADFD on the second one) when we end up in ce_compare_data
if the index does not match the checked-out stat information.

The "index_fd()" function will already have closed the fd for us, so we
should not close it again.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agogit-checkout: allow "checkout HEAD -- path"
Junio C Hamano [Mon, 31 Jul 2006 10:07:12 +0000 (31 03:07 -0700)]
git-checkout: allow "checkout HEAD -- path"

Even though -- is redundant in this case, we should allow it to prevent
confusion.

Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agorebase: Make the fast-fowarding message more user-friendly by using branch names...
Robert Shearman [Thu, 27 Jul 2006 09:32:46 +0000 (27 10:32 +0100)]
rebase: Make the fast-fowarding message more user-friendly by using branch names instead of SHA1 IDs.

Signed-off-by: Robert Shearman <rob@codeweavers.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agorebase: Fix the detection of fast-forwarding of the current branch to upstream.
Robert Shearman [Thu, 27 Jul 2006 09:32:25 +0000 (27 10:32 +0100)]
rebase: Fix the detection of fast-forwarding of the current branch to upstream.

Previously, a rebasing operation with on a branch that is just tracking
an upstream branch would output a confusing "Nothing to do" due to no
patches being given to git-am.

The test brings the behaviour back into line with that of just before
e646c9c8c0aa995eac284ea0a2117add19c4461c.

Signed-off-by: Robert Shearman <rob@codeweavers.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agotar-tree: illustrate an obscure feature better
Johannes Schindelin [Mon, 31 Jul 2006 00:26:27 +0000 (31 02:26 +0200)]
tar-tree: illustrate an obscure feature better

Since you can tar just a subdirectory of a certain revision, tell
the users so, by showing an example how to do it.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agogit.c: allow alias expansion without a git directory
Matthias Lederhofer [Sun, 30 Jul 2006 01:30:29 +0000 (30 03:30 +0200)]
git.c: allow alias expansion without a git directory

With this, the configuration mechanism can be used to say:

[alias]
init = init-db --template=/path/to/template

Signed-off-by: Matthias Lederhofer <matled@gmx.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agosetup_git_directory_gently: do not barf when GIT_DIR is given.
Matthias Lederhofer [Sun, 30 Jul 2006 01:30:29 +0000 (30 03:30 +0200)]
setup_git_directory_gently: do not barf when GIT_DIR is given.

Earlier we barfed when GIT_DIR environment variable points at a
directory yet to be created, which made it impossible to use
configuration mechanism in "git-init-db".

Signed-off-by: Matthias Lederhofer <matled@gmx.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agoBuild on Debian GNU/kFreeBSD
Gerrit Pape [Sat, 29 Jul 2006 16:26:18 +0000 (29 16:26 +0000)]
Build on Debian GNU/kFreeBSD

Patch from Petr Salinger to make the build process detect and support the
Debian GNU/kFreeBSD architecture, see
 http://bugs.debian.org/380209

Signed-off-by: Gerrit Pape <pape@smarden.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agoMerge branch 'lt/web'
Junio C Hamano [Sun, 30 Jul 2006 20:35:08 +0000 (30 13:35 -0700)]
Merge branch 'lt/web'

* lt/web:
  gitweb.cgi: git_blame2: slight optimization reading the blame lines
  gitweb.cgi: git_blame2: Revision blocks now have alternating colors
  gitweb.cgi: git_blame2: Allow back-trekking through commits
  gitweb.cgi: git_blame2: an alternative simple working git blame

12 years agoMerge branch '__/setup-n-mv'
Junio C Hamano [Sun, 30 Jul 2006 20:34:52 +0000 (30 13:34 -0700)]
Merge branch '__/setup-n-mv'

* __/setup-n-mv:
  Call setup_git_directory() much earlier
  Call setup_git_directory() early

12 years agoMerge branch 'js/mv'
Junio C Hamano [Sun, 30 Jul 2006 20:24:48 +0000 (30 13:24 -0700)]
Merge branch 'js/mv'

* js/mv:
  builtin git-mv: support moving directories
  Make git-mv a builtin
  Extract helper bits from c-merge-recursive work

12 years agoMerge branch 'jn/make'
Junio C Hamano [Sun, 30 Jul 2006 20:24:29 +0000 (30 13:24 -0700)]
Merge branch 'jn/make'

* jn/make:
  Set datarootdir in config.mak.in
  Quote all calls to GIT_CONF_APPEND_LINE
  Typofix in configure.ac comment.
  configure.ac vertical whitespace usage cleanup
  autoconf: Checks for some programs
  autoconf: Checks for libraries
  autoconf: Checks for some library functions.
  autoconf: Checks for typedefs, structures, and compiler characteristics.
  autoconf: Preparing the way for autodetection
  Copy description of build configuration variables to configure.ac
  Teach make clean about configure and autoconf
  autoconf: Use autoconf to write installation directories to config.mak.autogen

12 years agoMerge branch 'lt/setup' into __/setup-n-mv
Junio C Hamano [Sat, 29 Jul 2006 08:54:54 +0000 (29 01:54 -0700)]
Merge branch 'lt/setup' into __/setup-n-mv

This merges the new built-in calling convention code into Johannes's
builtin-mv topic in order to resolve their conflicts early on.

Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agoCall setup_git_directory() much earlier
Linus Torvalds [Sat, 29 Jul 2006 05:44:25 +0000 (28 22:44 -0700)]
Call setup_git_directory() much earlier

This changes the calling convention of built-in commands and
passes the "prefix" (i.e. pathname of $PWD relative to the
project root level) down to them.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
12 years agoCall setup_git_directory() early
Linus Torvalds [Sat, 29 Jul 2006 04:21:48 +0000 (28 21:21 -0700)]
Call setup_git_directory() early

Any git command that expects to work in a subdirectory of a project, and
that reads the git config files (which is just about all of them) needs to
make sure that it does the "setup_git_directory()" call before it tries to
read the config file.

This means, among other things, that we need to move the call out of
"init_revisions()", and into the caller.

This does the mostly trivial conversion to do that.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>