Permalink
Commits on Feb 12, 2006
  1. GIT 1.2.0

    Junio C Hamano
    Junio C Hamano committed Feb 12, 2006
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. Fix "test: unexpected operator" on bsd

    Junio C Hamano
    Junio C Hamano committed Feb 12, 2006
    This fixes the same issue as a previous fix by Alex Riesen does.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. git-commit: show dirtiness including index.

    Junio C Hamano
    Junio C Hamano committed Feb 12, 2006
    Earlier, when we switched a branch we used diff-files to show
    paths that are dirty in the working tree.  But we allow switching
    branches with updated index ("read-tree -m -u $old $new" works that
    way), and only showing paths that have differences in the working
    tree but not paths that are different in index was confusing.
    
    This shows both as modified from the top commit of the branch we
    just have switched to.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  4. Make pack-objects chattier.

    Junio C Hamano
    Junio C Hamano committed Feb 12, 2006
    You could give -q to squelch it, but currently no tool does it.
    This would make 'git clone host:repo here' over ssh not silent
    again.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  5. avoid echo -e, there are systems where it does not work

    raalkml authored and Junio C Hamano committed Feb 12, 2006
    FreeBSD 4.11 being one example: the built-in echo doesn't have -e,
    and the installed /bin/echo does not do "-e" as well.
    "printf" works, laking just "\e" and "\xAB'.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  6. fix "test: 2: unexpected operator" on bsd

    raalkml authored and Junio C Hamano committed Feb 12, 2006
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  7. Fix object re-hashing

    Linus Torvalds Junio C Hamano
    Linus Torvalds authored and Junio C Hamano committed Feb 12, 2006
    The hashed object lookup had a subtle bug in re-hashing: it did
    
    	for (i = 0; i < count; i++)
    		if (objs[i]) {
    			.. rehash ..
    
    where "count" was the old hash couny. Oon the face of it is obvious, since
    it clearly re-hashes all the old objects.
    
    However, it's wrong.
    
    If the last old hash entry before re-hashing was in use (or became in use
    by the re-hashing), then when re-hashing could have inserted an object
    into the hash entries with idx >= count due to overflow. When we then
    rehash the last old entry, that old entry might become empty, which means
    that the overflow entries should be re-hashed again.
    
    In other words, the loop has to be fixed to either traverse the whole
    array, rather than just the old count.
    
    (There's room for a slight optimization: instead of counting all the way
    up, we can break when we see the first empty slot that is above the old
    "count". At that point we know we don't have any collissions that we might
    have to fix up any more. This patch only does the trivial fix)
    
    [jc: with trivial fix on trivial fix]
    
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  8. hashtable-based objects: minimum fixups.

    Junio C Hamano
    Junio C Hamano committed Feb 12, 2006
    Calling hashtable_index from find_object before objs is created
    would result in division by zero failure.  Avoid it.
    
    Also the given object name may not be aligned suitably for
    unsigned int; avoid dereferencing casted pointer.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  9. Use a hashtable for objects instead of a sorted list

    dscho authored and Junio C Hamano committed Feb 12, 2006
    In a simple test, this brings down the CPU time from 47 sec to 22 sec.
    
    Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  10. Add howto about separating topics.

    kent@lysator.liu.se Junio C Hamano
    kent@lysator.liu.se authored and Junio C Hamano committed Feb 12, 2006
    This howto consists of a footnote from an email by JC to the git
    mailing list (<7vfyms0x4p.fsf@assigned-by-dhcp.cox.net>).
    
    Signed-off-by: Kent Engstrom <kent@lysator.liu.se>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  11. Merge branch 'pb/repo'

    Junio C Hamano
    Junio C Hamano committed Feb 12, 2006
    * pb/repo:
      Add support for explicit type specifiers when calling git-repo-config
  12. Merge branch 'jc/fixdiff'

    Junio C Hamano
    Junio C Hamano committed Feb 12, 2006
    * jc/fixdiff:
      diff-tree: do not default to -c
  13. Avoid using "git-var -l" until it gets fixed.

    Junio C Hamano
    Junio C Hamano committed Feb 11, 2006
    This is to be nicer to people with unusable GECOS field.
    
    "git-var -l" is currently broken in that when used by a user who
    does not have a usable GECOS field and has not corrected it by
    exporting GIT_COMMITTER_NAME environment variable it dies when
    it tries to output GIT_COMMITTER_IDENT (same thing for AUTHOR).
    
    "git-pull" used "git-var -l" only because it needed to get a
    configuration variable before "git-repo-config --get" was
    introduced.  Use the latter tool designed exactly for this
    purpose.
    
    "git-sh-setup" used "git-var GIT_AUTHOR_IDENT" without actually
    wanting to use its value.  The only purpose was to cause the
    command to check and barf if the repository format version
    recorded in the $GIT_DIR/config file is too new for us to deal
    with correctly.  Instead, use "repo-config --get" on a random
    property and see if it die()s, and check if the exit status is
    128 (comes from die -- missing variable is reported with exit
    status 1, so we can tell that case apart).
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  14. Add support for explicit type specifiers when calling git-repo-config

    Petr Baudis Junio C Hamano
    Petr Baudis authored and Junio C Hamano committed Feb 12, 2006
    Currently, git-repo-config will just return the raw value of option
    as specified in the config file; this makes things difficult for scripts
    calling it, especially if the value is supposed to be boolean.
    
    This patch makes it possible to ask git-repo-config to check if the option
    is of the given type (int or bool) and write out the value in its
    canonical form. If you do not pass --int or --bool, the behaviour stays
    unchanged and the raw value is emitted.
    
    This also incidentally fixes the segfault when option with no value is
    encountered.
    
    [jc: tweaked the option parsing a bit to make it easier to see
     that the patch does not change anything but the type stuff in
     the diff output.  Also changed to avoid "foo ? : bar" construct. ]
    
    Signed-off-by: Petr Baudis <pasky@suse.cz>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  15. diff-tree: do not default to -c

    Junio C Hamano
    Junio C Hamano committed Feb 12, 2006
    Marco says it breaks qgit.  This makes the flags a bit more
    orthogonal.
    
      $ git-diff-tree -r --abbrev ca18
    
        No output from this command because you asked to skip merge by
        not having -m there.
    
      $ git-diff-tree -r -m --abbrev ca18
      ca18205
      :100644 100644 538d21d... 59042d1... M	Makefile
      :100644 100644 410b758... 6c47c3a... M	entry.c
      ca18205
      :100644 100644 30479b4... 59042d1... M	Makefile
    
        The same "independent sets of diff" as before without -c.
    
      $ git-diff-tree -r -m -c --abbrev ca18
      ca18205
      ::100644 100644 100644 538d21d... 30479b4... 59042d1... MM	Makefile
    
        Combined.
    
      $ git-diff-tree -r -c --abbrev ca18
      ca18205
      ::100644 100644 100644 538d21d... 30479b4... 59042d1... MM	Makefile
    
        Asking for combined without -m does not make sense, so -c
        implies -m.
    
    We need to supply -c as default to whatchanged, which is a
    one-liner.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  16. t5500: adjust to change in pack-object reporting behaviour.

    Junio C Hamano
    Junio C Hamano committed Feb 12, 2006
    Now pack-object is not as chatty when its stderr is not connected
    to a terminal, so the test needs to be adjusted for that.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  17. Only call git-rerere if $GIT_DIR/rr-cache exists.

    Junio C Hamano
    Junio C Hamano committed Feb 12, 2006
    Johannes noticed that git-rerere depends on Digest.pm, and if
    one does not use the command, one can live without it.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  18. Use a relative path for SVN importing

    Christian Biesinger Junio C Hamano
    Christian Biesinger authored and Junio C Hamano committed Feb 11, 2006
    The absolute path (with the leading slash) breaks SVN importing,
    because it then looks for /trunk/... instead of /svn/trunk/...
    (in my case, the repository URL was https://servername/svn/)
    
    Signed-off-by: Christian Biesinger <cbiesinger@web.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  19. fetch-clone progress: finishing touches.

    Junio C Hamano
    Junio C Hamano committed Feb 12, 2006
    This makes fetch-pack also report the progress of packing part.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  20. Fix fetch-clone in the presense of signals

    Linus Torvalds Junio C Hamano
    Linus Torvalds authored and Junio C Hamano committed Feb 11, 2006
    We shouldn't fail a fetch just because a signal might have interrupted
    the read.
    
    Normally, we don't install any signal handlers, so EINTR really shouldn't
    happen. That said, really old versions of Linux will interrupt an
    interruptible system call even for signals that turn out to be ignored
    (SIGWINCH is the classic example - resizing your xterm would cause it).
    The same might well be true elsewhere too.
    
    Also, since receive_keep_pack() doesn't control the caller, it can't know
    that no signal handlers exist.
    
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  21. Make "git clone" pack-fetching download statistics better

    Linus Torvalds Junio C Hamano
    Linus Torvalds authored and Junio C Hamano committed Feb 11, 2006
    Average it out over a few events to make the numbers stable, and fix the
    silly usec->binary-ms conversion.
    
    Yeah, yeah, it's arguably eye-candy to keep the user calm, but let's do
    that right.
    
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Feb 11, 2006
  1. Make "git clone" less of a deathly quiet experience

    Linus Torvalds Junio C Hamano
    Linus Torvalds authored and Junio C Hamano committed Feb 11, 2006
    It used to be that "git-unpack-objects" would give nice percentages, but
    now that we don't unpack the initial clone pack any more, it doesn't. And
    I'd love to do that nice percentage view in the pack objects downloader
    too, but the thing doesn't even read the pack header, much less know how
    much it's going to get, so I was lazy and didn't.
    
    Instead, it at least prints out how much data it's gotten, and what the
    packing speed is. Which makes the user realize that it's actually doing
    something useful instead of sitting there silently (and if the recipient
    knows how large the final result is, he can at least make a guess about
    when it migt be done).
    
    So with this patch, I get something like this on my DSL line:
    
    	[torvalds@g5 ~]$ time git clone master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 clone-test
    	Packing 188543 objects
    	  48.398MB  (154 kB/s)
    
    where even the speed approximation seems to be roughtly correct (even
    though my algorithm is a truly stupid one, and only really gives "speed in
    the last half second or so").
    
    Anyway, _something_ like this is definitely needed. It could certainly be
    better (if it showed the same kind of thing that git-unpack-objects did,
    that would be much nicer, but would require parsing the object stream as
    it comes in). But this is  big step forward, I think.
    
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. Define GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL) to known values.

    Junio C Hamano
    Junio C Hamano committed Feb 11, 2006
    Without these, running tests with an account with empty gecos
    field would fail.
    
    We might want to loosen error from "git-var -l" (but not
    "git-var GIT_AUTHOR_NAME") later, but that is more or less an
    independent issue.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. Merge branch 'lt/diff-tree'

    Junio C Hamano
    Junio C Hamano committed Feb 11, 2006
    * lt/diff-tree:
      combine-diff: Record diff status a bit more faithfully
      find_unique_abbrev() simplification.
      combine-diff: move formatting logic to show_combined_diff()
      combined-diff: use diffcore before intersecting paths.
      diff-tree -c raw output
  4. git-commit -v: have patch at the end.

    Junio C Hamano
    Junio C Hamano committed Feb 11, 2006
    It was pointed out that otherwise more important summary
    information prefixed with '#' would become prone to be missed.
    
    Also instead of chopping at the first '^---$' line, stop at the
    first 'diff --git a/' line.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Feb 10, 2006
  1. rev-list: default to abbreviate merge parent names under --pretty.

    Junio C Hamano
    Junio C Hamano committed Feb 10, 2006
    When we prettyprint commit log messages, merge parent names were
    often very long and there was no way to abbreviate it.
    
    This changes them to be abbreviated by default, and non-default
    abbreviations can be specified with --no-abbrev or --abbrev=<n>
    options.
    
    Note that this affects only the prettyprinted parent names.  The
    output from --show-parents is meant for machine consumption and
    is not affected by this flag.
  2. delta micro optimization

    Nicolas Pitre Junio C Hamano
    Nicolas Pitre authored and Junio C Hamano committed Feb 10, 2006
    My kernel work habit made me look at the generated assembly for the
    delta code, and one obvious albeit small improvement is this patch.
    
    Signed-off-by: Nicolas Pitre <nico@cam.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. count-delta.c: comment fixes

    Nicolas Pitre Junio C Hamano
    Nicolas Pitre authored and Junio C Hamano committed Feb 10, 2006
    There was a stale comment that explains why the old code could
    undercount when delta data copied things around inside detination
    buffer.  We do not use that kind of delta, so the comment does
    not apply.
  4. Merge branch 'jc/empty-commit'

    Junio C Hamano
    Junio C Hamano committed Feb 10, 2006
    * jc/empty-commit:
      t6000: fix a careless test library add-on.
      Do not allow empty name or email.
  5. combine-diff: Record diff status a bit more faithfully

    Junio C Hamano
    Junio C Hamano committed Feb 10, 2006
    This shows "new file mode XXXX" and "deleted file mode XXXX"
    lines like two-way diff-patch output does, by checking the
    status from each parent.
    
    The diff-raw output for combined diff is made a bit uglier by
    showing diff status letters with each parent.  While most of the
    case you would see "MM" in the output, an Evil Merge that
    touches a path that was added by inheriting from one parent is
    possible and it would be shown like these:
    
        $ git-diff-tree --abbrev -c HEAD
        2d7ca89675eb8888b0b88a91102f096d4471f09f
        ::000000 000000 100644 0000000... 0000000... 31dd686... AA	b
        ::000000 100644 100644 0000000... 6c884ae... c6d4fa8... AM	d
        ::100644 100644 100644 4f7cbe7... f8c295c... 19d5d80... RR	e
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  6. find_unique_abbrev() simplification.

    Junio C Hamano
    Junio C Hamano committed Feb 10, 2006
    Earlier it did not grok the 0{40} SHA1 very well, but what it
    needed to do was to find the shortest 0{N} that is not used as a
    valid object name to be consistent with the way names of valid
    objects are abbreviated.  This makes some users simpler.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  7. git-status -v

    Junio C Hamano
    Junio C Hamano committed Feb 10, 2006
    This revamps the git-status command to take the same set of
    parameters as git commit.  It gives a preview of what is being
    committed with that command.  With -v flag, it shows the diff
    output between the HEAD commit and the index that would be
    committed if these flags were given to git-commit command.
    
    git-commit also acquires -v flag (it used to mean "verify" but
    that is the default anyway and there is --no-verify to turn it
    off, so not much is lost), which uses the updated git-status -v
    to seed the commit log buffer.  This is handy for writing a log
    message while reviewing the changes one last time.
    
    Now, git-commit and git-status are internally share the same
    implementation.
    
    Unlike previous git-commit change, this uses a temporary index
    to prepare the index file that would become the real index file
    after a successful commit, and moves it to the real index file
    once the commit is actually made.  This makes it safer than the
    previous scheme, which stashed away the original index file and
    restored it after an aborted commit.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  8. Merge branch 'jc/ls-files-o'

    Junio C Hamano
    Junio C Hamano committed Feb 10, 2006
    * jc/ls-files-o:
      ls-files: honour per-directory ignore file from higher directories.
  9. count-delta.c: Match the delta data semantics change in version 3.

    Junio C Hamano
    Junio C Hamano committed Feb 10, 2006
    This matches the count_delta() logic to the change previous
    commit introduces to patch_delta().
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  10. remove delta-against-self bit

    Nicolas Pitre Junio C Hamano
    Nicolas Pitre authored and Junio C Hamano committed Feb 9, 2006
    After experimenting with code to add the ability to encode a delta
    against part of the deltified file, it turns out that resulting packs
    are _bigger_ than when this ability is not used.  The raw delta output
    might be smaller, but it doesn't compress as well using gzip with a
    negative net saving on average.
    
    Said bit would in fact be more useful to allow for encoding the copying
    of chunks larger than 64KB providing more savings with large files.
    This will correspond to packs version 3.
    
    While the current code still produces packs version 2, it is made future
    proof so pack versions 2 and 3 are accepted.  Any pack version 2 are
    compatible with version 3 since the redefined bit was never used before.
    When enough time has passed, code to use that bit to produce version 3
    packs could be added.
    
    Signed-off-by: Nicolas Pitre <nico@cam.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>