git/git.git
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 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 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>
15 years agoUpdate get_sha1() to grok extended format.
Junio C Hamano [Thu, 4 Aug 2005 05:15:49 +0000 (22:15 -0700)]
Update get_sha1() to grok extended format.

Everybody envies rev-parse, who is the only one that can grok
the extended sha1 format.  Move the get_extended_sha1() out of
rev-parse, rename it to get_sha1() and make it available to
everybody else.

The one I posted earlier to the list had one bug where it did
not handle a name that ends with a digit correctly (it
incorrectly tried the "Nth parent" path).  This commit fixes it.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoFix send-pack for non-commitish tags.
Junio C Hamano [Fri, 5 Aug 2005 07:47:56 +0000 (00:47 -0700)]
Fix send-pack for non-commitish tags.

Again I left the v2.6.11-tree tag behind.  My bad.

This commit makes sure that we do not barf when pushing a ref
that is a non-commitish tag.  You can update a remote ref under
the following conditions:

 * You can always use --force.
 * Creating a brand new ref is OK.
 * If the remote ref is exactly the same as what you are
   pushing, it is OK (nothing is pushed).
 * You can replace a commitish with another commitish which is a
   descendant of it, if you can verify the ancestry between them;
   this and the above means you have to have what you are replacing.
 * Otherwise you cannot update; you need to use --force.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agogit-init-db: brown paper bag bugfix.
Junio C Hamano [Fri, 5 Aug 2005 04:43:43 +0000 (21:43 -0700)]
git-init-db: brown paper bag bugfix.

OK, I admit I am an idiot.  I ended up creating bunch of garbage
directories like .git/HEADbranch/ .git/HEADrefs/...

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoCompress the graph horizontally if it gets too wide.
Paul Mackerras [Thu, 4 Aug 2005 23:52:16 +0000 (09:52 +1000)]
Compress the graph horizontally if it gets too wide.

If the graph gets to use more than a certain percentage (default 50%)
of the width of the top-left pane, we now reduce the amount of space
allowed for each graph line.  This means it doesn't look quite as
nice but you can still see the headline for the commit.  (Currently
the only way to customize the percentage is to edit your ~/.gitk
file manually.)

15 years agogit-bisect termination condition fix.
Junio C Hamano [Thu, 4 Aug 2005 08:17:05 +0000 (01:17 -0700)]
git-bisect termination condition fix.

When I munged the original from Linus, which did not terminate
when the last bisect to check happened to be a bad one, to
terminate, I seem to have botched the end result to pick.

Thanks for Sanjoy Mahajan for a good reproduction recipe to
diagnose this.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoRetire git-check-files documentation too.
Junio C Hamano [Thu, 4 Aug 2005 08:49:03 +0000 (01:49 -0700)]
Retire git-check-files documentation too.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years ago[PATCH] Fix sparse warnings
Alecs King [Thu, 4 Aug 2005 03:35:37 +0000 (11:35 +0800)]
[PATCH] Fix sparse warnings

fix one 'should it be static?' warning and
two 'mixing declarations and code' warnings.

Signed-off-by: Alecs King <alecsk@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoRetire check-files.
Junio C Hamano [Thu, 4 Aug 2005 02:13:52 +0000 (19:13 -0700)]
Retire check-files.

The king penguin said:

    It has no point any more, all the tools check the file
    status on their own, and yes, the thing should probably be
    removed.

and the faithful servant makes it so.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years ago[PATCH] Fix debian doc-base
Kalle Valo [Wed, 3 Aug 2005 23:39:48 +0000 (02:39 +0300)]
[PATCH] Fix debian doc-base

Fixed location of HTML documents in debian doc-base file.

Without this fix debian package won't install properly (complains
about missing /usr/share/doc/git-core/html directory).

jc: thanks, Kalle.  I think debian/rules is still broken around
etcdir area, though.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agogit-send-pack: documentation
Junio C Hamano [Thu, 4 Aug 2005 00:15:44 +0000 (17:15 -0700)]
git-send-pack: documentation

Describe the renaming push.  The wording is horrible and I would
appreciate a rewrite, but it is better than nothing ;-).

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoRenaming push.
Junio C Hamano [Wed, 3 Aug 2005 23:35:29 +0000 (16:35 -0700)]
Renaming push.

This allows git-send-pack to push local refs to a destination
repository under different names.

Here is the name mapping rules for refs.

* If there is no ref mapping on the command line:

 - if '--all' is specified, it is equivalent to specifying
   <local> ":" <local> for all the existing local refs on the
   command line
 - otherwise, it is equivalent to specifying <ref> ":" <ref> for
   all the refs that exist on both sides.

* <name> is just a shorthand for <name> ":" <name>

