1. 18 6月, 2016 12 次提交
  2. 08 6月, 2016 1 次提交
  3. 02 6月, 2016 1 次提交
    • J
      t2300: run git-sh-setup in an environment that better mimics the real life · fe17fc00
      Junio C Hamano 提交于
      When we run scripted Porcelains, "git" potty has set up the $PATH by
      prepending $GIT_EXEC_PATH, the path given by "git --exec-path=$there
      $cmd", etc. already.  Because of this, scripted Porcelains can
      dot-source shell script library like git-sh-setup with simple dot
      without specifying any path.
      
      t2300 however dot-sources git-sh-setup without adjusting $PATH like
      the real "git" potty does.  This has not been a problem so far, but
      once git-sh-setup wants to rely on the $PATH adjustment, just like
      any scripted Porcelains already do, it would become one.  It cannot
      for example dot-source another shell library without specifying the
      full path to it by prefixing $(git --exec-path).
      Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      fe17fc00
  4. 01 6月, 2016 5 次提交
    • J
      More topics for 2.8.4 · 4b0891ff
      Junio C Hamano 提交于
      Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      4b0891ff
    • J
      Merge branch 'sb/submodule-deinit-all' into maint · 3296e1a9
      Junio C Hamano 提交于
      Correct faulty recommendation to use "git submodule deinit ." when
      de-initialising all submodules, which would result in a strange
      error message in a pathological corner case.
      
      * sb/submodule-deinit-all:
        submodule deinit: require '--all' instead of '.' for all submodules
      3296e1a9
    • J
      Merge branch 'bn/http-cookiefile-config' into maint · e646a82c
      Junio C Hamano 提交于
      "http.cookieFile" configuration variable clearly wants a pathname,
      but we forgot to treat it as such by e.g. applying tilde expansion.
      
      * bn/http-cookiefile-config:
        http: expand http.cookieFile as a path
        Documentation: config: improve word ordering for http.cookieFile
      e646a82c
    • J
      Merge branch 'jk/test-send-sh-x-trace-elsewhere' into maint · 68a6e976
      Junio C Hamano 提交于
      Running tests with '-x' option to trace the individual command
      executions is a useful way to debug test scripts, but some tests
      that capture the standard error stream and check what the command
      said can be broken with the trace output mixed in.  When running
      our tests under "bash", however, we can redirect the trace output
      to another file descriptor to keep the standard error of programs
      being tested intact.
      
      * jk/test-send-sh-x-trace-elsewhere:
        test-lib: set BASH_XTRACEFD automatically
      68a6e976
    • J
      Merge branch 'js/name-rev-use-oldest-ref' into maint · 9ee8f940
      Junio C Hamano 提交于
      "git describe --contains" often made a hard-to-justify choice of
      tag to give name to a given commit, because it tried to come up
      with a name with smallest number of hops from a tag, causing an old
      commit whose close descendant that is recently tagged were not
      described with respect to an old tag but with a newer tag.  It did
      not help that its computation of "hop" count was further tweaked to
      penalize being on a side branch of a merge.  The logic has been
      updated to favor using the tag with the oldest tagger date, which
      is a lot easier to explain to the end users: "We describe a commit
      in terms of the (chronologically) oldest tag that contains the
      commit."
      
      * js/name-rev-use-oldest-ref:
        name-rev: include taggerdate in considering the best name
      9ee8f940
  5. 27 5月, 2016 21 次提交