Code

git.git
18 years agoGIT 1.0.8 v1.0.8
Junio C Hamano [Sun, 8 Jan 2006 05:32:48 +0000 (21:32 -0800)]
GIT 1.0.8

18 years agomailsplit: allow empty input from stdin
Junio C Hamano [Sun, 8 Jan 2006 05:26:30 +0000 (21:26 -0800)]
mailsplit: allow empty input from stdin

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agorevert/cherry-pick: handle single quote in author name.
Junio C Hamano [Sun, 8 Jan 2006 04:45:11 +0000 (20:45 -0800)]
revert/cherry-pick: handle single quote in author name.

The same fix as aa66c7ec77d474b737da607d6cb2d07f56628def is
needed here.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoFix git-format-patch usage string wrt output modes.
Yann Dirson [Sun, 8 Jan 2006 00:39:16 +0000 (01:39 +0100)]
Fix git-format-patch usage string wrt output modes.

--stdout was not mentionned, and the description for the case where -o
was not given was thus incomplete.

Signed-off-by: Yann Dirson <ydirson@altern.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoFix typo in debug stanza of t2001
Yann Dirson [Sun, 8 Jan 2006 00:38:43 +0000 (01:38 +0100)]
Fix typo in debug stanza of t2001

Signed-off-by: Yann Dirson <ydirson@altern.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agotar-tree: finish honoring extractor's umask in git-tar-tree.
Junio C Hamano [Sat, 7 Jan 2006 23:11:11 +0000 (15:11 -0800)]
tar-tree: finish honoring extractor's umask in git-tar-tree.

Earlier commit 38ec15a973a1f075f0d94d130b0ef279562921cd forgot
to apply the same principle of not forcing go-w to the base
directory when specified.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years ago[PATCH] Compilation: zero-length array declaration.
Junio C Hamano [Sat, 7 Jan 2006 09:33:54 +0000 (01:33 -0800)]
[PATCH] Compilation: zero-length array declaration.

ISO C99 (and GCC 3.x or later) lets you write a flexible array
at the end of a structure, like this:

struct frotz {
int xyzzy;
char nitfol[]; /* more */
};

GCC 2.95 and 2.96 let you to do this with "char nitfol[0]";
unfortunately this is not allowed by ISO C90.

This declares such construct like this:

struct frotz {
int xyzzy;
char nitfol[FLEX_ARRAY]; /* more */
};

and git-compat-util.h defines FLEX_ARRAY to 0 for gcc 2.95 and
empty for others.

If you are using a C90 C compiler, you should be able
to override this with CFLAGS=-DFLEX_ARRAY=1 from the
command line of "make".

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoprune: do not show error from pack-redundant when no packs are found.
Junio C Hamano [Sat, 7 Jan 2006 08:29:48 +0000 (00:29 -0800)]
prune: do not show error from pack-redundant when no packs are found.

When there is no pack yet, git-prune leaked an error message
from "git-pack-redundant --all" which complained that there is
no pack.  Squelch the annoying message.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoRetire debian/ directory.
Junio C Hamano [Sat, 7 Jan 2006 03:18:12 +0000 (19:18 -0800)]
Retire debian/ directory.

The official maintainer is keeping up-to-date quite well, and now
the older Debian is supported with backports.org, there is no reason
for me to keep debian/ directory around here.

I have not been building and publishing debs since 1.0.4 anyway.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agounpack-objects: default to quiet if stderr is not a tty.
Junio C Hamano [Sat, 7 Jan 2006 02:53:16 +0000 (18:53 -0800)]
unpack-objects: default to quiet if stderr is not a tty.

This would help cron/at jobs that run send-pack to mirror
repositories.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoSubstitute "/" with $opt_s in tag names as well as branch names
Joe English [Fri, 6 Jan 2006 20:52:27 +0000 (12:52 -0800)]
Substitute "/" with $opt_s in tag names as well as branch names

In 'git cvsimport' changes "/" to "-" (or $opt_s) in branch names,
but not in tag names, which is inconsistent.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoTeach cvsexportcommit to add new files
Yann Dirson [Fri, 6 Jan 2006 20:54:41 +0000 (21:54 +0100)]
Teach cvsexportcommit to add new files

"cvs add" support was already there, but the "unknown" status
returned when querying a file not yet known to cvs caused the
script to abort prematurely.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoGIT 1.0.7 v1.0.7
Junio C Hamano [Fri, 6 Jan 2006 04:52:50 +0000 (20:52 -0800)]
GIT 1.0.7

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoFix git-symbolic-ref typo in git.txt.
Jon Loeliger [Tue, 3 Jan 2006 14:38:15 +0000 (08:38 -0600)]
Fix git-symbolic-ref typo in git.txt.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit: grok 'help' to mean '--help'.
Andreas Ericsson [Tue, 3 Jan 2006 09:53:54 +0000 (10:53 +0100)]
git: grok 'help' to mean '--help'.

