[Olsr-dev] rewriting public git history
Hans-Christoph Steiner
(spam-protected)
Fri May 18 18:29:35 CEST 2012
Hey Ferry,
It seems like you are force-overwriting commits in the olsr.org repo. This is a practice that should be avoided for a number of reasons:
- normally non-fastforward commits should raise a flag that someone might be trying to do something they aren't supposed to, like injecting nefarious code
- people might have already pulled the changes, and this will break their future pulls
- automated builders might have already pulled the changes, and will not be able to pull again without human intervention
Here's another take on this topic:
http://sethrobertson.github.com/GitBestPractices/#pubonce
.hc
On May 16, 2012, at 7:49 AM, <(spam-protected)> <(spam-protected)> wrote:
> This is an automated email from the git hooks/post-receive script. It was
> generated because a ref change was pushed to the repository containing
> the project "OLSR.org main repository".
>
> See http://olsr.org/git/?p=olsrd.git;a=commitdiff;h=OLSRD_0_6_2-385-ge9abc33
> for a web version of the last commit.
>
> The branch, eclipse has been updated
> discards 156fb9e6b9c4c9a57667a3ab2e282d981995457f (commit)
> via e9abc3363de76001d3c1e0103707d09331a3ac94 (commit)
> via ee63419908d8ef76430961f6e7c09571f51fabe0 (commit)
> via fda0cd4023c4c3a0417c93309be3a8f8048b5f76 (commit)
>
> This update added new revisions after undoing existing revisions. That is
> to say, the old revision is not a strict subset of the new revision. This
> situation occurs when you --force push a change and generate a repository
> containing something like this:
>
> * -- * -- B -- O -- O -- O (156fb9e6b9c4c9a57667a3ab2e282d981995457f)
> \
> N -- N -- N (e9abc3363de76001d3c1e0103707d09331a3ac94)
>
> When this happens we assume that you've already had alert emails for all
> of the O revisions, and so we here report only the revisions in the N
> branch from the common base, B.
>
> Those revisions listed above that are new to this repository have
> not appeared on any other notification email; so we list those
> revisions in full, below.
>
> - Log -----------------------------------------------------------------
> commit e9abc3363de76001d3c1e0103707d09331a3ac94
> Author: Ferry Huberts <(spam-protected)>
> Date: Tue Oct 11 14:25:03 2011 +0200
>
> olsrd: add eclipse project files
>
> Signed-off-by: Ferry Huberts <(spam-protected)>
>
> -----------------------------------------------------------------------
>
> Summary of changes:
> .cproject | 6 ++++--
> gui/win32/.gitignore | 4 ++++
> gui/win32/Main/.gitignore | 2 --
> gui/win32/Shim/.gitignore | 2 --
> src/hashing.c | 11 +++++++++++
> src/link_set.c | 3 ++-
> src/print_packet.c | 1 +
> 7 files changed, 22 insertions(+), 7 deletions(-)
> create mode 100644 gui/win32/.gitignore
> delete mode 100644 gui/win32/Main/.gitignore
> delete mode 100644 gui/win32/Shim/.gitignore
>
>
> hooks/post-receive
> --
> OLSR.org main repository
>
> _______________________________________________
> Olsr-commit mailing list
> (spam-protected)
> https://lists.olsr.org/mailman/listinfo/olsr-commit
More information about the Olsr-dev
mailing list