Shiki

Posts Mentioning RSS Toggle Comment Threads | Keyboard Shortcuts

• 

  Shiki 4:57 pm on April 15, 2010 Permalink | Reply
  Tags: console, curl, php (3), wampserver (2)   

  The undefined curl function in console (WampServer) 

  Stupid stupid me. On Windows/WampServer, I’ve always had this problem when working with PHP code that can run in the console and using cURL methods..

  PHP Fatal error:  Call to undefined function curl_init() in D:\Shiki\github\yii-clockwerk\test-app\CurlHelper.php on line 90
  Fatal error: Call to undefined function curl_init() in D:\Shiki\github\yii-clockwerk\test-app\CurlHelper.php on line 90

  It (cURL) works in the browser but not when in console. I didn’t think that it was this simple to fix. The PHP CLI uses a different config file (php.ini) compared to the one used by WampServer/Apache. You can see the location of the config file being used by typing:

  php --ini

  Result:

  Configuration File (php.ini) Path: C:\Windows
  Loaded Configuration File:         C:\wamp\bin\php\php5.3.0\php.ini
  Scan for additional .ini files in: (none)
  Additional .ini files parsed:      (none)

  You can then fix the curl problem by enabling it in the php.ini file being used. Make sure this is not commented out:

  extension=php_curl.dll
   

  Reply Click here to cancel reply.

  Name (required)

  Email (required)

  Web Site

   
• 

  Shiki 11:54 am on January 18, 2010 Permalink | Reply
  Tags: dropbox, git   

  “Ignoring funny ref” error on Git + Dropbox 

  At Twidl HQ, we use a combination of Git and Dropbox for managing our source code. It’s a simple but awesome setup. Sometimes, we get this really cryptic error when fetching from our main repo (our shared Dropbox folder):

  Ignoring funny ref 'refs/remotes/origin/master (Shiki's conflicted copy 2010-01-14)' locally

  It seems to happen when 2 people push to origin/master at almost the same time. This makes Dropbox update the same file and seems to be the cause of the error. When this happens, you can bet that one of the people who did the push will lose his changes to origin/master. So you’ll have to fix it accordingly.

  The “funny ref” error does not have any critical effect on the repo and Git seems to work perfectly. It will just annoy you every time you try to fetch ^_^x It turns out that this “master (Shiki’s conflicted copy 2010-01-14)” is a branch in the main repo. Simply deleting it will remove the error. In terminal, go to your main repo’s (Dropbox) root folder:

  git branch -d "master (Shiki's conflicted copy 2010-01-14)"

  If you’re not sure of the name of the conflicting branch, you can execute “git branch” to show all branches. There should at least be a “master” branch and your conflicting branch.

  Filipe Correia, and Shiki are discussing. Toggle Comments

   
  • 

    Filipe Correia 6:16 am on July 16, 2010 Permalink

    Hi! Thanks for writting this post. It was the only reference I’ve found to this issue…
    I’m finding the same problem myself (using dropbox too), but I’m not being able to solve it the same way you did.

    Here’s what I’m seeing:

    $ git pull
    error: * Ignoring funny ref 'refs/remotes/origin/master (fcorreia's conflicted copy 2010-07-14)' locally
    Already up-to-date.
    $ git branch "merge" "master (fcorreia's conflicted copy 2010-07-14)"
    fatal: Not a valid object name: 'master (fcorreia's conflicted copy 2010-07-14)'.
    $ git branch
    * master

    Any thoughts that might help?

    Thanks!

  • 

    Shiki 3:55 pm on July 16, 2010 Permalink

    From my experience, you could no longer merge with that branch. It seems to be a corrupted branch file because it was overwritten by somebody else who pushed to the dropbox repo.

    Deleting the branch didn’t work for you? Are you deleting it from the dropbox repo? When I get errors like this, I just delete that conflicted branch and fetch-merge-push again. I never lost any of my commits due to the conflict. They just didn’t get pushed properly because of dropbox’ syncing conflicts.

  • 

    Filipe Correia 5:49 pm on July 16, 2010 Permalink

    I’m not being able to delete it. In fact, it’s not showing up when I list the branches (only “master” shows up). It seems there isn’t actually a branch named “master (fcorreia’s conflicted copy 2010-07-14)”.

  • 

    Filipe Correia 6:10 pm on July 16, 2010 Permalink

    Ok, I think i’m on to something. I’ve just checked my repo files (on dropbox) and found these two files on the path “/refs/heads”:

    master
    master (fcorreia's conflicted copy 2010-07-14)

    It seems that this “master” file as conflicted, so dropbox automatically copied it to another filename. I wonder if I can just delete this file from the repo without leaving other garbage behind, and without losing commits.

  • 

    Shiki 10:36 am on July 17, 2010 Permalink

    Yes that’s right. You should use the repo on Dropbox. I’ve deleted conflicted branches like that with no problem. All I had to do was fetch-merge-push again to put my local changes to the Dropbox repo. Use

    branch -D

    to delete it if you can’t delete it with “branch -d” (small d).

    Also, notice that your Git repo actually still works with that conflicted copy in there. It just annoys you with the warning message when you fetch.

  • 

    Filipe Correia 8:19 pm on July 19, 2010 Permalink

    Ok, got it. Turns out I was trying to delete the branch locally (although it obviously only existed on the server). Thanks!

• 

  Shiki 8:37 pm on August 24, 2009 Permalink | Reply
  Tags: adobe, cs4, extract, photoshop, plugin   

  Installing the missing Extract feature in Photoshop CS4 

  

  Yeah so I’m a little late on this. Primarily because I’m no designer and I don’t use Photoshop that much. But I just found out that the Extract filter has been removed from CS4. Or maybe CS3 too? I didn’t notice until I needed to use it at work today where I just had to take out some cats and dogs out of their backgrounds.

  So, with some googling I found this article by John Nack. There he explains why they took Extract and other filters/plugins away. I still wish they retained Extract though, it’s kinda useful for us noob Photoshop users :p Thankfully you can still install the missing features. Just follow these steps:

  1. Download the plugins package. Download here for Mac, and here for Windows.
  2. In the package you should find 3 language folders. Open the one you need (ie English) and copy the child folder named Goodies and paste it somewhere safe like the Photoshop application folder. That’s /Applications/Adobe Photoshop CS4 for Mac and somewhere in C:/Program Files/ for Windows (sorry I can’t be too precise).
  3. Open Photoshop. Go to Preferences > Plug-Ins. Find a setting named Additional Plug-Ins Folder and set that to the Goodies folder.
  4. Restart Photoshop.

  That should do it.

  Dan, Shiki, and Stephen are discussing. Toggle Comments

   
  • 

    Stephen 11:34 pm on October 8, 2009 Permalink

    Thank you THANK YOU for posting this online. I was having trouble getting it to work.

  • 

    Shiki 7:39 am on October 9, 2009 Permalink

    Glad I could help!

  • 

    Dan 11:55 pm on November 30, 2009 Permalink

    Magnificent! you are a legend!