gitweb.git
Merge with master changes.Junio C Hamano Tue, 16 Aug 2005 00:02:31 +0000 (17:02 -0700)

Merge with master changes.

Tentative fix to git-commit-scriptJunio C Hamano Mon, 15 Aug 2005 22:37:37 +0000 (15:37 -0700)

Tentative fix to git-commit-script

The recent change to give the multiple commit message source was not
carrying over the authorship information from -C/-c commits correctly.
The export of the environment variable happens only in the subprocess,
not the main process that eventually runs git-commit-tree.

The right fix might be to teach git-commit-script to grok the From:
and Date: lines at the beginning of the commit message just like
git-applymbox knows how, but this has to do until that enhancement
happens.

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

Merge master changes into rc.Junio C Hamano Mon, 15 Aug 2005 22:53:37 +0000 (15:53 -0700)

Merge master changes into rc.

[PATCH] Add documentation for git repack and git-prune... Junio C Hamano Mon, 15 Aug 2005 22:48:47 +0000 (15:48 -0700)

[PATCH] Add documentation for git repack and git-prune-packed.

[jc: the patch forgot to update the main git.txt documentation,
making all these new documentation practically no-op, so I added
a minimum attempt linking them from there.]

Signed-off-by: Ryan Anderson <ryan@michonline.com>

[PATCH] clean up git scriptJunio C Hamano Mon, 15 Aug 2005 22:37:37 +0000 (15:37 -0700)

[PATCH] clean up git script

Makes git work with a pure POSIX shell (tested with bash --posix and ash).
Right now git causes ash to choke on the redundant shift on line two.

Reduces the number of system calls git makes just to do a usage
statement from 22610 to 1122, and the runtime for same from 349ms to
29ms on my x86 Linux box.

Presents a standard usage statement, and pretty prints the available
commands in a form that does not scroll off small terminals.

[jc: while shifting when $# was zero was a bug, the original
patch failed to shift when it needs to, which I fixed up.]

Signed-off-by: Amos Waterland <apw@rossby.metr.ou.edu>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Audit rev-parse users.Junio C Hamano Mon, 15 Aug 2005 22:37:37 +0000 (15:37 -0700)

Audit rev-parse users.

Make sure that we say --verify when we want to get a single SHA1
name. Also when we say --verify, --revs-only is redundant.

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

Keep excellent tutorial for using topic branches by... Junio C Hamano Mon, 15 Aug 2005 22:36:52 +0000 (15:36 -0700)

Keep excellent tutorial for using topic branches by Tony Luck

I would eventually like to move this to become a part of the tutorial,
but anyway, this was an excellent post that describes how topic
branches can be used to keep track of local changes.

[PATCH] Run Ispell through git.txtYasushi SHOJI Mon, 15 Aug 2005 15:23:06 +0000 (00:23 +0900)

[PATCH] Run Ispell through git.txt

Signed-off-by: Yasushi SHOJI <yashi@atmark-techno.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Show which branch you are on in git-status output.Junio C Hamano Mon, 15 Aug 2005 08:56:23 +0000 (01:56 -0700)

Show which branch you are on in git-status output.

When not on the "master" branch, show which branch we are
working on in the git-status message.

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

Add git-show-branches-scriptJunio C Hamano Mon, 15 Aug 2005 08:42:15 +0000 (01:42 -0700)

Add git-show-branches-script

Often I find myself wanting to do quick branches check when I am
not in the windowing environment and cannot run gitk.

This stupid script shows commits leading to the heads of
interesting branches with indication which ones belong to which
branches, so that fork point is somewhat discernible without
using gitk.

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

[PATCH] Add some simple howtos, culled from the mailing... Ryan Anderson Mon, 15 Aug 2005 08:25:53 +0000 (04:25 -0400)

[PATCH] Add some simple howtos, culled from the mailing list.

I think these are useful, and I think putting them in a new "howto"
directory might help some users until we get to the point of splitting
up the tutorial to be easier to read.

Given the authorship, I think it's safe to put these in the repository.

Signed-off-by: Ryan Anderson <ryan@michonline.com>

[PATCH] Fixed/Extended example for update hookJosef Weidendorfer Sat, 13 Aug 2005 20:39:41 +0000 (22:39 +0200)

[PATCH] Fixed/Extended example for update hook

Add sample code to distinguish --force rebased head and simple
fast-forward. At the same time fixes a real bug; the "new ref"
path was using a wrong parameter.

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

Add cheap local clone '-s' flag to git-clone-scriptJunio C Hamano Mon, 15 Aug 2005 00:25:57 +0000 (17:25 -0700)

Add cheap local clone '-s' flag to git-clone-script

Using the $GIT_OBJECT_DIRECTORY/info/alternates mechanism,
create a new repository that borrows objects from the original
repository when --shared flag is given in addition to --local.

It is worth pointing out that the "cloned" repository depends on
the original repository, so this should be used only when you
can reasonably trust that the original repository would not
disappear without your knowing.

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

Alternate object pool mechanism updates.Junio C Hamano Mon, 15 Aug 2005 00:25:57 +0000 (17:25 -0700)