* <src> ":" <dst>

  push ref that matches <src> to ref that matches <dst>.

  - It is an error if <src> does not match exactly one of local
    refs.

  - It is an error if <dst> matches more than one remote refs.

  - If <dst> does not match any remote refs, either

    - it has to start with "refs/"; <dst> is used as the
      destination literally in this case.

    - <src> == <dst> and the ref that matched the <src> must not
      exist in the set of remote refs; the ref matched <src>
      locally is used as the name of the destination.

For example,

  - "git-send-pack --all <remote>" works exactly as before;

  - "git-send-pack <remote> master:upstream" pushes local master
    to remote ref that matches "upstream".  If there is no such
    ref, it is an error.

  - "git-send-pack <remote> master:refs/heads/upstream" pushes
    local master to remote refs/heads/upstream, even when
    refs/heads/upstream does not exist.

  - "git-send-pack <remote> master" into an empty remote
    repository pushes the local ref/heads/master to the remote
    ref/heads/master.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoInstall sample hooks
Junio C Hamano [Tue, 2 Aug 2005 23:45:21 +0000 (16:45 -0700)]
Install sample hooks

A template mechanism to populate newly initialized repository
with default set of files is introduced.  Use it to ship example
hooks that can be used for update and post update checks, as
Josef Weidendorfer suggests.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years ago[PATCH] Plug memory leaks in git-unpack-objects
Sergey Vlasov [Wed, 3 Aug 2005 12:11:00 +0000 (16:11 +0400)]
[PATCH] Plug memory leaks in git-unpack-objects

- Call inflateEnd to release zlib state after use.
- After resolving delta, free base object data.

Signed-off-by: Sergey Vlasov <vsu@altlinux.ru>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agosend-pack: handle partial pushes correctly.
Junio C Hamano [Wed, 3 Aug 2005 19:41:12 +0000 (12:41 -0700)]
send-pack: handle partial pushes correctly.

When pushing into multi-user repository, or when pushing to a
repository from a local repository that has rebased branches
that has been pruned, the destination repository can have head
commits that are missing from the local repository.

This should not matter as long as the local head of the branch
being pushed is a proper superset of the destination branch, but
we ended up trying to run rev-list telling it to exclude objects
reachable from those heads missing from the local repository,
causing it to barf.  Prune those heads from the rev-list
parameter list, and make sure we do not try to push a branch
whose remote head is something we lack.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agogit-send-email-script: minimum whitespace cleanup.
Junio C Hamano [Mon, 1 Aug 2005 06:05:16 +0000 (23:05 -0700)]
git-send-email-script: minimum whitespace cleanup.

Now it is ready to hit the "master" branch, clean up the script
for trailing whitespace and mixture of tabs and spaces.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years ago[PATCH] Doc: update git-send-email-script documentation.
Ryan Anderson [Wed, 3 Aug 2005 01:45:22 +0000 (21:45 -0400)]
[PATCH] Doc: update git-send-email-script documentation.

Signed-off-by: Ryan Anderson <ryan@michonline.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years ago[PATCH] git-send-email-script - Fix loops that limit emails to unique values to be...
Ryan Anderson [Wed, 3 Aug 2005 01:45:22 +0000 (21:45 -0400)]
[PATCH] git-send-email-script - Fix loops that limit emails to unique values to be pedantically correct.

Email addresses aren't generally case sensitive in the real world, but
technically, they *can* be.  So, let's do the right thing.

Additionally, fix the generated message-id to have the right template used.

Signed-off-by: Ryan Anderson <ryan@michonline.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years ago[PATCH] git-send-email-script - fix 2 small bugs that snuck through an untested bout...
Ryan Anderson [Mon, 1 Aug 2005 00:04:25 +0000 (20:04 -0400)]
[PATCH] git-send-email-script - fix 2 small bugs that snuck through an untested bout of editing.

Signed-off-by: Ryan Anderson <ryan@michonline.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years ago[PATCH] Make the SMTP server used by git-sendm-email-script configurable on the comma...
Ryan Anderson [Mon, 1 Aug 2005 00:04:24 +0000 (20:04 -0400)]
[PATCH] Make the SMTP server used by git-sendm-email-script configurable on the command line with "--smtp-server"

 git-send-email-script |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

a21efe6d21d9f1aca09453ed2a4e2a2ff2d98ce6
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years ago[PATCH] git-send-email-script: Reformat readline interface and generate a better...
Ryan Anderson [Mon, 1 Aug 2005 00:04:24 +0000 (20:04 -0400)]
[PATCH] git-send-email-script: Reformat readline interface and generate a better message-id.

