1. 04 8月, 2015 4 次提交
    • J
      Merge branch 'sg/completion-commit-cleanup' into maint · 44737c42
      Junio C Hamano 提交于
      * sg/completion-commit-cleanup:
        completion: teach 'scissors' mode to 'git commit --cleanup='
      44737c42
    • J
      Merge branch 'pt/am-abort-fix' into maint · c36e465a
      Junio C Hamano 提交于
      Various fixes around "git am" that applies a patch to a history
      that is not there yet.
      
      * pt/am-abort-fix:
        am --abort: keep unrelated commits on unborn branch
        am --abort: support aborting to unborn branch
        am --abort: revert changes introduced by failed 3way merge
        am --skip: support skipping while on unborn branch
        am -3: support 3way merge on unborn branch
        am --skip: revert changes introduced by failed 3way merge
      c36e465a
    • J
      Merge branch 'mh/reporting-broken-refs-from-for-each-ref' into maint · 0533a9b7
      Junio C Hamano 提交于
      "git for-each-ref" reported "missing object" for 0{40} when it
      encounters a broken ref.  The lack of object whose name is 0{40} is
      not the problem; the ref being broken is.
      
      * mh/reporting-broken-refs-from-for-each-ref:
        read_loose_refs(): treat NULL_SHA1 loose references as broken
        read_loose_refs(): simplify function logic
        for-each-ref: report broken references correctly
        t6301: new tests of for-each-ref error handling
      0533a9b7
    • J
      Merge branch 'sg/commit-cleanup-scissors' into maint · a94594dc
      Junio C Hamano 提交于
      "git commit --cleanup=scissors" was not careful enough to protect
      against getting fooled by a line that looked like scissors.
      
      * sg/commit-cleanup-scissors:
        commit: cope with scissors lines in commit message
      a94594dc
  2. 28 7月, 2015 15 次提交
    • J
      Git 2.4.7 · ca00f80b
      Junio C Hamano 提交于
      Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      ca00f80b
    • J
      Merge branch 'jk/pretty-encoding-doc' into maint · caac7a3a
      Junio C Hamano 提交于
      Doc update.
      
      * jk/pretty-encoding-doc:
        docs: clarify that --encoding can produce invalid sequences
      caac7a3a
    • J
      Merge branch 'tb/checkout-doc' into maint · ff132a19
      Junio C Hamano 提交于
      Doc update.
      
      * tb/checkout-doc:
        git-checkout.txt: document "git checkout <pathspec>" better
      ff132a19
    • J
      Merge branch 'ls/hint-rev-list-count' into maint · 3afcec90
      Junio C Hamano 提交于
      * ls/hint-rev-list-count:
        rev-list: add --count to usage guide
      3afcec90
    • J
      Merge branch 'mm/branch-doc-updates' into maint · 315b3ba3
      Junio C Hamano 提交于
      * mm/branch-doc-updates:
        Documentation/branch: document -M and -D in terms of --force
        Documentation/branch: document -d --force and -m --force
      315b3ba3
    • J
      Merge branch 'jc/fsck-retire-require-eoh' into maint · bde6a72a
      Junio C Hamano 提交于
      A fix to a minor regression to "git fsck" in v2.2 era that started
      complaining about a body-less tag object when it lacks a separator
      empty line after its header to separate it with a non-existent body.
      
      * jc/fsck-retire-require-eoh:
        fsck: it is OK for a tag and a commit to lack the body
      bde6a72a
    • J
      Merge branch 'et/http-proxyauth' into maint · c1859365
      Junio C Hamano 提交于
      We used to ask libCURL to use the most secure authentication method
      available when talking to an HTTP proxy only when we were told to
      talk to one via configuration variables.  We now ask libCURL to
      always use the most secure authentication method, because the user
      can tell libCURL to use an HTTP proxy via an environment variable
      without using configuration variables.
      
      * et/http-proxyauth:
        http: always use any proxy auth method available
      c1859365
    • J
      Merge branch 'jc/unexport-git-pager-in-use-in-pager' into maint · 342c14db
      Junio C Hamano 提交于
      When you say "!<ENTER>" while running say "git log", you'd confuse
      yourself in the resulting shell, that may look as if you took
      control back to the original shell you spawned "git log" from but
      that isn't what is happening.  To that new shell, we leaked
      GIT_PAGER_IN_USE environment variable that was meant as a local
      communication between the original "Git" and subprocesses that was
      spawned by it after we launched the pager, which caused many
      "interesting" things to happen, e.g. "git diff | cat" still paints
      its output in color by default.
      
      Stop leaking that environment variable to the pager's half of the
      fork; we only need it on "Git" side when we spawn the pager.
      
      * jc/unexport-git-pager-in-use-in-pager:
        pager: do not leak "GIT_PAGER_IN_USE" to the pager
      342c14db
    • J
      Merge branch 'mh/strbuf-read-file-returns-ssize-t' into maint · 3b175fb9
      Junio C Hamano 提交于
      Avoid possible ssize_t to int truncation.
      
      * mh/strbuf-read-file-returns-ssize-t:
        strbuf: strbuf_read_file() should return ssize_t
      3b175fb9
    • J
      Merge branch 'kb/config-unmap-before-renaming' into maint · 6f402a93
      Junio C Hamano 提交于
      "git config" failed to update the configuration file when the
      underlying filesystem is incapable of renaming a file that is still
      open.
      
      * kb/config-unmap-before-renaming:
        config.c: fix writing config files on Windows network shares
      6f402a93
    • J
      Merge branch 'jk/rev-list-no-bitmap-while-pruning' into maint · 726359be
      Junio C Hamano 提交于
      A minor bugfix when pack bitmap is used with "rev-list --count".
      
      * jk/rev-list-no-bitmap-while-pruning:
        rev-list: disable --use-bitmap-index when pruning commits
      726359be
    • J
      Merge branch 'rh/test-color-avoid-terminfo-in-original-home' into maint · aa0b816c
      Junio C Hamano 提交于
      An ancient test framework enhancement to allow color was not
      entirely correct; this makes it work even when tput needs to read
      from the ~/.terminfo under the user's real HOME directory.
      
      * rh/test-color-avoid-terminfo-in-original-home:
        test-lib.sh: fix color support when tput needs ~/.terminfo
        Revert "test-lib.sh: do tests for color support after changing HOME"
      aa0b816c
    • J
      Merge branch 'jk/fix-refresh-utime' into maint · 7c696007
      Junio C Hamano 提交于
      Fix a small bug in our use of umask() return value.
      
      * jk/fix-refresh-utime:
        check_and_freshen_file: fix reversed success-check
      7c696007
    • J
      Merge branch 'cb/rebase-am-exit-code' into maint · 3f8b439a
      Junio C Hamano 提交于
      "git rebase" did not exit with failure when format-patch it invoked
      failed for whatever reason.
      
      * cb/rebase-am-exit-code:
        rebase: return non-zero error code if format-patch fails
      3f8b439a
    • J
      Merge branch 'jk/index-pack-reduce-recheck' into maint · de62fe8c
      Junio C Hamano 提交于
      Disable "have we lost a race with competing repack?" check while
      receiving a huge object transfer that runs index-pack.
      
      * jk/index-pack-reduce-recheck:
        index-pack: avoid excessive re-reading of pack directory
      de62fe8c
  3. 16 7月, 2015 12 次提交
  4. 09 7月, 2015 2 次提交
    • J
      check_and_freshen_file: fix reversed success-check · 3096b2ec
      Jeff King 提交于
      When we want to write out a loose object file, we have
      always first made sure we don't already have the object
      somewhere. Since 33d4221c (write_sha1_file: freshen existing
      objects, 2014-10-15), we also update the timestamp on the
      file, so that a simultaneous prune knows somebody is
      likely to reference it soon.
      
      If our utime() call fails, we treat this the same as not
      having the object in the first place; the safe thing to do
      is write out another copy. However, the loose-object check
      accidentally inverts the utime() check; it returns failure
      _only_ when the utime() call actually succeeded. Thus it was
      failing to protect us there, and in the normal case where
      utime() succeeds, it caused us to pointlessly write out and
      link the object.
      
      This passed our freshening tests, because writing out the
      new object is certainly _one_ way of updating its utime. So
      the normal case was inefficient, but not wrong.
      
      While we're here, let's also drop a comment in front of the
      check_and_freshen functions, making a note of their return
      type (since it is not our usual "0 for success, -1 for
      error").
      Signed-off-by: NJeff King <peff@peff.net>
      Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      3096b2ec
    • C
      rebase: return non-zero error code if format-patch fails · 60d708b2
      Clemens Buchacher 提交于
      Since e481af06 (rebase: Handle cases where format-patch fails) we
      notice if format-patch fails and return immediately from
      git-rebase--am. We save the return value with ret=$?, but then we
      return $?, which is usually zero in this case.
      
      Fix this by returning $ret instead.
      
      Cc: Andrew Wong <andrew.kw.w@gmail.com>
      Signed-off-by: NClemens Buchacher <clemens.buchacher@intel.com>
      Helped-by: NJorge Nunes <jorge.nunes@intel.com>
      Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      60d708b2
  5. 07 7月, 2015 2 次提交
  6. 04 7月, 2015 2 次提交
  7. 02 7月, 2015 2 次提交
  8. 01 7月, 2015 1 次提交