Do not forgot that we have a separate git-tk package these days.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

"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: NPavel Roskin <proski@gnu.org>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

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: NPavel Roskin <proski@gnu.org>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

"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: NPavel Roskin <proski@gnu.org>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

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: NPavel Roskin <proski@gnu.org>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Caught this during a test setting /bin/sh to (d)ash.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

- 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: NJunio C Hamano <junkio@cox.net>

Also add some illustration requested by Linus.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

In commit 4f7eb2e5 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: NLinus Torvalds <torvalds@osdl.org>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

This merges commit
    b664550c
from gitk into our head commit
    bf570303

Sincerely,
    jit-merge command.

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.

Mark it official.  Finally.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

This merges commit
    e8c80638
from master into our head commit
    bdb71a41

Sincerely,
    jit-merge command.

This merges commit
    466e4fdd
from gitk into our head commit
    ef0bd2e6

Sincerely,
    jit-merge command.

This merges commit
    ef0bd2e6
from master into our head commit
    f69714c3

Sincerely,
    jit-merge command.

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: NJohannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

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.

This merges commit
    c35a7b8d
from master into our head commit
    edee414c

Sincerely,
    jit-merge command.

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: NJunio C Hamano <junkio@cox.net>

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: NJunio C Hamano <junkio@cox.net>

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: NJunio C Hamano <junkio@cox.net>

When rewinding the head, stash away the value of the original
HEAD in ORIG_HEAD, just like git-resolve-script does.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

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: NJunio C Hamano <junkio@cox.net>

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: NJunio C Hamano <junkio@cox.net>

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

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: NJunio C Hamano <junkio@cox.net>

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: NJunio C Hamano <junkio@cox.net>

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: NJohannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

[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: NMartin Sivak <mars@nomi.cz>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

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

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: NJunio C Hamano <junkio@cox.net>

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.

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: NPavel Roskin <proski@gnu.org>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

This merges commit
    f10e0e0b
from master into our head commit
    c3958a79

Sincerely,
    jit-merge command.

This merges commit
    b1ba39e7
from gitk into our head commit
    93b5fcdd

Sincerely,
    jit-merge command.

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: NJunio C Hamano <junkio@cox.net>

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: NLinus Torvalds <torvalds@osdl.org>
Signed-off-by: NPaul Mackerras <paulus@samba.org>

This merges commit
    c882bc93
from master into our head commit
    e764a10b

Sincerely,
    jit-merge command.