Permalink
Commits on Oct 1, 2006
  1. GIT 1.4.3-rc1

    Junio C Hamano
    Junio C Hamano committed Oct 1, 2006
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. Merge branch 'maint'

    Junio C Hamano
    Junio C Hamano committed Oct 1, 2006
    * maint:
      git-diff -B output fix.
      Fix git-am safety checks
      Fix duplicate xmalloc in builtin-add
  3. Merge branch 'jc/gitpm'

    Junio C Hamano
    Junio C Hamano committed Oct 1, 2006
    * jc/gitpm: (52 commits)
      Remove -fPIC which was only needed for Git.xs
      Git.pm: Kill Git.xs for now
      Revert "Make it possible to set up libgit directly (instead of from the environment)"
      Revert "Git.pm: Introduce fast get_object() method"
      Revert "Convert git-annotate to use Git.pm"
      Fix compilation with Sun CC
      pass DESTDIR to the generated perl/Makefile
      Eliminate Scalar::Util usage from private-Error.pm
      Convert git-annotate to use Git.pm
      Git.pm: Introduce fast get_object() method
      Make it possible to set up libgit directly (instead of from the environment)
      Work around sed and make interactions on the backslash at the end of line.
      Git.pm: Introduce ident() and ident_person() methods
      Convert git-send-email to use Git.pm
      Git.pm: Add config() method
      Use $GITPERLLIB instead of $RUNNING_GIT_TESTS and centralize @INC munging
      INSTALL: a tip for running after building but without installing.
      Perly Git: make sure we do test the freshly built one.
      Git.pm: Don't #define around die
      Git.xs: older perl do not know const char *
      ...
  4. Merge branch 'jc/diff-stat'

    Junio C Hamano
    Junio C Hamano committed Oct 1, 2006
    * jc/diff-stat:
      diff --stat: ensure at least one '-' for deletions, and one '+' for additions
      diff --stat=width[,name-width]: allow custom diffstat output width.
      diff --stat: color output.
      diff --stat: allow custom diffstat output width.
  5. Merge branch 'lt/web'

    Junio C Hamano
    Junio C Hamano committed Oct 1, 2006
    * lt/web:
      gitweb: tree view: hash_base and hash are now context sensitive
      gitweb: History: blob and tree are first, then commitdiff, etc
      gitweb: Remove redundant "commit" from history
      gitweb: Don't use quotemeta on internally generated strings
      gitweb: Add snapshot to shortlog
      gitweb: Factor out gitweb_have_snapshot()
      gitweb: Remove redundant "commit" link from shortlog
      gitweb: "alternate" starts with shade (i.e. 1)
      gitweb: Add history and blame to git_difftree_body()
      gitweb: Remove excessively redundant entries from git_difftree_body
      Revert "gitweb: extend blame to show links to diff and previous"
      gitweb: Quote filename in HTTP Content-Disposition: header
      gitweb: Add git_url subroutine, and use it to quote full URLs
      gitweb: Split validate_input into validate_pathname and validate_refname
      gitweb: Use "return" instead of "return undef" for some subs
      gitweb: Strip trailing slashes from $path in git_get_hash_by_path
      gitweb: extend blame to show links to diff and previous
      gitweb: Remove redundant "tree" link
      gitweb: tree view: eliminate redundant "blob"
