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

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

4 answers

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.

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

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

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

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

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

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>"

Suggest an answer

Log in or Sign up to answer
Atlassian Community Anniversary

Happy Anniversary, Atlassian Community!

This community is celebrating its one-year anniversary and Atlassian co-founder Mike Cannon-Brookes has all the feels.

Read more
Community showcase
Piotr Plewa
Published Dec 27, 2017 in Bitbucket

Recipe: Deploying AWS Lambda functions with Bitbucket Pipelines

Bitbucket Pipelines helps me manage and automate a number of serverless deployments to AWS Lambda and this is how I do it. I'm building Node.js Lambda functions using node-lambda&nbsp...

1,758 views 1 5
Read article

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you