Permalink
Switch branches/tags
Commits on Jan 6, 2012
  1. Git 1.7.8.3

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

    * 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()
    gitster committed Jan 6, 2012
  3. Merge branch 'maint-1.7.7' into maint

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

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

    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>
    trast committed with gitster Jan 6, 2012
Commits on Jan 4, 2012
  1. t5550: repack everything into one file

    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>
    drizzd committed with gitster Jan 4, 2012
  2. Merge branch 'nd/maint-parse-depth' into maint

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

    Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    pclouds committed with gitster Jan 4, 2012
Commits on Jan 3, 2012
  1. Merge branch 'maint-1.7.7' into maint

    * 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
    gitster committed Jan 3, 2012
  2. Merge branch 'maint-1.7.6' into maint-1.7.7

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

    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>
    jlehmann committed with gitster Jan 1, 2012
  4. fix hang in git fetch if pointed at a 0 length bundle

    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>
    ferringb committed with gitster Jan 3, 2012
Commits on Jan 1, 2012
  1. Documentation: read-tree --prefix works with existing subtrees

    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>
    drizzd committed with gitster Dec 31, 2011
Commits on Dec 29, 2011
  1. Add MYMETA.json to perl/.gitignore

    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>
    jacknagel committed with gitster Dec 29, 2011
Commits on Dec 28, 2011
  1. Git 1.7.8.2

    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>
    gitster committed Dec 28, 2011
  2. Merge branch 'jv/maint-config-set' into maint

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

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

    * 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
    gitster committed Dec 28, 2011
  5. Merge branch 'tr/doc-sh-setup' into maint

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

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

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

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

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

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

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

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

    * 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
    gitster committed Dec 28, 2011
  14. Merge branch 'jk/maint-snprintf-va-copy' into maint

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

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

    * 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"
    gitster committed Dec 28, 2011
  17. Merge branch 'jk/fetch-no-tail-match-refs' into maint

    * 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
    gitster committed Dec 28, 2011
  18. Merge branch 'ew/keepalive' into maint

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

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

    * 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
    gitster committed Dec 28, 2011
  21. Merge branch 'aw/rebase-i-stop-on-failure-to-amend' into maint

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