Alternate object pool mechanism updates.

It was a mistake to use GIT_ALTERNATE_OBJECT_DIRECTORIES
environment variable to specify what alternate object pools to
look for missing objects when working with an object database.
It is not a property of the process running the git commands,
but a property of the object database that is partial and needs
other object pools to complete the set of objects it lacks.

This patch allows you to have $GIT_OBJECT_DIRECTORY/info/alternates
whose contents is in exactly the same format as the environment
variable, to let an object database name alternate object pools
it depends on.

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

Documentation updates.Junio C Hamano Mon, 15 Aug 2005 00:24:36 +0000 (17:24 -0700)

Documentation updates.

Linus brought up that documentation for many commands have
incorrect attribution. I started counting lines again, but
ended up adding a handful of missing manual pages.

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

Merge master into rcJunio C Hamano Sun, 14 Aug 2005 01:38:52 +0000 (18:38 -0700)

Merge master into rc

[PATCH] plug memory leak in diff.c::diff_free_filepair()Yasushi SHOJI Sat, 13 Aug 2005 10:58:56 +0000 (19:58 +0900)

[PATCH] plug memory leak in diff.c::diff_free_filepair()

When I run git-diff-tree on big change, it seems the command eats so
much memory. so I just put git under valgrind to see what's going on.
diff_free_filespec_data() doesn't free diff_filespec itself.

[jc: I ended up doing things slightly differently from Yasushi's
patch. The original idea was to use free_filespec_data() only to
free the data portion and keep useing the filespec itself, but
no existing code seems to do things that way, so I just yanked
that part out.]

Signed-off-by: Yasushi SHOJI <yashi@atmark-techno.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

[PATCH] fix null TZ problems on os/xBrad Roberts Sat, 13 Aug 2005 10:22:46 +0000 (03:22 -0700)

[PATCH] fix null TZ problems on os/x

It seems that the localtime() libc routine doesn't care for finding a TZ
that's empty. It's ok with TZ not being set. Setting the TZ to GMT allowed
these tests to pass.

$ uname -v
Darwin Kernel Version 7.9.0: Wed Mar 30 20:11:17 PST 2005; root:xnu/xnu-517.12.7.obj~1/RELEASE_PPC

Signed-off-by: Brad Roberts <braddr@puremagic.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

[PATCH] fix git-checkout-cache segfault on pariscJames Bottomley Sat, 13 Aug 2005 15:29:32 +0000 (10:29 -0500)

[PATCH] fix git-checkout-cache segfault on parisc

The index cleanup code is executed via atexit() which is *after* main
has completed, so the stack allocated cache_file has gone out of scope.
Parisc seems to use stack in the destructor functions, so cache_file
gets partially overwritten leading to the predictable disastrous
consequences.

[jc: Just to make sure, I audited other users of the function
hold_index_file_for_update() to make sure they do not have this
problem; everybody else uses non-stack cache_file structure and
is fine. Thanks, James.]

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

[PATCH] Make get_sha1_basic() more carefulLinus Torvalds Sat, 13 Aug 2005 18:05:25 +0000 (11:05 -0700)

[PATCH] Make get_sha1_basic() more careful

The "get_sha1_hex()" function is designed to work with SHA1 hex strings
that may be followed by arbitrary crud. However, that's not acceptable for
"get_sha1()" which is used for command line arguments etc: we don't want
to silently allow random characters after the end of the SHA1.

So verify that the hex string is all we have.

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

[PATCH] Make sure git-resolve-script always works on... Linus Torvalds Sat, 13 Aug 2005 17:50:56 +0000 (10:50 -0700)

[PATCH] Make sure git-resolve-script always works on commits

You can resolve a tag, and it does the right thing except that it might
end up writing the tag itself into the resulting HEAD, which will confuse
subsequent operations no end.

This makes sure that when we resolve two heads, we will have turned them
into proper commits before we start acting on them.

This also fixes the parsing of "treeish^0", which would incorrectly
resolve to "treeish" instead of causing an error.

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

Add SubmittingPatchesJunio C Hamano Sat, 13 Aug 2005 06:48:09 +0000 (23:48 -0700)

Add SubmittingPatches

Not that I have stricter patch submission standard than ordinary
projects, I wanted to have it to make sure people understand
what they are doing when they add their own Signed-off-by line.

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

Add --signoff and --verify option to git commit.Junio C Hamano Sat, 13 Aug 2005 06:39:15 +0000 (23:39 -0700)

Add --signoff and --verify option to git commit.

As brought up in the discussion which followed a patch to add a
signed-off-by line with the --sign flag to format-patch from
Johannes Schindelin, add --signoff to the git commit command.

Also add --verify to make sure the lines you introduced are
clean, which is more useful in commit but not very much in
format-patch as it was originally implemented, because finding
botches at format-patch time is too late.

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

Merge master changes into release candidate branch.Junio C Hamano Sat, 13 Aug 2005 07:12:51 +0000 (00:12 -0700)

