Permalink
Commits on Dec 13, 2007
  1. GIT 1.5.4-rc0

    gitster committed Dec 13, 2007
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Merge branch 'cc/help'

    gitster committed Dec 13, 2007
    * cc/help:
      RPM spec: Adjust htmldir
      git-help -w: do not require to be in git repository
      git.spec.in: remove python_path
      Documentation: rename git.texi to user-manual.texi
      Add git-browse-help to .gitignore
      git-help -i: show info documentation from matching version of git
      git-help -i: invoke info with document and node name
      Documentation: add gitman.info target
      Documentation: describe -w/--web option to "git-help".
      Use {web,instaweb,help}.browser config options.
      git-help: add -w|--web option to display html man page in a browser.
      Documentation: describe -i/--info option to "git-help"
      git-help: add -i|--info option to display info page.
  3. RPM spec: Adjust htmldir

    gitster committed Dec 12, 2007
    git help -w needs to know the right location of installed pages.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. git-help -w: do not require to be in git repository

    gitster committed Dec 13, 2007
    The users used to be able to say "git help cat-file" from anywhere, but
    the browse-help script insisted to be in a git repository, which caused
    "git help -w cat-file" to barf outside.  Correct it.
    
    While at it, remove leftover debugging "echo".
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. Merge branch 'jc/shortlog-e'

    gitster committed Dec 13, 2007
    * jc/shortlog-e:
      shortlog: default to HEAD when the standard input is a tty
      Invert numbers and names in the git-shortlog summary mode.
      shortlog: document -e option
      git-shortlog -e: show e-mail address as well
  6. Merge branch 'ew/svn-rev-db'

    gitster committed Dec 13, 2007
    * ew/svn-rev-db:
      git-svn: reinstate old rev_db optimization in new rev_map
      git-svn: replace .rev_db with a more space-efficient .rev_map format
  7. Merge branch 'jc/merge-recursive-gitlink'

    gitster committed Dec 13, 2007
    * jc/merge-recursive-gitlink:
      Support a merge with conflicting gitlink change
  8. Merge branch 'jk/svn-color'

    gitster committed Dec 13, 2007
    * jk/svn-color:
      git-svn: get color config from --get-colorbool
      Support GIT_PAGER_IN_USE environment variable