Most other scm's understand it, most users expect it and it's an easy fix.

Signed-off-by: Andreas Ericsson <ae@op5.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoDocumentation/git-svnimport: document -T and -t switches correctly
Eric Wong [Sun, 1 Jan 2006 21:32:53 +0000 (13:32 -0800)]
Documentation/git-svnimport: document -T and -t switches correctly

The -T and -t switches are swapped in the documentation and actual
code.  I've made the documentation match the code.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agosvnimport: support repositories requiring SSL authentication
Eric Wong [Sun, 1 Jan 2006 21:25:47 +0000 (13:25 -0800)]
svnimport: support repositories requiring SSL authentication

I looked at svn-mirror to see how it did this, seems about right.
"It works for me" when using it against https://svn.musicpd.org

tested command-line: git-svnimport -C mpc -i -m -v  \
-T mpc/trunk -b mpc/branches -t mpc/tags https://svn.musicpd.org

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agot3300: skip when filesystem does not like TAB in filenames.
Junio C Hamano [Fri, 6 Jan 2006 04:14:40 +0000 (20:14 -0800)]
t3300: skip when filesystem does not like TAB in filenames.

Instead of checking Cygwin explicitly, see if the filesystem lets us
create funny filenames.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoformat-patch/commit: Quote single quote in the author name properly.
Junio C Hamano [Fri, 6 Jan 2006 03:50:37 +0000 (19:50 -0800)]
format-patch/commit: Quote single quote in the author name properly.

Noticed by Kyle McMartin.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-fetch --tags: reject malformed tags.
Junio C Hamano [Fri, 6 Jan 2006 03:42:12 +0000 (19:42 -0800)]
git-fetch --tags: reject malformed tags.

When the other end was prepared with older git and has tags that
do not follow the naming convention (see check-ref-format), do not
barf but simply reject to copy them.

Initial fix by Simon Richter, but done differently.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoWrap synopsis lines and use [verse] to keep formatting
Jonas Fonseca [Sat, 31 Dec 2005 17:37:15 +0000 (18:37 +0100)]
Wrap synopsis lines and use [verse] to keep formatting

In addition, also fixes a few synopses to be more consistent and a gitlink.

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agouse GIT_DIR instead of /var/tmp
Alex Riesen [Thu, 5 Jan 2006 11:52:07 +0000 (12:52 +0100)]
use GIT_DIR instead of /var/tmp

Not every system (will not one microsoft windows system) have /var/tmp,
whereas using GIT_DIR for random temporary files is more or less established.

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agotrivial: check, if t/trash directory was successfully created
Alex Riesen [Thu, 5 Jan 2006 11:57:36 +0000 (12:57 +0100)]
trivial: check, if t/trash directory was successfully created

and was successfully entered. Otherwise git-init-db will create it directly
in the working directory (t/) which can be dangerous.

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agotrivial: .gitignore precompiled python modules
Alex Riesen [Thu, 5 Jan 2006 16:38:58 +0000 (17:38 +0100)]
trivial: .gitignore precompiled python modules

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agotrivial: use git-repo-config to detect how to run tests in the test repository
Alex Riesen [Thu, 5 Jan 2006 11:55:58 +0000 (12:55 +0100)]
trivial: use git-repo-config to detect how to run tests in the test repository

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agotrivial: use git-repo-config to detect if the test can be run on the repository
Alex Riesen [Thu, 5 Jan 2006 11:55:03 +0000 (12:55 +0100)]
trivial: use git-repo-config to detect if the test can be run on the repository

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agotrivial: remove the dots at the end of file names from merge-one-file
Alex Riesen [Thu, 5 Jan 2006 11:46:16 +0000 (12:46 +0100)]
trivial: remove the dots at the end of file names from merge-one-file

to make the output more friendly to mouse copy-paste.

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agotrivial: clarify, what are the config's user.name and user.email about
Alex Riesen [Thu, 5 Jan 2006 11:44:18 +0000 (12:44 +0100)]
trivial: clarify, what are the config's user.name and user.email about

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agotrivial: typo in git-commit.sh
Alex Riesen [Thu, 5 Jan 2006 11:44:59 +0000 (12:44 +0100)]
trivial: typo in git-commit.sh

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agouse result of open(2) to check for presence
Alex Riesen [Thu, 5 Jan 2006 11:43:34 +0000 (12:43 +0100)]
use result of open(2) to check for presence

