Permalink
Commits on Mar 1, 2013
  1. Git 1.8.1.5

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Mar 1, 2013
  2. Make !pattern in .gitattributes non-fatal

    Before 82dce99 (attr: more matching optimizations from .gitignore,
    2012-10-15), .gitattributes did not have any special treatment of a
    leading '!'.  The docs, however, always said
    
      The rules how the pattern matches paths are the same as in
      `.gitignore` files; see linkgit:gitignore[5].
    
    By those rules, leading '!' means pattern negation.  So 82dce99
    correctly determined that this kind of line makes no sense and should
    be disallowed.
    
    However, users who actually had a rule for files starting with a '!'
    are in a bad position: before 82dce99 '!' matched that literal
    character, so it is conceivable that users have .gitattributes with
    such lines in them.  After 82dce99 the unescaped version was
    disallowed in such a way that git outright refuses to run(!) most
    commands in the presence of such a .gitattributes.  It therefore
    becomes very hard to fix, let alone work with, such repositories.
    
    Let's at least allow the users to fix their repos: change the fatal
    error into a warning.
    
    Reported-by: mathstuf@gmail.com
    Signed-off-by: Thomas Rast <trast@student.ethz.ch>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    trast committed with gitster Mar 1, 2013
  3. Merge branch 'wk/user-manual' into maint

    * wk/user-manual:
      user-manual: Flesh out uncommitted changes and submodule updates
      user-manual: Use request-pull to generate "please pull" text
      user-manual: Reorganize the reroll sections, adding 'git rebase -i'
    gitster committed Mar 1, 2013
  4. Documentation/githooks: Fix linkgit

    Signed-off-by: Andrew Wong <andrew.kw.w@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    andrewkww committed with gitster Mar 1, 2013
Commits on Feb 27, 2013
  1. Update draft release notes to 1.8.1.5

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Feb 27, 2013
  2. Merge branch 'ef/non-ascii-parse-options-error-diag' into maint

    * ef/non-ascii-parse-options-error-diag:
      parse-options: report uncorrupted multi-byte options
    gitster committed Feb 27, 2013
  3. Merge branch 'wk/man-deny-current-branch-is-default-these-days' into …

    …maint
    
    * wk/man-deny-current-branch-is-default-these-days:
      user-manual: typofix (ofthe->of the)
      user-manual: Update for receive.denyCurrentBranch=refuse
    gitster committed Feb 27, 2013
  4. Merge branch 'jn/less-reconfigure' into maint

    * jn/less-reconfigure:
      Makefile: avoid infinite loop on configure.ac change
    gitster committed Feb 27, 2013
  5. Documentation/submodule: Add --force to update synopsis

    In commit 9db31bd (submodule: Add --force option for git submodule
    update, 2011-04-01) we added the option to the implementation's usage
    synopsis but forgot to add it to the synopsis in the command
    documentation.  Add the option to the synopsis in the same location it
    is reported in usage and re-wrap the options to avoid long lines.
    
    Signed-off-by: Brad King <brad.king@kitware.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    bradking committed with gitster Feb 27, 2013
Commits on Feb 25, 2013
  1. Prepare for 1.8.1.5

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Feb 25, 2013
  2. Merge branch 'jc/mention-tracking-for-pull-default' into maint

    * jc/mention-tracking-for-pull-default:
      doc: mention tracking for pull.default
    gitster committed Feb 25, 2013
  3. Merge branch 'mm/config-intro-in-git-doc' into maint

    * mm/config-intro-in-git-doc:
      git.txt: update description of the configuration mechanism
    gitster committed Feb 25, 2013
  4. Merge branch 'da/p4merge-mktemp-fix' into maint

    * da/p4merge-mktemp-fix:
      p4merge: fix printf usage
    gitster committed Feb 25, 2013
  5. Merge branch 'bw/get-tz-offset-perl' into maint

    * bw/get-tz-offset-perl:
      cvsimport: format commit timestamp ourselves without using strftime
      perl/Git.pm: fix get_tz_offset to properly handle DST boundary cases
      Move Git::SVN::get_tz to Git::get_tz_offset
    gitster committed Feb 25, 2013
  6. Merge branch 'al/mergetool-printf-fix' into maint

    * al/mergetool-printf-fix:
      difftool--helper: fix printf usage
      git-mergetool: print filename when it contains %
    gitster committed Feb 25, 2013
  7. Merge branch 'jx/utf8-printf-width' into maint

    * jx/utf8-printf-width:
      Add utf8_fprintf helper that returns correct number of columns
    gitster committed Feb 25, 2013
  8. Merge branch 'mg/bisect-doc' into maint

    * mg/bisect-doc:
      git-bisect.txt: clarify that reset quits bisect
    gitster committed Feb 25, 2013
  9. Merge branch 'sp/smart-http-content-type-check' into maint

    * sp/smart-http-content-type-check:
      http_request: reset "type" strbuf before adding
      t5551: fix expected error output
      Verify Content-Type from smart HTTP servers
    gitster committed Feb 25, 2013
  10. Merge branch 'jc/combine-diff-many-parents' into maint

    * jc/combine-diff-many-parents:
      t4038: add tests for "diff --cc --raw <trees>"
      combine-diff: lift 32-way limit of combined diff
    gitster committed Feb 25, 2013
  11. Merge branch 'jk/apply-similaritly-parsing' into maint

    * jk/apply-similaritly-parsing:
      builtin/apply: tighten (dis)similarity index parsing
    gitster committed Feb 25, 2013
  12. Merge branch 'jk/remote-helpers-doc' into maint

    * jk/remote-helpers-doc:
      Rename {git- => git}remote-helpers.txt
    gitster committed Feb 25, 2013
  13. Merge branch 'ab/gitweb-use-same-scheme' into maint

    * ab/gitweb-use-same-scheme:
      gitweb: refer to picon/gravatar images over the same scheme
    gitster committed Feb 25, 2013
  14. Merge branch 'zk/clean-report-failure' into maint

    * zk/clean-report-failure:
      git-clean: Display more accurate delete messages
    gitster committed Feb 25, 2013
  15. Merge branch 'nd/clone-no-separate-git-dir-with-bare' into maint

    * nd/clone-no-separate-git-dir-with-bare:
      clone: forbid --bare --separate-git-dir <dir>
    gitster committed Feb 25, 2013
  16. Merge branch 'da/p4merge-mktemp' into maint

    * da/p4merge-mktemp:
      mergetools/p4merge: Honor $TMPDIR for the /dev/null placeholder
    gitster committed Feb 25, 2013
  17. Documentation: "advice" is uncountable

    "Advice" is a mass noun, not a count noun; it's not ordinarily
    pluralized.
    
    Signed-off-by: Greg Price <price@mit.edu>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gnprice committed with gitster Feb 25, 2013
