Permalink
Commits on Jan 6, 2012
  1. Git 1.7.8.3

    gitster committed Jan 6, 2012
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. 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()
  3. 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
  4. 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
  5. 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 4, 2012
  1. 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>
  2. 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
  3. 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>
Commits on Jan 3, 2012
  1. 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
  2. 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
  3. 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>
  4. 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>
Commits on Dec 29, 2011
  1. Add MYMETA.json to perl/.gitignore

    jacknagel authored and gitster committed Dec 29, 2011
    ExtUtils::MakeMaker generates MYMETA.json in addition to MYMETA.yml
    since version 6.57_07. As it suggests, it is just meta information about
    the build and is cleaned up with 'make clean', so it should be ignored.
    
    Signed-off-by: Jack Nagel <jacknagel@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Dec 28, 2011
  1. Git 1.7.8.2

    gitster committed Dec 28, 2011
    Contains accumulated fixes since 1.7.8 that have been merged to the
    'master' branch in preparation for the 1.7.9 release.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Merge branch 'jv/maint-config-set' into maint

    gitster committed Dec 28, 2011
    * jv/maint-config-set:
      Fix an incorrect reference to --set-all.
  3. Merge branch 'jk/follow-rename-score' into maint

    gitster committed Dec 28, 2011
    * jk/follow-rename-score:
      use custom rename score during --follow
  4. Merge branch 'jc/checkout-m-twoway' into maint

    gitster committed Dec 28, 2011
    * jc/checkout-m-twoway:
      t/t2023-checkout-m.sh: fix use of test_must_fail
      checkout_merged(): squelch false warning from some gcc
      Test 'checkout -m -- path'
      checkout -m: no need to insist on having all 3 stages
  5. Merge branch 'tr/doc-sh-setup' into maint

    gitster committed Dec 28, 2011
    * tr/doc-sh-setup:
      git-sh-setup: make require_clean_work_tree part of the interface
  6. Merge branch 'jk/maint-strbuf-missing-init' into maint

    gitster committed Dec 28, 2011
    * jk/maint-strbuf-missing-init:
      commit, merge: initialize static strbuf
  7. Merge branch 'jk/maint-push-v-is-verbose' into maint

    gitster committed Dec 28, 2011
    * jk/maint-push-v-is-verbose:
      make "git push -v" actually verbose
  8. Merge branch 'jk/http-push-to-empty' into maint

    gitster committed Dec 28, 2011
    * jk/http-push-to-empty:
      remote-curl: don't pass back fake refs
    
    Conflicts:
    	remote-curl.c
  9. Merge branch 'jk/doc-fsck' into maint

    gitster committed Dec 28, 2011
    * jk/doc-fsck:
      docs: brush up obsolete bits of git-fsck manpage
  10. Merge branch 'jc/maint-lf-to-crlf-keep-crlf' into maint

    gitster committed Dec 28, 2011
    * jc/maint-lf-to-crlf-keep-crlf:
      lf_to_crlf_filter(): resurrect CRLF->CRLF hack
  11. Merge branch 'ef/setenv-putenv' into maint

    gitster committed Dec 28, 2011
    * ef/setenv-putenv:
      compat/setenv.c: error if name contains '='
      compat/setenv.c: update errno when erroring out
  12. Merge branch 'jc/advice-doc' into maint

    gitster committed Dec 28, 2011
    * jc/advice-doc:
      advice: Document that they all default to true
  13. Merge branch 'jn/maint-sequencer-fixes' into maint

    gitster committed Dec 28, 2011
    * jn/maint-sequencer-fixes:
      revert: stop creating and removing sequencer-old directory
      Revert "reset: Make reset remove the sequencer state"
      revert: do not remove state until sequence is finished
      revert: allow single-pick in the middle of cherry-pick sequence
      revert: pass around rev-list args in already-parsed form
      revert: allow cherry-pick --continue to commit before resuming
      revert: give --continue handling its own function
  14. Merge branch 'jk/maint-snprintf-va-copy' into maint

    gitster committed Dec 28, 2011
    * jk/maint-snprintf-va-copy:
      compat/snprintf: don't look at va_list twice
  15. Merge branch 'jk/maint-push-over-dav' into maint

    gitster committed Dec 28, 2011
    * jk/maint-push-over-dav:
      http-push: enable "proactive auth"
      t5540: test DAV push with authentication
  16. Merge branch 'jk/maint-mv' into maint

    gitster committed Dec 28, 2011
    * jk/maint-mv:
      mv: be quiet about overwriting
      mv: improve overwrite warning
      mv: make non-directory destination error more clear
      mv: honor --verbose flag
      docs: mention "-k" for both forms of "git mv"
  17. Merge branch 'jk/fetch-no-tail-match-refs' into maint

    gitster committed Dec 28, 2011
    * jk/fetch-no-tail-match-refs:
      connect.c: drop path_match function
      fetch-pack: match refs exactly
      t5500: give fully-qualified refs to fetch-pack
      drop "match" parameter from get_remote_heads
  18. Merge branch 'ew/keepalive' into maint

    gitster committed Dec 28, 2011
    * ew/keepalive:
      enable SO_KEEPALIVE for connected TCP sockets
  19. Merge branch 'ci/stripspace-docs' into maint

    gitster committed Dec 28, 2011
    * ci/stripspace-docs:
      Update documentation for stripspace
  20. Merge branch 'jh/fast-import-notes' into maint

    gitster committed Dec 28, 2011
    * jh/fast-import-notes:
      fast-import: Fix incorrect fanout level when modifying existing notes refs
      t9301: Add 2nd testcase exposing bugs in fast-import's notes fanout handling
      t9301: Fix testcase covering up a bug in fast-import's notes fanout handling
  21. Merge branch 'aw/rebase-i-stop-on-failure-to-amend' into maint

    gitster committed Dec 28, 2011
    * aw/rebase-i-stop-on-failure-to-amend:
      rebase -i: interrupt rebase when "commit --amend" failed during "reword"