Details

    • Type: Task
    • Status: Waiting for Infra
    • Priority: Minor
    • Resolution: Unresolved
    • Fix Version/s: None
    • Component/s: Github
    • Labels:
      None
    • Project:
      Incubator

      Description

      I just recently merged a PR:
      https://github.com/apache/incubator-openwhisk/pull/2718

      You can see if look at it the first commit [1], it is not mine but is Scott Wilson-Billing's.

      Yet when I squashed and merged the PR (which I opened) I was credited with the commit [2] which is not right. I used the Github "rebase and squash" button in this case.

      What's the Apache way of fixing this?

      [1] https://github.com/apache/incubator-openwhisk/pull/2718/commits/377d7d4c2a00acba5c261122dcbf1948541a0caf
      [2] https://github.com/apache/incubator-openwhisk/commit/ec56eb81005a0a62cadd591ca55e1468c73df2b3

        Activity

        Hide
        gmcdonald Gavin added a comment -
        This is not something we are going to fix. Whats done is done and we can not and will not rewrite history.
        Why you felt the need to squash is the real question, there is simply no need.
        Show
        gmcdonald Gavin added a comment - This is not something we are going to fix. Whats done is done and we can not and will not rewrite history. Why you felt the need to squash is the real question, there is simply no need.
        Hide
        Internal
        mrutkowski Matt Rutkowski added a comment - - edited
        I think all of us were hoping not to rewrite the history (keep that completely "off the table"... Before we perhaps revert and re-commit, will Snoot consider all committers on a merge (i.e., give them credit)?
        Show
        Internal
        mrutkowski Matt Rutkowski added a comment - - edited I think all of us were hoping not to rewrite the history (keep that completely "off the table"... Before we perhaps revert and re-commit, will Snoot consider all committers on a merge (i.e., give them credit)?
        Hide
        gmcdonald Gavin added a comment -
        the snoot part is a question for [~humbedooh] so pinging him.
        Show
        gmcdonald Gavin added a comment - the snoot part is a question for [~humbedooh] so pinging him.
        Hide
        humbedooh Daniel Gruno added a comment -
        a "squerge" will always default to your info, because you are doing some serious editing on the commits there, essentially making a brand new unified commit.
        Your best (and worst) bet is to change your git config before and after the squerge, so it thinks it's Scott doing the things.
        Show
        humbedooh Daniel Gruno added a comment - a "squerge" will always default to your info, because you are doing some serious editing on the commits there, essentially making a brand new unified commit. Your best (and worst) bet is to change your git config before and after the squerge, so it thinks it's Scott doing the things.

          People

          • Assignee:
            gmcdonald Gavin
            Reporter:
            rabbah rodric rabbah
            Request participants:
            None
          • Votes:
            0 Vote for this issue
            Watchers:
            3 Start watching this issue

            Dates

            • Created:
              Updated: