git/git.git
15 years agoMerge 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>
15 years agoDebianization updates
Matthias 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>
15 years agoFix 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>
15 years agoAdjust 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>
15 years agoMake 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>
15 years ago[PATCH] Unify Makefile indentation
Petr 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>
15 years ago[PATCH] Use $DESTDIR instead of $dest
Petr 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>
15 years agoMake 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>
15 years agoClean generated files a bit more, to cope with Debian build droppings.
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.

15 years ago[PATCH] Add "--sign" option to git-format-patch-script
Johannes 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>
15 years agofetch-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.

15 years agoUpdate 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.

15 years agoMerge changes in the master branch into 0.99.5 preparation branch.
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.

15 years ago[PATCH] Also parse objects we already have
Daniel 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>
15 years ago[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>
15 years agoClean 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>
15 years ago[PATCH] Trapping exit in tests, using return for errors: further fixes.
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>
15 years ago[PATCH] Trapping exit in tests, using return for errors
Pavel 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>
15 years ago[PATCH] Need to set PAGER in tests
Pavel 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>
15 years ago[PATCH] Missing test_done
Pavel 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>
15 years agoString 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>
15 years agoDebian 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>
15 years agomerge-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>
15 years ago[PATCH] Speed up git-merge-base a lot
Linus 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>
15 years agoMerge 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.

15 years agoStart preparing for 0.99.5
Junio 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>
15 years agoRefine the update heuristic to improve responsiveness a bit.
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.

15 years agoGIT 0.99.4. v0.99.4
Junio 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>
15 years agoMerge 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.

15 years agoMerge 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.

15 years agoMerge 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.

15 years ago[PATCH] Fix git-rev-parse's parent handling
Johannes 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>
15 years agoOnly do an update every 100 commits when drawing the graph.
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.

15 years agoMerge 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.

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

15 years agoAdd -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.

15 years agoTeach git push .git/branches shorthand
Junio 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>
15 years agols-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>
15 years agoTeach format-patch, rebase and cherry a..b format
Junio 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>
15 years agoStash 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>
15 years agogit-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>
15 years agoIntroduce --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>
15 years agoDocument "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>
15 years agogit-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>
15 years agoUpdate 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>
15 years ago[PATCH] add *--no-merges* flag to suppress display of merge commits
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>
15 years agoUse 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>
15 years agoSmall typofix in mailsplit.c
Junio 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>
15 years agoA 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>
15 years ago[PATCH] -Werror fixes
Timo 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.

15 years ago[PATCH] Warning fix for gcc 4
Pavel 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>
15 years agoMerge 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.

15 years agoMerge 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.

15 years agoDowngrade git-send-email-script
Junio 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>
15 years ago[PATCH] "Child" information in commit window - and cleanups
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>
15 years agoMerge 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.

15 years ago[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>
15 years ago[PATCH] Plug memory leak in git-pack-objects
Sergey 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>
15 years ago[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>
15 years ago[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>
15 years ago[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>
15 years ago[PATCH] git_mkstemp() fix
Holger 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>
15 years ago[PATCH] Make curl fail on server error
Catalin 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>
15 years agoMerge 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.

15 years agoMakefile 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>
15 years agoChange 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>
15 years agoUpdate Maintainer field of debian/control
Junio 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>
15 years ago[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>
15 years agoMerge 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.

15 years agoMerge 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.

15 years agoBetter graph line details display and expand history coverage.
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.

15 years ago[PATCH] gitk "parent information" in commit window
Linus 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>
15 years agoMerge 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.

15 years agoMerge 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.

15 years ago(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>
15 years agoUse lf translation rather than binary when reading commit data.
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.)

15 years agoFix 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>
15 years agoChange cursor to a hand cursor when over a SHA1 ID link.
Paul Mackerras [Sun, 7 Aug 2005 05:27:57 +0000 (15:27 +1000)]
Change cursor to a hand cursor when over a SHA1 ID link.

This is based on suggestions by Jeff Epler and Linus Torvalds, but
extended so that we do the switching between the watch cursor and
the normal cursor correctly as well.

Also fixed a bug pointed out by Junio Hamano - I wasn't incrementing
the link number (duh!).

15 years agoFix RPM build that omitted templates and tools.
Junio C Hamano [Sun, 7 Aug 2005 03:38:13 +0000 (20:38 -0700)]
Fix RPM build that omitted templates and tools.

Many many thanks go to Chris Wright and H. Peter Anvin whose
help were essential to get me going this build.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoMerge with master.
Junio C Hamano [Sun, 7 Aug 2005 03:54:43 +0000 (20:54 -0700)]
Merge with master.

This merges commit
    bfe19f876cb20bea606e1a698030c017f31965c1
from master into our head commit
    7a59013290bb26b80c997e5698757a735f1a92e0

Sincerely,
    jit-merge command.

15 years ago[PATCH] Extend "git reset" to take a reset point
Linus Torvalds [Sun, 7 Aug 2005 01:01:03 +0000 (18:01 -0700)]
[PATCH] Extend "git reset" to take a reset point

This was triggered by a query by Sam Ravnborg, and extends "git reset" to
reset the index and the .git/HEAD pointer to an arbitrarily named point.

For example

git reset HEAD^

will just reset the current HEAD to its own parent - leaving the working
directory untouched, but effectively un-doing the top-most commit. You
might want to do this if you realize after you committed that you made a
mistake that you want to fix up: reset your HEAD back to its previous
state, fix up the working directory and re-do the commit.

If you want to totally un-do the commit (and reset your working directory
to that point too), you'd first use "git reset HEAD^" to reset to the
parent, and then do a "git checkout -f" to reset the working directory
state to that point in time too.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoGIT 0.99.4 (release candidate)
Junio C Hamano [Sat, 6 Aug 2005 20:10:43 +0000 (13:10 -0700)]
GIT 0.99.4 (release candidate)

This is my first attempt to adjust Debian and RPM to pass
prefix, to prepare the 0.99.4 release.

It updates debian/rules and git-core.spec.in to properly pass
prefix when building binary packages.  It also updates
debian/changelog to make the resulting binary package name
0.99.4; this is not needed on the RPM side (it takes the version
number from the main Makefile).

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoRedo the templates generation and installation.
Junio C Hamano [Sat, 6 Aug 2005 19:50:14 +0000 (12:50 -0700)]
Redo the templates generation and installation.

Per discussion with people interested in binary packaging,
change the default template location from /etc/git-core to
/usr/share/git-core hierarchy.  If a user wants to run git
before installing for whatever reason, in addition to adding
$src to the PATH environment variable, git-init-db can be run
with --template=$src/templates/blt/ parameter.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agogitk proposed fix: handle more than one SHA1 links.
Junio C Hamano [Sat, 6 Aug 2005 16:28:31 +0000 (09:28 -0700)]
gitk proposed fix: handle more than one SHA1 links.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agosend-pack: allow generic sha1 expression on the source side.
Junio C Hamano [Sat, 6 Aug 2005 17:12:03 +0000 (10:12 -0700)]
send-pack: allow generic sha1 expression on the source side.

This extends the source side semantics to match what Linus
suggested.

An example:

    $ git-send-pack kernel.org:/pub/scm/git/git.git pu^^:master pu

    would allow me to push the current pu into pu, and the
    commit two commits before it into master, on my public
    repository.

The revised rule for updating remote heads is as follows.

 $ git-send-pack [--all] <remote> [<ref>...]

 - When no <ref> is specified:

   - with '--all', it is the same as specifying the full refs/*
     path for all local refs;

   - without '--all', it is the same as specifying the full
     refs/* path for refs that exist on both ends;

 - When one or more <ref>s are specified:

   - a single token <ref> (i.e. no colon) must be a pattern that
     tail-matches refs/* path for an existing local ref.  It is
     an error for the pattern to match no local ref, or more
     than one local refs.  The matching ref is pushed to the
     remote end under the same name.

   - <src>:<dst> can have different cases.  <src> is first tried
     as the tail-matching pattern for refs/* path.

     - If more than one matches are found, it is an error.

     - If one match is found, <dst> must either match no remote
       ref and start with "refs/", or match exactly one remote
       ref.  That remote ref is updated with the sha1 value
       obtained from the <src> sha1.

     - If no match is found, it is given to get_extended_sha1();
       it is an error if get_extended_sha1() does not find an
       object name.  If it succeeds, <dst> must either match
       no remote ref and start with "refs/" or match exactly
       one remote ref.  That remote ref is updated with the sha1
       value.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agosend-pack: allow the same source to be pushed more than once.
Junio C Hamano [Sat, 6 Aug 2005 17:16:52 +0000 (10:16 -0700)]
send-pack: allow the same source to be pushed more than once.

The revised code accidentally inherited the restriction that a
reference can be pushed only once, only because the original did
not allow renaming.  This is no longer necessary so lift it.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years ago[PATCH] Make git-sh-setup-script do what it was supposed to do
Linus Torvalds [Sat, 6 Aug 2005 17:04:50 +0000 (10:04 -0700)]
[PATCH] Make git-sh-setup-script do what it was supposed to do

Duh. A missing && meant that half the tests that git-sh-setup-script were
_meant_ to do were actually totally ignored.

In particular, the git sanity checking ended up only testing that the
GIT_OBJECT_DIRECTORY was sane, not that GIT_DIR itself was..

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoMerge with gitk.
Junio C Hamano [Sat, 6 Aug 2005 16:24:15 +0000 (09:24 -0700)]
Merge with gitk.

This merges commit
    d698206c12a4680a92c5f4894f0345dc7dcfe62a
from gitk into our head commit
    2c6e4771959dbe8116f39587d912f1215c06cd0d

Sincerely,
    jit-merge command.

15 years agoAdd forward and back buttons and make SHA1 IDs clickable links.
Paul Mackerras [Sat, 6 Aug 2005 12:06:06 +0000 (22:06 +1000)]
Add forward and back buttons and make SHA1 IDs clickable links.

When we display the commit message in the details pane, any string
of 40 [0-9a-f] characters that corresponds to a SHA1 ID that we
know about gets turned into a clickable link, and displayed in
blue and underlined.

We now keep a history of commits that we have looked at, and we
have forward and back buttons for moving within the history list.

15 years ago[PATCH] Assorted documentation patches
Johannes Schindelin [Fri, 5 Aug 2005 15:05:02 +0000 (17:05 +0200)]
[PATCH] Assorted documentation patches

[jc: Johannes spent time and effort to see how consistent our
use of terminilogy is, and as a byproduct made these corrections
not related to the terminology unification.  I really appreciate
it.]

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years ago[PATCH] git-commit-script fix for degenerated merge
Johannes Schindelin [Fri, 5 Aug 2005 15:34:38 +0000 (17:34 +0200)]
[PATCH] git-commit-script fix for degenerated merge

If merging results in an unchanged tree, git-commit-script should not
complain that there's nothing to commit.

Also, add "[--all]" to usage().

[jc: usually there is no reason to record an unchanging merge,
but this code path is triggered only when there is a nontrivial
merge that needed to be resolved by hand, and we should be able
to record the fact that these two tree heads are dealt with as a
regular two-parent commit in order to help later merges.]

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years ago[PATCH] git: use git_mkstemp() instead of mkstemp() for diff generation.
Holger Eitzenberger [Thu, 4 Aug 2005 20:49:49 +0000 (22:49 +0200)]
[PATCH] git: use git_mkstemp() instead of mkstemp() for diff generation.

This lets you run git diff in a repository otherwise read-only
to you.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years ago[PATCH] git: add git_mkstemp()
Holger Eitzenberger [Thu, 4 Aug 2005 20:43:03 +0000 (22:43 +0200)]
[PATCH] git: add git_mkstemp()

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoFix ref_newer() in send-pack.
Junio C Hamano [Sat, 6 Aug 2005 06:05:33 +0000 (23:05 -0700)]
Fix ref_newer() in send-pack.

When more than two references need to be checked with
ref_newer() function, the second and later calls did not work
correctly.  This was because the later calls found commits
retained by the "struct object" layer that still had smudges
made by earlier calls.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoFix refname termination.
Junio C Hamano [Fri, 5 Aug 2005 23:50:54 +0000 (16:50 -0700)]
Fix refname termination.

When a new ref is being pushed, the name of it was not
terminated properly.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years ago[PATCH] Fix git-merge-cache -q
Petr Baudis [Thu, 4 Aug 2005 22:31:12 +0000 (00:31 +0200)]
[PATCH] Fix git-merge-cache -q

I'm totally stupid and got it backwards, sorry about that.
git-merge-cache -q would mean it's noisy and quiet without any
parameters.

Signed-off-by: Petr Baudis <pasky@ucw.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agogit-applymbox: allow retrying after fixing up.
Junio C Hamano [Fri, 29 Jul 2005 22:37:11 +0000 (15:37 -0700)]
git-applymbox: allow retrying after fixing up.

After failing to apply a patch, when operating under -q (query)
flag, give the user an opportunity to fix up the patch in a
separate window and retry.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoMerge with gitk.
Junio C Hamano [Fri, 5 Aug 2005 08:39:07 +0000 (01:39 -0700)]
Merge with gitk.

15 years agodaemon.c: squelch error message from EINTR
Junio C Hamano [Tue, 26 Jul 2005 20:26:52 +0000 (13:26 -0700)]
daemon.c: squelch error message from EINTR

Every time after servicing the connection, select() first fails
with EINTR and ends up waiting for one second before serving the
next client.  The sleep() was placed by the original author per
suggestion from the list to avoid spinning on failing select,
but at least this EINTR situation should not result in "at most
one client per second" service limit.

I am not sure if this is the right fix, but WTH.  The king
penguin says that serious people would run the daemon under
inetd anyway, and I agree with that.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoTeach rev-list since..til notation.
Junio C Hamano [Thu, 4 Aug 2005 09:31:15 +0000 (02:31 -0700)]
Teach rev-list since..til notation.

The King Penguin says:

    Now, for extra bonus points, maybe you should make "git-rev-list" also
    understand the "rev..rev" format (which you can't do with just the
    get_sha1() interface, since it expands into more).

The faithful servant makes it so.

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