gitweb.git
Handle symlinks graciouslyJohannes 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>

t5300: 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>

avoid 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>

short circuit out of a few places where we would alloca... 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>

mailinfo: iconv does not like "latin-1" -- should spell... 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>

ls-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>

merge --no-commit: tweak messageJunio 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>

show-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>

check_packed_git_idx(): check integrity of the idx... 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)

sha1_to_hex: properly terminate the SHA1Johannes 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>

Fix for http-fetch from file:// URLsNick 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>

git-format-patch should show the correct versionJohannes 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>

send-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>

\n usage in stderr outputAlex 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>

sanity 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>

server-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>

[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>

An off-by-one bug found by valgrindPavel 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>

Avoid misleading success message on errorJohannes 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>

http-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>

objects/info/packs: work around bug in http-fetch.c... 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>

GIT 1.0.0 v1.0.0Junio 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>

Make "git-send-pack" less verbose by defaultLinus 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>

A 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>

ce_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>

Racy 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>

Racy GITJunio 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>

format-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>

diff --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>

diff: --abbrev optionJunio 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>

xread/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>

tests: make scripts executableJunio 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>

Remove "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>

Remove unused cmd-rename.shJunio 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>

Remove 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>

Documentation: stdout of update-hook is connected to... 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>

rev-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>

Documentation/git-archimport: document -o, -a, f, ... 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>

howto/using-topic-branches: Recommend public URL git... 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>

Make "git help" sort git commands in columnsLinus 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>

Make "git help" react to window size correctlyLinus 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>

Documentation: 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>

clone-pack: remove unused and undocumented --keep flagJunio 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>

fetch-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>

Revert "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.

Revert "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.

Revert "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.

Remove 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>

Documentation: 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>

Comment 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>

Fix git-am --skipJan Harkes Sat, 17 Dec 2005 06:01:06 +0000 (01:01 -0500)

Fix git-am --skip

git-am --skip does not unpack the next patch and ends up reapplying the
old patch, believing that it is the new patch in the sequence.

If the old patch applied successfully it will commit it with the
supposedly skipped log message and ends up dropping the following patch.
If the patch did not apply the user is left with the conflict he tried
to skip and has to unpack the next patch in the sequence by hand to get
git-am back on track.

By clearing the resume variable whenever skips bumps the sequence
counter we correctly unpack the next patch. I also added another
resume= in the case a patch file is missing from the sequence to
avoid the same problem when a file in the sequence was removed.

Signed-off-by: Jan Harkes <jaharkes@cs.cmu.edu>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Forbid pattern maching characters in refnames.Junio C Hamano Fri, 16 Dec 2005 02:03:59 +0000 (18:03 -0800)

Forbid pattern maching characters in refnames.

by marking '?', '*', and '[' as bad_ref_char().

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

Examples of resetting.Junio C Hamano Sat, 17 Dec 2005 02:23:33 +0000 (18:23 -0800)

Examples of resetting.

Morten Welinder says examples of resetting is really about
recovering from botched commit/pulls. I agree that pointers
from commands that cause a reset to be needed in the first place
would be very helpful.

Also reset examples did not mention "pull/merge" cases.

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

refs.c: off-by-one fix.Junio C Hamano Fri, 16 Dec 2005 02:52:51 +0000 (18:52 -0800)

refs.c: off-by-one fix.

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

We do not like "HEAD" as a new branch nameJohannes Schindelin Fri, 16 Dec 2005 01:40:25 +0000 (02:40 +0100)

We do not like "HEAD" as a new branch name

This makes git-check-ref-format fail for "HEAD". Since the check is only
executed when creating refs, the existing symbolic ref is safe.

Otherwise these commands, most likely are pilot errors, would do
pretty funky stuff:

git checkout -b HEAD
git pull . other:HEAD

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Sort globbed refname in show-branch.Junio C Hamano Fri, 16 Dec 2005 01:53:44 +0000 (17:53 -0800)

Sort globbed refname in show-branch.

"git show-branch bugs/*" shows all branches whose name match the
specified pattern, but in the order readdir() happened to
returned. Sort them to make the output more predictable.

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

small cleanup for diff-delta.cNicolas Pitre Thu, 15 Dec 2005 16:10:32 +0000 (11:10 -0500)

small cleanup for diff-delta.c

This patch removes unused remnants of the original xdiff source.
No functional change. Possible tiny speed improvement.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

git-whatchanged: Add usage stringFredrik Kuivinen Thu, 15 Dec 2005 22:48:38 +0000 (23:48 +0100)

git-whatchanged: Add usage string

Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>

git-log: Add usage stringFredrik Kuivinen Thu, 15 Dec 2005 22:48:26 +0000 (23:48 +0100)

git-log: Add usage string

Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>

git-diff: Usage string clean-upFredrik Kuivinen Thu, 15 Dec 2005 22:47:57 +0000 (23:47 +0100)

git-diff: Usage string clean-up

Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>

applymbox: typofixJunio C Hamano Thu, 15 Dec 2005 21:02:25 +0000 (13:02 -0800)

applymbox: typofix

Sorry, I broke this command completely with the stupid typo.

Noticed by Marco Costalba.

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

get_sha1_basic(): corner case ambiguity fixJunio C Hamano Thu, 15 Dec 2005 20:54:00 +0000 (12:54 -0800)

get_sha1_basic(): corner case ambiguity fix

When .git/refs/heads/frotz and .git/refs/tags/frotz existed, and
the object name stored in .git/refs/heads/frotz were corrupt, we
ended up picking tags/frotz without complaining. Worse yet, if
the corrupt .git/refs/heads/frotz was more than 40 bytes and
began with hexadecimal characters, it silently overwritten the
initial part of the returned result.

This commit adds a couple of tests to demonstrate these cases,
with a fix.

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

Documentation: tutorialJunio C Hamano Thu, 15 Dec 2005 07:08:08 +0000 (23:08 -0800)

Documentation: tutorial

At the beginning of tutorial, refer the reader to everyday if
she has not done so yet.

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

svnimport: exit cleanly when we are up to dateMartin Langhoff Thu, 15 Dec 2005 06:26:46 +0000 (19:26 +1300)

svnimport: exit cleanly when we are up to date

Now we detect that the SVN repo does not have new commits for us and exit
cleanly, removing the lockfile. With this, svnimport supports being run
on a cronjob to maintain a SVN2GIT gateway.

Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>
Signed-off-by: Junio C Hamano <junkio@cox.net>

clone-pack: make it usable for partial branch cloning.Junio C Hamano Thu, 15 Dec 2005 05:25:22 +0000 (21:25 -0800)

clone-pack: make it usable for partial branch cloning.

clone-pack had some logic to accept subset of remote refs from
the command line and clone from there. However, it was never
used in practice and its problems were not found out so far.

This commit changes the command to output the object names of
refs to the standard output instead of making a clone of the
remote repository when explicit <head> parameters are given; the
output format is the same as fetch-pack.

The traditional behaviour of cloning the whole repository by
giving no explicit <head> parameters stays the same.

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

GIT 0.99.9n aka 1.0rc6 v0.99.9nv1.0rc6Junio C Hamano Thu, 15 Dec 2005 01:30:03 +0000 (17:30 -0800)

GIT 0.99.9n aka 1.0rc6

Oh, I hate to do this but I ended up merging big usage string
cleanups from Fredrik, git-am enhancements that made a lot of
sense for non mbox users from HPA, and rebase changes (done
independently by me and Lukas) among other things, so git is
still in perpetual state of 1.0rc. 1.0 will probably be next
Wednesday, but who knows.

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

git rebase loses author name/email if given bad email... Amos Waterland Wed, 14 Dec 2005 22:48:19 +0000 (17:48 -0500)

git rebase loses author name/email if given bad email address

If GIT_AUTHOR_EMAIL is of a certain form, `git rebase master' will blow
away the author name and email when fast-forward merging commits. I
have not tracked it down, but here is a testcase that demonstrates the
behavior.

Signed-off-by: Amos Waterland <apw@us.ibm.com>
Acked-by: Michal Ostrowski <mostrows@watson.ibm.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Bugfixes for git-rebaseLukas Sandström Wed, 14 Dec 2005 23:36:35 +0000 (00:36 +0100)

Bugfixes for git-rebase

Fix bugs in git-rebase wrt rebasing another branch than
the current HEAD, rebasing with a dirty working dir,
and rebasing a proper decendant of the target branch.

[jc: with a bit of hand-merging]

Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>

mailinfo and git-am: allow "John Doe <johndoe>"Junio C Hamano Thu, 15 Dec 2005 00:31:06 +0000 (16:31 -0800)

mailinfo and git-am: allow "John Doe <johndoe>"

An isolated developer could have a local-only e-mail, which will
be stripped out by mailinfo because it lacks '@'. Define a
fallback parser to accomodate that.

At the same time, reject authorless patch in git-am.

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

define MAXPATHLEN for hosts that don't support itMartin Atukunda Tue, 13 Dec 2005 12:21:34 +0000 (15:21 +0300)

define MAXPATHLEN for hosts that don't support it

[jc: Martin says syllable (www.syllable.org) wants this.]

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

Do not let errors pass by unnoticed when running `make... Junio C Hamano Wed, 14 Dec 2005 21:32:52 +0000 (13:32 -0800)

Do not let errors pass by unnoticed when running `make check'.

[jc: originally from Amos Waterland.]

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

Merge branch 'hold/am'Junio C Hamano Wed, 14 Dec 2005 21:04:43 +0000 (13:04 -0800)

Merge branch 'hold/am'

rebase: do not get confused in fast-forward situation.Junio C Hamano Wed, 14 Dec 2005 11:11:37 +0000 (03:11 -0800)

rebase: do not get confused in fast-forward situation.

When switching to another branch and rebasing it in a one-go, it
failed to update the variable that holds the branch head, and
did not detect fast-forward situation correctly.

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

Merge branch 'fk/usage'Junio C Hamano Wed, 14 Dec 2005 21:01:01 +0000 (13:01 -0800)

Merge branch 'fk/usage'

Documentation: topic branchesJunio C Hamano Wed, 14 Dec 2005 20:57:49 +0000 (12:57 -0800)

Documentation: topic branches

Recommend git over ssh direct to master.kernel.org, instead of
going over rsync to public machines, since this is meant to be a
procedure for kernel subsystem maintainers.

Also fix an obvious typo.

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

applypatch: no need to do non-portable [[ ... ]]Junio C Hamano Wed, 14 Dec 2005 02:19:12 +0000 (18:19 -0800)

applypatch: no need to do non-portable [[ ... ]]

... when old, proven, case would do.

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

git-repack: Usage string clean-up, emit usage at incorr... freku045@student.liu.se Tue, 13 Dec 2005 22:30:32 +0000 (23:30 +0100)

git-repack: Usage string clean-up, emit usage at incorrect invocation

Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>

git-rebase: Usage string clean-up, emit usage string... freku045@student.liu.se Tue, 13 Dec 2005 22:30:32 +0000 (23:30 +0100)

git-rebase: Usage string clean-up, emit usage string at incorrect invocation

Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>

git-prune: Usage string clean-up, use the 'usage' functionfreku045@student.liu.se Tue, 13 Dec 2005 22:30:32 +0000 (23:30 +0100)

git-prune: Usage string clean-up, use the 'usage' function

Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>

git-lost-found: Usage string clean-up, emit usage strin... freku045@student.liu.se Tue, 13 Dec 2005 22:30:31 +0000 (23:30 +0100)

git-lost-found: Usage string clean-up, emit usage string at incorrect invocation

Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>

git-fetch: Usage string clean-up, emit usage string... freku045@student.liu.se Tue, 13 Dec 2005 22:30:31 +0000 (23:30 +0100)

git-fetch: Usage string clean-up, emit usage string at unrecognized option

Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>

git-cherry: Usage string clean-up, use the 'usage'... freku045@student.liu.se Tue, 13 Dec 2005 22:30:31 +0000 (23:30 +0100)

git-cherry: Usage string clean-up, use the 'usage' function

Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>

git-applypatch: Usage string clean-up, emit usage strin... freku045@student.liu.se Tue, 13 Dec 2005 22:30:31 +0000 (23:30 +0100)

git-applypatch: Usage string clean-up, emit usage string at incorrect invocation

Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>

git-am: Usage string clean-upfreku045@student.liu.se Tue, 13 Dec 2005 22:30:31 +0000 (23:30 +0100)

git-am: Usage string clean-up

Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>

git-revert: Usage string clean-upfreku045@student.liu.se Tue, 13 Dec 2005 22:30:31 +0000 (23:30 +0100)

git-revert: Usage string clean-up

Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>

git-verify-tag: Usage string clean-up, emit usage strin... freku045@student.liu.se Tue, 13 Dec 2005 22:30:31 +0000 (23:30 +0100)

git-verify-tag: Usage string clean-up, emit usage string at incorrect invocation

Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Trivial usage string clean-upfreku045@student.liu.se Tue, 13 Dec 2005 22:30:31 +0000 (23:30 +0100)

Trivial usage string clean-up

Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>

t3200: branch --help does not die anymore.Junio C Hamano Tue, 13 Dec 2005 07:38:47 +0000 (23:38 -0800)

t3200: branch --help does not die anymore.

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

Usage message clean-up, take #2Fredrik Kuivinen Sun, 11 Dec 2005 09:55:49 +0000 (10:55 +0100)

Usage message clean-up, take #2

There were some problems with the usage message clean-up patch
series. I hadn't realised that subdirectory aware scripts can't source
git-sh-setup. I propose that we change this and let the scripts which
are subdirectory aware set a variable, SUBDIRECTORY_OK, before they
source git-sh-setup.

The scripts will also set USAGE and possibly LONG_USAGE before they
source git-sh-setup. If LONG_USAGE isn't set it defaults to USAGE.

If we go this way it's easy to catch --help in git-sh-setup, print the
(long) usage message to stdout and exit cleanly. git-sh-setup can
define a 'usage' shell function which can be called by the scripts to
print the short usage string to stderr and exit non-cleanly. It will
also be easy to change $0 to basename $0 or something else, if would
like to do that sometime in the future.

What follows is a patch to convert a couple of the commands to this
style. If it's ok with everyone to do it this way I will convert the
rest of the scripts too.

[jc: thrown in to proposed updates queue for comments.]

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

git-am support for naked email messages (take 2)H. Peter Anvin Wed, 14 Dec 2005 06:39:23 +0000 (22:39 -0800)

git-am support for naked email messages (take 2)

This allows git-am to accept single-message files as well as mboxes.
Unlike the previous version, this one doesn't need to be explicitly told
which one it is; rather, it looks to see if the first line is a From
line and uses it to select mbox mode or not.

I moved the logic to do all this into git-mailsplit, which got a new
user interface as result, although the old interface is still available
for backwards compatibility.

[jc: applied with two obvious fixes.]

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Everyday: a bit more examples.Junio C Hamano Wed, 14 Dec 2005 08:42:45 +0000 (00:42 -0800)

Everyday: a bit more examples.

Talk about the following as well:

* git fetch --tags
* Use of "git push" as a one-man distributed development vehicle.
* Show example of remotes file for pulling and pushing.
* Annotate git-shell setup.
* Using Carl's update hook in a CVS-style shared repository.

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

checkout-index: fix checking out specific path.Junio C Hamano Wed, 14 Dec 2005 05:39:56 +0000 (21:39 -0800)

checkout-index: fix checking out specific path.

3bd348aeea24709cd9be4b9d741f79b6014cd7e3 commit broke checking
out specific paths.

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

Make git-send-pack exit with error when some refs could... Petr Baudis Wed, 14 Dec 2005 00:45:40 +0000 (01:45 +0100)

Make git-send-pack exit with error when some refs couldn't be pushed out

In case some refs couldn't be pushed out due to an error (mostly the
not-a-proper-subset error), make git-send-pack exit with non-zero status
after the push is over (that is, it still tries to push out the rest
of the refs).

[jc: I adjusted a test for this change.]

Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>

[PATCH] allow merging any committishJunio C Hamano Wed, 14 Dec 2005 01:01:23 +0000 (17:01 -0800)

[PATCH] allow merging any committish

Although "git-merge" is advertised as the end-user level command
(instead of being a "git-pull" backend), it was not prepared to
take tag objects that point at commits and barfed when fed one.
Sanitize the input while we validate them, for which we already
have a loop.

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

git-clone: tell the user a bit more about clone-pack... Junio C Hamano Tue, 13 Dec 2005 23:58:00 +0000 (15:58 -0800)

git-clone: tell the user a bit more about clone-pack failure.

When clone-pack has trouble with the remote, it dies unfriendly
"EOF" error message. We cannot tell the reason why it failed
from the local end; it could be that the repository did not
exist, or configured not to serve over git-daemon, or a network
failure. At least, saying clone-pack failed makes it a bit more
meaningful.

I am not convinced yet that removing the newly created directory
is the right thing to do, so this commit leaves the new
directory behind.

Reported by Sam Ravnborg.

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

Documentation: not learning core git commands.Junio C Hamano Tue, 13 Dec 2005 10:38:24 +0000 (02:38 -0800)

Documentation: not learning core git commands.

The initial section of tutorial was too heavy on internal
workings for the first-time readers, so rewrite the introductory
section of git(7) to start with "not learning core git commands"
section and refer them to README to grasp the basic concepts,
then Everyday to give overview with task/role oriented examples
for minimum set of commands, and finally the tutorial.

Also add to existing note in the tutorial that many too
technical descriptions can be skipped by a casual reader.

I initially started to review the tutorial, with the objective
of ripping out the detailed technical information altogether,
but I found that the level of details in the initial couple of
sections that talk about refs and the object database in a
hands-on fashion was about rigth, and left all of them there. I
feel that reading about fsck-index and repack is too abstract
without being aware of these directories and files.

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

Documentation: diff examples.Junio C Hamano Tue, 13 Dec 2005 09:54:15 +0000 (01:54 -0800)

Documentation: diff examples.

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

Documentation: fix missing links to git(7)Junio C Hamano Tue, 13 Dec 2005 07:55:09 +0000 (23:55 -0800)

Documentation: fix missing links to git(7)

Also move pack protocol description to technical/.

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

Documentation: more examples.Junio C Hamano Tue, 13 Dec 2005 07:24:06 +0000 (23:24 -0800)

Documentation: more examples.

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

Everyday: a bit more example.Junio C Hamano Tue, 13 Dec 2005 02:29:53 +0000 (18:29 -0800)

Everyday: a bit more example.

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