Permalink
Commits on Jan 6, 2012
  1. Git 1.7.9-rc0

    gitster committed Jan 6, 2012
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Merge branch 'jc/show-sig'

    gitster committed Jan 6, 2012
    * jc/show-sig:
      log --show-signature: reword the common two-head merge case
      log-tree: show mergetag in log --show-signature output
      log-tree.c: small refactor in show_signature()
      commit --amend -S: strip existing gpgsig headers
      verify_signed_buffer: fix stale comment
      gpg-interface: allow use of a custom GPG binary
      pretty: %G[?GS] placeholders
      test "commit -S" and "log --show-signature"
      log: --show-signature
      commit: teach --gpg-sign option
    
    Conflicts:
    	builtin/commit-tree.c
    	builtin/commit.c
    	builtin/merge.c
    	notes-cache.c
    	pretty.c
  3. Merge branch 'jm/stash-diff-disambiguate'

    gitster committed Jan 6, 2012
    * jm/stash-diff-disambiguate:
      stash: Don't fail if work dir contains file named 'HEAD'
  4. Merge branch 'jh/fetch-head-update'

    gitster committed Jan 6, 2012
    * jh/fetch-head-update:
      write first for-merge ref to FETCH_HEAD first
  5. Merge branch 'pw/p4-view-updates'

    gitster committed Jan 6, 2012
    * pw/p4-view-updates:
      git-p4: view spec documentation
      git-p4: rewrite view handling
      git-p4: support single file p4 client view maps
      git-p4: sort client views by reverse View number
      git-p4: fix test for unsupported P4 Client Views
      git-p4: test client view handling
  6. Sync with 1.7.8.3

    gitster committed Jan 6, 2012
  7. Git 1.7.8.3

    gitster committed Jan 6, 2012
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  8. Merge branch 'jn/maint-gitweb-utf8-fix' into maint

    gitster committed Jan 6, 2012
    * jn/maint-gitweb-utf8-fix:
      gitweb: Fix fallback mode of to_utf8 subroutine
      gitweb: Output valid utf8 in git_blame_common('data')
      gitweb: esc_html() site name for title in OPML
      gitweb: Call to_utf8() on input string in chop_and_escape_str()
  9. Merge branch 'maint-1.7.7' into maint

    gitster committed Jan 6, 2012
    * maint-1.7.7:
      Documentation: rerere.enabled is the primary way to configure rerere
  10. Merge branch 'maint-1.7.6' into maint-1.7.7

    gitster committed Jan 6, 2012
    * maint-1.7.6:
      Documentation: rerere.enabled is the primary way to configure rerere
  11. Documentation: rerere.enabled is the primary way to configure rerere

    trast authored and gitster committed Jan 6, 2012
    The wording seems to suggest that creating the directory is needed and the
    setting of rerere.enabled is only for disabling the feature by setting it
    to 'false'. But the configuration is meant to be the primary control and
    setting it to 'true' will enable it; the rr-cache directory will be
    created as necessary and the user does not have to create it.
    
    Signed-off-by: Thomas Rast <trast@student.ethz.ch>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jan 5, 2012
  1. log --show-signature: reword the common two-head merge case

    gitster committed Jan 5, 2012
    While identifying the commit merged to our history as "parent #2" is
    technically correct, we will never say "parent #1" (as that is the tip of
    our history before the merge is made), and we rarely would say "parent #3"
    (which would mean the merge is an octopus), especially when responding to
    a request to pull a signed tag.
    
    Treat the most common case to merge a single commit specially, and just
    say "merged tag '<tagname>'" instead.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. log-tree: show mergetag in log --show-signature output

    gitster committed Jan 4, 2012
    A commit object that merges a signed tag records the "mergetag" extended
    header. Check the validity of the GPG signature on it, and show it in a
    way similar to how "gpgsig" extended header is shown.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. log-tree.c: small refactor in show_signature()

    gitster committed Jan 4, 2012
    The next patch needs to show the result of signature verification on a
    mergetag extended header in a way similar to how embedded signature for
    the commit object itself is shown. Separate out the logic to go through
    the message lines and show them in the "error" color (highlighted) or the
    "correct" color (dim).
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. commit --amend -S: strip existing gpgsig headers

    gitster committed Jan 5, 2012
    Any existing commit signature was made against the contents of the old
    commit, including its committer date that is about to change, and will
    become invalid by amending it.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. verify_signed_buffer: fix stale comment

    gitster committed Jan 4, 2012
    The function used to take an integer flag to specify where the output
    should go, but these days we supply a strbuf to receive it.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  6. Merge branch 'jc/signed-commit' and 'jc/pull-signed-tag'

    gitster committed Jan 5, 2012
    They both use the extended headers in commit objects, and the former has
    necessary infrastructure to show them that is useful to view the result of
    the latter.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jan 4, 2012
  1. Merge branch 'maint'

    gitster committed Jan 4, 2012
    * maint:
      t5550: repack everything into one file
      Catch invalid --depth option passed to clone or fetch
  2. t5550: repack everything into one file

    Clemens Buchacher authored and gitster committed Jan 4, 2012
    Subsequently we assume that there is only one pack. Currently this is
    true only by accident. Pass '-a -d' to repack in order to guarantee that
    assumption to hold true.
    
    The prune-packed command is now redundant since repack -d already calls
    it.
    
    Signed-off-by: Clemens Buchacher <drizzd@aon.at>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. Merge branch 'nd/maint-parse-depth' into maint

    gitster committed Jan 4, 2012
    * nd/maint-parse-depth:
      Catch invalid --depth option passed to clone or fetch
  4. Catch invalid --depth option passed to clone or fetch

    pclouds authored and gitster committed Jan 4, 2012
    Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. write first for-merge ref to FETCH_HEAD first

    joeyh authored and gitster committed Dec 26, 2011
    The FETCH_HEAD refname is supposed to refer to the ref that was fetched
    and should be merged. However all fetched refs are written to
    .git/FETCH_HEAD in an arbitrary order, and resolve_ref_unsafe simply
    takes the first ref as the FETCH_HEAD, which is often the wrong one,
    when other branches were also fetched.
    
    The solution is to write the for-merge ref(s) to FETCH_HEAD first.
    Then, unless --append is used, the FETCH_HEAD refname behaves as intended.
    If the user uses --append, they presumably are doing so in order to
    preserve the old FETCH_HEAD.
    
    While we are at it, update an old example in the read-tree documentation
    that implied that each entry in FETCH_HEAD only has the object name, which
    is not true for quite a while.
    
    [jc: adjusted tests]
    
    Signed-off-by: Joey Hess <joey@kitenet.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jan 3, 2012
  1. git-p4: view spec documentation

    Pete Wyckoff authored and gitster committed Jan 2, 2012
    Signed-off-by: Pete Wyckoff <pw@padd.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. git-p4: rewrite view handling

    Pete Wyckoff authored and gitster committed Jan 2, 2012
    The old code was not very complete or robust.  Redo it.
    
    This new code should be useful for a few possible additions
    in the future:
    
        - support for * and %%n wildcards
        - allowing ... inside paths
        - representing branch specs (not just client specs)
        - tracking changes to views
    
    Mark the remaining 12 tests in t9809 as fixed.
    
    Signed-off-by: Pete Wyckoff <pw@padd.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. git-p4: support single file p4 client view maps

    ggibbons authored and gitster committed Jan 2, 2012
    Perforce client views can map individual files,
    mapping one //depot file path to one //client file path.
    These mappings contain no meta/masking characters.
    This patch add support for these file maps to
    the currently supported '...' view mappings.
    
    [pw: one test now suceeds]
    
    Signed-off-by: Gary Gibbons <ggibbons@perforce.com>
    Signed-off-by: Pete Wyckoff <pw@padd.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. git-p4: sort client views by reverse View number

    ggibbons authored and gitster committed Jan 2, 2012
    Correct view sorting to support the Perforce order,
    where client views are ordered and later views
    override earlier view mappings.
    
    [pw: one test now succeeds]
    
    Signed-off-by: Gary Gibbons <ggibbons@perforce.com>
    Signed-off-by: Pete Wyckoff <pw@padd.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. git-p4: fix test for unsupported P4 Client Views

    ggibbons authored and gitster committed Jan 2, 2012
    Change re method in test for unsupported Client View types
    (containing %% or *) anywhere in the string rather than
    at the begining.
    
    [pw: two tests now succeed]
    
    Signed-off-by: Gary Gibbons <ggibbons@perforce.com>
    Signed-off-by: Pete Wyckoff <pw@padd.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  6. git-p4: test client view handling

    Pete Wyckoff authored and gitster committed Jan 2, 2012
    Test many aspects of processing p4 client views with the
    git-p4 option --use-client-spec.  16 out of 22 tests are
    currently broken.
    
    Signed-off-by: Pete Wyckoff <pw@padd.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  7. Merge branch 'pw/p4-docs-and-tests'

    gitster committed Jan 3, 2012
    * pw/p4-docs-and-tests:
      git-p4: document and test submit options
      git-p4: test and document --use-client-spec
      git-p4: test --keep-path
      git-p4: test --max-changes
      git-p4: document and test --import-local
      git-p4: honor --changesfile option and test
      git-p4: document and test clone --branch
      git-p4: test cloning with two dirs, clarify doc
      git-p4: clone does not use --git-dir
      git-p4: introduce asciidoc documentation
      rename git-p4 tests
  8. Merge branch 'maint'

    gitster committed Jan 3, 2012
    * maint:
      docs: describe behavior of relative submodule URLs
      fix hang in git fetch if pointed at a 0 length bundle
      Documentation: read-tree --prefix works with existing subtrees
      Add MYMETA.json to perl/.gitignore
  9. Merge branch 'maint-1.7.7' into maint

    gitster committed Jan 3, 2012
    * maint-1.7.7:
      docs: describe behavior of relative submodule URLs
      Documentation: read-tree --prefix works with existing subtrees
      Add MYMETA.json to perl/.gitignore
  10. Merge branch 'maint-1.7.6' into maint-1.7.7

    gitster committed Jan 3, 2012
    * maint-1.7.6:
      Documentation: read-tree --prefix works with existing subtrees
      Add MYMETA.json to perl/.gitignore
  11. docs: describe behavior of relative submodule URLs

    jlehmann authored and gitster committed Jan 1, 2012
    Since the relative submodule URLs have been introduced in f31a522, they
    do not conform to the rules for resolving relative URIs but rather to
    those of relative directories.
    
    Document that behavior.
    
    Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  12. fix hang in git fetch if pointed at a 0 length bundle

    ferringb authored and gitster committed Jan 3, 2012
    git-repo if interupted at the exact wrong time will generate zero
    length bundles- literal empty files.  git-repo is wrong here, but
    git fetch shouldn't effectively spin loop if pointed at a zero
    length bundle.
    
    Signed-off-by: Brian Harring <ferringb@chromium.org>
    Helped-by: Johannes Sixt
    Helped-by: Nguyen Thai Ngoc Duy
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jan 1, 2012
  1. Documentation: read-tree --prefix works with existing subtrees

    Clemens Buchacher authored and gitster committed Dec 31, 2011
    Since 34110cd (Make 'unpack_trees()' have a separate source and
    destination index) it is no longer true that a subdirectory with
    the same prefix must not exist.
    
    Signed-off-by: Clemens Buchacher <drizzd@aon.at>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>