Tag: osx

git-gui command crashes on macOS Sierra

After update to macOS Sierra, git-gui command crashes with an error: Wish[23862:202062] *** Terminating app due to uncaught exception ‘CALayerInvalidGeometry’, reason: ‘CALayer position contains NaN: [0 nan]’ *** First throw call stack: ( 0 CoreFoundation 0x00007fff8cd9252b __exceptionPreprocess + 171 1 libobjc.A.dylib 0x00007fffa146acad objc_exception_throw + 48 2 CoreFoundation 0x00007fff8ce10a0d +[NSException raise:format:] + 205 3 QuartzCore 0x00007fff92938980 […]

Homebrew’s `git` not using completion

When using OSX’s git, after I modify a file I can simply do git commit <tab>, and that’ll auto complete the file’s name to the one that was modified. However, if I install a newer version of git from homebrew and I use it, that feature no longer works (meaning I press <tab> and it […]

GIT push whines about untrusted X11 forwarding setup failed

I’m new to both git and OSX, coming from Ubuntu and svn. When I do a “git push” from the OSX terminal shell, I get the following warning: folklore$ git push origin master Warning: untrusted X11 forwarding setup failed: xauth key data not generated Warning: No xauth data; using fake authentication data for X11 forwarding. […]

Show system files / Show git ignore in osx

By default it is not possible to see .gitignore files in osx. What is command to reveal these files?

How do I pipe in FileMerge as a diff tool with git on OS X?

I’m new to git on OS X, and I’m using it via the command line. I come from the world of Tortoise SVN and Beyond Compare on Windows. I want to be able to send diffs to FileMerge. I was able to do this with TextMate simply by using: git diff | mate But I’m […]

Is there a good (visual) Git tool for Mac OS X or Windows?

I’m looking at porting my projects to Git from SVN (I’m convinced that Git is worth the move) and I’m trying to come up with a set of tools to use for the project. I’ve googled around for some tools but I wasn’t really impressed with what I found. What visual tools are recommended for […]

How to use git mergetool's filemerge

The documentation is here: http://www.kernel.org/pub/software/scm/git/docs/git-mergetool.html A handy guide is here: http://ryanflorence.com/git-for-beginners/ However, neither of them explain how to use mergetool’s filemerge. The guide I read says “I hit enter and FileMerge pops up and I deal with the conflicts:” but it doesn’t mention how to “deal with the conflicts“. When I run: git mergetool :and […]

Bash script running from launchDaemon on MAC – not connecting to jenkins

I’ve got very simple plist file which is supposed to run my script: <?xml version=”1.0″ encoding=”UTF-8″?> <!DOCTYPE plist PUBLIC “-//Apple Computer//DTD PLIST 1.0//EN” “http://www.apple.com/DTDs/PropertyList-1.0.dtd”> <plist version=”1.0″> <dict> <key>Label</key> <string>com.example.ci</string> <key>ProgramArguments</key> <array> <string>sh</string> <string>/Users/Shared/Jenkins/Home/my_scripts/run_jenkins.sh</string> </array> <key>KeepAlive</key> <true/> <key>StandardOutPath</key> <string>/Users/Shared/Jenkins/Home/stdout.log</string> <key>StandardErrorPath</key> <string>/Users/Shared/Jenkins/Home/error.log</string> </dict> </plist> and when I run it nothing happens – I mean when I run […]

Trouble with Jenkins and Git

Right now I’m trying to pull a repository from bitbucket with the Git plugin, and build it within jenkins. However, whenever I do this, I get: FATAL: Could not checkout null with start point <Starting Point> hudson.plugins.git.GitException: Could not checkout null with start point <Starting Point> at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.checkoutBranch(CliGitAPIImpl.java:894) at hudson.plugins.git.GitSCM$4.invoke(GitSCM.java:1229) at hudson.plugins.git.GitSCM$4.invoke(GitSCM.java:1205) at hudson.FilePath.act(FilePath.java:906) at […]

Permission Denied while trying to connect to Docker Daemon while running Jenkins pipeline in Macbook

I am trying to run Jenkins pipeline job in my macbook. I also have docker instance running locally. Initially I got the “docker command not found” error while running the Jenkins Job. I fixed the error by adding a symlink “ln -f -s /Applications/Docker.app/Contents/Resources/bin/* /usr/local/bin“ I also applied these two changes so that jenkins user […]

Git Baby is a git and github fan, let's start git clone.