Permalink
Commits on Apr 4, 2006
  1. GIT 1.3.0-rc2

    Junio C Hamano
    Junio C Hamano committed Apr 4, 2006
    Bunch of cleanups with a few notable enhancements since
    1.3.0-rc1:
    
     - revision traversal infrastructure is updated so that
       existence of paths limiters and/or --max-age does not cause
       it to call limit_list().  This helps the latency working with
       the command quite a bit.
    
     - comes with updated gitk.
    
    One notable fix is to make sure that the IO is restarted upon
    signal even on platforms whose default signal semantics is not
    to do so.  This is the fix for the notorious "clone is broken
    since 1.2.2 on Solaris" problem.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. Merge in xdiff cleanup pieces

    Junio C Hamano
    Junio C Hamano committed Apr 4, 2006
  3. Set HTTP user agent to git/GIT_VERSION

    Nick Hengeveld Junio C Hamano
    Nick Hengeveld authored and Junio C Hamano committed Apr 4, 2006
    Useful for diagnostics/troubleshooting to know which client versions are
    hitting your server.
    
    Signed-off-by: Nick Hengeveld <nickh@reactrix.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  4. git-ls-remote: send no-cache header when fetching info/refs

    Nick Hengeveld Junio C Hamano
    Nick Hengeveld authored and Junio C Hamano committed Apr 4, 2006
    Proxies should not cache this file as it can cause a client to end up with
    a stale version, as reported here:
    
    http://marc.theaimsgroup.com/?l=git&m=114407944125389
    
    Signed-off-by: Nick Hengeveld <nickh@reactrix.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  5. Merge branch 'pe/cleanup'

    Junio C Hamano
    Junio C Hamano committed Apr 4, 2006
    * pe/cleanup:
      Replace xmalloc+memset(0) with xcalloc.
      Use blob_, commit_, tag_, and tree_type throughout.
  6. Merge branch 'lt/fix-sol-pack'

    Junio C Hamano
    Junio C Hamano committed Apr 4, 2006
    * lt/fix-sol-pack:
      Use sigaction and SA_RESTART in read-tree.c; add option in Makefile.
      safe_fgets() - even more anal fgets()
      pack-objects: be incredibly anal about stdio semantics
      Fix Solaris stdio signal handling stupidities
  7. Replace xmalloc+memset(0) with xcalloc.

    Peter Eriksen Junio C Hamano
    Peter Eriksen authored and Junio C Hamano committed Apr 3, 2006
    Signed-off-by: Peter Eriksen <s022018@student.dtu.dk>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  8. Use blob_, commit_, tag_, and tree_type throughout.

    Peter Eriksen Junio C Hamano
    Peter Eriksen authored and Junio C Hamano committed Apr 2, 2006
    This replaces occurences of "blob", "commit", "tag", and "tree",
    where they're really used as type specifiers, which we already
    have defined global constants for.
    
    Signed-off-by: Peter Eriksen <s022018@student.dtu.dk>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  9. Clean-up trivially redundant diff.

    davidel authored and Junio C Hamano committed Apr 4, 2006
    Also corrects the line numbers in unified output when using
    zero lines context.
  10. contrib/git-svn: handle array values correctly

    Eric Wong Junio C Hamano
    Eric Wong authored and Junio C Hamano committed Apr 4, 2006
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  11. contrib/git-svn: make sure our git-svn is up-to-date for test

    Eric Wong Junio C Hamano
    Eric Wong authored and Junio C Hamano committed Apr 3, 2006
    Bugs like the last one could've been avoided if it weren't for
    this...
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  12. contrib/git-svn: ensure repo-config returns a value before using it

    Eric Wong Junio C Hamano
    Eric Wong authored and Junio C Hamano committed Apr 3, 2006
    fetching from repos without an authors-file defined was broken.
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  13. Use sigaction and SA_RESTART in read-tree.c; add option in Makefile.

    Jason Riedy Junio C Hamano
    Jason Riedy authored and Junio C Hamano committed Apr 2, 2006
    Might as well ape the sigaction change in read-tree.c to avoid
    the same potential problems.  The fprintf status output will
    be overwritten in a second, so don't bother guarding it.  Do
    move the fputc after disabling SIGALRM to ensure we go to the
    next line, though.
    
    Also add a NO_SA_RESTART option in the Makefile in case someone
    doesn't have SA_RESTART but does restart (maybe older HP/UX?).
    We want the builder to chose this specifically in case the
    system both lacks SA_RESTART and does not restart stdio calls;
    a compat #define in git-compat-utils.h would silently allow
    broken systems.
    
    Signed-off-by: Jason Riedy <ejr@cs.berkeley.edu>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  14. safe_fgets() - even more anal fgets()

    Junio C Hamano
    Junio C Hamano committed Apr 4, 2006
    This is from Linus -- the previous round forgot to clear error
    after EINTR case.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Apr 3, 2006
  1. fix repacking with lots of tags

    radford authored and Junio C Hamano committed Apr 3, 2006
    Use git-rev-list's --all instead of git-rev-parse's to keep from
    hitting the shell's argument list length limits when repacking
    with lots of tags.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. Documentation: revise top of git man page

    bfields authored and Junio C Hamano committed Apr 2, 2006
    I'm afraid I'll be accused of trying to suck all the jokes and the
    personality out of the git documentation.  I'm not!  Really!
    
    That said, "man git" is one of the first things a new user is likely try,
    and it seems a little cruel to start off with a somewhat obscure joke
    about the architecture of git.
    
    So instead I'm trying for a relatively straightforward description of what
    git does, and what features distinguish it from other systems, together
    with immediate links to introductory documentation.
    
    I also did some minor reorganization in an attempt to clarify the
    classification of commands.  And revised a bit for conciseness (as is
    obvious from the diffstat--hopefully I didn't cut anything important).
    
    Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Apr 2, 2006
  1. pack-objects: be incredibly anal about stdio semantics

    Linus Torvalds Junio C Hamano
    Linus Torvalds authored and Junio C Hamano committed Apr 2, 2006
    This is the "letter of the law" version of using fgets() properly in the
    face of incredibly broken stdio implementations.  We can work around the
    Solaris breakage with SA_RESTART, but in case anybody else is ever that
    stupid, here's the "safe" (read: "insanely anal") way to use fgets.
    
    It probably goes without saying that I'm not terribly impressed by
    Solaris libc.
    
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. Fix Solaris stdio signal handling stupidities

    Linus Torvalds Junio C Hamano
    Linus Torvalds authored and Junio C Hamano committed Apr 2, 2006
    This uses sigaction() to install the SIGALRM handler with SA_RESTART, so
    that Solaris stdio doesn't break completely when a signal interrupts a
    read.
    
    Thanks to Jason Riedy for confirming the silly Solaris signal behaviour.
    
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. Fix sparse warnings about non-ANSI function prototypes

    Rene Scharfe Junio C Hamano
    Rene Scharfe authored and Junio C Hamano committed Apr 2, 2006
    Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  4. Fix sparse warnings about usage of 0 instead of NULL

    Rene Scharfe Junio C Hamano
    Rene Scharfe authored and Junio C Hamano committed Apr 2, 2006
    Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  5. Remove useless pointer update

    Rene Scharfe Junio C Hamano
    Rene Scharfe authored and Junio C Hamano committed Apr 2, 2006
    buf is not used afterwards.  The compiler optimized the dead store out
    anyway, but let's clean the source, too.
    
    Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  6. contrib/git-svn: documentation updates

    Eric Wong Junio C Hamano
    Eric Wong authored and Junio C Hamano committed Apr 2, 2006
    contrib/git-svn/git-svn.txt:
    	added git-repo-config key names for options
    	fixed quoting of "git-svn-HEAD" in the manpage
    	use preformatted text for examples
    
    contrib/git-svn/Makefile:
    	add target to generate HTML:
    		http://git-svn.yhbt.net/git-svn.html
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  7. contrib/git-svn: accept configuration via repo-config

    Eric Wong Junio C Hamano
    Eric Wong authored and Junio C Hamano committed Apr 2, 2006
    repo-config keys are any of the long option names minus the '-'
    characters
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  8. revision: --max-age alone does not need limit_list() anymore.

    Junio C Hamano
    Junio C Hamano committed Apr 2, 2006
    This makes git log --since=7.days to be streamable.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  9. revision: simplify argument parsing.

    Junio C Hamano
    Junio C Hamano committed Apr 2, 2006
    This just moves code around to consolidate the part that sets
    revs->limited to one place based on various flags.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  10. revision: --topo-order and --unpacked

    Junio C Hamano
    Junio C Hamano committed Apr 2, 2006
    Now, using --unpacked without limit_list() does not make much
    sense, but this is parallel to the earlier --max-age fix.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  11. revision: Fix --topo-order and --max-age with reachability limiting.

    Linus Torvalds Junio C Hamano
    Linus Torvalds authored and Junio C Hamano committed Apr 2, 2006
    What ends up not working very well at all is the combination of
    "--topo-order" and the output filter in get_revision. It will
    return NULL when we see the first commit out of date-order, even
    if we have other commits coming.
    
    So we really should do the "past the date order" thing in
    get_revision() only if we have _not_ done it already in
    limit_list().
    
    Something like this.
    
    The easiest way to test this is with just
    
    	gitk --since=3.days.ago
    
    on the kernel tree. Without this patch, it tends to be pretty obviously
    broken.
    
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Apr 1, 2006
  1. Make path-limiting be incremental when possible.

    Linus Torvalds Junio C Hamano
    Linus Torvalds authored and Junio C Hamano committed Mar 31, 2006
    This makes git-rev-list able to do path-limiting without having to parse
    all of history before it starts showing the results.
    
    This makes things like "git log -- pathname" much more pleasant to use.
    
    This is actually a pretty small patch, and the biggest part of it is
    purely cleanups (turning the "goto next" statements into "continue"), but
    it's conceptually a lot bigger than it looks.
    
    What it does is that if you do a path-limited revision list, and you do
    _not_ ask for pseudo-parenthood information, it won't do all the
    path-limiting up-front, but instead do it incrementally in
    "get_revision()".
    
    This is an absolutely huge deal for anything like "git log -- <pathname>",
    but also for some things that we don't do yet - like the "find where
    things changed" logic I've described elsewhere, where we want to find the
    previous revision that changed a file.
    
    The reason I put "RFC" in the subject line is that while I've validated it
    various ways, like doing
    
    	git-rev-list HEAD -- drivers/char/ | md5sum
    
    before-and-after on the kernel archive, it's "git-rev-list" after all. In
    other words, it's that really really subtle and complex central piece of
    software. So while I think this is important and should go in asap, I also
    think it should get lots of testing and eyeballs looking at the code.
    
    Btw, don't even bother testing this with the git archive. git itself is so
    small that parsing the whole revision history for it takes about a second
    even with path limiting. The thing that _really_ shows this off is doing
    
    	git log drivers/
    
    on the kernel archive, or even better, on the _historic_ kernel archive.
    
    With this change, the response is instantaneous (although seeking to the
    end of the result will obviously take as long as it ever did). Before this
    change, the command would think about the result for tens of seconds - or
    even minutes, in the case of the bigger old kernel archive - before
    starting to output the results.
    
    NOTE NOTE NOTE! Using path limiting with things like "gitk", which uses
    the "--parents" flag to actually generate a pseudo-history of the
    resulting commits won't actually see the improvement in interactivity,
    since that forces git-rev-list to do the whole-history thing after all.
    
    MAYBE we can fix that too at some point, but I won't promise anything.
    
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. Move "--parent" parsing into generic revision.c library code

    Linus Torvalds Junio C Hamano
    Linus Torvalds authored and Junio C Hamano committed Mar 31, 2006
    Not only do we do it in both rev-list.c and git.c, the revision walking
    code will soon want to know whether we should rewrite parenthood
    information or not.
    
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. Makefile: many programs now depend on xdiff/lib.a having been built.

    Junio C Hamano
    Junio C Hamano committed Apr 1, 2006
    The dependency was not properly updated when we added this
    library, breaking parallel build with $(MAKE) -j.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Mar 31, 2006
  1. rev-list --boundary: fix re-injecting boundary commits.

    Junio C Hamano
    Junio C Hamano committed Mar 31, 2006
    Marco reported that
    
    	$ git rev-list --boundary --topo-order --parents 5aa44d5..ab57c8d
    
    misses these two boundary commits.
    
            c649657
            eb38cc6
    
    Indeed, we can see that gitk shows these two commits at the
    bottom, because the --boundary code failed to output them.
    
    The code did not check to avoid pushing the same uninteresting
    commit twice to the result list.  I am not sure why this fixes
    the reported problem, but this seems to fix it.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. Merge git://git.kernel.org/pub/scm/gitk/gitk

    Junio C Hamano
    Junio C Hamano committed Mar 31, 2006
    * git://git.kernel.org/pub/scm/gitk/gitk:
      gitk: Better workaround for arrows on diagonal line segments
      gitk: Allow top panes to scroll horizontally with mouse button 2
      gitk: Prevent parent link from overwriting commit headline
      gitk: Show diffs for boundary commits
      gitk: Use the new --boundary flag to git-rev-list
Commits on Mar 30, 2006
  1. gitk: Better workaround for arrows on diagonal line segments

    paulusmack committed Mar 30, 2006
    Instead of adding extra padding to create a vertical line segment at
    the lower end of a line that has an arrow, this now just draws a very
    short vertical line segment at the lower end.  This alternative
    workaround for the Tk8.4 behaviour (not drawing arrows on diagonal
    line segments) doesn't have the problem of making the graph very wide
    when people do a lot of merges in a row (hi Junio :).
    
    Signed-off-by: Paul Mackerras <paulus@samba.org>
  2. contrib/git-svn: force GIT_DIR to an absolute path

    Eric Wong Junio C Hamano
    Eric Wong authored and Junio C Hamano committed Mar 30, 2006
    We chdir internally, so we need a consistent GIT_DIR variable.
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. git-clone: exit early if repo isn't specified

    yashi authored and Junio C Hamano committed Mar 30, 2006
    git-clone without a repo isn't useful at all.  print message and get
    out asap.
    
    This patch also move the variable 'local' to where other variables are
    initialized.
    
    Signed-off-by: Yasushi SHOJI <yashi@atmark-techno.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>