[limesurvey-developers] git commit amend in 2.06 branch

Discussion:

Alfredo Esteban

2015-01-12 15:09:58 UTC

Hi,

This morning I committed to master and 2.06 branch with a typo (ussue) in
the comment. I have committed with --amend option and push --force to 2.06
branch to fix the typo.

If you have not pulled this morning from 2.06 you can ignore this email. If
you have pulled after my commit with the typo (11:45 aprox) and before I
fixed the comment (a few minutes ago) you have to:

git fetch origin
git reset --hard origin/master # Loses local commits

See this link
<http://stackoverflow.com/questions/8981194/changing-git-commit-message-after-push-given-that-no-one-pulled-from-remote>for
more info.

I think I will keep the typo in master to prevent these problems in main
branch (do you agree?)

Sorry for the inconveniences,

Alfredo

Denis Chenu

2015-01-12 17:01:49 UTC

Permalink

Why not just a "Fix typo" commit ;), then no issue with pull/push :)

Example :
https://github.com/LimeSurvey/LimeSurvey/commit/d4d1c143854b48ad4928b6363608475b35b29bdd

Denis

Post by Alfredo Esteban
Hi,
This morning I committed to master and 2.06 branch with a typo
(ussue) in the comment. I have committed with --amend option and push
--force to 2.06 branch to fix the typo.
If you have not pulled this morning from 2.06 you can ignore this
email. If you have pulled after my commit with the typo (11:45 aprox)
git fetch origin
git reset --hard origin/master # Loses local commits
See this link
<http://stackoverflow.com/questions/8981194/changing-git-commit-message-after-push-given-that-no-one-pulled-from-remote>for
more info.
I think I will keep the typo in master to prevent these problems in
main branch (do you agree?)
Sorry for the inconveniences,
Alfredo
------------------------------------------------------------------------------
New Year. New Location. New Benefits. New Data Center in Ashburn, VA.
GigeNET is offering a free month of service with a new server in Ashburn.
Choose from 2 high performing configs, both with 100TB of bandwidth.
Higher redundancy.Lower latency.Increased capacity.Completely compliant.
vanity: www.gigenet.com
_______________________________________________
limesurvey-developers mailing list
https://lists.sourceforge.net/lists/listinfo/limesurvey-developers

Alfredo Esteban

2015-01-12 18:45:48 UTC

Permalink

The problem is the typo was in the comment of the commit, not in the code.
You can see the same typo in master branch: "ussue" instead of "issue".

Alfredo

Post by Denis Chenu
Why not just a "Fix typo" commit ;), then no issue with pull/push :)
https://github.com/LimeSurvey/LimeSurvey/commit/d4d1c143854b48ad4928b6363608475b35b29bdd
Denis
Hi,
This morning I committed to master and 2.06 branch with a typo (ussue)
in the comment. I have committed with --amend option and push --force to
2.06 branch to fix the typo.
If you have not pulled this morning from 2.06 you can ignore this email.
If you have pulled after my commit with the typo (11:45 aprox) and before I
git fetch origin
git reset --hard origin/master # Loses local commits
See this link
<http://stackoverflow.com/questions/8981194/changing-git-commit-message-after-push-given-that-no-one-pulled-from-remote>for
more info.
I think I will keep the typo in master to prevent these problems in main
branch (do you agree?)
Sorry for the inconveniences,
Alfredo
------------------------------------------------------------------------------
New Year. New Location. New Benefits. New Data Center in Ashburn, VA.
GigeNET is offering a free month of service with a new server in Ashburn.
Choose from 2 high performing configs, both with 100TB of bandwidth.
Higher redundancy.Lower latency.Increased capacity.Completely compliant.
vanity: www.gigenet.com
_______________________________________________
------------------------------------------------------------------------------
New Year. New Location. New Benefits. New Data Center in Ashburn, VA.
GigeNET is offering a free month of service with a new server in Ashburn.
Choose from 2 high performing configs, both with 100TB of bandwidth.
Higher redundancy.Lower latency.Increased capacity.Completely compliant.
www.gigenet.com
_______________________________________________
limesurvey-developers mailing list
https://lists.sourceforge.net/lists/listinfo/limesurvey-developers

Sam Mousa

2015-01-12 18:59:22 UTC

Permalink

Still these problems are not that big of an issue, forced pushes are.

