nd-GitHub/Authorship-of-merge-commits-made-by-Github-Apps-changed/td-p/48797/highlight/false/page/3
Best
Yun Tang
From: Jark Wu
Sent: Monday, March 9, 2020 16:02
To: dev
Subject: Re: [DISCUSS] Disable "Squash and merge" button for Flink repository
on GitHu
Hi everyone,
Updates: GitHub fixed this to preserve the authors information.
However, the "committed" field will be "GitHub "
instead who merges PR.
I reported this in GitHub Community [1] and will track the problem later.
Not sure it is a GitHub bug or my setting problem.
Best,
Jark
[1]:
https:
Hi,
Thank you all for the discussion!
On one hand, due to the network problem, the "Squash and merge" button is
very helpful. I’m also getting more and more rely on it as it is also very
convenient.
On the other hand, I think the concerns raised by Stephan are valid and we
should pay attention t
All right sounds fair.
Especially that the button helps in case of unstable networks makes sense.
On Fri, Mar 6, 2020 at 11:04 AM Aljoscha Krettek
wrote:
> If there is a noreply email address that could be on purpose. This
> happens when you configure github to not show your real e-mail address
If there is a noreply email address that could be on purpose. This
happens when you configure github to not show your real e-mail address.
This also happens when contributors open a PR and don't want to show
their real e-mail address. I talked to at least 1 person that had it set
up like this o
Hi,
> It looks like this feature still messes up email addresses, for example if
> you do a "git log | grep noreply" in the repo.
I’ve checked my appearences on that list (git log | grep noreply) and they
happened couple of times, when I actually used squash and merge (I wanted to
squash fixup
These Github buttons sometimes can help me merge commits when the network
from China to Github is unstable. It would take me so long to fetch and
reorganize
commits locally, and fetch master, doing some rebase and then push. Each
step
is time consuming when network situation is bad.
So I would lik
Hi Jark,
Thanks for the further investigation.
If the bug of missing author can be solved by Github soon, I am generally
neutral to disable "Squash and merge" button, even somehow preferring to keep
it because it could bring a bit benefits sometimes and some committers are
willing to rely on
Hi Jark,
Thanks for starting this discussion. Personally I also love the "squash and
merge" button. It's very convenient.
Regarding to the email address "noreply", it seems that there are two cases:
- The email address in the original commit is already "noreply". In this case,
this issue will s
Hi Stephan,
> noreply email address.
I investigated this and found some x...@users.noreply.github.com address. I
think that's because they enabled "kepp email addresses private" on GitHub
[1].
> Don't most PRs consist anyways of multiple commits where we want to
preserve "refactor" and "feature"
Hi,
I agree with Jark. The tool is useful. If there are some problem, I think
we can reach an agreement to form certain terms?
Github provides:
- "rebase and merge" keep all commits.
- "squash and merge" squash all commits to one commits, pull request
authors used to be multiple commits, like "ad
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA512
Seems, this will be fixed today:
https://twitter.com/natfriedman/status/1235613840659767298?s=19
- -Matthias
On 3/5/20 8:37 AM, Stephan Ewen wrote:
> It looks like this feature still messes up email addresses, for
> example if you do a "git log |
It looks like this feature still messes up email addresses, for example if
you do a "git log | grep noreply" in the repo.
Don't most PRs consist anyways of multiple commits where we want to
preserve "refactor" and "feature" differentiation in the history, rather
than squash everything?
On Thu, Ma
Hi,
If it’s really not preserving ownership (I didn’t notice the problem before),
+1 for removing “squash and merge”.
However -1 for removing “rebase and merge”. I didn’t see any issues with it and
I’m using it constantly.
Piotrek
> On 5 Mar 2020, at 16:40, Jark Wu wrote:
>
> Hi all,
>
> T
Hi all,
Thanks for the feedbacks. But I want to clarify the motivation to disable
"Squash and merge" is just because of the regression/bug of the missing
author information.
If GitHub fixes this later, I think it makes sense to bring this button
back.
Hi Stephan & Zhijiang,
To be honest, I love
+1 for disabling this feature for now.
Thanks a lot for spotting this!
On Thu, Mar 5, 2020 at 3:54 PM Zhijiang
wrote:
> +1 for disabling "Squash and merge" if feasible to do that.
>
> The possible benefit to use this button is for saving some efforts to
> squash some intermediate "[fixup]" comm
+1 for disabling "Squash and merge" if feasible to do that.
The possible benefit to use this button is for saving some efforts to squash
some intermediate "[fixup]" commits during PR review.
But it would bring more potential problems as mentioned below, missing author
information and message of
Hi Yadong,
Maybe we firstly reach out INFRA team and see the reply from their side.
Since the actual operator is INFRA team, in the dev mailing list we can
focus on motivation and
wait for the reply.
Best,
tison.
Yadong Xie 于2020年3月5日周四 下午9:29写道：
> Hi Jark
>
> I think GitHub UI can not disab
Hi Jark
I think GitHub UI can not disable both the "Squash and merge" button and
"Rebase and merge" at the same time if there exists any protected branch in
the repository(according to github rules).
If we only left "merge and commits" button, it will against requiring a
linear commit history rul
For implement it, file a JIRA ticket in INFRA [1]
Best,
tison.
[1] https://issues.apache.org/jira/projects/INFRA
Stephan Ewen 于2020年3月5日周四 下午8:57写道：
> Big +1 to disable it.
>
> I have never been a fan, it has always caused problems:
> - Merge commits
> - weird alias emails
> - lost autho
Big +1 to disable it.
I have never been a fan, it has always caused problems:
- Merge commits
- weird alias emails
- lost author information
- commit message misses the "This closes #" line to track back
commits to PRs/reviews.
The button goes against best practice, it should go away.
Be
Hi Jark
There is a conversation about this here:
https://github.community/t5/How-to-use-Git-and-GitHub/Authorship-of-merge-commits-made-by-Github-Apps-changed/td-p/48797
I think GitHub will fix it soon, it is a bug, not a feature :).
Jingsong Li 于2020年3月5日周四 下午8:32写道：
> Thanks for deep investiga
Thanks for deep investigation.
+1 to disable "Squash and merge" button now.
But I think this is a very serious problem, It affects too many GitHub
workers. Github should deal with it quickly?
Best,
Jingsong Lee
On Thu, Mar 5, 2020 at 7:21 PM Xingbo Huang wrote:
> Hi Jark,
>
> Thanks for bringi
Hi Jark,
Thanks for bringing up this discussion. Good catch. Agree that we can
disable "Squash and merge"(also the other buttons) for now.
There is a guideline on how to do that in
https://help.github.com/en/github/administering-a-repository/configuring-commit-squashing-for-pull-requests
.
Best,
24 matches
Mail list logo