Merge master changes into release candidate branch.

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

Debianization updatesMatthias Urlichs Sat, 13 Aug 2005 00:38:15 +0000 (02:38 +0200)

Debianization updates

git-tk should be architecture independent.
git-core forgot to depend on perl.

Signed-Off-By: Matthias Urlichs <smurf@debian.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Fix debianization: mark git-tk architecture neutral.Junio C Hamano Fri, 12 Aug 2005 20:32:02 +0000 (13:32 -0700)

Fix debianization: mark git-tk architecture neutral.

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

Adjust binary packaging to dest=>DESTDIR change.Junio C Hamano Fri, 12 Aug 2005 19:25:34 +0000 (12:25 -0700)

Adjust binary packaging to dest=>DESTDIR change.

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

Make tools/ directory first-class citizen.Junio C Hamano Fri, 12 Aug 2005 17:37:33 +0000 (10:37 -0700)

Make tools/ directory first-class citizen.

Tools directory being separate is just a historical
coincidence. Build and install together with the main
directory, just like the clean target does.

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

[PATCH] Unify Makefile indentationPetr Baudis Thu, 4 Aug 2005 22:52:46 +0000 (00:52 +0200)

[PATCH] Unify Makefile indentation

Use <tab> instead of two spaces uniformly in the Makefile, even in the
ifdefs. Gives it a nice consistent look.

[jc: At the same time I indented the nested ifdefs to make them
slightly easier to read.]

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

[PATCH] Use $DESTDIR instead of $destPetr Baudis Thu, 4 Aug 2005 23:56:38 +0000 (01:56 +0200)

[PATCH] Use $DESTDIR instead of $dest

$DESTDIR is more usual during the build than $dest and is what
is usually used in the makefiles, so let's use it too.

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

Make CFLAGS overridable from make command line.Pavel Roskin Sat, 6 Aug 2005 05:36:15 +0000 (01:36 -0400)

Make CFLAGS overridable from make command line.

This patch renames COPTS to CFLAGS, because it's COPTS that was user
overridable. Also, -Wall is moved there because it's optional. What
was CFLAGS is now ALL_CFLAGS, which users should not override.

Defines are added to DEFINES. Since ALL_CFLAGS is recursively expanded,
it uses the final value of DEFINES.

Implicit rules are made explicit since the implicit rules use CFLAGS
rather than ALL_CFLAGS. I believe that serious projects should not rely
on implicit rules anyway. Percent rules are used because they are used
already and because they don't need the .SUFFIXES target.

[jc: in addition to updating the patch for 0.99.4, I fixed up a
glitch in Pavel's original patch which compiled sha1.o out of
mozilla-sha1/sha1.c, where it should have left the resulting
object file in mozilla-sha1 directory for later "ar".]

Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Clean generated files a bit more, to cope with Debian... Junio C Hamano Fri, 12 Aug 2005 08:03:07 +0000 (01:03 -0700)

Clean generated files a bit more, to cope with Debian build droppings.

Also attempt to build a source package for debian.

[PATCH] Add "--sign" option to git-format-patch-scriptJohannes Schindelin Fri, 12 Aug 2005 13:32:42 +0000 (15:32 +0200)

[PATCH] Add "--sign" option to git-format-patch-script

This adds the option "--sign" to git-format-patch-script which adds
a Signed-off-by: line automatically.

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

fetch-pack: start multi-head pulling.Junio C Hamano Fri, 12 Aug 2005 09:08:29 +0000 (02:08 -0700)

fetch-pack: start multi-head pulling.

This is a beginning of resurrecting the multi-head pulling support
for git-fetch-pack command. The git-fetch-script wrapper still
only knows about fetching a single head, without renaming, so it is
not very useful unless you directly call git-fetch-pack itself yet.

It also fixes a longstanding obsolete description of how the command
discovers the list of local commits.

Update unpack-objects usage and documentation.Junio C Hamano Fri, 12 Aug 2005 08:45:52 +0000 (01:45 -0700)

Update unpack-objects usage and documentation.

It long supported -q flag to suppress progress meter without
properly being documented.

Merge changes in the master branch into 0.99.5 preparat... Junio C Hamano Fri, 12 Aug 2005 05:12:29 +0000 (22:12 -0700)

Merge changes in the master branch into 0.99.5 preparation branch.

[PATCH] Also parse objects we already haveDaniel Barkalow Fri, 12 Aug 2005 03:17:55 +0000 (23:17 -0400)

[PATCH] Also parse objects we already have

In the case where we don't know from context what type an object is, but
we don't have to fetch it, we need to parse it to determine the type
before processing it.

Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

[PATCH] Fix parallel pull dependancy tracking.Daniel Barkalow Thu, 11 Aug 2005 23:38:09 +0000 (19:38 -0400)

[PATCH] Fix parallel pull dependancy tracking.

It didn't refetch an object it already had (good), but didn't process
it, either (bad). Synchronously process anything you already have.

Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Clean generated deb files.Junio C Hamano Fri, 12 Aug 2005 01:52:34 +0000 (18:52 -0700)

