Permalink
Commits on Dec 17, 2008
  1. GIT 1.5.5.6

    gitster committed Dec 17, 2008
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. GIT 1.5.4.7

    gitster committed Dec 17, 2008
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. gitweb: do not run "git diff" that is Porcelain

    gitster committed Dec 17, 2008
    Jakub says that legacy-style URI to view two blob differences are never
    generated since 1.4.3.  This codepath runs "git diff" Porcelain from the
    gitweb, which is a no-no.  It can trigger diff.external command that is
    specified in the configuration file of the repository being viewed.
    
    This patch applies to v1.5.4 and later.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jun 27, 2008
  1. GIT 1.5.5.5

    gitster committed Jun 27, 2008
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Merge branch 'maint-1.5.4' into maint-1.5.5

    gitster committed Jun 27, 2008
    * maint-1.5.4:
      GIT 1.5.4.6
      git-shell: accept "git foo" form
    
    Conflicts:
    
    	GIT-VERSION-GEN
    	RelNotes
  3. GIT 1.5.4.6

    gitster committed Jun 27, 2008
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jun 26, 2008
  1. git-shell: accept "git foo" form

    gitster committed Dec 2, 2007
    This is a backport of 0a47dc1
    to 'maint' to be included in 1.5.6.2 so that older server side
    can accept dashless form of request when clients are updated.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jun 17, 2008
  1. diff.c: fix emit_line() again not to add extra line

    gitster committed Jun 17, 2008
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jun 16, 2008
  1. diff: reset color before printing newline

    szeder authored and gitster committed Jun 16, 2008
    It worked that way since commit 50f575f (Tweak diff colors,
    2006-06-22), but commit c1795bb (Unify whitespace checking, 2007-12-13)
    changed it.  This patch restores the old behaviour.
    
    Besides Linus' arguments in the log message of 50f575f, resetting color
    before printing newline is also important to keep 'git add --patch'
    happy.  If the last line(s) of a file are removed, then that hunk will
    end with a colored line.  However, if the newline comes before the color
    reset, then the diff output will have an additional line at the end
    containing only the reset sequence.  This causes trouble in
    git-add--interactive.perl's parse_diff function, because @colored will
    have one more element than @diff, and that last element will contain the
    color reset.  The elements of these arrays will then be copied to @hunk,
    but only as many as the number of elements in @diff.  As a result the
    last color reset is lost and all subsequent terminal output will be
    printed in color.
    
    Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jun 11, 2008
  1. fix typo in tutorial

    FredMaranhao authored and gitster committed Jun 11, 2008
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jun 9, 2008
  1. git-read-tree: document -v option.

    Miklos Vajna authored and gitster committed Jun 9, 2008
    Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jun 8, 2008
  1. Remove exec bit from builtin-fast-export.c

    Johannes Sixt authored and gitster committed Jun 8, 2008
    Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jun 7, 2008
  1. GIT 1.5.5.4

    gitster committed Jun 7, 2008
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jun 6, 2008
  1. git-for-each-ref.txt: minor improvements

    Lea Wiemann authored and gitster committed Jun 5, 2008
    Rewrapped synopsis and removed wrong asterisk behind --count option;
    clarified --sort=<key> description for multiple keys; documented that
    for-each-ref supports not only glob patterns but also prefixes like
    "refs/heads" as patterns, and that multiple patterns can be given.
    
    Signed-off-by: Lea Wiemann <LeWiemann@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. name-rev: Fix segmentation fault when using --all

    dotdash authored and gitster committed Jun 5, 2008
    In commit da2478d "describe --always: fall back to showing an
    abbreviated object name" we lost the check that skips empty entries in
    the object hash table when iterating over it in cmd_name_rev. That may
    cause a NULL pointer being handed to show_name(), leading to a
    segmentation fault. So add that check back again.
    
    Signed-off-by: Björn Steinbrink <B.Steinbrink@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jun 4, 2008
  1. describe: match pattern for lightweight tags too

    Michael Dressel authored and gitster committed Jun 4, 2008
    The <pattern> given "git describe --match" was used only to filter tag
    objects, and not to filter lightweight tags.  This fixes it.
    
    [jc: made the log to clarify this is a bugfix, not an enhancement, with
    additional test]
    
    Signed-off-by: Michael Dressel <MichaelTiloDressel@t-online.de>
    Acked-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on May 28, 2008
  1. GIT 1.5.5.3

    gitster committed May 28, 2008
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. commit --interactive: properly update the index before commiting

    Gerrit Pape authored and gitster committed May 27, 2008
    When adding files through git commit --interactive, and 'quit'
    afterwards, the message in the editor of the commit message indicates
    that many (maybe all) files are deleted from the tree.  Dismissing that
    and running git commit afterwards does the right thing.  This commit
    fixes git commit --interactive to properly update the index before
    commiting.
    
    Reported by Jiří Paleček through
     http://bugs.debian.org/480429
    
    Signed-off-by: Gerrit Pape <pape@smarden.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. gitweb: only display "next" links in logs if there is a next page

    Lea Wiemann authored and gitster committed May 27, 2008
    There was a bug in the implementation of the "next" links in
    format_paging_nav (for log and shortlog), which caused the next links
    to always be displayed, even if there is no next page.  This fixes it.
    
    Signed-off-by: Lea Wiemann <LeWiemann@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. Revert "filter-branch: subdirectory filter needs --full-history"

    Johannes Sixt authored and gitster committed May 26, 2008
    This reverts commit cfabd6e. I had
    implemented it without understanding what --full-history does. Consider
    this history:
    
        C--M--N
       /  /  /
      A--B  /
       \   /
        D-/
    
    where B and C modify a path, X, in the same way so that the result is
    identical, and D does not modify it at all. With the path limiter X and
    without --full-history this is simplified to
    
       A--B
    
    i.e. only one of the paths via B or C is chosen. I had assumed that
    --full-history would keep both paths like this
    
        C--M
       /  /
      A--B
    
    removing the path via D; but in fact it keeps the entire history.
    
    Currently, git does not have the capability to simplify to this
    intermediary case. However, the other extreme to keep the entire history
    is not wanted either in usual cases. I think we can expect that histories
    like the above are rare, and in the usual cases we want a simplified
    history. So let's remove --full-history again.
    
    (Concerning t7003, subsequent tests depend on what the test case sets up,
    so we can't just back out the entire test case.)
    
    Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. Documentation/git-bundle.txt: fix synopsis

    Gerrit Pape authored and gitster committed May 27, 2008
    The <git-rev-list args> are mandatory to git bundle create, not
    optional.  The usage output of git bundle is already right on this.
    
    Signed-off-by: Gerrit Pape <pape@smarden.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on May 27, 2008
  1. Merge branch 'gp/bisect-fix' into maint

    gitster committed May 27, 2008
    * gp/bisect-fix:
      bisect: print an error message when "git rev-list --bisect-vars" fails
      git-bisect.sh: don't accidentally override existing branch "bisect"
  2. Documentation: fix graph in git-rev-parse.txt

    chunga authored and gitster committed May 26, 2008
    Preformatted html and man pages show a mangled graph, caused by a
    backslash.
    
    Commit f1ec6b2 fixed this same issue,
    but it seems that new versions of the Asciidoc toolchain changed their
    behaviour.
    
    Signed-off-by: Michele Ballabio <barra_cuda@katamail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on May 26, 2008
  1. show-branch --current: do not barf on detached HEAD

    gitster committed May 26, 2008
    The code assumed that there always is the current branch, but the result
    from resolve_ref() on detached HEAD does not even start with "refs/heads/".
    
    Originally noticed and fixed by Stephan Beyer.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Merge branch 'jk/maint-send-email-compose' into maint

    gitster committed May 26, 2008
    * jk/maint-send-email-compose:
      send-email: rfc2047-quote subject lines with non-ascii characters
      send-email: specify content-type of --compose body
  3. Merge branch 'hb/maint-send-email-quote-recipients' into maint

    gitster committed May 26, 2008
    * hb/maint-send-email-quote-recipients:
      Fix recipient santitization
  4. Merge branch 'maint-1.5.4' into maint

    gitster committed May 26, 2008
    * maint-1.5.4:
      builtin-fast-export: Only output a single parent per line
  5. builtin-fast-export: Only output a single parent per line

    pieter authored and gitster committed May 24, 2008
    According to the git-fast-import man-page, you can only put a single
    committish per merge: line, like this:
    
      merge :10
      merge :11
    
    However, git-fast-export puts all parents on a single line, like this:
    
      merge :10 :11
    
    This changes fast-export to output a single parent per line.  Otherwise
    neither git-fast-import nor bzr-fast-import can read its output.
    
    [jc: fix-up to remove excess LF in the output that makes fast-import barf]
    
    Signed-off-by: Pieter de Bie <pdebie@ai.rug.nl>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  6. Release Notes for 1.5.5.2

    gitster committed May 26, 2008
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on May 23, 2008
  1. Merge branch 'maint-1.5.4' into maint

    gitster committed May 23, 2008
    * maint-1.5.4:
      rev-parse --symbolic-full-name: don't print '^' if SHA1 is not a ref
  2. rev-parse --symbolic-full-name: don't print '^' if SHA1 is not a ref

    Johannes Sixt authored and gitster committed May 23, 2008
    The intention of --symbolic-full-name is to not print anything if a
    revision is not an exact ref. But this command:
    
        $ git-rev-parse --symbolic-full-name --not master~1
    
    still emitted a sole '^' to stdout (provided that there's no other ref at
    master~1). This fixes it.
    
    Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. Add missing "short" alternative to --date in rev-list-options.txt

    heikkiorsila authored and gitster committed May 22, 2008
    Signed-off-by: Heikki Orsila <heikki.orsila@iki.fi>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. git-show.txt: Not very stubby these days.

    Jon Loeliger authored and gitster committed May 22, 2008
    Signed-off-by: Jon Loeliger <jdl@freescale.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. Clarify repack -n documentation

    spearce authored and gitster committed May 22, 2008
    While repacking a local repository a coworker thought the -n option
    was necessary to git-repack to keep it from updating some unknown
    file on the central server we all share.  Explaining further what
    the option is (not) doing helps to make it clear the option does
    not impact any remote repositories the user may have configured.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on May 21, 2008
  1. Merge branch 'maint-1.5.4' into maint

    gitster committed May 21, 2008
    * maint-1.5.4:
      git-am: fix typo in usage message
      doc/git-daemon: s/uploadarchive/uploadarch/