Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adjust error reporting from merge failures and use LC_ALL=C for git #8548

Merged
merged 33 commits into from
Nov 10, 2019
Merged

Adjust error reporting from merge failures and use LC_ALL=C for git #8548

merged 33 commits into from
Nov 10, 2019

Commits on Oct 16, 2019

  1. Adjust error reporting from merge failures

    @zeripath
    zeripath committed Oct 16, 2019
    Configuration menu
    Copy the full SHA
    97b534f View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2019

  1. Add errbuf resets

    @zeripath
    zeripath committed Oct 22, 2019
    Configuration menu
    Copy the full SHA
    33d1d28 View commit details
    Browse the repository at this point in the history

  2. Remove the -q as we want the message if there is a failure

    @zeripath
    zeripath committed Oct 22, 2019
    Configuration menu
    Copy the full SHA
    c1f49d8 View commit details
    Browse the repository at this point in the history

  3. save the stdout

    @zeripath
    zeripath committed Oct 22, 2019
    Configuration menu
    Copy the full SHA
    137d700 View commit details
    Browse the repository at this point in the history

  4. sanitize the error out

    @zeripath
    zeripath committed Oct 22, 2019
    Configuration menu
    Copy the full SHA
    a439b57 View commit details
    Browse the repository at this point in the history

  5. truncate message slightly and adjust message

    @zeripath
    zeripath committed Oct 22, 2019
    Configuration menu
    Copy the full SHA
    28d0f84 View commit details
    Browse the repository at this point in the history

  6. in runes...

    @zeripath
    zeripath committed Oct 22, 2019
    Configuration menu
    Copy the full SHA
    e4eb801 View commit details
    Browse the repository at this point in the history

  7. ReplaceAll is too new - use Replace(... -1)

    @zeripath
    zeripath committed Oct 22, 2019
    Configuration menu
    Copy the full SHA
    ad111ce View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2019

  1. Merge branch 'master' into merging-fixes

    @zeripath
    zeripath authored Oct 23, 2019
    Configuration menu
    Copy the full SHA
    2290433 View commit details
    Browse the repository at this point in the history

  2. Apply suggestions from code review

    @zeripath
    zeripath authored Oct 23, 2019
    Configuration menu
    Copy the full SHA
    a1e23e9 View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2019

  1. Merge branch 'master' into merging-fixes

    @zeripath
    zeripath committed Oct 29, 2019
    Configuration menu
    Copy the full SHA
    218368b View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2019

  1. Set locale

    @zeripath
    zeripath committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    d3eaac2 View commit details
    Browse the repository at this point in the history

  2. Handle lots of types of error better

    @zeripath
    zeripath committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    b6077bb View commit details
    Browse the repository at this point in the history

  3. use fallthrough to reduce replication

    @zeripath
    zeripath committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    08cffb3 View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2019

  1. More golangci-lint fixes

    @zeripath
    zeripath committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    252b605 View commit details
    Browse the repository at this point in the history

  2. finally fixed golangci-lint

    @zeripath
    zeripath committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    6b7855f View commit details
    Browse the repository at this point in the history

  3. Update modules/auth/repo_form.go

    @zeripath
    zeripath authored Oct 31, 2019
    Configuration menu
    Copy the full SHA
    6511e18 View commit details
    Browse the repository at this point in the history

  4. update swagger

    @zeripath
    zeripath committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    18300d0 View commit details
    Browse the repository at this point in the history

  5. Update command.go

    @zeripath
    zeripath authored Oct 31, 2019
    Configuration menu
    Copy the full SHA
    130f61a View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2019

  1. Merge branch 'master' into merging-fixes

    @zeripath
    zeripath committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    d4be899 View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2019

  1. Remove MergeStyleUnrelatedMerge

    @zeripath
    zeripath committed Nov 3, 2019
    Configuration menu
    Copy the full SHA
    6546958 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into merging-fixes

    @zeripath
    zeripath authored Nov 3, 2019
    Configuration menu
    Copy the full SHA
    98ab798 View commit details
    Browse the repository at this point in the history

  3. remove mergeunrelated message in locale_en-US.ini

    @zeripath
    zeripath committed Nov 3, 2019
    Configuration menu
    Copy the full SHA
    cef2489 View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2019

  1. Apply suggestions from code review 

    Co-Authored-By: Lauris BH <lauris@nix.lv>
    @zeripath @lafriks
    zeripath and lafriks authored Nov 5, 2019
    Configuration menu
    Copy the full SHA
    e56d6ce View commit details
    Browse the repository at this point in the history

  2. Switch to use Locale instead of LCALL name

    @zeripath
    zeripath authored Nov 5, 2019
    Configuration menu
    Copy the full SHA
    2954f0f View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2019

  1. Fix fmt

    @zeripath
    zeripath authored Nov 6, 2019
    Configuration menu
    Copy the full SHA
    ac66b00 View commit details
    Browse the repository at this point in the history

  2. Fix fmt 2 (the revenge)

    @zeripath
    zeripath authored Nov 6, 2019
    Configuration menu
    Copy the full SHA
    4f35d66 View commit details
    Browse the repository at this point in the history

  3. Remove unused configurability from git.Command

    @zeripath
    zeripath committed Nov 6, 2019
    Configuration menu
    Copy the full SHA
    5a30d6f View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2019

  1. Add tests

    @zeripath
    zeripath committed Nov 9, 2019
    Configuration menu
    Copy the full SHA
    c115d79 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into merging-fixes

    @zeripath
    zeripath committed Nov 9, 2019
    Configuration menu
    Copy the full SHA
    08e0b49 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into merging-fixes

    @zeripath
    zeripath authored Nov 9, 2019
    Configuration menu
    Copy the full SHA
    4462fe9 View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2019

  1. Merge branch 'master' into merging-fixes

    @zeripath
    zeripath authored Nov 10, 2019
    Configuration menu
    Copy the full SHA
    9f38346 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into merging-fixes

    @zeripath
    zeripath authored Nov 10, 2019
    Configuration menu
    Copy the full SHA
    a234bf1 View commit details
    Browse the repository at this point in the history