This is what i did to fix it: 1. git status: says my upstream is gone.
2. Read this to understand git jargon better: http://stackoverflow.com/a/21616241/2815375 3. git branch --unset-upstream: to remove this reference to upstream. From same link. 4. git gc --prune=now: I pruned all dead files. From http://stackoverflow.com/a/7614419/2815375 5. This gave me an error saying my origin/master was bad. 6. rm .git/refs/remotes/origin/master: removed this file. From http://stackoverflow.com/a/15458951/2815375 7. Did step 4) again. Everything fine now. 8. git remote show origin: to ensure remote properly defined. 9. git push --set-upstream origin master: to ensure proper tracking and everything synced up to date. From http://stackoverflow.com/a/12694311/2815375 10. git status: "your branch is up to date with origin.master" 11. Do this for every submodule 12. Now works. On Tuesday, February 24, 2015 at 4:48:25 PM UTC, Rizwan Choudrey wrote: > > Hi, > > AS crashed on start-up this morning. Now when I try to commit and push I > get an internal IDE error. It implies that my references to the master have > somehow got corrupted. Anyone know how to fix this please? > > Thanks, > Riz > > *IDE internal error:* > collectInfoToPush | Couldn't collect commits to push. > fatal: bad revision 'origin/master..master' > during executing git log origin/master..master > --pretty=format:%x01%H%x02%ct%x02%an%x02%at%x02%ae%x02%cn%x02%ce%x02%P%x02%s%x02%b%x02%B%x03 > > --encoding=UTF-8 --full-history --sparse -M --name-status -- > com.intellij.openapi.vcs.VcsException: warning: ignoring broken ref > refs/remotes/origin/master. > fatal: bad revision 'origin/master..master' > during executing git log origin/master..master > --pretty=format:%x01%H%x02%ct%x02%an%x02%at%x02%ae%x02%cn%x02%ce%x02%P%x02%s%x02%b%x02%B%x03 > > --encoding=UTF-8 --full-history --sparse -M --name-status -- > at git4idea.commands.GitSimpleHandler.run(GitSimpleHandler.java:238) > at git4idea.history.GitHistoryUtils.loadDetails(GitHistoryUtils.java:804) > at git4idea.history.GitHistoryUtils.history(GitHistoryUtils.java:771) > at git4idea.push.GitPusher.collectCommitsToPush(GitPusher.java:210) > at git4idea.push.GitPusher.collectsCommitsToPush(GitPusher.java:190) > at git4idea.push.GitPusher.collectCommitsToPush(GitPusher.java:154) > at git4idea.push.GitPushDialog.collectInfoToPush(GitPushDialog.java:198) > at git4idea.push.GitPushDialog.access$300(GitPushDialog.java:46) > at git4idea.push.GitPushDialog$1.run(GitPushDialog.java:141) > at > com.intellij.openapi.application.impl.ApplicationImpl$8.run(ApplicationImpl.java:419) > at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511) > at java.util.concurrent.FutureTask.run(FutureTask.java:266) > at > java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142) > at > java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617) > at java.lang.Thread.run(Thread.java:744) > at > com.intellij.openapi.application.impl.ApplicationImpl$1$1.run(ApplicationImpl.java:149) > Caused by: com.intellij.openapi.vcs.VcsException: warning: ignoring broken > ref refs/remotes/origin/master. > fatal: bad revision 'origin/master..master' > > at > git4idea.commands.GitSimpleHandler$1.processTerminated(GitSimpleHandler.java:224) > at sun.reflect.GeneratedMethodAccessor115.invoke(Unknown Source) > at > sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) > at java.lang.reflect.Method.invoke(Method.java:483) > at com.intellij.util.EventDispatcher.dispatch(EventDispatcher.java:90) > at com.intellij.util.EventDispatcher.access$100(EventDispatcher.java:34) > at com.intellij.util.EventDispatcher$1.invoke(EventDispatcher.java:67) > at com.sun.proxy.$Proxy104.processTerminated(Unknown Source) > at > git4idea.commands.GitTextHandler$1.processTerminated(GitTextHandler.java:79) > at sun.reflect.GeneratedMethodAccessor114.invoke(Unknown Source) > at > sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) > at java.lang.reflect.Method.invoke(Method.java:483) > at > com.intellij.execution.process.ProcessHandler$4.invoke(ProcessHandler.java:214) > at com.sun.proxy.$Proxy11.processTerminated(Unknown Source) > at > com.intellij.execution.process.ProcessHandler$3.run(ProcessHandler.java:171) > at > com.intellij.execution.process.ProcessHandler$TasksRunner.execute(ProcessHandler.java:247) > at > com.intellij.execution.process.ProcessHandler.notifyTerminated(ProcessHandler.java:153) > at > com.intellij.execution.process.ProcessHandler.notifyProcessTerminated(ProcessHandler.java:149) > at > com.intellij.execution.process.BaseOSProcessHandler.onOSProcessTerminated(BaseOSProcessHandler.java:133) > at > com.intellij.execution.process.BaseOSProcessHandler$1$1.consume(BaseOSProcessHandler.java:107) > at > com.intellij.execution.process.BaseOSProcessHandler$1$1.consume(BaseOSProcessHandler.java:91) > at > com.intellij.execution.process.ProcessWaitFor$1.run(ProcessWaitFor.java:40) > ... 7 more > > -- You received this message because you are subscribed to the Google Groups "adt-dev" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
