Permalink
Commits on Sep 11, 2012
  1. Git 1.7.11.6

    gitster committed Sep 11, 2012
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Merge branch 'jc/maint-mergetool-style-fix' into maint-1.7.11

    gitster committed Sep 11, 2012
    * jc/maint-mergetool-style-fix:
      mergetool: style fixes
  3. Merge branch 'sz/submodule-force-update' into maint-1.7.11

    gitster committed Sep 11, 2012
    * sz/submodule-force-update:
      Make 'git submodule update --force' always check out submodules.
  4. Merge branch 'ph/stash-rerere' into maint-1.7.11

    gitster committed Sep 11, 2012
    * ph/stash-rerere:
      stash: invoke rerere in case of conflict
      test: git-stash conflict sets up rerere
  5. Merge branch 'jc/maint-sane-execvp-notdir' into maint-1.7.11

    gitster committed Sep 11, 2012
    * jc/maint-sane-execvp-notdir:
      sane_execvp(): ignore non-directory on $PATH
  6. Merge branch 'jc/maint-config-exit-status' into maint-1.7.11

    gitster committed Sep 11, 2012
    * jc/maint-config-exit-status:
      config: "git config baa" should exit with status 1
  7. Merge branch 'mh/maint-config-doc-proxy-command' into maint-1.7.11

    gitster committed Sep 11, 2012
    * mh/maint-config-doc-proxy-command:
      git-config doc: unconfuse an example
      git-config.txt: fix example
  8. Merge branch 'hv/submodule-path-unmatch' into maint-1.7.11

    gitster committed Sep 11, 2012
    * hv/submodule-path-unmatch:
      Let submodule command exit with error status if path does not exist
  9. Merge branch 'mz/empty-rebase-test' into maint-1.7.11

    gitster committed Sep 11, 2012
    * mz/empty-rebase-test:
      add tests for 'git rebase --keep-empty'
  10. Merge branch 'jk/docs-docbook-monospace-display' into maint-1.7.11

    gitster committed Sep 11, 2012
    * jk/docs-docbook-monospace-display:
      docs: monospace listings in docbook output
  11. Merge branch 'ab/diff-write-incomplete-line' into maint-1.7.11

    gitster committed Sep 11, 2012
    * ab/diff-write-incomplete-line:
      Fix '\ No newline...' annotation in rewrite diffs
  12. Merge branch 'jc/maint-t7406-rev-parse-max-count-huh' into maint-1.7.11

    gitster committed Sep 11, 2012
    * jc/maint-t7406-rev-parse-max-count-huh:
      t7406: fix misleading "rev-parse --max-count=1 HEAD"
  13. Merge branch 'tr/void-diff-setup-done' into maint-1.7.11

    gitster committed Sep 11, 2012
    * tr/void-diff-setup-done:
      diff_setup_done(): return void
  14. Merge branch 'tr/merge-recursive-flush' into maint-1.7.11

    gitster committed Sep 11, 2012
    * tr/merge-recursive-flush:
      merge-recursive: eliminate flush_buffer() in favor of write_in_full()
  15. Merge branch 'nd/index-errno' into maint-1.7.11

    gitster committed Sep 11, 2012
    * nd/index-errno:
      read_index_from: remove bogus errno assignments
  16. Merge branch 'pg/maint-apply-remove-unused-variable' into maint-1.7.11

    gitster committed Sep 11, 2012
    * pg/maint-apply-remove-unused-variable:
      apply: delete unused deflate_origlen from patch struct