Signed-off-by: Ryan Anderson <ryan@michonline.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years ago[PATCH] Add "--chain-reply-to" to git-send-email-script, to control whether or not the
Ryan Anderson [Mon, 1 Aug 2005 00:04:24 +0000 (20:04 -0400)]
[PATCH] Add "--chain-reply-to" to git-send-email-script, to control whether or not the

Note, using --no-chain-reply-to means you probably want to put a special
message into the first email you send, i.e, a 0/N patch cover sheet.

Signed-off-by: Ryan Anderson <ryan@michonline.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years ago[PATCH] Cleanup initial comments, add copyright notices.
Ryan Anderson [Mon, 1 Aug 2005 00:04:24 +0000 (20:04 -0400)]
[PATCH] Cleanup initial comments, add copyright notices.

Signed-off-by: Ryan Anderson <ryan@michonline.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years ago[PATCH] Convert from using quoted-printable to just 8bit encoding on all emails.
Ryan Anderson [Mon, 1 Aug 2005 00:04:24 +0000 (20:04 -0400)]
[PATCH] Convert from using quoted-printable to just 8bit encoding on all emails.

(Deleted some spurious comments)

Signed-off-by: Ryan Anderson <ryan@michonline.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years ago[PATCH] Add new dependencies caused by git-send-email-script to debian/control
Ryan Anderson [Sun, 31 Jul 2005 08:17:25 +0000 (04:17 -0400)]
[PATCH] Add new dependencies caused by git-send-email-script to debian/control

Signed-off-by: Ryan Anderson <ryan@michonline.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years ago[PATCH] Add documentation for git-send-email-script
Ryan Anderson [Sun, 31 Jul 2005 08:17:25 +0000 (04:17 -0400)]
[PATCH] Add documentation for git-send-email-script

Signed-off-by: Ryan Anderson <ryan@michonline.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years ago[PATCH] Add git-send-email-script - tool to send emails from git-format-patch-script
Ryan Anderson [Sun, 31 Jul 2005 08:17:25 +0000 (04:17 -0400)]
[PATCH] Add git-send-email-script - tool to send emails from git-format-patch-script

This is based off of GregKH's script, send-lots-of-email.pl, and strives to do
all the nice things a good subsystem maintainer does when forwarding a patch or
50 upstream:

All the prior handlers of the patch, as determined by the
Signed-off-by: lines, and/or the author of the commit, are cc:ed on the
email.

All emails are sent as a reply to the previous email, making it easy to
skip a collection of emails that are uninteresting.

Signed-off-by: Ryan Anderson <ryan@michonline.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years ago[PATCH] Parallelize pulling by ssh
barkalow@iabervon.org [Tue, 2 Aug 2005 23:46:29 +0000 (19:46 -0400)]
[PATCH] Parallelize pulling by ssh

This causes ssh-pull to request objects in prefetch() and read then in
fetch(), such that it reduces the unpipelined round-trip time.

This also makes sha1_write_from_fd() support having a buffer of data
which it accidentally read from the fd after the object; this was
formerly not a problem, because it would always get a short read at
the end of an object, because the next object had not been
requested. This is no longer true.

Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years ago[PATCH] Parallelize the pull algorithm
barkalow@iabervon.org [Tue, 2 Aug 2005 23:46:10 +0000 (19:46 -0400)]
[PATCH] Parallelize the pull algorithm

This processes objects in two simultaneous passes. Each object will
first be given to prefetch(), as soon as it is possible to tell that
it will be needed, and then will be given to fetch(), when it is the
next object that needs to be parsed. Unless an implementation does
something with prefetch(), this should have no effect.

Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years ago[PATCH] Object library enhancements
barkalow@iabervon.org [Tue, 2 Aug 2005 23:45:48 +0000 (19:45 -0400)]
[PATCH] Object library enhancements

Add function to look up an object which is entirely unknown, so that
it can be put in a list. Various other functions related to lists of
objects.

Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoMake sure leading directories exist when pushing refs.
Junio C Hamano [Wed, 3 Aug 2005 01:27:57 +0000 (18:27 -0700)]
Make sure leading directories exist when pushing refs.

It does not matter if the only refs you push are directly
underneath heads and tags, but we forgot to make sure we have
leading directories so pushing tags/v0.99/1 would not have
worked.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoreceive-pack hooks updates.
Junio C Hamano [Tue, 2 Aug 2005 21:24:22 +0000 (14:24 -0700)]
receive-pack hooks updates.

The earlier one conflated update and post-update hooks for no
good reason.  Correct that ugly hack.  Now post-update hooks
will take the list of successfully updated refs.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoMake send-pack --all and explicit ref mutually exclusive.
Junio C Hamano [Tue, 2 Aug 2005 19:20:27 +0000 (12:20 -0700)]
Make send-pack --all and explicit ref mutually exclusive.

send-pack had a confusing misfeature that "send-pack --all
master" updated all refs, while "send-pack --all" did not do
anything.  Make --all and explicit refs mutually exclusive, and
make sure "send-pack --all" updates all refs.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years ago[PATCH] list shortlog items in commit order
Nicolas Pitre [Tue, 2 Aug 2005 21:18:57 +0000 (17:18 -0400)]
[PATCH] list shortlog items in commit order

The current shortlog list is backward making it look odd.
This reverses it so things appear more logically.

[jc: Nico says that this restores the short-log behaviour from
the BK days.]

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoClean t/trash upon "make clean" as well.
Junio C Hamano [Wed, 3 Aug 2005 00:24:11 +0000 (17:24 -0700)]
Clean t/trash upon "make clean" as well.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoGIT 0.99.3 v0.99.3
Junio C Hamano [Mon, 1 Aug 2005 22:19:34 +0000 (15:19 -0700)]
GIT 0.99.3

Things have slowly but surely started to settle down, and the
http transport finally can natively grok packed repositories.
To give Pasky a good anchor point, hoping that he can start
split off the core part from Cogito, here is the 0.99.3, which
will be accompanied with its own tag.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years ago[PATCH] git-merge-cache -q doesn't complain about failing merge program
Petr Baudis [Fri, 29 Jul 2005 12:53:38 +0000 (14:53 +0200)]
[PATCH] git-merge-cache -q doesn't complain about failing merge program

git-merge-cache reporting failed merge program is undesirable for
Cogito, since it emits its own more appropriate error message in that
case. However, I want to show other possible git-merge-cache error
messages. So -q will just silence this particular error.

Signed-off-by: Petr Baudis <pasky@ucw.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years ago[PATCH] Fix sparse warnings
Linus Torvalds [Mon, 1 Aug 2005 19:11:53 +0000 (12:11 -0700)]
[PATCH] Fix sparse warnings

A few sparse warnings have crept in again since I checked last time:
undeclared variables with global scope.

Fix them by marking the private variables properly "static".

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years ago[PATCH] Do not rely on a sane wc
Johannes Schindelin [Mon, 1 Aug 2005 14:32:37 +0000 (16:32 +0200)]
[PATCH] Do not rely on a sane wc

Some implementations of wc pad the line number with white space, which
expr does not grok as a number.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years ago[PATCH] Updates to tutorial.txt
Johannes Schindelin [Mon, 1 Aug 2005 14:33:19 +0000 (16:33 +0200)]
[PATCH] Updates to tutorial.txt

Fix a few typos.
Adapt to git-http-pull not borking on packed repositories.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoCVS-like push-pull description update.
Junio C Hamano [Mon, 1 Aug 2005 19:33:05 +0000 (12:33 -0700)]
CVS-like push-pull description update.

 - Yes, push does not lock, but that does not mean it is not
   meant for multi-user repository.  It just ought to perform
   correctly without using locks.

 - Let's not pretend we know _the_ right way.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years ago[PATCH] Updates for cvs-migration.txt
Johannes Schindelin [Mon, 1 Aug 2005 14:32:58 +0000 (16:32 +0200)]
[PATCH] Updates for cvs-migration.txt

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years ago[PATCH] Fix warning about non-void return in a void function.
A Large Angry SCM [Mon, 1 Aug 2005 14:05:57 +0000 (10:05 -0400)]
[PATCH] Fix warning about non-void return in a void function.

Signed-off-by: A Large Angry SCM <gitzilla@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoRetire git-fetch-dumb-http and missing-revs
Junio C Hamano [Mon, 1 Aug 2005 07:41:49 +0000 (00:41 -0700)]
Retire git-fetch-dumb-http and missing-revs

Now git-http-pull knows how to do packed repo, retire scripted
hacks I placed as a stop-gap measure.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years ago[PATCH] Support downloading packs by HTTP (whitespace fixed)
barkalow@iabervon.org [Mon, 1 Aug 2005 00:54:17 +0000 (20:54 -0400)]
[PATCH] Support downloading packs by HTTP (whitespace fixed)

This adds support to http-pull for finding the list of pack files
available on the server, downloading the index files for those pack
files, and downloading pack files when they contain needed objects not
available individually. It retains the index files even if the pack
files were not needed, but downloads the list of pack files once per
run if an object is not found separately.

Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years ago[PATCH] Functions for managing the set of packs the library is using (whitespace...
barkalow@iabervon.org [Mon, 1 Aug 2005 00:53:44 +0000 (20:53 -0400)]
[PATCH] Functions for managing the set of packs the library is using (whitespace fixed)

This adds support for reading an uninstalled index, and installing a
pack file that was added while the program was running, as well as
functions for determining where to put the file.

Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years ago[PATCH] Added hook in git-receive-pack
Josef Weidendorfer [Sun, 31 Jul 2005 19:17:43 +0000 (21:17 +0200)]
[PATCH] Added hook in git-receive-pack

Just before updating a ref,

    $GIT_DIR/hooks/update refname old-sha1 new-sha1

is called if executable.  The hook can decline the ref to be
updated by exiting with a non-zero status, or allow it to be
updated by exiting with a zero status.  The mechanism also
allows e.g sending of a mail with pushed commits on the remote
repository.

Documentation update with an example hook is included.

jc: The credits of the basic idea and initial implementation go
to Josef, but I ended up rewriting major parts of his patch, so
bugs are all mine.  Also I changed the semantics for the hook
from his original version (which were post-update hook) so that
the hook can optionally decline to update the ref, and also can
be used to implement the overall cleanups.  The latter was
primarily to implement a suggestion from Linus that calling
update-server-info should be made optional.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years ago[PATCH] Fix support for old libcurl
barkalow@iabervon.org [Sun, 31 Jul 2005 19:59:20 +0000 (15:59 -0400)]
[PATCH] Fix support for old libcurl

Old libcurl has curl_easy_setopt(), and http-pull requires it; it just
doesn't have one of the options.

Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoFix typo in recent Makefile cleanup (again).
Junio C Hamano [Sun, 31 Jul 2005 19:06:22 +0000 (12:06 -0700)]
Fix typo in recent Makefile cleanup (again).

Another instance of $(bin) was missed when it was renamed to
$(bindir).

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoTeach parse_commit_buffer about grafting.
Junio C Hamano [Sat, 30 Jul 2005 07:58:28 +0000 (00:58 -0700)]
Teach parse_commit_buffer about grafting.

Introduce a new file $GIT_DIR/info/grafts (or $GIT_GRAFT_FILE)
which is a list of "fake commit parent records".  Each line of
this file is a commit ID, followed by parent commit IDs, all
40-byte hex SHA1 separated by a single SP in between.  The
records override the parent information we would normally read
from the commit objects, allowing both adding "fake" parents
(i.e. grafting), and pretending as if a commit is not a child of
some of its real parents (i.e. cauterizing).

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoAdd a stupid "count objects" script.
Junio C Hamano [Sun, 31 Jul 2005 00:31:47 +0000 (17:31 -0700)]
Add a stupid "count objects" script.

This counts the number of unpacked object files and disk space
consumed by them, to help you decide when it is a good time to
repack.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoFetch from a packed repository on dumb servers.
Junio C Hamano [Tue, 26 Jul 2005 05:42:18 +0000 (22:42 -0700)]
Fetch from a packed repository on dumb servers.

Implement fetching from a packed repository over http/https
using the dumb server support files.

I consider some parts of the logic should be in a separate C
program, but it appears to work with my simple tests.  I have
backburnered it for a bit too long for my liking, so let's throw
it out in the open and see what happens.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoMerge with gitk.
Junio C Hamano [Sun, 31 Jul 2005 17:32:49 +0000 (10:32 -0700)]
Merge with gitk.

15 years agoFix some bugs causing application error popups.
Paul Mackerras [Sun, 31 Jul 2005 11:35:21 +0000 (21:35 +1000)]
Fix some bugs causing application error popups.

Specifically this should fix the following errors:

wrong # args: should be "startdiff ids" (fix from Junio Hamano)
can't read "filelines(....)": no such element in array
can't unset "treepending": no such variable

15 years ago[PATCH] add NO_CURL option to the Makefile
Johannes Schindelin [Sun, 31 Jul 2005 00:14:23 +0000 (02:14 +0200)]
[PATCH] add NO_CURL option to the Makefile

This patch implements Linus' idea that if you are not interested in
pulling by HTTP, you can now say

NO_CURL=1 make

to compile everything except git-http-pull (thus not needing curl at all).

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoFix merge-base from getting confused.
Linus Torvalds [Sat, 30 Jul 2005 22:10:20 +0000 (15:10 -0700)]
Fix merge-base from getting confused.

On Sat, 30 Jul 2005, Linus Torvalds wrote:
>
> Yup, it's git-merge-base, and it is confused by the same thing that
> confused git-rev-list.

Hmm.. Here's a tentative fix. I'm not really happy with it, and maybe
somebody else can come up with a better one. I think this one ends up
being quite a bit more expensive than the old one (it will look up _all_
common parents that have a child that isn't common, and then select the
newest one of the bunch), but I haven't really thought it through very
much.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
15 years ago[PATCH] Making it easier to find which change introduced a bug
Linus Torvalds [Sat, 30 Jul 2005 17:08:20 +0000 (10:08 -0700)]
[PATCH] Making it easier to find which change introduced a bug

This adds a new "git bisect" command.

 - "git bisect start"
start bisection search.

 - "git bisect bad <rev>"
mark some version known-bad (if no arguments, then current HEAD)

 - "git bisect good <revs>..."
mark some versions known-good (if no arguments, then current HEAD)

 - "git bisect reset <branch>"
done with bisection search and go back to your work (if
no arguments, then "master").

The way you use it is:

git bisect start
git bisect bad # Current version is bad
git bisect good v2.6.13-rc2 # v2.6.13-rc2 was the last version
# tested that was good

When you give at least one bad and one good versions, it will
bisect the revision tree and say something like:

Bisecting: 675 revisions left to test after this

and check out the state in the middle. Now, compile that kernel, and boot
it. Now, let's say that this booted kernel works fine, then just do

git bisect good # this one is good

which will now say

Bisecting: 337 revisions left to test after this

and you continue along, compiling that one, testing it, and depending on
whether it is good or bad, you say "git bisect good" or "git bisect bad",
and ask for the next bisection.

Until you have no more left, and you'll have been left with the first bad
kernel rev in "refs/bisect/bad".

Oh, and then after you want to reset to the original head, do a

git bisect reset

to get back to the master branch, instead of being in one of the bisection
branches ("git bisect start" will do that for you too, actually: it will
reset the bisection state, and before it does that it checks that you're
not using some old bisection branch).

Not really any harder than doing series of "quilt push" and "quilt pop",
now is it?

[jc: This patch is a rework based on what Linus posted to the
     list.  The changes are:

  - The original introduced four separate commands, which was
    three too many, so I merged them into one with subcommands.

  - Since the next thing you would want to do after telling it
    "bad" and "good" is always to bisect, this version does it
    automatically for you.

  - I think the termination condition was wrong.  The original
    version checked if the set of revisions reachable from next
    bisection but not rechable from any of the known good ones
    is empty, but if the current bisection was a bad one, this
    would not terminate, so I changed it to terminate it when
    the set becomes a singleton or empty.

  - Removed the use of shell array variable.

]

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoNO_OPENSSL should really mean no openssl.
Junio C Hamano [Sat, 30 Jul 2005 05:43:06 +0000 (22:43 -0700)]
NO_OPENSSL should really mean no openssl.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoFix typo in recent Makefile cleanup.
Junio C Hamano [Sat, 30 Jul 2005 01:38:15 +0000 (18:38 -0700)]
Fix typo in recent Makefile cleanup.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years ago[PATCH] document git-rev-list better
Matthias Urlichs [Fri, 29 Jul 2005 18:10:46 +0000 (20:10 +0200)]
[PATCH] document git-rev-list better

Document new (and not-so-new) flags of git-rev-list.

Signed-off-By: Matthias Urlichs <smurf@smurf.noris.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years ago[PATCH] Build commands through object files
Petr Baudis [Fri, 29 Jul 2005 17:21:53 +0000 (19:21 +0200)]
[PATCH] Build commands through object files

Separate the process of building the commands to compilation and
linkage. This makes it more consistent with the library objects, is the
traditional thing to do, and significantly speeds up the subsequent
rebuilds, especially for us the people who develop git on 300MHz
notebooks.

Ported from Cogito.

Signed-off-by: Petr Baudis <pasky@ucw.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoSkip --merge-order test when built with NO_OPENSSL
Junio C Hamano [Fri, 29 Jul 2005 22:32:43 +0000 (15:32 -0700)]
Skip --merge-order test when built with NO_OPENSSL

When built with NO_OPENSSL, rev-list --merge-order does not
work, causing t6001 test to fail.  Detect that and skip this
test to allow continuing to the rest of the tests.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years ago[PATCH] Support for NO_OPENSSL
Petr Baudis [Fri, 29 Jul 2005 15:50:51 +0000 (17:50 +0200)]
[PATCH] Support for NO_OPENSSL

Support for completely OpenSSL-less builds. FSF considers distributing GPL
binaries with OpenSSL linked in as a legal problem so this is trouble
e.g. for Debian, or some people might not want to install OpenSSL
anyway. If you

make NO_OPENSSL=1

you get completely OpenSSL-less build, disabling --merge-order and using
Mozilla's SHA1 implementation.

Ported from Cogito.

Signed-off-by: Petr Baudis <pasky@ucw.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years ago[PATCH] Reorder Makefile rules
Petr Baudis [Fri, 29 Jul 2005 15:50:24 +0000 (17:50 +0200)]
[PATCH] Reorder Makefile rules

The Makefile rules were massively reordered so that they are actually
logically grouped now. Captions were added to separate the sections. No
rule contents was touched during the process.

Signed-off-by: Petr Baudis <pasky@ucw.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years ago[PATCH] Remove the explicit Makefile dependencies description
Petr Baudis [Fri, 29 Jul 2005 15:48:50 +0000 (17:48 +0200)]
[PATCH] Remove the explicit Makefile dependencies description

Remove about one gazillion of explicit dependency rules with few lines
describing the general dependency pattern and then the exceptions. This
noticably shortens the Makefile and makes it easier to touch it.

This is part of the Cogito Makefile changes port.

Signed-off-by: Petr Baudis <pasky@ucw.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years ago[PATCH] Improve the compilation-time settings interface
Petr Baudis [Fri, 29 Jul 2005 15:48:26 +0000 (17:48 +0200)]
[PATCH] Improve the compilation-time settings interface

Describe variables which make itself takes and adjusts compilation
accordingly (MOZILLA_SHA1, NO_OPENSSL, PPC_SHA1), and make adding
defines more convenient through the $DEFINES variable. $COPTS includes
-g as well now and is not overriden if it was already declared in the
environment. Also, $CFLAGS is appended to rather than reset, so that if
there was already a $CFLAGS environment variable, it's appended to. Some
more variables are also made overridable through the environment. Renamed
$bin to $bindir which is the name commonly used for this.

This is part of the Cogito Makefile changes port.

Signed-off-by: Petr Baudis <pasky@ucw.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years ago[PATCH] Unify usage strings declaration
Petr Baudis [Fri, 29 Jul 2005 09:01:26 +0000 (11:01 +0200)]
[PATCH] Unify usage strings declaration

All usage strings are now declared as static const char [].

This is carried over from my old git-pb branch.

Signed-off-by: Petr Baudis <pasky@ucw.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years ago[PATCH] Trivial tidyups
Petr Baudis [Fri, 29 Jul 2005 09:00:45 +0000 (11:00 +0200)]
[PATCH] Trivial tidyups

Simple whitespace-related tidyups ensuring style consistency.

This is carried over from my old git-pb branch.

Signed-off-by: Petr Baudis <pasky@ucw.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years ago[PATCH] mmap error handling
Pavel Roskin [Fri, 29 Jul 2005 14:49:14 +0000 (10:49 -0400)]
[PATCH] mmap error handling

I have reviewed all occurrences of mmap() in git and fixed three types
of errors/defects:

1) The result is not checked.
2) The file descriptor is closed if mmap() succeeds, but not when it
fails.
3) Various casts applied to -1 are used instead of MAP_FAILED, which is
specifically defined to check mmap() return value.

[jc: This is a second round of Pavel's patch.  He fixed up the problem
that close() potentially clobbering the errno from mmap, which
the first round had.]

Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoDocumentation and tests: ls-files exclude pattern.
Junio C Hamano [Fri, 29 Jul 2005 06:53:29 +0000 (23:53 -0700)]
Documentation and tests: ls-files exclude pattern.

Update the tests and documentation to match the new "last one
determines its fate" semantics.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agols-files: rework exclude patterns.
Junio C Hamano [Fri, 29 Jul 2005 06:32:20 +0000 (23:32 -0700)]
ls-files: rework exclude patterns.

Pasky and others raised many valid points on the problems
initial exclude pattern enhancement work had.  Based on the
list discussion, rework the exclude logic to use "last match
determines its fate" rule, and order the list by exclude-from
(the fallback default pattern file), exclude-per-directory
(shallower to deeper, so deeper ones can override), and then
command line exclude patterns.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years ago[PATCH] Fix interesting git-rev-list corner case
Linus Torvalds [Fri, 29 Jul 2005 22:50:30 +0000 (15:50 -0700)]
[PATCH] Fix interesting git-rev-list corner case

This corner-case was triggered by a kernel commit that was not in date
order, due to a misconfigured time zone that made the commit appear three
hours older than it was.

That caused git-rev-list to traverse the commit tree in a non-obvious
order, and made it parse several of the _parents_ of the misplaced commit
before it actually parsed the commit itself. That's fine, but it meant
that the grandparents of the commit didn't get marked uninteresting,
because they had been reached through an "interesting" branch.

The reason was that "mark_parents_uninteresting()" (which is supposed to
mark all existing parents as being uninteresting - duh) didn't actually
traverse more than one level down the parent chain.

NORMALLY this is fine, since with the date-based traversal order,
grandparents won't ever even have been looked at before their parents (so
traversing the chain down isn't needed, because the next time around when
we pick out the parent we'll mark _its_ parents uninteresting), but since
we'd gotten out of order, we'd already seen the parent and thus never got
around to mark the grandparents.

Anyway, the fix is simple. Just traverse parent chains recursively.
Normally the chain won't even exist (since the parent hasn't been parsed
yet), so this is not actually going to trigger except in this strange
corner-case.

Add a comment to the simple one-liner, since this was a bit subtle, and I
had to really think things through to understand how it could happen.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoTutorial: use a bit longer sample filenames.
Junio C Hamano [Fri, 29 Jul 2005 05:33:45 +0000 (22:33 -0700)]
Tutorial: use a bit longer sample filenames.

Darrin Thompson noticed when he was showing off GIT to others
that the use of filenames "a" and "b" in the tutorial example
was unnecessarily confusing, especially with our "patch -p1"
prefix a/ and b/, without giving us any patch.  I was very
tempted to change them back to l/ and k/ prefixes, but decided
to restrain myself and update the tutorial instead ;-).

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years ago[PATCH] support older versions of libcurl
Johannes Schindelin [Fri, 29 Jul 2005 02:24:13 +0000 (19:24 -0700)]
[PATCH] support older versions of libcurl