Clean generated deb files.

Do not forgot that we have a separate git-tk package these days.

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

[PATCH] Trapping exit in tests, using return for errors... Pavel Roskin Thu, 11 Aug 2005 16:00:40 +0000 (12:00 -0400)

[PATCH] Trapping exit in tests, using return for errors: further fixes.

"return" from a test would leave the exit trap set, which could cause a
spurious error message if it's the last test in the script or
--immediate is used.

The easiest solution would be to have a global trap that is set when
test-lib.sh is sourced and unset either by test_done(), error() or by
test_failure_() with --immediate.

Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

[PATCH] Trapping exit in tests, using return for errorsPavel Roskin Thu, 11 Aug 2005 03:56:21 +0000 (23:56 -0400)

[PATCH] Trapping exit in tests, using return for errors

I have noticed that "make test" fails without any explanations when the
"merge" utility is missing. I don't think tests should be silent in
case of failure.

It turned out that the particular test was using "exit" to interrupt the
test in case of an error. This caused the whole test script to exit.
No further tests would be run even if "--immediate" wasn't specified.
No error message was printed.

This patch does following:

All instances of "exit", "exit 1" and "(exit 1)" in tests have been
replaced with "return 1". In fact, "(exit 1)" had no effect.

File descriptor 5 is duplicated from file descriptor 1. This is needed
to print important error messages from tests.

New function test_run_() has been introduced. Any "return" in the test
would merely cause that function to return without skipping calls to
test_failure_() and test_ok_(). The new function also traps "exit" and
treats it like a fatal error (in case somebody reintroduces "exit" in
the tests).

test_expect_failure() and test_expect_success() check both the result of
eval and the return value of test_run_(). If the later is not 0, it's
always a failure because it indicates the the test didn't complete.

Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

[PATCH] Need to set PAGER in testsPavel Roskin Thu, 11 Aug 2005 02:10:01 +0000 (22:10 -0400)

[PATCH] Need to set PAGER in tests

"t5400-send-pack.sh --verbose" stops waiting for user input. It happens
because "git log" uses less for output now. To prevent this, PAGER
should be set to cat.

Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

[PATCH] Missing test_donePavel Roskin Thu, 11 Aug 2005 02:15:02 +0000 (22:15 -0400)

[PATCH] Missing test_done

All test scripts should end with test_done, which reports the test
results. In the future, it could be used for other purposes, e.g. to
distinguish graceful end from "exit" in a test. This patch fixes
scripts that don't call test_done.

Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

String comparison of test is done with '=', not '=='.Junio C Hamano Thu, 11 Aug 2005 05:53:27 +0000 (22:53 -0700)

String comparison of test is done with '=', not '=='.

Caught this during a test setting /bin/sh to (d)ash.

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

Debian packaging fixes.Matthias Urlichs Wed, 10 Aug 2005 23:54:36 +0000 (01:54 +0200)

Debian packaging fixes.

- Split gitk off to its own package;
it needs tk installed, but nothing else does.
- Refer to GPL properly, don't install COPYING.
- Fix maintainer.
- Use dh_movefiles instead of dh_install;
we don't want to list everything *except* gitk.

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

merge-base.c: pathological case fix.Junio C Hamano Fri, 12 Aug 2005 01:13:55 +0000 (18:13 -0700)

merge-base.c: pathological case fix.

Also add some illustration requested by Linus.

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

[PATCH] Speed up git-merge-base a lotLinus Torvalds Wed, 10 Aug 2005 23:26:32 +0000 (16:26 -0700)

[PATCH] Speed up git-merge-base a lot

In commit 4f7eb2e5a351e0d1f19fd4eab7e92834cc4528c2 I fixed git-merge-base
getting confused by datestamps that caused it to traverse things in a
non-obvious order.

However, my fix was a very brute-force one, and it had some really
horrible implications for more complex trees with lots of parallell
development. It might end up traversing all the way to the root commit.

Now, normally that isn't that horrible: it's used mainly for merging, and
the bad cases really tend to happen fairly rarely, so if it takes a few
seconds, we're not in too bad shape.

However, gitk will also do the git-merge-base for every merge it shows,
because it basically re-does the trivial merge in order to show the
"interesting" parts. And there we'd really like the result to be
instantaneous.

This patch does that by walking the tree more completely, and using the
same heuristic as git-rev-list to decide "ok, the rest is uninteresting".

In one - hopefully fairly extreme - case, it made a git-merge-base go from
just under five seconds(!) to a tenth of a second on my machine.

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

Merge with gitk.Junio C Hamano Fri, 12 Aug 2005 01:24:35 +0000 (18:24 -0700)

Merge with gitk.

This merges commit
b664550c066810b770ad3e19cafe2fbdd42c6793
from gitk into our head commit
bf570303153902ec3d85570ed24515bcf8948848

Sincerely,
jit-merge command.

Start preparing for 0.99.5Junio C Hamano Thu, 11 Aug 2005 05:05:59 +0000 (22:05 -0700)

Start preparing for 0.99.5

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

