1. 26 Dec, 2018 2 commits
    • Duy Nguyen's avatar
      worktree.c: add get_worktree_config() · b2e21eec
      Duy Nguyen authored
      "git config --worktree" can write to the write file whether
      extensions.worktreeConfig is enabled or not. In order to do the same
      using config API, we need to determine the right file to write to. Add
      this function for that purpose. This is the basis for the coming
      repo_config_set_worktree()
      b2e21eec
    • Duy Nguyen's avatar
      config.c: avoid git_path() in do_git_config_sequence() · 1d7ccc34
      Duy Nguyen authored
      This function has both $GIT_COMMON_DIR and $GIT_DIR in "opts". Use it
      to construct config.worktree path instead because git_pathdup() is
      tied to the current worktree, but the given $GIT_DIR could be from
      another one.
      1d7ccc34
  2. 15 Dec, 2018 9 commits
  3. 14 Dec, 2018 2 commits
    • Derrick Stolee's avatar
      .gitattributes: ensure t/oid-info/* has eol=lf · fc767afe
      Derrick Stolee authored
      The new test_oid machinery in the test library requires reading
      some information from t/oid-info/hash-info and t/oid-info/oid.
      
      The logic to read from these files in shell uses built-in "read"
      command, which leaves CR at the end of these text files when they
      are checked out with CRLF line endings, at least when run with bash
      shipped with Git for Windows.  This results in an unexpected value
      in the variable these lines are read into, leading the tests to
      fail.
      
      Mark them to be checked out always with the LF line endings.
      Signed-off-by: 's avatarDerrick Stolee <dstolee@microsoft.com>
      Signed-off-by: 's avatarJunio C Hamano <gitster@pobox.com>
      fc767afe
    • Johannes Schindelin's avatar
      t9902: 'send-email' test case requires PERL · 0365b9ec
      Johannes Schindelin authored
      The oneline notwithstanding, 13374987 (completion: use _gitcompbuiltin
      for format-patch, 2018-11-03) changed also the way send-email options
      are completed, by asking the git send-email command itself what options
      it offers.
      
      Necessarily, this must fail when built with NO_PERL because send-email
      itself is a Perl script. Which means that we need the PERL prerequisite
      for the send-email test case in t9902.
      Signed-off-by: Johannes Schindelin's avatarJohannes Schindelin <johannes.schindelin@gmx.de>
      Signed-off-by: 's avatarJunio C Hamano <gitster@pobox.com>
      0365b9ec
  4. 13 Dec, 2018 1 commit
  5. 12 Dec, 2018 4 commits
  6. 09 Dec, 2018 2 commits
    • Junio C Hamano's avatar
      Git 2.20 · 5d826e97
      Junio C Hamano authored
      Signed-off-by: 's avatarJunio C Hamano <gitster@pobox.com>
      5d826e97
    • Junio C Hamano's avatar
      Merge tag 'l10n-2.20.0-rnd3' of https://github.com/git-l10n/git-po · b5796d9a
      Junio C Hamano authored
      l10n-2.20.0-rnd3
      
      * tag 'l10n-2.20.0-rnd3' of https://github.com/git-l10n/git-po: (22 commits)
        l10n: de.po: fix two messages
        l10n: zh_CN: for git v2.20.0 l10n round 1 to 3
        l10n: update German translation
        l10n: bg.po: Updated Bulgarian translation (4187t)
        l10n: sv.po: Update Swedish translation (4187t0f0u)
        l10n: fr.po v2.20.0 round 3
        l10n: vi(4187t): Updated Vietnamese translation for v2.20.0 rd3
        l10n: es.po v2.20.0 round 3
        l10n: git.pot: v2.20.0 round 3 (5 new, 3 removed)
        l10n: vi(4185t): Updated Vietnamese translation for v2.20.0
        l10n: es.po v2.20.0 round 1
        l10n: bg.po: Updated Bulgarian translation (4185t)
        l10n: git.pot: v2.20.0 round 2 (2 new, 2 removed)
        l10n: bg.po: Updated Bulgarian translation (4185t)
        l10n: sv.po: Update Swedish translation (4185t0f0u)
        l10n: fr.po v2.20 rnd 1
        l10n: Update Catalan translation
        l10n: git.pot: v2.20.0 round 1 (254 new, 27 removed)
        l10n: Update Catalan translation
        l10n: vi.po: fix typo in pack-objects
        ...
      b5796d9a
  7. 07 Dec, 2018 1 commit
  8. 06 Dec, 2018 2 commits
  9. 04 Dec, 2018 7 commits
  10. 03 Dec, 2018 1 commit
  11. 02 Dec, 2018 9 commits