Commits on Dec 12, 2007
  1. git.spec.in: remove python_path

    gitster committed Dec 12, 2007
    We do not depend on python nor customize scripts for it anymore.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Documentation: rename git.texi to user-manual.texi

    gitster committed Dec 12, 2007
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. disable t9119 for now.

    gitster committed Dec 12, 2007
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. Fix "diff --check" whitespace detection

    wincent authored and gitster committed Dec 12, 2007
    "diff --check" would only detect spaces before tabs if a tab was the
    last character in the leading indent. Fix that and add a test case to
    make sure the bug doesn't regress in the future.
    
    Signed-off-by: Wincent Colaiuta <win@wincent.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. git-diff --numstat -z: make it machine readable

    gitster committed Dec 12, 2007
    The "-z" format is all about machine parsability, but showing renamed
    paths as "common/{a => b}/suffix" makes it impossible.  The scripts would
    never have successfully parsed "--numstat -z -M" in the old format.
    
    This fixes the output format in a (hopefully minimally) backward
    incompatible way.
    
     * The output without -z is not changed.  This has given a good way for
       humans to view added and deleted lines separately, and showing the
       path in combined, shorter way would preserve readability.
    
     * The output with -z is unchanged for paths that do not involve renames.
       Existing scripts that do not pass -M/-C are not affected at all.
    
     * The output with -z for a renamed path is shown in a format that can
       easily be distinguished from an unrenamed path.
    
    This is based on Jakub Narebski's patch.  Bugs and documentation typos
    are mine.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  6. Documentation: minor grammar fix for "git apply"

    wincent authored and gitster committed Dec 12, 2007
    Signed-off-by: Wincent Colaiuta <win@wincent.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  7. Use "whitespace" consistently

    wincent authored and gitster committed Dec 12, 2007
    For consistency, change "white space" and "whitespaces" to
    "whitespace", fixing a couple of adjacent grammar problems in the
    docs.
    
    Signed-off-by: Wincent Colaiuta <win@wincent.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  8. Fix XML parser leaks in http-push

    glandium authored and gitster committed Dec 11, 2007
    XML_Parser were never freed. While at it, move the parser initialization to
    right before it is needed.
    
    Signed-off-by: Mike Hommey <mh@glandium.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  9. Fix small memory leaks induced by diff_tree_setup_paths

    glandium authored and gitster committed Dec 11, 2007
    Run diff_tree_release_paths in the appropriate places, and add a test to
    avoid NULL dereference. Better safe than sorry.
    
    Signed-off-by: Mike Hommey <mh@glandium.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  10. Fix git-fast-export for zero-sized blobs

    raalkml authored and gitster committed Dec 11, 2007
    Writing 1 elements of size 0-byte successfully will cause fwrite(3) to
    return 0, and flagging it as error is a mistake.
    
    Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  11. Fix clone not to ignore depth when performing a local clone

    hashpling authored and gitster committed Dec 11, 2007
    When git-clone detects that it can perform a local clone it
    follows a path that silently ignores the depth parameter.
    
    Presumably if the user explicitly requests a shallow clone they
    have a reason to prefer a space efficient clone of just the recent
    history so bypass the local magic if the user specifies the depth
    parameter.
    
    Signed-off-by: Charles Bailey <charles@hashpling.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  12. shortlog: default to HEAD when the standard input is a tty

    gitster committed Dec 11, 2007
    Instead of warning the user that it is expecting git log output from
    the standard input (and waiting for the user to type the log from
    the keyboard, which is a silly thing to do), default to traverse from
    HEAD when there is no rev parameter given and the standard input is
    a tty.
    
    This factors out a useful helper "add_head()" from builtin-diff.c to a
    more appropriate place revision.c while renaming it to more descriptive
    name add_head_to_pending(), as that is what the function is about.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  13. blame: drop blob data after passing blame to the parent

    gitster committed Dec 12, 2007
    We used to keep the blob data for each origin that has any remaining
    line in the result, but this will get very costly with a huge file that
    has a deep history.  This patch releases the blob after we ran diff
    between the child rev and its parents.  When passing blame from a parent
    to its parent (i.e. the grandparent), the blob data for the parent may
    need to be read again, but it should be relatively cheap, thanks to
    delta-base cache.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Dec 11, 2007
  1. git-clone: print an error message when trying to clone empty repo

    peff authored and gitster committed Dec 11, 2007
    Previously, cloning an empty repository looked like this:
    
    $ (mkdir parent && cd parent && git --bare init)
    $ git-clone parent child
    Initialized empty Git repository in /home/peff/clone/child/.git/
    $ cd child
    -bash: cd: child: No such file or directory
    $ echo 'wtf?' | mail git@vger.kernel.org
    
    Now we at least report that the clone was not successful.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Invert numbers and names in the git-shortlog summary mode.

    MadCoder authored and gitster committed Dec 11, 2007
    Also make it `cut` friendly using a tab to separate the numbers and names.
    
    Signed-off-by: Pierre Habouzit <madcoder@debian.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. shortlog: document -e option

    peff authored and gitster committed Dec 11, 2007
    This shows e-mail address in addition to author's name.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. git.el: Added a menu for git-status-mode.

    julliard authored and gitster committed Dec 11, 2007
    Originally written by Rémi Vanicat, I just changed the layout a little.
    
    Signed-off-by: Rémi Vanicat <vanicat@debian.org>
    Signed-off-by: Alexandre Julliard <julliard@winehq.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. Fix a typo in checkout.sh and cleanup one-line help messages

    Johannes Sixt authored and gitster committed Dec 11, 2007
    This also shortens option descriptions to fit in 80 columns.
    
    Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  6. git-svn: get color config from --get-colorbool

    peff authored and gitster committed Dec 11, 2007
    git-config recently learned a --get-colorbool option. By
    using it, we will get the same color=auto behavior that
    other git commands have.
    
    Specifically, this fixes the case where "color.diff = true"
    meant "always" in git-svn, but "auto" in other programs.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  7. Support GIT_PAGER_IN_USE environment variable

    peff authored and gitster committed Dec 11, 2007
    When deciding whether or not to turn on automatic color
    support, git_config_colorbool checks whether stdout is a
    tty. However, because we run a pager, if stdout is not a
    tty, we must check whether it is because we started the
    pager. This used to be done by checking the pager_in_use
    variable.
    
    This variable was set only when the git program being run
    started the pager; there was no way for an external program
    running git indicate that it had already started a pager.
    This patch allows a program to set GIT_PAGER_IN_USE to a
    true value to indicate that even though stdout is not a tty,
    it is because a pager is being used.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  8. Support a merge with conflicting gitlink change

    gitster committed Dec 10, 2007
    merge-recursive did not support merging trees that have conflicting
    changes in submodules they contain, and died.  Support it exactly the
    same way as how it handles conflicting symbolic link changes --- mark it
    as a conflict, take the tentative result from the current side, and
    letting the caller resolve the conflict, without dying in merge_file()
    function.
    
    Also reword the error message issued when merge_file() has to die
    because it sees a tree entry of type it does not support yet.
    
    [jc: fixed up initial draft by Finn Arne Gangstad]
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  9. commit: do not add extra LF at the end of the summary.

    gitster committed Dec 11, 2007
    The scripted version relied on the nice "auto-strip the terminating LF"
    behaviour shell gives to "var=$(cmd)" construct, but we have to roll
    that ourselves.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  10. "git tag -u keyname" broken

    torvalds authored and gitster committed Dec 11, 2007
    Commit 3968658 broke signed tags using
    the "-u" flag when it made builtin-tag.c use parse_options() to parse its
    arguments (but it quite possibly was broken even before that, by the
    builtin rewrite).
    
    It used to be that passing the signing ID with the -u parameter also
    (obviously!) implied that you wanted to sign and annotate the tag, but
    that logic got dropped. It also totally ignored the actual key ID that was
    passed in.
    
    This reinstates it all.
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  11. send-email: do not muck with initial-reply-to when unset.

    gitster committed Dec 11, 2007
    When not prompting, initial_reply_to can be left unset.  Do not try to
    sanitize it and get useless warning.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  12. Don't cache DESTDIR in perl/perl.mak.

    Gerrit Pape authored and gitster committed Dec 10, 2007
    DESTDIR is supposed to be overridden on 'make install' after doing
    'make'.  Have the automatically generated perl/perl.mak not cache the
    value of DESTDIR to support that for the perl/ subdirectory also.
    
    Signed-off-by: Gerrit Pape <pape@smarden.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  13. autoconf: Check asciidoc version to automatically set ASCIIDOC8

    jnareb authored and gitster committed Dec 9, 2007
    Check for asciidoc, and if it exists check asciidoc version, setting
    ASCIIDOC8 when needed.  Currently it just runs asciidoc in asciidoc7
    compatibility mode (see: Documentation/Makefile).
    
    Signed-off-by: Jakub Narebski <jnareb@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  14. git-svn: reinstate old rev_db optimization in new rev_map

    Eric Wong authored and gitster committed Dec 9, 2007
    This reinstates an old optimization in .rev_db which
    stored the highest revision number we scanned, allowing
    us to avoid scanning the SVN log for those revisions
    again in a subsequent invocation.
    
    This means the last 24-byte record in a .rev_map file
    can be a 4-byte SVN revision number with 20-bytes of
    zeroes representing a non-existent commit.  This record
    can and will be overwritten when a new commit iff
    the commit is all zeroes.
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>