"fatal: ref HEAD is not a symbolic ref" during interactive git rebase -

-

got 3 commits - 1 proper, , 2 silly cleanup ones, typos etc. want squash them. fire away:

git rebase -i head~3

sounds simple, , should work - i've tried after running problem, in brand new repo, , works expected. editor shows 3 commits, pick top, squash other two, save , quit, done. if run in verbose mode, see more details - git enters detached head state checking out 1st commit 'picked', 'rebasing 2/3' , 'rebasing 3/3', apparently creating temp commits along way -- , success message; editor pops again @ point, offering me change commit message. all's good.

but same command dies in work repo! 3 commits in editor, pick-squash-squash.. time, don't see 'rebasing 2/3', instead first line after 'head @ my-sha-1', runs fatal!

head @ 48a6c3d... <commit message> fatal: ref head not symbolic ref

but why would git expect head symbolic ref? rebase process detach head - same see in exploratory example - why fatal in second example, not in first one? cat .git/head give me sha1 of commit i've 'picked'...

i've spend several hours reading , researching, something's not right here, , cant find it! suspect maybe hooks responsible (know little them, , know problematic repo have some). thank consideration in answering this!

your "work" repo broken somehow. see i can't git rebase --interactive anymore details.

i'd try running git status in work repo figure out going on. e.g. git rebase --abort, git merge --abort or may required.

i'd run git fsck, too.

after repo , working directory go, interactive rebase should work fine. note may need git rebase --root --preserve-merges ... in case want touch first commit in repo.


Comments

Post a Comment

Popular posts from this blog

plot - Remove Objects from Legend When You Have Also Used Fit, Matlab -

-
Image
i've plotted data points , fitted exponential curve between them using 'fit' in matlab. problem fit-function got fitted line wanted plot, markers on top of regular markers. solved problem plotting wanted markers on top of unwanted couldn't seen. problem. when want show legends dots in there. how can remove markers legend without removing fitted line since both of them hidden inside fit-function? can stop 'fit' plotting unwanted markers? so, want remove blue dot called 'hoff' in picture below. you can leave out legend-entries manually leaving out handles of lines, dont want in legend. try this: %if plot something, want showing in legend, save handle: h_line = plot(x,y) %you dont want show line? dont anything, plot it: plot(mymarker) %then set legend-> can add text legend-entries %a cell-array containing strings want show up: legend([h_line another_line],{'text1' 'text2'}) with example (see comments) came solution: ...
Read more

java - Why does my date parsing return a weird date? -

-
here code using: string string = "08/07/2013".replace('/', '-'); date date = new simpledateformat("yyyy-mm-dd").parse(string); why date return: "wen jan 3 00:00:00 est 14"? not @ date format told use. edit: need format because database using requires format. the format use parse date string, not match it. using yyyy 08 . use following format: new simpledateformat("dd-mm-yyyy") and why @ replacing / - ? can build pattern original string only: string string = "08/07/2013" date date = new simpledateformat("dd/mm/yyyy").parse(string); and if want date string in yyyy-mm-dd format, can format date using dateformat#format(date) method: string formatteddate = new simpledateformat("yyyy-mm-dd").format(date); see also: change date format in java string simpledateformat java doc
Read more

Need help in packaging app using TideSDK on Windows -

-
i developed application using tidesdk on windows , when click launchapp works fine. moved package , installed imagemagick , wix 3.0 required packaging on windows. clicked on package runtime , cannot guess packaged app is? found file 'installer' in workspace when click on it says installer not find application path . think application not being packaged properly. here log see in tidesdk: preparing package desktop app runtime. 1 moment... staging trial -> copying contents d:\lab\tidesdk\trial d:\lab\tidesdk\trial\packages\win32\bundle\trial -> copying installer c:\programdata\tidesdk\sdk\win32\1.3.1-beta\installer d:\lab\tidesdk\trial\packages\win32\bundle\trial -> copying runtime d:\lab\tidesdk\trial\packages\win32\bundle\trial -> date: d:\lab\tidesdk\trial\packages\win32\bundle\trial\modules\app\1.3.1-beta -> date: d:\lab\tidesdk\trial\packages\win32\bundle\trial\modules\codec\1.3.1-beta -> date: d:\lab\tidesdk\trial\packages\win32\bundle\trial\mod...
Read more