nav[aria-label="Primary Navigation"] { padding: 0; & ul { list-style: none; width: 100%; display: flex; flex-direction: row; justify-content: start; align-items: start; gap: 30px; padding: 0; & li { margin: 0; } & ul li { list-style: none; } } }

The file in stash server was reverted to a previous revision without any log

Ge Xin-Lu

We met a problem in git.(We use Atlassian Stash in our team)

A file named "one.py" was firstly changed at 2015/04/01.

Then some other developers pushed a lot of changes to server in the coming days.

Later in 2015/04/08, the "one.py" file was changed again and push to stash server.

Then some other developers pushed a lot of changes to server as usual.

And comes the problem, today (2015/04/09), I found that the "one.py" file was reverted to the revision which we pushed the changes in 2015/04/01. And when I checked the "one.py" file's change history, I can't get the change history in 2015/04/08. It lost.

What happened? Why we lost the commit history? Can you help me?

Thanks Steven

Accepted answers

All comments

RudeyG

Probably your other developers used 'force' push and rewrite the GIT history in Stash.

You can enable 'disable force push' hook in your Stash repository (http://blogs.atlassian.com/2013/03/stash-22-customize-workflow-git-hooks-api-merge-checks/);

More about -force push can be found at Git documentation at http://git-scm.com/docs/git-push.

Simply put, your developers should always keep their local repo up to date by 'git pull' first, merge the conflict if any, then do 'push' to Stash.

Ge Xin-Lu

Thanks for your answer. But I've already 'disable force push' hook in our Stash repository. So I confused why we met this problem. Devs can't force push changes to stash server. Thanks Steven

RudeyG

Maybe you can double check to see whether that is the case by using 'force push' to a test repo in Stash.

Ge Xin-Lu

Yes, I've checked that. We can't use force push to a repo which has been disabled 'force push' Thanks Steven

Tim Crall1

Does the commit from 2015/04/08 show up on the Stash server "Commits" page at all?

Ge Xin-Lu

Yes, there is the "commits" information in the "Commits" page.

Tim Crall1

If the commit also shows up locally when you do a "git log" on the clone (and I can't see why it wouldn't), you should be able to retore the file file (to the working directory) by doing a "git checkout <commit> <file>"

Welcome!

It looks like you're new here. Sign in or register to get started.

Quick Links

Find more posts tagged with

bitbucket

bitbucket-server