Refine the update heuristic to improve responsiveness... Paul Mackerras Wed, 10 Aug 2005 23:56:23 +0000 (09:56 +1000)

Refine the update heuristic to improve responsiveness a bit.

The previous commit improved performance a lot but also meant that
we waited longer to see something drawn. This refines the heuristics
for when to call update so that (1) when we have finished processing
a bufferfull of information from git-rev-list, we call update if
enough time has elapsed, regardless of how many commits we've drawn,
and (2) the number of commits drawn between updates scales with the
total number of commits drawn: 1 for 1-99 commits, 10 for 100-9999
commits, or 100 for >= 10000 commits.

GIT 0.99.4. v0.99.4Junio C Hamano Wed, 10 Aug 2005 21:43:08 +0000 (14:43 -0700)

GIT 0.99.4.

Mark it official. Finally.

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

Merge with master.Junio C Hamano Wed, 10 Aug 2005 20:20:08 +0000 (13:20 -0700)

Merge with master.

This merges commit
e8c80638abc99928dba9ac832589749a531e2e21
from master into our head commit
bdb71a41caa9ffed2e3207736c21fffbc2007670

Sincerely,
jit-merge command.

Merge with gitk.Junio C Hamano Wed, 10 Aug 2005 20:18:11 +0000 (13:18 -0700)

Merge with gitk.

This merges commit
466e4fdd6696c89700294e1a54fa73e1fb94643b
from gitk into our head commit
ef0bd2e6e643f09a8294937caf99463328b9215a

Sincerely,
jit-merge command.

Merge with master.Junio C Hamano Wed, 10 Aug 2005 17:55:54 +0000 (10:55 -0700)

Merge with master.

This merges commit
ef0bd2e6e643f09a8294937caf99463328b9215a
from master into our head commit
f69714c38c6f3296a4bfba0d057e0f1605373f49

Sincerely,
jit-merge command.

[PATCH] Fix git-rev-parse's parent handlingJohannes Schindelin Wed, 10 Aug 2005 03:07:36 +0000 (05:07 +0200)

[PATCH] Fix git-rev-parse's parent handling

git-rev-parse HEAD^1 would fail, because of an off-by-one bug (but HEAD^
would yield the expected result). Also, when the parent does not exist, do
not silently return an incorrect SHA1. Of course, this no longer applies
to git-rev-parse alone, but every user of get_sha1().

While at it, add a test.

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

Only do an update every 100 commits when drawing the... Paul Mackerras Wed, 10 Aug 2005 12:50:28 +0000 (22:50 +1000)

Only do an update every 100 commits when drawing the graph.

On a large repository with > 60,000 commits, each call to the Tk
update primitive (which gives Tk a chance to respond to events and
redraw the screen) was taking up to 0.2 seconds. Because the logic
was to call update after drawing a commit if 0.1 seconds had passed
since the last update call, we were calling it for every commit,
which was slowing us down enormously. Now we also require that we
have drawn 100 commits since the last update (as well as it being
at least 0.1 seconds since the last update). Drawing 100 commits
takes around 0.1 - 0.2 seconds (even in this large repo) on my G5.

Merge with master.Junio C Hamano Wed, 10 Aug 2005 07:10:18 +0000 (00:10 -0700)

Merge with master.

This merges commit
c35a7b8d806317dc1762e36561cbd31c2530dd9c
from master into our head commit
edee414c3e5a546aae3dd1529f397df949713305

Sincerely,
jit-merge command.

Skip merges in format-patch.Junio C Hamano Wed, 10 Aug 2005 07:06:16 +0000 (00:06 -0700)

Skip merges in format-patch.

Add -v option to git-cherry.Junio C Hamano Wed, 10 Aug 2005 06:58:35 +0000 (23:58 -0700)

Add -v option to git-cherry.

Teach git push .git/branches shorthandJunio C Hamano Mon, 8 Aug 2005 05:55:45 +0000 (22:55 -0700)

Teach git push .git/branches shorthand

Although it is uncertain if we would keep .git/branches for
long, the shorthand stored there can be used for pushing if it
is host:path/to/git format, so let's make use of it. This does
not use git-parse-remote because that script will be rewritten
quite a bit for updated pulling.

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

ls-remote: drop storing operation and add documentation.Junio C Hamano Mon, 8 Aug 2005 08:20:03 +0000 (01:20 -0700)

ls-remote: drop storing operation and add documentation.

The store operation was never useful because we needed to fetch
the objects needed to complete the reference. Remove it.

The fetch command fetch multiple references shortly to
replace the lost "store" functionality in more a generic way.

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

Teach format-patch, rebase and cherry a..b formatJunio C Hamano Sun, 7 Aug 2005 22:51:09 +0000 (15:51 -0700)

Teach format-patch, rebase and cherry a..b format

Although these commands take only begin and end, not necessarily
generic SHA1 expressions rev-parse supports, supporting a..b
notation is good for consistency. This commit adds such without
breaking backward compatibility.

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

Stash away the original head in ORIG_HEAD when resetting.Junio C Hamano Sun, 7 Aug 2005 03:59:47 +0000 (20:59 -0700)