Commits on Feb 21, 2013
  1. Makefile: avoid infinite loop on configure.ac change

    If you are using autoconf and change the configure.ac, the
    Makefile will notice that config.status is older than
    configure.ac, and will attempt to rebuild and re-run the
    configure script to pick up your changes. The first step in
    doing so is to run "make configure". Unfortunately, this
    tries to include config.mak.autogen, which depends on
    config.status, which depends on configure.ac; so we must
    rebuild config.status. Which leads to us running "make
    configure", and so on.
    
    It's easy to demonstrate with:
    
      make configure
      ./configure
      touch configure.ac
      make
    
    We can break this cycle by not re-invoking make to build
    "configure", and instead just putting its rules inline into
    our config.status rebuild procedure.  We can avoid a copy by
    factoring the rules into a make variable.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    peff committed with gitster Feb 21, 2013
Commits on Feb 20, 2013
  1. Git 1.8.1.4

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Feb 19, 2013
  2. Merge branch 'ob/imap-send-ssl-verify' into maint

    * ob/imap-send-ssl-verify:
      imap-send: support subjectAltName as well
      imap-send: the subject of SSL certificate must match the host
      imap-send: move #ifdef around
    gitster committed Feb 20, 2013
  3. imap-send: support subjectAltName as well

    Check not only the common name of the certificate subject, but also
    check the subject alternative DNS names as well, when verifying that
    the certificate matches that of the host we are trying to talk to.
    
    Signed-off-by: Oswald Buddenhagen <ossi@kde.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    ossilator committed with gitster Feb 15, 2013
  4. imap-send: the subject of SSL certificate must match the host

    We did not check a valid certificate's subject at all, and would
    have happily talked with a wrong host after connecting to an
    incorrect address and getting a valid certificate that does not
    belong to the host we intended to talk to.
    
    Signed-off-by: Oswald Buddenhagen <ossi@kde.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    ossilator committed with gitster Feb 15, 2013
Commits on Feb 19, 2013
  1. user-manual: Flesh out uncommitted changes and submodule updates

    If you try and update a submodule with a dirty working directory, you
    get an error message like:
    
      $ git submodule update
      error: Your local changes to the following files would be overwritten by checkout:
      ...
      Please, commit your changes or stash them before you can switch branches.
      Aborting
      ...
    
    Mention this in the submodule notes.  The previous phrase was short
    enough that I originally thought it might have been referring to the
    reflog note (obviously, uncommitted changes will not show up in the
    reflog either ;).
    
    Signed-off-by: W. Trevor King <wking@tremily.us>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    wking committed with gitster Feb 19, 2013
  2. user-manual: Use request-pull to generate "please pull" text

    Less work and more error checking (e.g. does a merge base exist?).
    Add an explicit push before request-pull to satisfy request-pull,
    which checks to make sure the references are publically available.
    
    Signed-off-by: W. Trevor King <wking@tremily.us>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    wking committed with gitster Feb 19, 2013
  3. user-manual: Reorganize the reroll sections, adding 'git rebase -i'

    I think this interface is often more convenient than extended cherry
    picking or using 'git format-patch'.  In fact, I removed the
    cherry-pick section entirely.  The entry-level suggestions for
    rerolling are now:
    
        1. git commit --amend
        2. git format-patch origin
           git reset --hard origin
           ...edit and reorder patches...
           git am *.patch
        3. git rebase -i origin
    
    Signed-off-by: W. Trevor King <wking@tremily.us>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    wking committed with gitster Feb 19, 2013
  4. imap-send: move #ifdef around

    Instead of adding an early return to the inside of the
    ssl_socket_connect() function for NO_OPENSSL compilation, split it
    into a separate stub function.
    
    No functional change, but the next change to extend ssl_socket_connect()
    will become easier to read this way.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Feb 15, 2013