Not that the stat against open race would matter much in this context,
but that simplifies
the code a bit. Also some diagnostics added (why the open failed)

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agofix potential deadlock in create_one_file
Alex Riesen [Thu, 5 Jan 2006 09:00:12 +0000 (10:00 +0100)]
fix potential deadlock in create_one_file

It can happen if the temporary file already exists (i.e. after a panic
and reboot).

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agotrivial: O_EXCL makes O_TRUNC redundant
Alex Riesen [Thu, 5 Jan 2006 08:58:06 +0000 (09:58 +0100)]
trivial: O_EXCL makes O_TRUNC redundant

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agotrivial: retval of waitpid is not errno
Alex Riesen [Thu, 5 Jan 2006 08:56:37 +0000 (09:56 +0100)]
trivial: retval of waitpid is not errno

...but is used as such and passed to strerror.

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoFix nasty approxidate bug
Linus Torvalds [Thu, 5 Jan 2006 03:33:55 +0000 (19:33 -0800)]
Fix nasty approxidate bug

Stupid me.

If approxidate ends up with a month that is ahead of the current month, it
decrements the year to last year.

Which is correct, and means that "last december" does the right thing.

HOWEVER. It should only do so if the year is the same as the current year.

Without this fix, "5 days ago" ends up being in 2004, because it first
decrements five days, getting us to December 2005 (correct), but then it
also ends up decrementing the year once more to turn that December into
"last year" (incorrect, since it already _was_ last year).

Duh. Pass me a donut.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoAIX compile fix for repo-config.c
Amos Waterland [Thu, 5 Jan 2006 00:31:02 +0000 (19:31 -0500)]
AIX compile fix for repo-config.c

AIX 5 has a /usr/include/regex.h containing this code:

 #ifdef  _NO_PROTO
 extern  char    *regex();
 extern  char    *regcmp();
 #else /* _NO_PROTO */
 extern  char    *regex(const char *, const char *, ...);
 extern  char    *regcmp(const char *, ...);
 #endif  /* _NO_PROTO */

This means that repo-config.c is trying to redefine the `regex' symbol.
Here is a simple patch that just uses `regexp' as the symbol name instead.

Signed-off-by: Amos Waterland <apw@us.ibm.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-init-db(1): Describe --shared and the idempotent nature of init-db
Jonas Fonseca [Sat, 31 Dec 2005 17:30:25 +0000 (18:30 +0100)]
git-init-db(1): Describe --shared and the idempotent nature of init-db

Based on the recent discussion on the mailing list.

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years ago?alloc: do not return NULL when asked for zero bytes
Junio C Hamano [Thu, 29 Dec 2005 09:31:26 +0000 (01:31 -0800)]
?alloc: do not return NULL when asked for zero bytes

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agocode comments: spell
Junio C Hamano [Thu, 29 Dec 2005 09:30:08 +0000 (01:30 -0800)]
code comments: spell

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoDocumentation: spell.
Junio C Hamano [Thu, 29 Dec 2005 09:20:06 +0000 (01:20 -0800)]
Documentation: spell.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoFix skipping merge-order test with NO_OPENSSL=1.
Gerrit Pape [Wed, 28 Dec 2005 11:25:38 +0000 (12:25 +0100)]
Fix skipping merge-order test with NO_OPENSSL=1.

Move git-rev-list --merge-order usage check for 'OpenSSL not linked' after
test 1; we cannot trigger this unless we try to actually use --merge-order
by giving some ref, and we do not have any ref until we run the first test
to create commits.

Signed-off-by: Gerrit Pape <pape@smarden.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoGIT 1.0.6 v1.0.6
Junio C Hamano [Wed, 28 Dec 2005 02:08:58 +0000 (18:08 -0800)]
GIT 1.0.6

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoDo not mark tags fetched via --tags flag as mergeable
Junio C Hamano [Tue, 27 Dec 2005 19:52:51 +0000 (11:52 -0800)]
Do not mark tags fetched via --tags flag as mergeable

Otherwise "git pull --tags" would mistakenly try to merge all of
them, which is never what the user wants.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoFix bogus tests on rev-list output.
Junio C Hamano [Tue, 27 Dec 2005 19:06:43 +0000 (11:06 -0800)]
Fix bogus tests on rev-list output.

These tests seem to mean checking the output with expected
result, but was not doing its handrolled test helper function.