Stash away the original head in ORIG_HEAD when resetting.

When rewinding the head, stash away the value of the original
HEAD in ORIG_HEAD, just like git-resolve-script does.

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

git-revert: revert an existing commit.Junio C Hamano Wed, 10 Aug 2005 05:30:17 +0000 (22:30 -0700)

git-revert: revert an existing commit.

Given one existing commit, revert the change the patch
introduces, and record a new commit that records it. This
requires your working tree to be clean (no modifications from
the HEAD commit).

This is based on what Linus posted to the list, with
enhancements he suggested, including the use of -M to attempt
reverting renames.

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

Introduce --pretty=oneline format.Junio C Hamano Tue, 9 Aug 2005 05:15:40 +0000 (22:15 -0700)

Introduce --pretty=oneline format.

This introduces --pretty=oneline to git-rev-tree and
git-rev-list commands to show only the first line of the commit
message, without frills.

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

Document "git commit"Junio C Hamano Tue, 9 Aug 2005 00:39:18 +0000 (17:39 -0700)

Document "git commit"

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

git-commit: log parameter updates.Junio C Hamano Tue, 9 Aug 2005 00:03:14 +0000 (17:03 -0700)

git-commit: log parameter updates.

While moving '-m' to make room for CVS compatible "here is the
log message", enhance source of log parameters.

-m 'message': a command line parameter.
-F <file> : a file (use '-' to read from stdin).
-C <commit> : message in existing commit.
-c <commit> : message in existing commit (allows further editing).

Longer option names for these options are also available.

While we are at it, get rid of shell array bashism.

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

Update rev-parse flags list.Junio C Hamano Tue, 9 Aug 2005 02:31:37 +0000 (19:31 -0700)

Update rev-parse flags list.

I haven't audited the rev-parse users, but I am having a feeling
that many of them would choke when they expect a couple of SHA1
object names and malicious user feeds them "--max-count=6" or
somesuch to shoot himself in the foot. Anyway, this adds a
couple of missing parameters that affect the list of revs to be
returned from rev-list, not the flags that affect how they are
presented by rev-list. I think that is the intention, but I am
not quite sure.

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

[PATCH] add *--no-merges* flag to suppress display... Johannes Schindelin Mon, 8 Aug 2005 09:37:21 +0000 (11:37 +0200)

[PATCH] add *--no-merges* flag to suppress display of merge commits

As requested by Junio (who suggested --single-parents-only, but this
could forget a no-parent root).

Also, adds a few missing options to the usage string.

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

Use GIT_SSH environment to specify alternate ssh binary.Martin Sivak Wed, 3 Aug 2005 15:15:42 +0000 (17:15 +0200)

Use GIT_SSH environment to specify alternate ssh binary.

[jc: I ended up rewriting Martin's patch due to whitespace
breakage, but the credit goes to Martin for doing the initial
patch to identify what needs to be changed.]

Signed-off-by: Martin Sivak <mars@nomi.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Small typofix in mailsplit.cJunio C Hamano Wed, 10 Aug 2005 05:21:51 +0000 (22:21 -0700)

Small typofix in mailsplit.c

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

A bit more format warning squelching.Junio C Hamano Wed, 10 Aug 2005 04:25:46 +0000 (21:25 -0700)

A bit more format warning squelching.

Inspired by patch from Timo Sirainen. Most of them are not
strictly necessary but making warnings less chatty would help
spot real bugs later.

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

[PATCH] -Werror fixesTimo Sirainen Tue, 9 Aug 2005 15:30:22 +0000 (18:30 +0300)

[PATCH] -Werror fixes

GCC's format __attribute__ is good for checking errors, especially
with -Wformat=2 parameter. This fixes most of the reported problems
against 2005-08-09 snapshot.

[PATCH] Warning fix for gcc 4Pavel Roskin Tue, 9 Aug 2005 20:54:40 +0000 (16:54 -0400)

[PATCH] Warning fix for gcc 4

This patch fixes the only warning reported by gcc 4.0.1 on Fedora Core 4
for x86_64:

sha1_file.c:1391: warning: pointer targets in assignment differ in
signedness

Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge with master.Junio C Hamano Tue, 9 Aug 2005 17:22:23 +0000 (10:22 -0700)

Merge with master.

This merges commit
f10e0e0b18c8e2e69535e7380fb3c1f9b097cfda
from master into our head commit
c3958a7926ab20b90fe0767580b466698477f5b6

Sincerely,
jit-merge command.

Merge with gitk.Junio C Hamano Tue, 9 Aug 2005 17:21:09 +0000 (10:21 -0700)

Merge with gitk.

This merges commit
b1ba39e7e80cdee3e7c1c80334cd9aa87b9b7b69
from gitk into our head commit
93b5fcdd8ddaa7f55ce1a43d8b9eaed1d5febc98

Sincerely,
jit-merge command.

Downgrade git-send-email-scriptJunio C Hamano Tue, 9 Aug 2005 17:16:12 +0000 (10:16 -0700)