Post by Alfredo Esteban
The problem is the typo was in the comment of the commit, not in the code.
You can see the same typo in master branch: "ussue" instead of "issue".
Alfredo
Why not just a "Fix typo" commit ;), then no issue with pull/push :)

Post by Denis Chenu
https://github.com/LimeSurvey/LimeSurvey/commit/d4d1c143854b48ad4928b6363608475b35b29bdd
Denis
Hi,
This morning I committed to master and 2.06 branch with a typo (ussue)
in the comment. I have committed with --amend option and push --force to
2.06 branch to fix the typo.
If you have not pulled this morning from 2.06 you can ignore this
email. If you have pulled after my commit with the typo (11:45 aprox) and
git fetch origin
git reset --hard origin/master # Loses local commits
See this link
<http://stackoverflow.com/questions/8981194/changing-git-commit-message-after-push-given-that-no-one-pulled-from-remote>for
more info.
I think I will keep the typo in master to prevent these problems in
main branch (do you agree?)
Sorry for the inconveniences,
Alfredo
------------------------------------------------------------------------------
New Year. New Location. New Benefits. New Data Center in Ashburn, VA.
GigeNET is offering a free month of service with a new server in Ashburn.
Choose from 2 high performing configs, both with 100TB of bandwidth.
Higher redundancy.Lower latency.Increased capacity.Completely compliant.
vanity: www.gigenet.com
_______________________________________________
------------------------------------------------------------------------------
New Year. New Location. New Benefits. New Data Center in Ashburn, VA.
GigeNET is offering a free month of service with a new server in Ashburn.
Choose from 2 high performing configs, both with 100TB of bandwidth.
Higher redundancy.Lower latency.Increased capacity.Completely compliant.
www.gigenet.com
_______________________________________________
limesurvey-developers mailing list
https://lists.sourceforge.net/lists/listinfo/limesurvey-developers

------------------------------------------------------------------------------
New Year. New Location. New Benefits. New Data Center in Ashburn, VA.
GigeNET is offering a free month of service with a new server in Ashburn.
Choose from 2 high performing configs, both with 100TB of bandwidth.
Higher redundancy.Lower latency.Increased capacity.Completely compliant.
www.gigenet.com
_______________________________________________
limesurvey-developers mailing list
https://lists.sourceforge.net/lists/listinfo/limesurvey-developers

Alfredo Esteban

2015-01-12 19:50:12 UTC

Permalink

In fact, if I push a typo again (I hope not) I won't push forced in any
branch.

Alfredo

Post by Sam Mousa
Still these problems are not that big of an issue, forced pushes are.

Post by Alfredo Esteban
The problem is the typo was in the comment of the commit, not in the
code. You can see the same typo in master branch: "ussue" instead of
"issue".
Alfredo
Why not just a "Fix typo" commit ;), then no issue with pull/push :)

Post by Denis Chenu
https://github.com/LimeSurvey/LimeSurvey/commit/d4d1c143854b48ad4928b6363608475b35b29bdd
Denis
Hi,
This morning I committed to master and 2.06 branch with a typo
(ussue) in the comment. I have committed with --amend option and push
--force to 2.06 branch to fix the typo.
If you have not pulled this morning from 2.06 you can ignore this
email. If you have pulled after my commit with the typo (11:45 aprox) and
git fetch origin
git reset --hard origin/master # Loses local commits
See this link
<http://stackoverflow.com/questions/8981194/changing-git-commit-message-after-push-given-that-no-one-pulled-from-remote>for
more info.
I think I will keep the typo in master to prevent these problems in
main branch (do you agree?)
Sorry for the inconveniences,
Alfredo
------------------------------------------------------------------------------
New Year. New Location. New Benefits. New Data Center in Ashburn, VA.
GigeNET is offering a free month of service with a new server in Ashburn.
Choose from 2 high performing configs, both with 100TB of bandwidth.
Higher redundancy.Lower latency.Increased capacity.Completely compliant.
vanity: www.gigenet.com
_______________________________________________
------------------------------------------------------------------------------
New Year. New Location. New Benefits. New Data Center in Ashburn, VA.
GigeNET is offering a free month of service with a new server in Ashburn.
Choose from 2 high performing configs, both with 100TB of bandwidth.
Higher redundancy.Lower latency.Increased capacity.Completely compliant.
www.gigenet.com
_______________________________________________
limesurvey-developers mailing list
https://lists.sourceforge.net/lists/listinfo/limesurvey-developers