Permalink
Commits on Oct 10, 2006
  1. add commit count options to git-shortlog

    Nicolas Pitre Junio C Hamano
    Nicolas Pitre authored and Junio C Hamano committed Oct 6, 2006
    This patch does 3 things:
    
    1) Output the number of commits along with the name for each author
       (nice to know for long lists spending more than a screen worth of
       commit lines).
    
    2) Provide a switch (-n) to sort authors according to their number of
       commits instead of author alphabetic order.
    
    3) Provide a switch (-s) to supress commit lines and only keep a
       summary of authors and the number of commits for each of them.
    
    And for good measure a short usage is displayed with -h.
    
    Signed-off-by: Nicolas Pitre <nico@cam.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. Fix git-revert

    Junio C Hamano
    Junio C Hamano committed Oct 10, 2006
    Defaulting to $replay for the sake of fixing cherry-pick was not
    done conditionally, which broke git-revert.
    
    Noticed by Luben.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Oct 8, 2006
  1. gitweb: Cleanup Git logo and Git logo target generation

    jnareb authored and Junio C Hamano committed Oct 6, 2006
    Rename $githelp_url and $githelp_label to $logo_url and $logo_label to
    be more obvious what they refer to; while at it add commented out
    previous contents (git documentation at kernel.org). Add comment about
    logo size.
    
    Use $cgi->a(...) to generate Git logo link; it automatically escapes
    attribute values when it is needed.  Escape href attribute using
    esc_url instead of (incorrect!) esc_html.
    
    Move styling of git logo <img> element from "style" attribute to CSS
    via setting class to "logo".  Perhaps we should set it by id rather
    than by class.
    
    Signed-off-by: Jakub Narebski <jnareb@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. git-tar-tree: don't RUN_SETUP

    Rene Scharfe Junio C Hamano
    Rene Scharfe authored and Junio C Hamano committed Oct 8, 2006
    Noted by Jiri Slaby, git-tar-tree --remote doesn't need to be run
    from inside of a git archive.  Since git-tar-tree is now only a
    wrapper for git-archive, which calls setup_git_directory() as
    needed, we should drop the flag RUN_SETUP.
    
    Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. test-lib: separate individual test better in verbose mode.

    tali authored and Junio C Hamano committed Oct 7, 2006
    When running tests with --verbose it is difficult to see where
    one test starts and where it ends because everything is printed
    in one big lump.
    Fix that by printing one single newline between each test.
    
    Signed-off-by: Martin Waitz <tali@admingilde.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  4. git-commit: fix coding style.

    tali authored and Junio C Hamano committed Oct 7, 2006
    git-commit.sh was using a mixture of spaces and tabs for indentation.
    This is changed to one tab per indentation level.
    No code changes.
    
    Signed-off-by: Martin Waitz <tali@admingilde.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Oct 7, 2006
  1. gitweb: [commit view] Do not suppress commitdiff link in root commit

    Petr Baudis Junio C Hamano
    Petr Baudis authored and Junio C Hamano committed Oct 6, 2006
    There's no reason for that, the commitdiff view is meaningful for the
    root commit as well and we link to it everywhere else.
    
    Signed-off-by: Petr Baudis <pasky@suse.cz>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. gitweb: Handle commits with empty commit messages more reasonably

    Petr Baudis Junio C Hamano
    Petr Baudis authored and Junio C Hamano committed Oct 6, 2006
    Currently those look very weird, you can't get easily at the commit view
    etc. This patch makes their title '(no commit message)'.
    
    Signed-off-by: Petr Baudis <pasky@suse.cz>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. gitweb: Separate (new) and (deleted) in commitdiff by a space

    Petr Baudis Junio C Hamano
    Petr Baudis authored and Junio C Hamano committed Oct 6, 2006
    Currently it's pasted to the sha1 of the blob and looks ugly.
    
    Signed-off-by: Petr Baudis <pasky@suse.cz>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  4. Show snapshot link in shortlog only if have_snapsho

    Petr Baudis Junio C Hamano
    Petr Baudis authored and Junio C Hamano committed Oct 6, 2006
    Signed-off-by: Petr Baudis <pasky@suse.cz>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Oct 6, 2006
  1. gitweb: refactor decode() for utf8 conversion

    yashi authored and Junio C Hamano committed Oct 1, 2006
    we already had a few place using decode() to convert perl internal
    encode to utf8.  added a new thin wrapper to do just that.
    
    Signed-off-by: Yasushi SHOJI <yashi@atmark-techno.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. Add default values for --window and --depth to the docs

    dstosberg authored and Junio C Hamano committed Oct 6, 2006
    Currently, you actually have to read the source to find out the
    default values. While at it, fix two typos and suggest that these
    options actually take a parameter in git-pack-objects.txt.
    
    Signed-off-by: Dennis Stosberg <dennis@stosberg.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. cherry-pick: make -r the default

    Junio C Hamano
    Junio C Hamano committed Oct 6, 2006
    And introduce -x to expose (possibly) private commit object name
    for people who cherry-pick between public branches.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Oct 5, 2006
  1. git-send-email: avoid uninitialized variable warning.

    Junio C Hamano
    Junio C Hamano committed Oct 5, 2006
    The code took length of $reply_to when it was not even defined,
    causing -w to warn.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. gitweb: Make the Git logo link target to point to the homepage

    Junio C Hamano
    Junio C Hamano committed Sep 23, 2006
    It provides more useful information for causual Git users than the Git docs
    (especially about where to get Git and such).
    
    People can override with GITWEB_CONFIG if they want to.
    
    Signed-off-by: Petr Baudis <pasky@suse.cz>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Acked-by: Petr Baudis <pasky@suse.cz>
  3. gitweb: blame: Minimize vertical table row padding

    ltuikov authored and Junio C Hamano committed Oct 5, 2006
    Minimize vertical table row padding for blame only.  I
    discovered this while having the browser's blame output
    right next to my editor's window, only to notice how much
    vertically stretched the blame output was.
    
    Blame most likely shows source code and is in this way
    more "spartan" than the rest of the tables gitweb shows.
    
    This patch makes the blame table more vertically compact,
    thus being closer to what you'd see in your editor's window,
    as well as reusing more window estate to show more
    information (which in turn minimizes scrolling).
    
    Signed-off-by: Luben Tuikov <ltuikov@yahoo.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  4. gitweb: Do not print "log" and "shortlog" redundantly in commit view

    ltuikov authored and Junio C Hamano committed Oct 5, 2006
    Do not print "log" and "shortlog" redundantly in commit
    view.  This is passed into the $extra argument of
    git_print_page_nav from git_commit, but git_print_page_nav
    prints "log" and "shortlog" already with the same head.
    
    Noticed by Junio.
    
    Signed-off-by: Luben Tuikov <ltuikov@yahoo.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  5. vc-git.el: Switch to using git-blame instead of git-annotate.

    julliard authored and Junio C Hamano committed Oct 5, 2006
    Signed-off-by: Alexandre Julliard <julliard@winehq.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  6. git.el: Fixed inverted "renamed from/to" message.

    julliard authored and Junio C Hamano committed Oct 5, 2006
    The deleted file should be labeled "renamed to" and the added file
    "renamed from", not the other way around (duh!)
    
    Signed-off-by: Alexandre Julliard <julliard@winehq.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  7. tar-tree deprecation: we eat our own dog food.

    Junio C Hamano
    Junio C Hamano committed Oct 5, 2006
    It is silly to keep using git-tar-tree in dist target when the
    command gives a big deprecation warning when called.  Instead,
    use "git-archive --format=tar" which we recommend to our users.
    
    Update gitweb's snapshot feature to use git-archive for the same
    reason.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  8. Add git-upload-archive to the main git man page

    fbuihuu authored and Junio C Hamano committed Oct 5, 2006
    Signed-off-by: Franck Bui-Huu <fbuihuu@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Oct 4, 2006
  1. git-commit: cleanup unused function.

    tali authored and Junio C Hamano committed Oct 3, 2006
    The report() function is not used anymore. Kill it.
    
    Signed-off-by: Martin Waitz <tali@admingilde.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. Fix usage string to match that given in the man page

    akc42 authored and Junio C Hamano committed Oct 3, 2006
    Still not managed to understand git-send-mail sufficiently well to  not
    accidently miss of this list when I sending it to Junio
    
    Signed-off-by: Alan Chandler <alan@chandlerfamily.org.uk>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. Update the gitweb/README file to include setting the GITWEB_CONFIG en…

    akc42 authored and Junio C Hamano committed Oct 3, 2006
    …vironment
    
    Signed-off-by: Alan Chandler <alan@chandlerfamily.org.uk>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Oct 3, 2006
  1. gitweb: document webserver configuration for common gitweb/repo URLs.

    tali authored and Junio C Hamano committed Oct 3, 2006
    Add a small apache configuration which shows how to use apache
    to put gitweb and GIT repositories at the same URL.
    
    Signed-off-by: Martin Waitz <tali@admingilde.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. gitweb: Escape ESCAPE (\e) character

    ltuikov authored and Junio C Hamano committed Oct 2, 2006
    Take a look at commit 20a3847
    using gitweb before this patch.  This patch fixes this.
    
    Signed-off-by: Luben Tuikov <ltuikov@yahoo.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. escape tilde in Documentation/git-rev-parse.txt

    Junio C Hamano
    Junio C Hamano committed Oct 3, 2006
    Fixes a failure to build the git-rev-parse manpage, seen with
    asciidoc 8.0.0
    
    We would love to use nicer quoting $$~$$ but alas asciidoc 7
    does not know about it.  So use asciidoc.conf and define {tilde}
    to be &#126;.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Acked-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
  4. Error in test description of t1200-tutorial

    robinrosenberg authored and Junio C Hamano committed Oct 3, 2006
    Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  5. lock_ref_sha1_basic does not remove empty directories on BSD

    dstosberg authored and Junio C Hamano committed Oct 2, 2006
    lock_ref_sha1_basic relies on errno beeing set to EISDIR by the
    call to read() in resolve_ref() to detect directories.  But calling
    read() on a directory under NetBSD returns EPERM, and even succeeds
    for local filesystems on FreeBSD.
    
    Signed-off-by: Dennis Stosberg <dennis@stosberg.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Oct 2, 2006
  1. Merge branch 'maint'

    Junio C Hamano
    Junio C Hamano committed Oct 2, 2006
    * maint:
      git-push: .git/remotes/ file does not require SP after colon
      git-mv: invalidate the removed path properly in cache-tree
  2. git-push: .git/remotes/ file does not require SP after colon

    Junio C Hamano
    Junio C Hamano committed Oct 2, 2006
    Although most people would have one after colon if only for
    readability, we never required it in git-parse-remote, so let's
    not require one only in git-push.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. git-mv: invalidate the removed path properly in cache-tree

    Junio C Hamano
    Junio C Hamano committed Oct 2, 2006
    The command updated the cache without invalidating the cache
    tree entries while removing an existing entry.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  4. Makefile: install and clean merge-recur, still.

    Junio C Hamano
    Junio C Hamano committed Oct 2, 2006
    We advertised git-merge-recur for some time, and we planned to
    support it for one release after we made it the 'recursive'.
    
    However we forgot to install it nor have "make clean" clean it.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
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