Downgrade git-send-email-script

RPM folks have problem installing the package otherwise. Since
its usefulness does have much to do with GIT, downgrade it to
"contrib" status for now. We may want to move it to contrib/
subdirectory after auditing other programs when we reorganize
the source tree.

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

[PATCH] "Child" information in commit window - and... Linus Torvalds Tue, 9 Aug 2005 03:04:20 +0000 (20:04 -0700)

[PATCH] "Child" information in commit window - and cleanups

This adds "Child: " lines to the commit window, which tells what children
a commit has.

It also cleans things up: it marks the text widget as no-wrap, which means
that it doesn't need to truncate the commit description arbitrarily by
hand. Also, the description itself is now done by a common helper routine
that handles both the parent and the children.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>

Merge with master.Junio C Hamano Tue, 9 Aug 2005 05:57:57 +0000 (22:57 -0700)

Merge with master.

This merges commit
c882bc932f6702a935c748893536356b0bba11ce
from master into our head commit
e764a10b17610ed9b3969bdb351e09f9635eb0ab

Sincerely,
jit-merge command.

[PATCH] Add -m <message> option to "git tag"Chris Wright Tue, 9 Aug 2005 00:04:42 +0000 (17:04 -0700)

[PATCH] Add -m <message> option to "git tag"

Allow users to create a tag message by passing message on command line
instead of requiring an $EDITOR session.

Signed-off-by: Chris Wright <chrisw@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

[PATCH] Plug memory leak in git-pack-objectsSergey Vlasov Mon, 8 Aug 2005 18:46:58 +0000 (22:46 +0400)

[PATCH] Plug memory leak in git-pack-objects

find_deltas() should free its temporary objects before returning.

[jc: Sergey, if you have [PATCH] title on the Subject line of your
e-mail, please do not repeat it on the first line in your message
body. Thanks.]

Signed-off-by: Sergey Vlasov <vsu@altlinux.ru>
Signed-off-by: Junio C Hamano <junkio@cox.net>

[PATCH] Plug memory leak in sha1close()Sergey Vlasov Mon, 8 Aug 2005 18:46:13 +0000 (22:46 +0400)

[PATCH] Plug memory leak in sha1close()

sha1create() and sha1fd() malloc the returned struct sha1file;
sha1close() should free it.

Signed-off-by: Sergey Vlasov <vsu@altlinux.ru>
Signed-off-by: Junio C Hamano <junkio@cox.net>

[PATCH] Plug memory leak in write_sha1_to_fd()Sergey Vlasov Mon, 8 Aug 2005 18:45:36 +0000 (22:45 +0400)

[PATCH] Plug memory leak in write_sha1_to_fd()

If the object to write was packed, both its uncompressed and compressed
data were leaked. If the object was not packed, its file was not unmapped.

[jc: I think it still leaks on the write error path of
write_sha1_to_fd(), but that should be fixable in a small separate
patch.]

Signed-off-by: Sergey Vlasov <vsu@altlinux.ru>
Signed-off-by: Junio C Hamano <junkio@cox.net>

[PATCH] Plug memory leak in read_object_with_reference()Sergey Vlasov Mon, 8 Aug 2005 18:44:43 +0000 (22:44 +0400)

[PATCH] Plug memory leak in read_object_with_reference()

When following a reference, read_object_with_reference() did not free the
intermediate object data.

Signed-off-by: Sergey Vlasov <vsu@altlinux.ru>
Signed-off-by: Junio C Hamano <junkio@cox.net>

[PATCH] git_mkstemp() fixHolger Eitzenberger Mon, 8 Aug 2005 20:33:08 +0000 (22:33 +0200)

[PATCH] git_mkstemp() fix

git_mkstemp() attempted to use TMPDIR environment variable, but it botched
copying the templates.

[jc: Holger, please add your own Signed-off-by line, and also if you can,
send in future patches as non attachments.]

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

[PATCH] Make curl fail on server errorCatalin Marinas Mon, 8 Aug 2005 09:53:23 +0000 (10:53 +0100)

[PATCH] Make curl fail on server error

Some http servers return an HTML error page and git reads it as normal
data. Adding -f option makes curl fail silently.

Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge with master.Junio C Hamano Tue, 9 Aug 2005 01:02:39 +0000 (18:02 -0700)

Merge with master.

This merges commit
3c4e8a636f4de3668b24d0020df731cdc78ae6e9
from master into our head commit
80f45687f44b6258b0eacae6b1ae15e3ad4a6552

Sincerely,
jit-merge command.

Makefile dependency fix.Junio C Hamano Mon, 8 Aug 2005 22:58:54 +0000 (15:58 -0700)

Makefile dependency fix.

Johannes Schindelin noticed that recent Makefile updates were
too eager to loosen dependencies.

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

Change RPM dependency from Prereq to Requires.Junio C Hamano Mon, 8 Aug 2005 22:03:39 +0000 (15:03 -0700)

Change RPM dependency from Prereq to Requires.