Commits on Sep 10, 2012
  1. Almost 1.7.11.6

    gitster committed Sep 10, 2012
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Merge branch 'mg/rebase-i-onto-reflog-in-full' into maint-1.7.11

    gitster committed Sep 10, 2012
    The reflog entries left by "git rebase" and "git rebase -i" were
    inconsistent (the interactive one gave an abbreviated object name).
    
    * mg/rebase-i-onto-reflog-in-full:
      rebase -i: use full onto sha1 in reflog
  3. Merge branch 'jc/maint-protect-sh-from-ifs' into maint-1.7.11

    gitster committed Sep 10, 2012
    When the user exports a non-default IFS without HT, scripts that
    rely on being able to parse "ls-files -s | while read a b c..."
    start to fail.  Protect them from such a misconfiguration.
    
    * jc/maint-protect-sh-from-ifs:
      sh-setup: protect from exported IFS
  4. Merge branch 'bc/receive-pack-stdout-protection' into maint-1.7.11

    gitster committed Sep 10, 2012
    When "git push" triggered the automatic gc on the receiving end, a
    message from "git prune" that said it was removing cruft leaked to
    the standard output, breaking the communication protocol.
    
    * bc/receive-pack-stdout-protection:
      receive-pack: do not leak output from auto-gc to standard output
      t/t5400: demonstrate breakage caused by informational message from prune
  5. Merge branch 'jk/maint-null-in-trees' into maint-1.7.11

    gitster committed Sep 10, 2012
    "git diff" had a confusion between taking data from a path in the
    working tree and taking data from an object that happens to have
    name 0{40} recorded in a tree.
    
    * jk/maint-null-in-trees:
      fsck: detect null sha1 in tree entries
      do not write null sha1s to on-disk index
      diff: do not use null sha1 as a sentinel value
  6. Merge branch 'tr/maint-send-email-2047' into maint-1.7.11

    gitster committed Sep 10, 2012
    "git send-email" did not unquote encoded words that appear on the
    header correctly, and lost "_" from strings.
    
    * tr/maint-send-email-2047:
      send-email: improve RFC2047 quote parsing
  7. Merge branch 'mm/die-with-dashdash-help' into maint-1.7.11

    gitster committed Sep 10, 2012
    When the user gives an argument that can be taken as both a
    revision name and a pathname without disambiguating with "--", we
    used to give a help message "Use '--' to separate".  The message
    has been clarified to show where that '--' goes on the command
    line.
    
    * mm/die-with-dashdash-help:
      setup: clarify error messages for file/revisions ambiguity
  8. Merge branch 'js/gitweb-path-info-unquote' into maint-1.7.11

    gitster committed Sep 10, 2012
    "gitweb" when used with PATH_INFO failed to notice directories with
    SP (and other characters that need URL-style quoting) in them.
    
    * js/gitweb-path-info-unquote:
      gitweb: URL-decode $my_url/$my_uri when stripping PATH_INFO
Commits on Aug 24, 2012
  1. Prepare for 1.7.11.6

    gitster committed Aug 24, 2012
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Merge branch 'mv/pull-r-for-rebase' into maint-1.7.11

    gitster committed Aug 24, 2012
    A minor documentation update.
    
    * mv/pull-r-for-rebase:
      man: git pull -r is a short for --rebase
  3. Merge branch 'jc/maint-abbrev-option-cli' into maint-1.7.11

    gitster committed Aug 24, 2012
    We did not document that many commands take unique prefix
    abbreviations of long options (e.g. "--option" may be the only flag
    that the command accepts that begin with "--opt", in which case you
    can give "--opt") anywhere easy to find for new people.
    
    * jc/maint-abbrev-option-cli:
      gitcli: describe abbreviation of long options
  4. Merge branch 'jc/maint-rev-list-topo-doc' into maint-1.7.11

    gitster committed Aug 24, 2012
    It was unclear what "--topo-order" was really about in the
    documentation. It is not just about "children before parent", but
    also about "don't mix lineages".
    
    * jc/maint-rev-list-topo-doc:
      rev-list docs: clarify --topo-order description
  5. Merge branch 'hv/coding-guidelines' into maint-1.7.11

    gitster committed Aug 24, 2012
    In earlier days, "imitate the style in the neibouring code" was
    sufficient to keep the coherent style, but over time some parts of
    the codebase have drifted enough to make it ineffective.
    
    * hv/coding-guidelines:
      Documentation/CodingGuidelines: spell out more shell guidelines
  6. Merge branch 'jc/tag-doc' into maint-1.7.11

    gitster committed Aug 24, 2012
    Our documentation used to assume having files in .git/refs/*
    directories was the only to have branches and tags, but that is not
    true for quite some time.
    
    * jc/tag-doc:
      Documentation: do not mention .git/refs/* directories
  7. Merge branch 'mk/test-seq' into maint-1.7.11

    gitster committed Aug 24, 2012
    Add a compatibility/utility function to the test framework.
    
    * mk/test-seq:
      tests: Introduce test_seq
  8. Merge branch 'lp/no-cmd-http-fetch' into maint-1.7.11

    gitster committed Aug 24, 2012
    * lp/no-cmd-http-fetch:
      builtin.h: remove unused cmd_<foo> declarations
  9. Merge branch 'bw/maint-1.7.9-solaris-getpass' into maint-1.7.11

    gitster committed Aug 24, 2012
    * bw/maint-1.7.9-solaris-getpass:
      Enable HAVE_DEV_TTY for Solaris
      terminal: seek when switching between reading and writing
  10. Merge branch 'jk/maint-commit-check-committer-early' into maint-1.7.11

    gitster committed Aug 24, 2012
    * jk/maint-commit-check-committer-early:
      commit: check committer identity more strictly
  11. Make 'git submodule update --force' always check out submodules.

    Stefan Zager committed with gitster Jul 25, 2012
    Currently, it will only do a checkout if the sha1 registered in the containing
    repository doesn't match the HEAD of the submodule, regardless of whether the
    submodule is dirty.  As discussed on the mailing list, the '--force' flag is a
    strong indicator that the state of the submodule is suspect, and should be reset
    to HEAD.
    
    Signed-off-by: Stefan Zager <szager@google.com>
    Acked-by: Jens Lehmann <Jens.Lehmann@web.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>