Results 1 to 6 of 6
  1. #1
    Join Date
    Sep 2013
    Posts
    6

    Default Git 2+ integration on Mac OS X not working

    I've configured the command line tools on Mac OS X 10.11. I've configured git:
    Code:
    diff.tool, merge.tool, difftool, mergetool
    using both "bc" and "bc3".

    Running
    Code:
    git difftool <file name>
    from the command line does nothing, and there are no messages in the console log.

    There are, however numerous errors when running the Gui, and it is often crashing.

    Example Console Output:
    Code:
    10/23/15 09:19:26.032 BCompare[51489]: This application is modifying the autolayout engine from a background thread, which can lead to engine corruption and weird crashes.  This will cause an exception in a future release.
     Stack:(
    	0   CoreFoundation                      0x9ad459b9 __raiseError + 201
    	1   libobjc.A.dylib                     0x937dcf11 objc_exception_throw + 276
    	2   CoreFoundation                      0x9ad458cd +[NSException raise:format:] + 141
    	3   Foundation                          0x9a4ec7f2 _AssertAutolayoutOnMainThreadOnly + 207
    	4   Foundation                          0x9a4ec5dc -[NSISEngine withBehaviors:performModifications:] + 44
    	5   Foundation                          0x9a4ec5ab -[NSISEngine withAutomaticOptimizationDisabled:] + 48
    	6   AppKit                              0x9d25a254 __97-[NSWindow(NSConstraintBasedLayout) _fromConstraintsGetWindowMinSize:maxSize:allowDynamicLayout:]_block_invoke + 699
    	7   Foundation                          0x9a4ec65d -[NSISEngine withBehaviors:performModifications:] + 173
    	8   AppKit                              0x9d1b6875 -[NSWindow(NSConstraintBasedLayout) _fromConstraintsGetWindowMinSize:maxSize:allowDynamicLayout:] + 489
    	9   AppKit                              0x9d1b65f3 -[NSWindow(NSConstraintBasedLayout) _getConstrainedWindowMinSize:maxSize:] + 58
    	10  AppKit                              0x9d1b64fe -[NSWindow minFullScreenContentSize] + 71
    	11  AppKit                              0x9d3bfa44 -[NSWindow _minFullScreenContentSizeForFrame:] + 36
    	12  AppKit                              0x9d3bfa17 -[NSWindow _actualMinFullScreenContentSize] + 98
    	13  AppKit                              0x9d1dfaae -[NSWindow _updateCGWindowSizesForTiling] + 84
    	14  AppKit                              0x9d2eb61e -[NSWindow(NSConstraintBasedLayout) _changeWindowFrameFromConstraintsIfNecessary] + 762
    	15  AppKit                              0x9d2eb31e __51-[NSWindow(NSConstraintBasedLayout) layoutIfNeeded]_block_invoke + 36
    	16  Foundation                          0x9a4ec65d -[NSISEngine withBehaviors:performModifications:] + 173
    	17  Foundation                          0x9a50165b -[NSISEngine withDelegateCallsDisabled:] + 48
    	18  AppKit                              0x9d2eb2ce -[NSWindow(NSConstraintBasedLayout) layoutIfNeeded] + 213
    	19  AppKit                              0x9da2c36e ___NSWindowGetDisplayCycleObserver_block_invoke6412 + 244
    	20  AppKit                              0x9d2fe9ef __37+[NSDisplayCycle currentDisplayCycle]_block_invoke + 617
    	21  QuartzCore                          0x98a5065c _ZN2CA11Transaction19run_commit_handlersE18CATransactionPhase + 84
    	22  QuartzCore                          0x98a4fa7e _ZN2CA7Context18commit_transactionEPNS_11TransactionE + 188
    	23  QuartzCore                          0x98a4f731 _ZN2CA11Transaction6commitEv + 597
    	24  QuartzCore                          0x98a5b7b5 _ZN2CA11Transaction17observer_callbackEP19__CFRunLoopObservermPv + 75
    	25  CoreFoundation                      0x9ac61afe __CFRUNLOOP_IS_CALLING_OUT_TO_AN_OBSERVER_CALLBACK_FUNCTION__ + 30
    	26  CoreFoundation                      0x9ac61a5e __CFRunLoopDoObservers + 398
    	27  CoreFoundation                      0x9ac3ec61 CFRunLoopRunSpecific + 417
    	28  CoreFoundation                      0x9ac3eaab CFRunLoopRunInMode + 123
    	29  HIToolbox                           0x98267719 RunCurrentEventLoopInMode + 267
    	30  HIToolbox                           0x982673ed ReceiveNextEventCommon + 201
    	31  HIToolbox                           0x982bf524 AcquireNextEventInMode + 79
    	32  HIToolbox                           0x982bcb66 _ZL19IsUserStillTrackingP14MenuSelectDataPh + 385
    	33  HIToolbox                           0x98449bd1 _ZL15TrackMenuCommonR14MenuSelectDataPhP13SelectionDataP10MenuResultS5_ + 1682
    	34  HIToolbox                           0x984443e6 _ZL14MenuSelectCoreP8MenuData5PointdmPP13OpaqueMenuRefPt + 599
    	35  HIToolbox                           0x984449b5 MenuSelect + 162
    	36  HIToolbox                           0x983f662a _ZN9HIMenuBar16HandleMouseEventEP14OpaqueEventRef + 96
    	37  HIToolbox                           0x982d6284 _ZN9HIMenuBar11HandleEventEP25OpaqueEventHandlerCallRefP14OpaqueEventRef + 60
    	38  HIToolbox                           0x9824406b _ZN8HIObject9EventHookEP25OpaqueEventHandlerCallRefP14OpaqueEventRefPv + 163
    	39  HIToolbox                           0x9829b68b _Z22_InvokeEventHandlerUPPP25OpaqueEventHandlerCallRefP14OpaqueEventRefPvPFlS0_S2_S3_E + 36
    	40  HIToolbox                           0x982439a0 _ZL23DispatchEventToHandlersP14EventTargetRecP14OpaqueEventRefP14HandlerCallRec + 1832
    	41  HIToolbox                           0x98242bb4 _ZL30SendEventToEventTargetInternalP14OpaqueEventRefP20OpaqueEventTargetRefP14HandlerCallRec + 402
    	42  HIToolbox                           0x98255f6d SendEventToEventTarget + 34
    	43  HIToolbox                           0x9827c664 _ZL29ToolboxEventDispatcherHandlerP25OpaqueEventHandlerCallRefP14OpaqueEventRefPv + 3100
    	44  HIToolbox                           0x98243def _ZL23DispatchEventToHandlersP14EventTargetRecP14OpaqueEventRefP14HandlerCallRec + 2935
    	45  HIToolbox                           0x98242bb4 _ZL30SendEventToEventTargetInternalP14OpaqueEventRefP20OpaqueEventTargetRefP14HandlerCallRec + 402
    	46  HIToolbox                           0x98255f6d SendEventToEventTarget + 34
    	47  BCompare                            0x0007e0ef BCompare + 450799
    	48  BCompare                            0x00185659 BCompare + 1529433
    	49  BCompare                            0x000a8e05 BCompare + 626181
    	50  CarbonCore                          0x929185f7 CooperativeThread + 305
    	51  libsystem_pthread.dylib             0x94ff7794 _pthread_body + 138
    	52  libsystem_pthread.dylib             0x94ff770a _pthread_body + 0
    	53  libsystem_pthread.dylib             0x94ff4fa6 thread_start + 34
    )

  2. #2
    Join Date
    Oct 2007
    Location
    Madison, WI
    Posts
    11,623

    Default

    Hello,

    Did you follow the instructions to define as a difftool here:
    http://www.scootersoftware.com/suppo...kb_vcs_osx#git

    And are you running BC4.1.1 Pro for Merge? Along with the Beyond Compare menu -> Install Command Line Tools?

    I tested on my 10.10.5 machine with BC 4.1.1 and Git 2.6.2. I'll also check on 10.11 when I get the chance to update or another support member can help verify, but if you could verify the above that would be useful info.
    Aaron P Scooter Software

  3. #3
    Join Date
    Oct 2007
    Location
    Madison, WI
    Posts
    4,610

    Default

    I just tested Beyond Compare 4.1.1 with Git on OS X 10.11. The command git difftool file.txt worked correctly when I configured git following the instructions on our website that Aaron linked in the previous post.

    The output of git --version on my system is "git version 2.3.8 (Apple Git-58)", if you have a different version on your system you might need to make sure you've installed all available system updates through the app store.
    Chris K Scooter Software

  4. #4
    Join Date
    Sep 2013
    Posts
    6

    Default

    Got it working.

    However, the documentation says to use "git config --global diff.tool bc3" for legacy reasons, and yet on both my Linux and Mac OS X workstations, I had to use "bc" (without the numeral) in order for everything to behave.

    In the Git for Windows section of the help documentation it says 'Git versions older than 2.2.0 (git --version) use "bc3" as the keyword for BC4. For Git 2.2.0+, use "bc".' I think this is true across the board now?

    Git version -
    Linux: 2.6.2
    Mac: 2.3.8 (Apple Git-58)

  5. #5
    Join Date
    Oct 2007
    Location
    Madison, WI
    Posts
    11,623

    Default

    On my test system, I have Git --version 2.6.2 and it still uses 'bc3' for my git. The install of Git I am using is from git-scm.com and the pre-built download. Did you get your install of Git from a different source or method?
    Aaron P Scooter Software

  6. #6
    Join Date
    Sep 2013
    Posts
    6

    Default

    Aaron,

    As I mentioned in my previous post, I'm using the version of Git from Apple (Apple Git-58) v2.3.8.

    An interesting note - when I set "difftool.prompt=false" it _seems_ to work the first time, but opens ALL files at the same time. Not helpful, so I turned the prompt off - and now it's not working again. And setting the prompt to false doesn't work either.

    Is there a way to see some kind of debug output or trace of the launch process so I can do some better troubleshooting?

Posting Permissions

  • You may not post new threads
  • You may not post replies
  • You may not post attachments
  • You may not edit your posts
  •