Some newer features of libcurl are used which are not strictly necessary
for http-pull. Use them only if libcurl is new enough to know about them.

[jc: I just reworked #ifdef sprinkled all over the code into a
single section that defines a set of macros.]

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoMerge with gitk.
Junio C Hamano [Fri, 29 Jul 2005 17:17:37 +0000 (10:17 -0700)]
Merge with gitk.

15 years agoImprove the merge display when the result differs from all parents.
Paul Mackerras [Fri, 29 Jul 2005 14:23:03 +0000 (09:23 -0500)]
Improve the merge display when the result differs from all parents.

Now we see if the result is quite similar to one of the parents, and
if it is, display the result as a diff from that parent.  If the result
is similar to more than one parent, pick the one that it's most
similar to.

15 years ago[PATCH] socklen_t needs to be defined and libssl to be linked on old Mac OS X
Johannes Schindelin [Thu, 28 Jul 2005 14:51:41 +0000 (16:51 +0200)]
[PATCH] socklen_t needs to be defined and libssl to be linked on old Mac OS X

On older Mac OS X (10.2.8), no socklen_t is defined, and therefore
daemon.c does not compile. However, Mac OS X 10.4 seems to define
socklen_t differently.

Also, linking fails due to some symbols defined in libssl (not just
libcrypto).

[jc: I am tentatively dropping the socklen_t part of the patch
because I am waiting for confirmation on the server side IPV6
patch from Yoshifuji-san]

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years ago[PATCH] support bc version 1.04
Johannes Schindelin [Thu, 28 Jul 2005 14:48:37 +0000 (16:48 +0200)]
[PATCH] support bc version 1.04

Test t6002 unnecessarily fails when bc is a bit older than average.

Signed-off-by: Johannes.Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years ago[PATCH] remove "-r" option to xargs
Johannes Schindelin [Thu, 28 Jul 2005 14:48:13 +0000 (16:48 +0200)]
[PATCH] remove "-r" option to xargs

git-prune-script still contained that non-portable option.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoserver-info: do not complain if a tag points at a non-commit.
Junio C Hamano [Thu, 28 Jul 2005 21:33:17 +0000 (14:33 -0700)]
server-info: do not complain if a tag points at a non-commit.

Linux 2.6 tree has one of those tree tags.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years ago[PATCH] Make git-apply --stat less butt-ugly with long filenames
Linus Torvalds [Fri, 29 Jul 2005 03:37:23 +0000 (20:37 -0700)]
[PATCH] Make git-apply --stat less butt-ugly with long filenames

When git-apply was printing out long filenames, it used to just truncate
them to show the last "max_len" characters of the filename. Which can be
really quite ugly (note the two filenames that have just been silently
truncated from the beginning - it looks even worse when there are lots
of them, like there were in the current v2.6.13-rc4 cris arch update):

 Documentation/video4linux/README.saa7134           |    9
 Documentation/video4linux/bttv/Cards               |   74
 umentation/video4linux/hauppauge-wintv-cx88-ir.txt |   54
 Documentation/video4linux/lifeview.txt             |   42
 mentation/video4linux/not-in-cx2388x-datasheet.txt |   41
 Documentation/w1/w1.generic                        |  107

With this patch it now looks like so:

 Documentation/video4linux/README.saa7134           |    9
 Documentation/video4linux/bttv/Cards               |   74
 .../video4linux/hauppauge-wintv-cx88-ir.txt        |   54
 Documentation/video4linux/lifeview.txt             |   42
 .../video4linux/not-in-cx2388x-datasheet.txt       |   41
 Documentation/w1/w1.generic                        |  107

ie we've made it clear with an ellipsis that we've cut off something from
the beginning, and it also tries to do it cleanly at a subdirectory level.

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