Permalink
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 committed with gitster 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 committed with gitster 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 committed with gitster 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 committed with gitster 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 committed with gitster 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 committed with gitster 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 committed with gitster 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 committed with gitster 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 committed with gitster 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 committed with gitster 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/
  2. Fix recipient santitization

    vonbrand committed with gitster Mar 28, 2008
    Need to quote all special characters, not just the first one
    
    Signed-off-by: Horst H. von Brand <vonbrand@inf.utfsm.cl>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. send-email: rfc2047-quote subject lines with non-ascii characters

    peff committed with gitster Mar 28, 2008
    We always use 'utf-8' as the encoding, since we currently
    have no way of getting the information from the user.
    
    This also refactors the quoting of recipient names, since
    both processes can share the rfc2047 quoting code.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. send-email: specify content-type of --compose body

    peff committed with gitster Mar 28, 2008
    If the compose message contains non-ascii characters, then
    we assume it is in utf-8 and include the appropriate MIME
    headers. If the user has already included a MIME-Version
    header, then we assume they know what they are doing and
    don't add any headers.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on May 20, 2008
  1. git-am: fix typo in usage message

    peff committed with gitster May 19, 2008
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. doc/git-daemon: s/uploadarchive/uploadarch/

    peff committed with gitster May 19, 2008
    The git-daemon upload-archive feature has always used the
    config directive 'daemon.uploadarch'; the documentation
    which came later seems to have just mistakenly used the
    wrong name.
    
    Noticed by lionel@over-blog.com.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on May 16, 2008
  1. git-filter-branch: Clarify file removal example.

    Jon Loeliger committed with gitster May 16, 2008
    Signed-off-by: Jon Loeliger <jdl@jdl.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on May 14, 2008
  1. Merge branch 'maint-1.5.4' into maint

    gitster committed May 14, 2008
    * maint-1.5.4:
      Documentation/git-describe.txt: make description more readable
  2. Documentation/git-describe.txt: make description more readable

    ihilt committed with gitster May 14, 2008
    Signed-off-by: Ian Hilt <ian.hilt@gmail.com>
    Credit-to: Kevin Ballard <kevin@sb.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on May 11, 2008
  1. Merge branch 'maint-1.5.4' into maint

    gitster committed May 11, 2008
    * maint-1.5.4:
      wt-status.h: declare global variables as extern
      builtin-commit.c: add -u as short name for --untracked-files
      git-repack: re-enable parsing of -n command line option
  2. wt-status.h: declare global variables as extern

    Johannes Sixt committed with gitster May 9, 2008
    There are linkers out there that complain if a global non-static variable
    is defined multiple times.
    
    Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. builtin-commit.c: add -u as short name for --untracked-files

    sitaramc committed with gitster May 9, 2008
    This makes the C code consistent with the documentation and the old shell
    code.
    
    Signed-off-by: Sitaram Chamarty <sitaramc@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. git-repack: re-enable parsing of -n command line option

    gitzilla committed with gitster May 10, 2008
    In commit 5715d0b (Migrate git-repack.sh to use git-rev-parse --parseopt,
    2007-11-04), parsing of the '-n' command line option was accidentally lost
    when git-repack.sh was migrated to use git-rev-parse --parseopt. This adds
    it back.
    
    Signed-off-by: A Large Angry SCM <gitzilla@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on May 9, 2008
  1. Merge branch 'maint-1.5.4' into maint

    gitster committed May 9, 2008
    * maint-1.5.4:
      Documentation/config.txt: Mention branch.<name>.rebase applies to "git pull"
      doc: clarify definition of "update" for git-add -u
  2. bisect: print an error message when "git rev-list --bisect-vars" fails

    chriscool committed with gitster May 7, 2008
    Before this patch no error was printed when "git rev-list --bisect-vars"
    failed. This can happen when bad and good revs are mistaken.
    
    This patch prints an error message on stderr that describe the likely
    failure cause.
    
    Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on May 8, 2008
  1. Documentation/config.txt: Mention branch.<name>.rebase applies to "gi…

    dustin committed with gitster May 8, 2008
    …t pull"
    
    Signed-off-by: Dustin Sallings <dustin@spy.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. doc: clarify definition of "update" for git-add -u

    peff committed with gitster May 8, 2008
    The "-u" option is described only in terms of "updating"
    files, which in turn is described only as "similar to what
    git commit -a does". Let's be a little more specific about
    what updating entails.
    
    Suggested by Geoffrey Irving.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>