Commits on Sep 30, 2006
  1. gitweb: tree view: hash_base and hash are now context sensitive

    ltuikov authored and Junio C Hamano committed Sep 29, 2006
    In tree view, by default, hash_base is HEAD and hash is the
    entry equivalent.  Else the user had selected a hash_base or
    hash, say by clicking on a revision or commit, in which case
    those values are used.
    
    Signed-off-by: Luben Tuikov <ltuikov@yahoo.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. git-diff -B output fix.

    Junio C Hamano
    Junio C Hamano committed Sep 29, 2006
    Geert noticed that complete rewrite diff missed the usual a/ and b/
    leading paths.  Pickaxe says it never worked, ever.
    
    Embarrassing.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    (cherry picked from bc1a580 commit)
  3. fetch: Reset remote refs list each time fetch_main is called

    Santi Béjar Junio C Hamano
    Santi Béjar authored and Junio C Hamano committed Sep 29, 2006
    This prevents the fetch of the heads again in the second call of fetch_main.
    
    Signed-off-by: Santi Béjar <sbejar@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  4. Remove -fPIC which was only needed for Git.xs

    Junio C Hamano
    Junio C Hamano committed Sep 29, 2006
    The distinction between BASIC_ vs ALL_ is still kept, since it
    is not Git.xs specific -- we could face the same issue when we
    do other language bindings (e.g. Python).
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Sep 29, 2006
  1. Fix approxidate() to understand 12:34 AM/PM are 00:34 and 12:34

    Linus Torvalds Junio C Hamano
    Linus Torvalds authored and Junio C Hamano committed Sep 29, 2006
    It just simplifies the whole thing to say
    
    	"hour = (hour % 12) + X"
    
    where X is 12 for PM and 0 for AM.
    
    It also fixes the "exact date" parsing, which didn't parse AM at all, and
    as such would do the same "12:30 AM" means "12:30 24-hour-format" bug. Of
    course, I hope that no exact dates use AM/PM anyway, but since we support
    the PM format, let's just get it right.
    
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. git-diff -B output fix.

    Junio C Hamano
    Junio C Hamano committed Sep 29, 2006
    Geert noticed that complete rewrite diff missed the usual a/ and b/
    leading paths.  Pickaxe says it never worked, ever.
    
    Embarrassing.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. Make cvsexportcommit remove files.

    robinrosenberg authored and Junio C Hamano committed Sep 28, 2006
    Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  4. diff --stat: ensure at least one '-' for deletions, and one '+' for a…

    dscho authored and Junio C Hamano committed Sep 28, 2006
    …dditions
    
    The number of '-' and '+' is still linear. The idea is that
    scaled-length := floor(a * length + b) with the following constraints: if
    length == 1, scaled-length == 1, and the combined length of plusses
    and minusses should not be larger than the width by a small margin. Thus,
    
    	a + b == 1
    
    and
    	a * max_plusses + b + a * max_minusses + b = width + 1
    
    The solution is
    
    	a * x + b = ((width - 1) * (x - 1) + max_change - 1)
    		 / (max_change - 1)
    
    Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  5. diff --stat=width[,name-width]: allow custom diffstat output width.

    Linus Torvalds Junio C Hamano
    Linus Torvalds authored and Junio C Hamano committed Sep 28, 2006
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  6. gitweb: History: blob and tree are first, then commitdiff, etc

    ltuikov authored and Junio C Hamano committed Sep 29, 2006
    Reorder link display in history to be consistent with other
    list displays: log, shortlog, etc.  We now display:
    
    	blob | commitdiff
    	blob | commitdiff | diff_to_current
    
    and
    
    	tree | commitdiff
    
    Instead of the old history format where "blob" and "tree"
    are between "commitdiff" and "diff_to_current" if present/
    applicable.
    
    Signed-off-by: Luben Tuikov <ltuikov@yahoo.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  7. gitweb: Remove redundant "commit" from history

    ltuikov authored and Junio C Hamano committed Sep 29, 2006
    Remove redundant "commit" from history -- it can be had
    by clicking on the title of the commit.  This commit
    makes visualization consistent with shortlog, log, etc.
    
    Signed-off-by: Luben Tuikov <ltuikov@yahoo.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  8. http/ftp: optionally ask curl to not use EPSV command

    Sasha Khapyorsky Junio C Hamano
    Sasha Khapyorsky authored and Junio C Hamano committed Sep 29, 2006
    If http.noEPSV config variable is defined and true, or if
    GIT_CURL_FTP_NO_EPSV environment variable is defined, disable using
    of EPSV ftp command (PASV will be used instead). This is helpful with
    some "poor" ftp servers which does not support EPSV mode.
    
    Signed-off-by: Sasha Khapyorsky <sashak@voltaire.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  9. gitweb: Don't use quotemeta on internally generated strings

    ltuikov authored and Junio C Hamano committed Sep 28, 2006
    Do not use quotemeta on internally generated strings
    such as filenames of snapshot, blobs, etc.
    quotemeta quotes any characters not matching /A-Za-z_0-9/.
    Which means that we get strings like this:
    
    before: linux\-2\.6\.git\-5c2d97cb31fb77981797fec46230ca005b865799\.tar\.gz
    after:  linux-2.6.git-5c2d97cb31fb77981797fec46230ca005b865799.tar.gz
    
    This patch fixes this.
    
    Signed-off-by: Luben Tuikov <ltuikov@yahoo.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  10. gitweb: Add snapshot to shortlog

    ltuikov authored and Junio C Hamano committed Sep 28, 2006
    Add snapshot to each commit-row of shortlog.
    
    Signed-off-by: Luben Tuikov <ltuikov@yahoo.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  11. gitweb: Factor out gitweb_have_snapshot()

    ltuikov authored and Junio C Hamano committed Sep 28, 2006
    Create gitweb_have_snapshot() which returns true
    of snapshot is available and enabled, else false.
    
    Signed-off-by: Luben Tuikov <ltuikov@yahoo.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  12. gitweb: Remove redundant "commit" link from shortlog

    ltuikov authored and Junio C Hamano committed Sep 28, 2006
    Remove the redundant "commit" link from shortlog.
    It can be had by simply clicking on the entry title
    of the row.
    
    Signed-off-by: Luben Tuikov <ltuikov@yahoo.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  13. gitweb: "alternate" starts with shade (i.e. 1)

    ltuikov authored and Junio C Hamano committed Sep 28, 2006
    When displaying a list of rows (difftree, shortlog, etc),
    the first entry is now printed shaded, i.e. alternate is
    initialized to 1, as opposed to non-shaded (alternate
    initialized to 0).
    
    This solves the problem when there is only one row to
    display -- it is displayed shaded to visually indicate that
    it is "active", part of a "list", etc.
    
    (Compare this to the trivial case of more than one entry,
    where the rows have alternating shade, thus suggesting
    being part of a "list" of "active" entries, etc.)
    
    Signed-off-by: Luben Tuikov <ltuikov@yahoo.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  14. git-format-patch: fix bug using -o in subdirectories

    matled authored and Junio C Hamano committed Sep 28, 2006
    This was introduced by me in commit v1.4.2.1-gc08e524.
    
    Signed-off-by: Matthias Lederhofer <matled@gmx.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  15. do not discard constness in interp_set_entry value argument

    Alex Riesen Junio C Hamano
    Alex Riesen authored and Junio C Hamano committed Sep 28, 2006
    Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  16. Fix approxidate() to understand more extended numbers

    Linus Torvalds Junio C Hamano
    Linus Torvalds authored and Junio C Hamano committed Sep 28, 2006
    You can now say "5:35 PM yesterday", and approxidate() gets the right answer.
    
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  17. Clean up approxidate() in preparation for fixes

    Linus Torvalds Junio C Hamano
    Linus Torvalds authored and Junio C Hamano committed Sep 28, 2006
    Our approxidate cannot handle simple times like "5 PM yesterday", and to
    fix that, we will need to add some logic for number handling.  This just
    splits that out into a function of its own (the same way the _real_ date
    parsing works).
    
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  18. fix daemon.c compilation for NO_IPV6=1

    Alex Riesen Junio C Hamano
    Alex Riesen authored and Junio C Hamano committed Sep 28, 2006
    Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Sep 28, 2006
  1. daemon: default to 256 for HOST_NAME_MAX if it is not defined

    dscho authored and Junio C Hamano committed Sep 28, 2006
    Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. format-patch: use cwd as default output directory

    matled authored and Junio C Hamano committed Sep 22, 2006
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. svnimport: add support for parsing From: lines for author

    awhitcroft authored and Junio C Hamano committed Sep 25, 2006
    When commiting a non-signed off contribution you cannot just add
    a Signed-off-by: from the author as they did not sign it off.
    But if you then commit it, and necessarily sign it off yourself,
    the change appears to be yours.  In this case it is common to use
    the following form:
    
    	Commentry
    
    	From: originator <email>
    	Signed-of-by: me <my email>
    
    Now that we have support for parsing Signed-off-by: for author
    information it makes sense to handle From: as well.  This patch
    adds a new -F which will handle From: lines in the comments.  It
    may be used in combination with -S.
    
    Signed-off-by: Andy Whitcroft <apw@shadowen.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  4. Contributed bash completion support for core Git tools.

    Junio C Hamano
    Junio C Hamano committed Sep 28, 2006
    This is a set of bash completion routines for many of the
    popular core Git tools.  I wrote these routines from scratch
    after reading the git-compl and git-compl-lib routines available
    from the gitcompletion package at http://gitweb.hawaga.org.uk/
    and found those to be lacking in functionality for some commands.
    Consequently there may be some similarities but many differences.
    
    Since these are completion routines only for tools shipped with
    core Git and since bash is a popular shell on many of the native
    core Git platforms (Linux, Mac OS X, Solaris, BSD) including these
    routines as part of the stock package would probably be convienent
    for many users.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  5. Merge branch 'jl/virtual'

    Junio C Hamano
    Junio C Hamano committed Sep 28, 2006
    * jl/virtual:
      Removed memory leaks from interpolation table uses.
      Cleaned up git-daemon virtual hosting support.
  6. Merge branch 'cc/branch-test'

    Junio C Hamano
    Junio C Hamano committed Sep 28, 2006
    * cc/branch-test:
      Remove empty ref directories that prevent creating a ref.
  7. gitweb: Add history and blame to git_difftree_body()

    ltuikov authored and Junio C Hamano committed Sep 28, 2006
    Add blame and history to Deleted files.
    Add blame and history to Modified or Type changed files.
    Add blame and history to Renamed or Copied files.
    
    This allows us to do
    	blame->commit->blame->commit->blame->...
    instead of
    	blame->commit->file->blame->commit->file->blame->...
    which is longer and easier to get wrong.
    
    Signed-off-by: Luben Tuikov <ltuikov@yahoo.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  8. Merge branch 'sp/void'

    Junio C Hamano
    Junio C Hamano committed Sep 28, 2006
    * sp/void:
      Allow git-checkout when on a non-existant branch.