[Buildbot-commits] [buildbot/buildbot] 41c0f5: Be less dependent on `.gitconfig` and `.gitattribu...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/buildbot/buildbot
  Commit: 41c0f5d95ee1ad47df0540c1221dc614abd83d3f
      https://github.com/buildbot/buildbot/commit/41c0f5d95ee1ad47df0540c1221dc614abd83d3f
  Author: Olivier Favre <olivier at yakaz.com>
  Date:   2015-02-18 (Wed, 18 Feb 2015)

  Changed paths:
    M master/buildbot/clients/tryclient.py

  Log Message:
  -----------
  Be less dependent on `.gitconfig` and `.gitattributes` for `git diff` output

Using `[diff] noprefix` strips the standard `a/` and `b/` prefixes,
we can restore them using `--src-prefix=a/` and `--dst-prefix=b/`.

This fixes the following error:

    fatal: git diff header lacks filename information when removing 1
    leading pathname components (line 5)

`.gitattributes` can configure special text conversion filters and
external diff programs, we can remove them using `--no-textconv` and
`--no-ext-diff`.

This fixes the following errors:

    error: patch failed: path/to/some/file:123
    error: path/to/some/file: patch does not apply


  Commit: 47b9afc3008de78e52a557baeaa0f52149039af9
      https://github.com/buildbot/buildbot/commit/47b9afc3008de78e52a557baeaa0f52149039af9
  Author: Mikhail Sobolev <mss at mawhrin.net>
  Date:   2015-02-20 (Fri, 20 Feb 2015)

  Changed paths:
    M master/buildbot/clients/tryclient.py

  Log Message:
  -----------
  Merge pull request #1550 from yakaz/fix-git-diff-prefix-textconv-extdiff

Be less dependent on `.gitconfig` and `.gitattributes` for `git diff` output


Compare: https://github.com/buildbot/buildbot/compare/20d2dc083db9...47b9afc3008d