Also fix the guard to workaround wc output that have whitespace
padding, which was broken but not exposed because the test was
not testing it ;-).

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoGuard a test against wc that pads its output with whitespace
Junio C Hamano [Tue, 27 Dec 2005 18:51:23 +0000 (10:51 -0800)]
Guard a test against wc that pads its output with whitespace

Spotted by Johannes.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agocopy_fd: close ifd on error
Sam Ravnborg [Tue, 27 Dec 2005 08:19:05 +0000 (09:19 +0100)]
copy_fd: close ifd on error

In copy_fd when write fails we ought to close input file descriptor.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoGIT 1.0.5 v1.0.5
Junio C Hamano [Tue, 27 Dec 2005 02:44:15 +0000 (18:44 -0800)]
GIT 1.0.5

Minor fixes.

Starting from this one I won't be touching debian/ directory
since the official maintainer seems to be reasonably quick to
package up things.  The packaging procedure used there seems to
be quite different from what I have, so I'd like to avoid
potential confusion and reduce work by the official maintainer
and myself.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoHandle symlinks graciously
Johannes Schindelin [Mon, 26 Dec 2005 21:31:42 +0000 (22:31 +0100)]
Handle symlinks graciously

This patch converts a stat() to an lstat() call, thereby fixing the case
when the date of a symlink was not the same as the one recorded in the
index. The included test case demonstrates this.

This is for the case that the symlink points to a non-existing file. If
the file exists, worse things than just an error message happen.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agot5300: avoid false failures.
Junio C Hamano [Tue, 27 Dec 2005 02:23:41 +0000 (18:23 -0800)]
t5300: avoid false failures.

Johannes found that the test has 1/256 chance of falsely
producing an uncorrupted idx file, causing the check to detect
corruption fail.  Now we have 1/2^160 chance of false failure
;-).

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoavoid asking ?alloc() for zero bytes.
Junio C Hamano [Mon, 26 Dec 2005 20:34:56 +0000 (12:34 -0800)]
avoid asking ?alloc() for zero bytes.

Avoid asking for zero bytes when that change simplifies overall
logic.  Later we would change the wrapper to ask for 1 byte on
platforms that return NULL for zero byte request.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoshort circuit out of a few places where we would allocate zero bytes
Eric Wong [Sat, 24 Dec 2005 12:12:43 +0000 (04:12 -0800)]
short circuit out of a few places where we would allocate zero bytes

dietlibc versions of malloc, calloc and realloc all return NULL if
they're told to allocate 0 bytes, causes the x* wrappers to die().

There are several more places where these calls could end up asking
for 0 bytes, too...

Maybe simply not die()-ing in the x* wrappers if 0/NULL is returned
when the requested size is zero is a safer and easier way to go.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoGIT 1.0.4 v1.0.4
Junio C Hamano [Sat, 24 Dec 2005 08:02:08 +0000 (00:02 -0800)]
GIT 1.0.4

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agomailinfo: iconv does not like "latin-1" -- should spell it "latin1"
Junio C Hamano [Sat, 24 Dec 2005 07:56:52 +0000 (23:56 -0800)]
mailinfo: iconv does not like "latin-1" -- should spell it "latin1"

This was a stupid typo that did not follow

http://www.iana.org/assignments/character-sets

Long noticed but neglected by JC, but finally reported by
Marco.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agols-files --full-name: usage string and documentation.
Junio C Hamano [Fri, 23 Dec 2005 23:51:33 +0000 (15:51 -0800)]
ls-files --full-name: usage string and documentation.

Somehow this option was not mentioned anywhere in the
documentation nor the usage string.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agomerge --no-commit: tweak message
Junio C Hamano [Fri, 23 Dec 2005 23:48:09 +0000 (15:48 -0800)]
merge --no-commit: tweak message

We did not distinguish the case the user asked not to make a
commit with --no-commit flag and the automerge failed.  Tell
these cases apart and phrase dying message differently.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoshow-branch: usability updates.
Junio C Hamano [Fri, 23 Dec 2005 20:47:18 +0000 (12:47 -0800)]
show-branch: usability updates.

