Cannot proceed with update

Can someone help to resolve this error. Bench v4.0.1 Frappe v8.0.65 and ERPNext v8.0.46.
$git diff / $ git stash also shows nothing. Tried git reset --hard but can not proceed with update.

Hi. How come your develop branch for frappe is 1 commit ahead of upstream/develop?

Hi @tundebabzy, found this file difference so did the commit.

Putting git log, may be it is useful.

OK.
Please discard your commit from the tree and then bench update again. It’s your commit that is breaking the update. Meanwhile, always commit all changes to a local branch

@tundebabzy, how do you know that the commits are done at remote branch? I don’t think I have access to remote branch.

You can commit but cannot push.

@tundebabzy, at start the error was coming so did git reset --hard and found this file so did the commit. The commit is reverted but no change in the error. If you want me to run specific commands then please tell me.

Hello @NeisSenni
Let’s try this
run:
git log

Next, copy out the hash of the commit before yours. From an earlier screenshot, it’s the one by Ayush Shukla (e2de37b). Then run:
git reset <copied out hash>

Try to update again and let’s see if that works. Sorry for the hassle though.

@tundebabzy, I just did reset (git reset --hard upstream) so now it is at Ayush Shukla’s commit but still can’t update.

I am using Antix Linux (Debian 7), are there any check specific to OS that restricts the update.

I think you can just bench update --reset it

@johnskywalker, have run bench update --reset and then bench update. Bench update still giving error “Cannot proceed with update”.

try this in the root folder ? (upstream should be https://github.com/frappe/frappe by default)

git reset --hard upstream/develop

@fahimalizain tried with “git reset --hard upstream/develop” , still cannot proceed with update.

Check if you have any files untracked in frappe, if any delete it

git status

Are you sure that frappe is the app that causing the issue in the error thats given now ? (maybe modified erpnext or any other app could cause this too)

Please post bench update error output again if all else fails.
Thank you

@fahimalizain , I have two apps frappe and erpnext. “git status” command have run at both the apps. Please find the output here.

Thats a bug from bench.
It expects the text nothing to commit, working directory clean, instead your output is nothing to commit (working directory clean), which also should be allowed.

EDIT: I am not so sure if its safe to pull from the app dir itself.

Thank you.

Are you running Antix Linux ?
saw your post here regarding that: ERPNext setup on Antix Linux

I guess git outputs are different in that ?

@fahimalizain, I have update the file app.py but its still showing the same message while doing bench update. The cause of the message seems quite correct. May be have to do something else after updating file app.py to take it into action.

Yes, I am using Antix Linux and have also mentioned it above.

Overall its fine. Thanks @fahimalizain, @johnskywalker and @tundebabzy for all your efforts.

Try changing the app.py line 145 to the following and check again ?

if not re.search(r'nothing to commit(, working (directory|tree) clean| \(working (directory|tree) clean\))', out):

Also confirm that the edits you make in bench .py are actually coming in action by using some test print statements.

@fahimalizain, copy and pasted the line you have suggested in app.py file. Now it is working fine. Thanks again!