Permalink
Commits on Mar 28, 2006
  1. GIT 1.3.0 rc1

    All of the things that were not in the "master" branch were
    either cooked long enough in "next" without causing problems
    (e.g. insanely fast rename detector or true built-in diff) or
    isolated in a specific subsystem (e.g. tar-tree and svnimport).
    
    So I am clearing the deck to prepare for a 1.3.0.  Remaining
    wrinkles, if any, will be ironed in the "master" branch.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Mar 28, 2006
  2. Merge branch ak/svn

    Junio C Hamano committed Mar 28, 2006
Commits on Mar 27, 2006
  1. Merge branch 'lt/diffgen' into next

    * lt/diffgen:
      add clean and ignore rules for xdiff/
      Remove dependency on a file named "-lz"
    Junio C Hamano committed Mar 27, 2006
  2. Merge branch 'master' into next

    * master:
      Optionally do not list empty directories in git-ls-files --others
      Document git-rebase behavior on conflicts.
      Fix error handling for nonexistent names
    Junio C Hamano committed Mar 27, 2006
  3. add clean and ignore rules for xdiff/

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Mar 27, 2006
  4. Optionally do not list empty directories in git-ls-files --others

    Without the --directory flag, git-ls-files wouldn't ever list directories,
    producing no output for empty directories, which is good since they cannot
    be added and they bear no content, even untracked one (if Git ever starts
    tracking directories on their own, this should obviously change since the
    content notion will change).
    
    With the --directory flag however, git-ls-files would list even empty
    directories. This may be good in some situations but sometimes you want to
    prevent that. This patch adds a --no-empty-directory option which makes
    git-ls-files omit empty directories.
    
    Signed-off-by: Petr Baudis <pasky@suse.cz>
    Petr Baudis committed with Junio C Hamano Mar 26, 2006
  5. Document git-rebase behavior on conflicts.

    bfields committed with Junio C Hamano Mar 26, 2006
  6. Remove dependency on a file named "-lz"

    By changing the dependency "$(LIB_H)" to "$(LIBS)", at least one version
    of make thought that a file named "-lz" would be needed.
    
    Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    dscho committed with Junio C Hamano Mar 26, 2006
  7. Fix error handling for nonexistent names

    When passing in a pathname pattern without the "--" separator on the
    command line, we verify that the pathnames in question exist. However,
    there were two bugs in that verification:
    
     - git-rev-parse would only check the first pathname, and silently allow
       any invalid subsequent pathname, whether it existed or not (which
       defeats the purpose of the check, and is also inconsistent with what
       git-rev-list actually does)
    
     - git-rev-list (and "git log" etc) would check each filename, but if the
       check failed, it would print the error using the first one, i.e.:
    
    	[torvalds@g5 git]$ git log Makefile bad-file
    	fatal: 'Makefile': No such file or directory
    
       instead of saying that it's 'bad-file' that doesn't exist.
    
    This fixes both bugs.
    
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Linus Torvalds committed with Junio C Hamano Mar 27, 2006
Commits on Mar 26, 2006
  1. Merge branch 'jc/thin' into next

    * jc/thin:
      git-push: make --thin pack transfer the default.
      gitk: Fix two bugs reported by users
      gitk: Improve appearance of first child links
      gitk: Make downward-pointing arrows end in vertical line segment
      gitk: Don't change cursor at end of layout if find in progress
      gitk: Make commitdata an array rather than a list
      gitk: Fix display of diff lines beginning with --- or +++
      [PATCH] gitk: Make error_popup react to Return
      gitk: Fix a bug in drawing the selected line as a thick line
      gitk: Further speedups
      gitk: Various speed improvements
      gitk: Fix Update menu item
      gitk: Fix clicks on arrows on line ends
      gitk: New improved gitk
      contrib/git-svn: stabilize memory usage for big fetches
    Junio C Hamano committed Mar 26, 2006
  2. git-push: make --thin pack transfer the default.

    Just in case it has problems, you can say "git push --no-thin".
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Mar 26, 2006
  3. Merge branches 'jc/clone' and 'jc/name'

    * jc/clone:
      git-clone: typofix.
      clone: record the remote primary branch with remotes/$origin/HEAD
      revamp git-clone (take #2).
      revamp git-clone.
      fetch,parse-remote,fmt-merge-msg: refs/remotes/* support
    
    * jc/name:
      sha1_name: make core.warnambiguousrefs the default.
      sha1_name: warning ambiguous refs.
      get_sha1_basic(): try refs/... and finally refs/remotes/$foo/HEAD
      core.warnambiguousrefs: warns when "name" is used and both "name" branch and tag exists.
    Junio C Hamano committed Mar 26, 2006
  4. Merge branch 'jc/merge'

    * jc/merge:
      git-merge knows some strategies want to skip trivial merges
    Junio C Hamano committed Mar 26, 2006
  5. Merge branch 'lt/diffgen' into next

    * lt/diffgen:
      true built-in diff: run everything in-core.
    Junio C Hamano committed Mar 26, 2006
  6. git-svnimport: if a limit is specified, respect it

    git-svnimport will import the same revision over and over again if a
    limit (-l <rev>) has been specified. Instead if that revision has already
    been processed, exit with an up-to-date message.
    
    Signed-off-by: Anand Kumria <wildfire@progsoc.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Anand Kumria committed with Junio C Hamano Mar 25, 2006
  7. Merge git://git.kernel.org/pub/scm/gitk/gitk

    * git://git.kernel.org/pub/scm/gitk/gitk:
      gitk: Fix two bugs reported by users
      gitk: Improve appearance of first child links
      gitk: Make downward-pointing arrows end in vertical line segment
      gitk: Don't change cursor at end of layout if find in progress
      gitk: Make commitdata an array rather than a list
      gitk: Fix display of diff lines beginning with --- or +++
      [PATCH] gitk: Make error_popup react to Return
      gitk: Fix a bug in drawing the selected line as a thick line
      gitk: Further speedups
      gitk: Various speed improvements
      gitk: Fix Update menu item
      gitk: Fix clicks on arrows on line ends
      gitk: New improved gitk
    Junio C Hamano committed Mar 26, 2006
  8. true built-in diff: run everything in-core.

    This stops using temporary files when we are using the built-in
    diff (including the complete rewrite).
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Mar 26, 2006
  9. contrib/git-svn: stabilize memory usage for big fetches

    We should be safely able to import histories with thousands
    of revisions without hogging up lots of memory.
    
    With this, we lose the ability to autocorrect mistakes when
    people specify revisions in reverse, but it's probably no longer
    a problem since we only have one method of log parsing nowadays.
    
    I've added an extra check to ensure that revision numbers do
    increment.
    
    Also, increment the version number to 0.11.0.  I really should
    just call it 1.0 soon...
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Eric Wong committed with Junio C Hamano Mar 26, 2006
  10. Merge branch 'ew/email' into next

    * ew/email:
      send-email: lazy-load Email::Valid and make it optional
      send-email: try to order messages in email clients more correctly
      send-email: Change from Mail::Sendmail to Net::SMTP
      send-email: use built-in time() instead of /bin/date '+%s'
    Junio C Hamano committed Mar 26, 2006
  11. Merge branch 'lt/diffgen' into next

    * lt/diffgen:
      built-in diff: minimum tweaks
      builtin-diff: \No newline at end of file.
      Use a *real* built-in diff generator
    Junio C Hamano committed Mar 26, 2006
  12. Merge branch 'rs/tar-tree' into next

    * rs/tar-tree:
      tar-tree: Use the prefix field of a tar header
      tar-tree: Remove obsolete code
      tar-tree: Use write_entry() to write the archive contents
      tar-tree: Introduce write_entry()
      tar-tree: Use SHA1 of root tree for the basedir
      git-apply: safety fixes
      Removed bogus "<snap>" identifier.
      Clarify and expand some hook documentation.
      commit-tree: check return value from write_sha1_file()
      send-email: Identify author at the top when sending e-mail
      Format tweaks for asciidoc.
    Junio C Hamano committed Mar 26, 2006
  13. send-email: lazy-load Email::Valid and make it optional

    It's not installed on enough machines, and is overkill most of
    the time.  We'll fallback to a very basic regexp just in case,
    but nothing like the monster regexp Email::Valid has to offer :)
    
    Small cleanup from Merlyn.
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Eric Wong committed with Junio C Hamano Mar 26, 2006
  14. send-email: try to order messages in email clients more correctly

    If --no-chain-reply-to is set, patches may not always be ordered
    correctly in email clients.  This patch makes sure each email
    sent from a different second.
    
    I chose to start with a time (slightly) in the past because
    those are probably more likely in real-world usage and spam
    filters might be more tolerant of them.
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Eric Wong committed with Junio C Hamano Mar 25, 2006
  15. send-email: Change from Mail::Sendmail to Net::SMTP

    Net::SMTP is in the base Perl distribution, so users are more
    likely to have it.  Net::SMTP also allows reusing the SMTP
    connection, so sending multiple emails is faster.
    
    [jc: tweaked X-Mailer further while we are at it.]
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Eric Wong committed with Junio C Hamano Mar 26, 2006
  16. send-email: use built-in time() instead of /bin/date '+%s'

    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Eric Wong committed with Junio C Hamano Mar 25, 2006
  17. built-in diff: minimum tweaks

    This fixes up a couple of minor issues with the real built-in
    diff to be more usable:
    
     - Omit ---/+++ header unless we emit diff output;
    
     - Detect and punt binary diff like GNU does;
    
     - Honor GIT_DIFF_OPTS minimally (only -u<number> and
       --unified=<number> are currently supported);
    
     - Omit line count of 1 from "@@ -l,k +m,n @@" hunk header
       (i.e. when k == 1 or n == 1)
    
     - Adjust testsuite for the lack of -p support.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Mar 25, 2006
  18. builtin-diff: \No newline at end of file.

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Linus Torvalds committed with Junio C Hamano Mar 25, 2006
  19. Use a *real* built-in diff generator

    This uses a simplified libxdiff setup to generate unified diffs _without_
    doing  fork/execve of GNU "diff".
    
    This has several huge advantages, for example:
    
    Before:
    
    	[torvalds@g5 linux]$ time git diff v2.6.16.. > /dev/null
    
    	real    0m24.818s
    	user    0m13.332s
    	sys     0m8.664s
    
    After:
    
    	[torvalds@g5 linux]$ time git diff v2.6.16.. > /dev/null
    
    	real    0m4.563s
    	user    0m2.944s
    	sys     0m1.580s
    
    and the fact that this should be a lot more portable (ie we can ignore all
    the issues with doing fork/execve under Windows).
    
    Perhaps even more importantly, this allows us to do diffs without actually
    ever writing out the git file contents to a temporary file (and without
    any of the shell quoting issues on filenames etc etc).
    
    NOTE! THIS PATCH DOES NOT DO THAT OPTIMIZATION YET! I was lazy, and the
    current "diff-core" code actually will always write the temp-files,
    because it used to be something that you simply had to do. So this current
    one actually writes a temp-file like before, and then reads it into memory
    again just to do the diff. Stupid.
    
    But if this basic infrastructure is accepted, we can start switching over
    diff-core to not write temp-files, which should speed things up even
    further, especially when doing big tree-to-tree diffs.
    
    Now, in the interest of full disclosure, I should also point out a few
    downsides:
    
     - the libxdiff algorithm is different, and I bet GNU diff has gotten a
       lot more testing. And the thing is, generating a diff is not an exact
       science - you can get two different diffs (and you will), and they can
       both be perfectly valid. So it's not possible to "validate" the
       libxdiff output by just comparing it against GNU diff.
    
     - GNU diff does some nice eye-candy, like trying to figure out what the
       last function was, and adding that information to the "@@ .." line.
       libxdiff doesn't do that.
    
     - The libxdiff thing has some known deficiencies. In particular, it gets
       the "\No newline at end of file" case wrong. So this is currently for
       the experimental branch only. I hope Davide will help fix it.
    
    That said, I think the huge performance advantage, and the fact that it
    integrates better is definitely worth it. But it should go into a
    development branch at least due to the missing newline issue.
    
    Technical note: this is based on libxdiff-0.17, but I did some surgery to
    get rid of the extraneous fat - stuff that git doesn't need, and seriously
    cutting down on mmfile_t, which had much more capabilities than the diff
    algorithm either needed or used. In this version, "mmfile_t" is just a
    trivial <pointer,length> tuple.
    
    That said, I tried to keep the differences to simple removals, so that you
    can do a diff between this and the libxdiff origin, and you'll basically
    see just things getting deleted. Even the mmfile_t simplifications are
    left in a state where the diffs should be readable.
    
    Apologies to Davide, whom I'd love to get feedback on this all from (I
    wrote my own "fill_mmfile()" for the new simpler mmfile_t format: the old
    complex format had a helper function for that, but I did my surgery with
    the goal in mind that eventually we _should_ just do
    
    	mmfile_t mf;
    
    	buf = read_sha1_file(sha1, type, &size);
    	mf->ptr = buf;
    	mf->size = size;
    	.. use "mf" directly ..
    
    which was really a nightmare with the old "helpful" mmfile_t, and really
    is that easy with the new cut-down interfaces).
    
    [ Btw, as any hawk-eye can see from the diff, this was actually generated
      with itself, so it is "self-hosting". That's about all the testing it
      has gotten, along with the above kernel diff, which eye-balls correctly,
      but shows the newline issue when you double-check it with "git-apply" ]
    
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Linus Torvalds committed with Junio C Hamano Mar 25, 2006
  20. tar-tree: Use the prefix field of a tar header

    ... to store parts of the path, if possible.  This allows us to avoid
    writing extended headers in certain cases (long pathes can only be
    split at '/' chars).
    
    Also adds a file to the test repo with a 100 chars long directory name.
    Even old versions of tar that don't understand POSIX extended headers
    should be able to handle this testcase.
    
    Btw.: The longest path in the kernel tree currently has 70 chars.
    Together with a 30 chars long prefix this would already cross the
    field limit of 100 chars.
    
    Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Rene Scharfe committed with Junio C Hamano Mar 25, 2006
  21. tar-tree: Remove obsolete code

    Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Rene Scharfe committed with Junio C Hamano Mar 25, 2006
  22. tar-tree: Use write_entry() to write the archive contents

    Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Rene Scharfe committed with Junio C Hamano Mar 25, 2006
  23. tar-tree: Introduce write_entry()

    ... and use it initially to write global extended header records.
    Improvements compared to the old write_header():
    
      - Uses a struct ustar_header instead of hardcoded offsets.
      - Takes one struct strbuf as path argument instead of a (basedir,
        prefix, name) tuple.
      - Not only writes the tar header, but also the contents of the
        file, if any.
      - Does not write directly into the ring buffer.  This allows the
        code to be layed out more naturally, because there is no more
        ordering constraint.  Before we had to first finish writing the
        extended header, now we can construct the extended and normal
        headers in parallel.
      - The typeflag parameter has been replaced by (reasonable) magic
        values.  path == NULL indicates an extended header, additionally
        sha1 == NULL means it is a global extended header.
    
    Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Rene Scharfe committed with Junio C Hamano Mar 25, 2006
  24. tar-tree: Use SHA1 of root tree for the basedir

    ... instead of the made-up "0".
    
    Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Rene Scharfe committed with Junio C Hamano Mar 25, 2006
  25. git-apply: safety fixes

    This was triggered by me testing the "@@" numbering shorthand by GNU
    patch, which not only showed that git-apply thought it meant the number
    was duplicated (when it means that the second number is 1), but my tests
    showed than when git-apply mis-understood the number, it would then not
    raise an alarm about it if the patch ended early.
    
    Now, this doesn't actually _matter_, since with a three-line context, the
    only case that "x,1" will be shorthanded to "x" is when x itself is 1 (in
    which case git-apply got it right), but the fact that git-apply would also
    silently accept truncated patches was a missed opportunity for additional
    sanity-checking.
    
    So make git-apply refuse to look at a patch fragment that ends early.
    
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Linus Torvalds committed with Junio C Hamano Mar 25, 2006
Commits on Mar 25, 2006
  1. Removed bogus "<snap>" identifier.

    Signed-off-by: Jon Loeliger <jdl@jdl.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Jon Loeliger committed with Junio C Hamano Mar 25, 2006