This does three things:

 . It simplifies the logic to handle the case in which no
   refs are given on the command line, and fixes the bug
   when only "--heads" is specified.  Earlier we showed
   them twice.

 . It avoids to add the same ref twice.

 . It sorts the glob result (e.g. "git show-branch
   'tags/v1.0*'") according to a more version friendly
   sort order.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agocheck_packed_git_idx(): check integrity of the idx file itself.
Junio C Hamano [Fri, 23 Dec 2005 06:57:20 +0000 (22:57 -0800)]
check_packed_git_idx(): check integrity of the idx file itself.

Although pack-check.c had routine to verify the checksum for the
pack index file itself, the core did not check it before using
it.

This is stolen from the patch to tighten packname requirements.

Signed-off-by: Junio C Hamano <junkio@cox.net>
(cherry picked from 797bd6f490c91c07986382b9f268e0df712cb246 commit)

18 years agoGIT 1.0.3 v1.0.3
Junio C Hamano [Fri, 23 Dec 2005 02:14:31 +0000 (18:14 -0800)]
GIT 1.0.3

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agosha1_to_hex: properly terminate the SHA1
Johannes Schindelin [Thu, 22 Dec 2005 17:55:59 +0000 (18:55 +0100)]
sha1_to_hex: properly terminate the SHA1

sha1_to_hex() returns a pointer to a static buffer. Some of its users
modify that buffer by appending a newline character. Other users rely
on the fact that you can call

printf("%s", sha1_to_hex(sha1));

Just to be on the safe side, terminate the SHA1 in sha1_to_hex().

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoFix for http-fetch from file:// URLs
Nick Hengeveld [Thu, 22 Dec 2005 17:09:05 +0000 (09:09 -0800)]
Fix for http-fetch from file:// URLs

Recognize missing files when using http-fetch with file:// URLs

Signed-off-by: Nick Hengeveld <nickh@reactrix.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-format-patch should show the correct version
Johannes Schindelin [Thu, 22 Dec 2005 19:38:23 +0000 (20:38 +0100)]
git-format-patch should show the correct version

We want to record the version of the tools the patch was generated with.
While these tools could be rebuilt, git-format-patch stayed the same and
report the wrong version.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agosend-pack: reword non-fast-forward error message.
Junio C Hamano [Thu, 22 Dec 2005 20:39:39 +0000 (12:39 -0800)]
send-pack: reword non-fast-forward error message.

Wnen refusing to push a head, we said cryptic "remote 'branch'
object X does not exist on local" or "remote ref 'branch' is not
a strict subset of local ref 'branch'".  That was gittish.

Since the most likely reason this happens is because the pushed
head was not up-to-date, clarify the error message to say that
straight, and suggest pulling first.

First noticed by Johannes and seconded by Andreas.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years ago\n usage in stderr output
Alex Riesen [Thu, 15 Dec 2005 07:47:30 +0000 (08:47 +0100)]
\n usage in stderr output

fprintf and die sometimes have missing/excessive "\n" in their arguments,
correct the strings where I think it would be appropriate.

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agosanity check in add_packed_git()
Pavel Roskin [Wed, 21 Dec 2005 23:47:09 +0000 (18:47 -0500)]
sanity check in add_packed_git()

add_packed_git() tries to get the pack SHA1 by parsing its name.  It may
access uninitialized memory for packs with short names.

Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoGIT 1.0.0b v1.0.0b v1.0.2
Junio C Hamano [Wed, 21 Dec 2005 21:51:51 +0000 (13:51 -0800)]
GIT 1.0.0b

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoserver-info: skip empty lines.
Junio C Hamano [Wed, 21 Dec 2005 21:48:47 +0000 (13:48 -0800)]
server-info: skip empty lines.

Now we allow an empty line in objects/info/packs file, recognize
that and stop complaining.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years ago[PATCH] quote.c: Make loop control more readable.
Pavel Roskin [Wed, 21 Dec 2005 20:35:48 +0000 (15:35 -0500)]
[PATCH] quote.c: Make loop control more readable.

quote_c_style_counted() in quote.c uses a hard-to-read  construct.
Convert this to a more traditional form of the for loop.

Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoGIT 1.0.0a v1.0.0a v1.0.1
Junio C Hamano [Wed, 21 Dec 2005 21:17:54 +0000 (13:17 -0800)]
GIT 1.0.0a

    - Avoid misleading success message on error (Johannes)
    - objects/info/packs: work around bug in http-fetch.c::fetch_indices()
    - http-fetch.c: fix objects/info/pack parsing.
    - An off-by-one bug found by valgrind (Pavel)

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoAn off-by-one bug found by valgrind
Pavel Roskin [Wed, 21 Dec 2005 20:35:48 +0000 (15:35 -0500)]
An off-by-one bug found by valgrind

Insufficient memory is allocated in index-pack.c to hold the *.idx name.
One more byte should be allocated to hold the terminating 0.

Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoAvoid misleading success message on error
Johannes Schindelin [Wed, 21 Dec 2005 16:53:29 +0000 (17:53 +0100)]
Avoid misleading success message on error

When a push fails (for example when the remote head does not fast forward
to the desired ref) it is not correct to print "Everything up-to-date".

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agohttp-fetch.c: fix objects/info/pack parsing.
Junio C Hamano [Wed, 21 Dec 2005 20:10:10 +0000 (12:10 -0800)]
http-fetch.c: fix objects/info/pack parsing.

It failed to register the last pack in the objects/info/packs
file.  Also it had an independent overrun error.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoobjects/info/packs: work around bug in http-fetch.c::fetch_indices()
Junio C Hamano [Wed, 21 Dec 2005 20:09:17 +0000 (12:09 -0800)]
objects/info/packs: work around bug in http-fetch.c::fetch_indices()

The code to fetch pack index files in deployed clients have a
bug that causes it to ignore the pack file on the last line of
objects/info/packs file, so append an empty line to work it
around.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoGIT 1.0.0 v1.0.0
Junio C Hamano [Wed, 21 Dec 2005 08:01:00 +0000 (00:01 -0800)]
GIT 1.0.0

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMake "git-send-pack" less verbose by default
Linus Torvalds [Wed, 21 Dec 2005 02:13:02 +0000 (18:13 -0800)]
Make "git-send-pack" less verbose by default

It used to make sense to have git-send-pack talk about the things it sent
when (a) it was a new program and (b) nobody had a lot of tags and
branches.

These days, it's just distracting to see tons of

'refs/tags/xyz': up-to-date
...

when updating a remote repo.

So shut it up by default, and add a "--verbose" flag for those who really
want to see it.

Also, since this makes he case of everything being up-to-date just totally
silent, make it say "Everything up-to-date" if no refs needed updating.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoA shared repository should be writable by members.
Junio C Hamano [Wed, 21 Dec 2005 04:54:28 +0000 (20:54 -0800)]
A shared repository should be writable by members.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoce_smudge_racily_clean_entry: explain why it works.
Junio C Hamano [Tue, 20 Dec 2005 22:18:47 +0000 (14:18 -0800)]
ce_smudge_racily_clean_entry: explain why it works.

This is a tricky code and warrants extra commenting.  I wasted
30 minutes trying to break it until I realized why it works.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoRacy GIT (part #2)
Junio C Hamano [Tue, 20 Dec 2005 20:12:18 +0000 (12:12 -0800)]
Racy GIT (part #2)

The previous round caught the most trivial case well, but broke
down once index file is updated again.  Smudge problematic
entries (they should be very few if any under normal interactive
workflow) before writing a new index file out.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoRacy GIT
Junio C Hamano [Tue, 20 Dec 2005 08:02:15 +0000 (00:02 -0800)]
Racy GIT

This fixes the longstanding "Racy GIT" problem, which was pretty
much there from the beginning of time, but was first
demonstrated by Pasky in this message on October 24, 2005:

    http://marc.theaimsgroup.com/?l=git&m=113014629716878

If you run the following sequence of commands:

echo frotz >infocom
        git update-index --add infocom
        echo xyzzy >infocom

so that the second update to file "infocom" does not change
st_mtime, what is recorded as the stat information for the cache
entry "infocom" exactly matches what is on the filesystem
(owner, group, inum, mtime, ctime, mode, length).  After this
sequence, we incorrectly think "infocom" file still has string
"frotz" in it, and get really confused.  E.g. git-diff-files
would say there is no change, git-update-index --refresh would
not even look at the filesystem to correct the situation.

Some ways of working around this issue were already suggested by
Linus in the same thread on the same day, including waiting
until the next second before returning from update-index if a
cache entry written out has the current timestamp, but that
means we can make at most one commit per second, and given that
the e-mail patch workflow used by Linus needs to process at
least 5 commits per second, it is not an acceptable solution.
Linus notes that git-apply is primarily used to update the index
while processing e-mailed patches, which is true, and
git-apply's up-to-date check is fooled by the same problem but
luckily in the other direction, so it is not really a big issue,
but still it is disturbing.

The function ce_match_stat() is called to bypass the comparison
against filesystem data when the stat data recorded in the cache
entry matches what stat() returns from the filesystem.  This
patch tackles the problem by changing it to actually go to the
filesystem data for cache entries that have the same mtime as
the index file itself.  This works as long as the index file and
working tree files are on the filesystems that share the same
monotonic clock.  Files on network mounted filesystems sometimes
get skewed timestamps compared to "date" output, but as long as
working tree files' timestamps are skewed the same way as the
index file's, this approach still works.  The only problematic
files are the ones that have the same timestamp as the index
file's, because two file updates that sandwitch the index file
update must happen within the same second to trigger the
problem.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoformat-patch: make sure header and body are separated.
Junio C Hamano [Tue, 20 Dec 2005 05:55:12 +0000 (21:55 -0800)]
format-patch: make sure header and body are separated.

Since log message in a commit object is defined to be binary
blob, it could be something without an empty line between the
title line and the body text.  Be careful to format such into
a form suitable for e-mail submission.  There must be an empty
line between the headers and the body.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agodiff --abbrev: document --abbrev=<n> form.
Junio C Hamano [Sun, 18 Dec 2005 10:03:15 +0000 (02:03 -0800)]
diff --abbrev: document --abbrev=<n> form.

It was implemented there but was not advertised.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agodiff: --abbrev option
Junio C Hamano [Wed, 14 Dec 2005 01:21:41 +0000 (17:21 -0800)]
diff: --abbrev option

When I show transcripts to explain how something works, I often
find myself hand-editing the diff-raw output to shorten various
object names in the output.

This adds --abbrev option to the diff family, which shortens
diff-raw output and diff-tree commit id headers.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoxread/xwrite: do not worry about EINTR at calling sites.
Junio C Hamano [Tue, 20 Dec 2005 00:18:28 +0000 (16:18 -0800)]
xread/xwrite: do not worry about EINTR at calling sites.

We had errno==EINTR check after read(2)/write(2) sprinkled all
over the places, always doing continue.  Consolidate them into
xread()/xwrite() wrapper routines.

Credits for suggestion goes to HPA -- bugs are mine.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agotests: make scripts executable
Junio C Hamano [Tue, 20 Dec 2005 02:27:04 +0000 (18:27 -0800)]
tests: make scripts executable

just for consistency.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoRemove "octopus".
Junio C Hamano [Tue, 20 Dec 2005 02:03:31 +0000 (18:03 -0800)]
Remove "octopus".

We still advertise "git resolve" as a standalone command, but never
"git octopus", so nobody should be using it and it is safe to
retire it.  The functionality is still available as a strategy
backend.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoRemove unused cmd-rename.sh
Junio C Hamano [Tue, 20 Dec 2005 02:02:20 +0000 (18:02 -0800)]
Remove unused cmd-rename.sh

This file is a remnant from the big command rename which happened
quite some time ago.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoRemove generated files */*.py[co]
Junio C Hamano [Tue, 20 Dec 2005 01:59:58 +0000 (17:59 -0800)]
Remove generated files */*.py[co]

We missed ones in the compat/ subdirectory.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoDocumentation: stdout of update-hook is connected to /dev/null
Junio C Hamano [Tue, 20 Dec 2005 00:35:48 +0000 (16:35 -0800)]
Documentation: stdout of update-hook is connected to /dev/null

Mention that update-hook does not emit its stdout to the sender.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agorev-list --objects: fix object list without commit.
Junio C Hamano [Tue, 20 Dec 2005 00:16:49 +0000 (16:16 -0800)]
rev-list --objects: fix object list without commit.

Earlier, "rev-list --objects <sha1>" for an object chain that
does not have any commit failed with a usage message.  This
fixes "send-pack remote $tag" where tag points at a non-commit
(e.g. a blob).

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoDocumentation/git-archimport: document -o, -a, f, -D options
Eric Wong [Mon, 19 Dec 2005 01:23:50 +0000 (17:23 -0800)]
Documentation/git-archimport: document -o, -a, f, -D options

Also, ensure usage help switches are in the same order.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agohowto/using-topic-branches: Recommend public URL git://git.kernel.org/
Junio C Hamano [Mon, 19 Dec 2005 08:31:08 +0000 (00:31 -0800)]
howto/using-topic-branches: Recommend public URL git://git./

Recommending this means subsystem maintainers do not have to log-in
just to resync with upstream.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMake "git help" sort git commands in columns
Linus Torvalds [Sun, 18 Dec 2005 20:41:10 +0000 (12:41 -0800)]
Make "git help" sort git commands in columns

This changes "pretty_print_string_list()" to show the git commands
alphabetically in column order, which is the normal one.

Ie instead of doing

git commands available in '/home/torvalds/bin'
----------------------------------------------
  add                am                 ...
  applypatch         archimport         ...
  cat-file           check-ref-format   ...
...

it does

git commands available in '/home/torvalds/bin'
----------------------------------------------
  add                diff-tree          ...
  am                 fetch              ...
  apply              fetch-pack         ...
...

where each column is sorted.

This is how "ls" sorts things too, and since visually the columns are much
more distinct than the rows, so it _looks_ more sorted.

The "ls" command has a "-x" option that lists entries by lines (the way
git.c used to): if somebody wants to do that, the new print-out logic
could be easily accomodated to that too. Matter of taste and preference, I
guess.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMake "git help" react to window size correctly
Linus Torvalds [Sun, 18 Dec 2005 20:15:58 +0000 (12:15 -0800)]
Make "git help" react to window size correctly

Currently the git "show commands" function will react to the environment
variable COLUMNS, or just default to a width of 80 characters.

That's just soo eighties. Nobody sane sets COLUMNS any more, unless they
need to support some stone-age software from before the age of steam
engines, SIGWINCH and TIOCGWINSZ.

So get with the new century, and use TIOCGWINSZ to get the terminal size.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoDocumentation: typos and small fixes in "everyday".
Junio C Hamano [Sun, 18 Dec 2005 20:11:27 +0000 (12:11 -0800)]
Documentation: typos and small fixes in "everyday".

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoclone-pack: remove unused and undocumented --keep flag
Junio C Hamano [Sun, 18 Dec 2005 09:55:29 +0000 (01:55 -0800)]
clone-pack: remove unused and undocumented --keep flag

While we are at it, give fully spelled --keep to fetch-pack.
Also give --quiet in addition to -q to fetch-pack as well.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agofetch-pack: -k option to keep downloaded pack.
Junio C Hamano [Thu, 15 Dec 2005 06:17:38 +0000 (22:17 -0800)]
fetch-pack: -k option to keep downloaded pack.

Split out the functions that deal with the socketpair after
finishing git protocol handshake to receive the packed data into
a separate file, and use it in fetch-pack to keep/explode the
received pack data.  We earlier had something like that on
clone-pack side once, but the list discussion resulted in the
decision that it makes sense to always keep the pack for
clone-pack, so unpacking option is not enabled on the clone-pack
side, but we later still could do so easily if we wanted to with
this change.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoRevert "get_sha1_basic(): corner case ambiguity fix"
Junio C Hamano [Sat, 17 Dec 2005 08:00:50 +0000 (00:00 -0800)]
Revert "get_sha1_basic(): corner case ambiguity fix"

This reverts 6677c4665af2d73f670bec382bc82d0f2e9513fb commit.

The misguided disambiguation has been reverted, so there is no point
testing that misfeature.

18 years agoRevert "We do not like "HEAD" as a new branch name"
Junio C Hamano [Sat, 17 Dec 2005 07:48:22 +0000 (23:48 -0800)]
Revert "We do not like "HEAD" as a new branch name"

This reverts ee34518d629331dadd58b1a75294369d679eda8b commit.

18 years agoRevert "refs.c: off-by-one fix."
Junio C Hamano [Sat, 17 Dec 2005 07:48:14 +0000 (23:48 -0800)]
Revert "refs.c: off-by-one fix."

This reverts 06bf6ac4248e834a229027908d405f5e42ac96d7 commit.

18 years agoRemove misguided branch disambiguation.
Junio C Hamano [Sat, 17 Dec 2005 07:19:14 +0000 (23:19 -0800)]
Remove misguided branch disambiguation.

This removes the misguided attempt to refuse processing a branch
name xyzzy and insist it to be given as either heads/xyzzy or
tags/xyzzy when a tag xyzzy exists.  There was no reason to do
so --- the search order was predictable and well defined, so if
the user says xyzzy we should have taken the tag xyzzy in such a
case without complaining.

This incidentally fixes another subtle bug related to this.  If
such a duplicate branch/tag name happened to be a unique valid
prefix of an existing commit object name (say, "beef"), we did
not take the tag "beef" but after complaining used the commit
object whose name started with beef.

Another problem this fixes while introducing some confusion is
that there is no longer a reason to forbid a branch name HEAD
anymore.  In other words, now "git pull . ref1:HEAD" would work
as expected, once we revert "We do not like HEAD branch" patch.
It creates "HEAD" branch under ${GIT_DIR-.git}/refs/heads (or
fast-forwards if already exists) using the tip of ref1 branch
from the current repository, and merges it into the current
branch.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoDocumentation: HTTP needs update-server-info.
Junio C Hamano [Sat, 17 Dec 2005 19:39:39 +0000 (11:39 -0800)]
Documentation: HTTP needs update-server-info.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoComment fixes.
Junio C Hamano [Sat, 17 Dec 2005 07:12:33 +0000 (23:12 -0800)]
Comment fixes.

Signed-off-by: Junio C Hamano <junkio@cox.net>