Permalink
Commits on Sep 15, 2012
  1. Git 1.7.11.7

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Sep 15, 2012
  2. Merge branch 'jk/maint-quiet-is-synonym-to-s-in-log' into maint-1.7.11

    * jk/maint-quiet-is-synonym-to-s-in-log:
      log: fix --quiet synonym for -s
    gitster committed Sep 15, 2012
  3. Merge branch 'jc/maint-ident-missing-human-name' into maint-1.7.11

    * jc/maint-ident-missing-human-name:
      split_ident_line(): make best effort when parsing author/committer line
    gitster committed Sep 15, 2012
  4. Merge branch 'rj/test-regex' into maint-1.7.11

    * rj/test-regex:
      test-regex: Add a test to check for a bug in the regex routines
    gitster committed Sep 15, 2012
  5. Merge branch 'da/gitk-reload-tag-contents' into maint-1.7.11

    * da/gitk-reload-tag-contents:
      gitk: Rename 'tagcontents' to 'cached_tagcontent'
      gitk: Teach "Reread references" to reload tags
      gitk: Avoid Meta1-F5
    gitster committed Sep 15, 2012
  6. Merge branch 'jc/maint-checkout-fileglob-doc' into maint-1.7.11

    * jc/maint-checkout-fileglob-doc:
      gitcli: contrast wildcard given to shell and to git
      gitcli: formatting fix
      Document file-glob for "git checkout -- '*.c'"
    gitster committed Sep 15, 2012
Commits on Sep 12, 2012
  1. Merge branch 'jc/apply-binary-p0' into maint-1.7.11

    "git apply -p0" did not parse pathnames on "diff --git" line
    correctly.  This caused patches that had pathnames in no other
    places to be mistakenly rejected (most notably, binary patch that
    does not rename nor change mode).  Textual patches, renames or mode
    changes have preimage and postimage pathnames in different places in
    a form that can be parsed unambiguously and did not suffer from this
    problem.
    
    * jc/apply-binary-p0:
      apply: compute patch->def_name correctly under -p0
    gitster committed Sep 12, 2012
  2. Merge branch 'jc/dotdot-is-parent-directory' into maint-1.7.11

    "git log .." errored out saying it is both rev range and a path when
    there is no disambiguating "--" is on the command line.  Update the
    command line parser to interpret ".." as a path in such a case.
    
    * jc/dotdot-is-parent-directory:
      specifying ranges: we did not mean to make ".." an empty set
    gitster committed Sep 12, 2012
  3. Merge branch 'jc/maint-doc-checkout-b-always-takes-branch-name' into …

    …maint-1.7.11
    
    The synopsis said "checkout [-B branch]" to make it clear the
    branch name is a parameter to the option, but the heading for the
    option description was "-B::", not "-B branch::", making the
    documentation misleading.
    
    * jc/maint-doc-checkout-b-always-takes-branch-name:
      doc: "git checkout -b/-B/--orphan" always takes a branch name
    gitster committed Sep 12, 2012
  4. Merge branch 'jk/maint-http-half-auth-push' into maint-1.7.11

    Pushing to smart HTTP server with recent Git fails without having
    the username in the URL to force authentication, if the server is
    configured to allow GET anonymously, while requiring authentication
    for POST.
    
    * jk/maint-http-half-auth-push:
      http: prompt for credentials on failed POST
      http: factor out http error code handling
      t: test http access to "half-auth" repositories
      t: test basic smart-http authentication
      t/lib-httpd: recognize */smart/* repos as smart-http
      t/lib-httpd: only route auth/dumb to dumb repos
      t5550: factor out http auth setup
      t5550: put auth-required repo in auth/dumb
    gitster committed Sep 12, 2012
  5. Merge branch 'kk/maint-for-each-ref-multi-sort' into maint-1.7.11

    "git for-each-ref" did not honor multiple "--sort=<key>" arguments
    correctly.
    
    * kk/maint-for-each-ref-multi-sort:
      for-each-ref: Fix sort with multiple keys
      t6300: test sort with multiple keys
    gitster committed Sep 12, 2012
Commits on Sep 11, 2012
  1. Git 1.7.11.6

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

    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
    gitster committed Sep 10, 2012
  3. Merge branch 'jc/maint-protect-sh-from-ifs' into maint-1.7.11

    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
    gitster committed Sep 10, 2012
  4. Merge branch 'bc/receive-pack-stdout-protection' into maint-1.7.11

    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
    gitster committed Sep 10, 2012
  5. Merge branch 'jk/maint-null-in-trees' into maint-1.7.11

    "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
    gitster committed Sep 10, 2012
  6. Merge branch 'tr/maint-send-email-2047' into maint-1.7.11

    "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
    gitster committed Sep 10, 2012
  7. Merge branch 'mm/die-with-dashdash-help' into maint-1.7.11

    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
    gitster committed Sep 10, 2012
  8. Merge branch 'js/gitweb-path-info-unquote' into maint-1.7.11

    "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
    gitster committed Sep 10, 2012