Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: darccio/mergo
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0.3.12
Choose a base ref
...
head repository: darccio/mergo
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v0.3.13
Choose a head ref
  • 16 commits
  • 9 files changed
  • 7 contributors

Commits on Apr 5, 2021

  1. Fix typo in README.md

    suppot -> support
    eltociear authored Apr 5, 2021
    Configuration menu
    Copy the full SHA
    a2870b0 View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2021

  1. Merge pull request #184 from eltociear/patch-1

    Fix typo in README.md
    darccio authored Apr 20, 2021
    Configuration menu
    Copy the full SHA
    b968a17 View commit details
    Browse the repository at this point in the history

Commits on May 19, 2021

  1. Configuration menu
    Copy the full SHA
    c26eae1 View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2021

  1. Configuration menu
    Copy the full SHA
    2200c5d View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2021

  1. Merge pull request #193 from tjpnz/master

    Adding StructBot to Mergo in the wild section
    darccio authored Sep 23, 2021
    Configuration menu
    Copy the full SHA
    c8f4443 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    d739e7a View commit details
    Browse the repository at this point in the history
  3. Merge pull request #191 from marcauberer/master

    Add Goreleaser to featured projects
    darccio authored Sep 23, 2021
    Configuration menu
    Copy the full SHA
    fd3dfc9 View commit details
    Browse the repository at this point in the history

Commits on May 16, 2022

  1. Support slices of same type

    Fixes #209
    heaths committed May 16, 2022
    Configuration menu
    Copy the full SHA
    200f90d View commit details
    Browse the repository at this point in the history

Commits on May 18, 2022

  1. fix: gate transformers on valid non-nil destinations

    This builds on #203 which attempted to provide a more flexible gating to
    running transformers. However upon testing #203 in my own environment, I
    ran into the first panic listed below.
    
    There are a variety of errors that can happen when trying to run
    reflection on zero values:
    
    2 just from my testing of this PR
    ```
            panic: reflect: call of reflect.Value.Type on zero Value
    
            panic: reflect: call of reflect.Value.FieldByName on zero Value
    ```
    The panic specifically calls out zero values, but it's actual a more
    specific set of values which is covered by `reflect.IsValid`.
    
    I attempted to replace the check with `reflect.IsZero`, which ends up
    being too restrictive and breaks existing tests. I also attempted to
    solely use `reflect.IsZero` which is not restrictive enough and cause
    the later panic above in the tests. Thus I arrived on the combination in
    this PR which seems to strike the "right" balance.
    Zaq? Wiedmann committed May 18, 2022
    Configuration menu
    Copy the full SHA
    ab6b270 View commit details
    Browse the repository at this point in the history
  2. add test for keeping zero values with transformer

    Zaq? Wiedmann committed May 18, 2022
    Configuration menu
    Copy the full SHA
    4bed36e View commit details
    Browse the repository at this point in the history
  3. add test for deepMerge panic

    Zaq? Wiedmann committed May 18, 2022
    Configuration menu
    Copy the full SHA
    8109749 View commit details
    Browse the repository at this point in the history

Commits on May 24, 2022

  1. Merge pull request #211 from zaquestion/transformer_valid_destination

    fix: gate transformers on valid non-nil destinations
    darccio authored May 24, 2022
    Configuration menu
    Copy the full SHA
    fd7d2bc View commit details
    Browse the repository at this point in the history

Commits on May 25, 2022

  1. Merge pull request #210 from heaths/issue209

    Support slices of same type
    darccio authored May 25, 2022
    Configuration menu
    Copy the full SHA
    39ebbbb View commit details
    Browse the repository at this point in the history
  2. Upgrade yaml to v3

    As requested in "Update the yaml dependency to v3? #206".
    darccio committed May 25, 2022
    Configuration menu
    Copy the full SHA
    f86e6f6 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #212 from imdario/dcc/issue-206

    Upgrade yaml to v3
    darccio authored May 25, 2022
    Configuration menu
    Copy the full SHA
    80c13e1 View commit details
    Browse the repository at this point in the history
  4. Update README.md

    darccio authored May 25, 2022
    Configuration menu
    Copy the full SHA
    1949787 View commit details
    Browse the repository at this point in the history
Loading