Sergey Vlasov says we do not pre-require (i.e. required packages
during installation) the dependencies, and should use Requires
instead of Prereq. Knowing nothing about RPM, I just believe
him.

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

Update Maintainer field of debian/controlJunio C Hamano Mon, 8 Aug 2005 06:21:38 +0000 (23:21 -0700)

Update Maintainer field of debian/control

My understanding is that having my name there is just as wrong
as having name of Linus, since neither of us is a debian
maintainer, but at least this would prevent people from bugging
Linus.

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

[PATCH] RPM spec updates.Horst von Brand Mon, 8 Aug 2005 03:18:19 +0000 (23:18 -0400)

[PATCH] RPM spec updates.

Fix description and clean up the spec file.

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

Merge with master.Junio C Hamano Mon, 8 Aug 2005 00:10:50 +0000 (17:10 -0700)

Merge with master.

This merges commit
d59a6043a8a7aed97c684fb4f14fe5221df1fcaf
from master into our head commit
1ff53bfdeea4d707571c9cae818888c070b51153

Sincerely,
jit-merge command.

Merge with gitk.Junio C Hamano Mon, 8 Aug 2005 00:10:20 +0000 (17:10 -0700)

Merge with gitk.

This merges commit
fa4da7b32e1197fa5032db6a2de7749868253f8b
from gitk into our head commit
6b7242aa1acc3c7835f80522914ffc4b2e789a29

Sincerely,
jit-merge command.

Better graph line details display and expand history... Paul Mackerras Sun, 7 Aug 2005 23:47:22 +0000 (09:47 +1000)

Better graph line details display and expand history coverage.

Now the history remembers when we have clicked on a graph line
and when we have asked for a diff between two commits, as well
as when we have displayed a commit.

The display when you click on a graph line now uses clickable
SHA1 IDs instead of the embedded "Go" buttons. Also made the
IDs clickable in the header for a diff between two commits.

[PATCH] gitk "parent information" in commit windowLinus Torvalds Sun, 7 Aug 2005 20:58:56 +0000 (13:58 -0700)

[PATCH] gitk "parent information" in commit window

This adds a useful "Parent:" line to the git commit information window.

It looks something like this (from the infamous octopus merge):

Author: Junio C Hamano <junkio@cox.net> 2005-05-05 16:16:54
Committer: Junio C Hamano <junkio@cox.net> 2005-05-05 16:16:54
Parent: fc54a9c30ccad3fde5890d2c0ca2e2acc0848fbc (Update git-apply-patch-script ...)
Parent: 9e30dd7c0ecc9f10372f31539d0122db97418353 (Make git-prune-script executa ...)
Parent: c4b83e618f1df7d8ecc9392fa40e5bebccbe6b5a (Do not write out new index if ...)
Parent: 660265909fc178581ef327076716dfd3550e6e7b (diff-cache shows differences ...)
Parent: b28858bf65d4fd6d8bb070865518ec43817fe7f3 (Update diff engine for symlin ...)

Octopus merge of the following five patches.

Update git-apply-patch-script for symbolic links.
Make git-prune-script executable again.
Do not write out new index if nothing has changed.
diff-cache shows differences for unmerged paths without --cache.
Update diff engine for symlinks stored in the cache.

Signed-off-by: Junio C Hamano <junkio@cox.net>
where all the parent commit ID's are clickable, because the new lines are
added as part of the "comment" string, and thus the regular clickability
thing will match them automatically.

I think this is good. And my random-tcl-monkey-skills are clearly getting
better (although it's perfectly possible that somebody who actually knows
what he is doing would have done things differently).

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>

Merge with master.Junio C Hamano Sun, 7 Aug 2005 21:12:38 +0000 (14:12 -0700)

Merge with master.

This merges commit
6b7242aa1acc3c7835f80522914ffc4b2e789a29
from master into our head commit
f29eaed12fc07bc5b2e4d1a302136a26ff4488ce

Sincerely,
jit-merge command.

Merge with gitk.Junio C Hamano Sun, 7 Aug 2005 21:11:08 +0000 (14:11 -0700)

Merge with gitk.

This merges commit
d6e8149bc53de57cab7cc0d9aff6c2341f3a7efa
from gitk into our head commit
200e7fbbac82b6665f8175af0e375fbef3568c30

Sincerely,
jit-merge command.

(revert local fix)Junio C Hamano Sun, 7 Aug 2005 21:11:02 +0000 (14:11 -0700)

(revert local fix)

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

Use lf translation rather than binary when reading... Paul Mackerras Sun, 7 Aug 2005 10:01:24 +0000 (20:01 +1000)

Use lf translation rather than binary when reading commit data.

The effect of this is that it allows Tcl to do the locale-specific
conversion of the input data to its internal unicode representation.
That means that commit messages in Russian or other languages should
be displayed correctly now (according to the locale that is in effect.)

Fix build rules for debian package.Junio C Hamano Sun, 7 Aug 2005 05:29:21 +0000 (22:29 -0700)

Fix build rules for debian package.

Run install-tools target to install the tools to accept e-mail
patches. Also clean up the main Makefile a bit.

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