Interactive rebase hangs

I'm trying to do an interactive rebase that hits a conflict, after solving the conflict and continuing the rebase the status bar sits forever and the rebase never completes. No error is thrown. Any suggestions?

12 answers

1 accepted

I'm pretty certain I've tracked this one down and it'll be available in the next release (either 1.6.4 or 1.7 dependent on which comes first). It's a weird edge case that was unexpected based on the information fed back from Git.

Cheers

Just happened to me.  Interactive rebase of a single commit onto a branch that resulted in one conflict.  I resolved the conflict with an external merge tool and then used the action menu to continue the rebase.  The command that is supposedly being run is:

git -c diff.mnemonicprefix=false -c core.quotepath=false -c credential.helper=sourcetree -c sequence.editor='/Applications/SourceTree.app/Contents/Resources/stree_gri' -c core.editor='/Applications/SourceTree.app/Contents/Resources/stree_gri' rebase --continue

Clicking cancel on the dialog and opening a terminal window and typing git rebase --continue resulted in an editor with the commit message (which I saved/closed without change) and the rebase finished successfully.

Just happened to me as well, latest sourceTree version.

Same problem here. Running version 2.5.2 (111) on macOS.

Resolved it with the same workaround.

Hi Greg,

Sorry this is happening for you, we haven't yet had any reports like this so I may have to ask a few questions back and forth to find out a little more each time. My main questions are what Git version you're using i.e. embedded or system, and if it's system git, what version are you using. Secondly, does your repository path contain any odd characters or spaces? And finally, is your SourceTree installation path in /Applications/SourceTree?

Many thanks in advance.

Hey Kieran, thanks for the speedy reply.

- We are using Embedded Git 1.7.11.1

- Repository path is as follows, so I don't think anything strange is going on

/Users/greg/Repos/PropertyManager/

- SourceTree is located in /Applications/SourceTree

A little more to the issue, It catches the first conflict in the rebase, which I can fix, when I continue rebase it should hit another merge conflict, instead it just hangs. I attempted the same task in CLI and that is what happened, once I solved that conflict I could continue rebasing as expected.

Sorry for not responding sooner, Greg. There should be nothing wrong with what you've provided, sometimes people have something whacky in their paths, or are using an older system git version. All SourceTree does is call git rebase --interactive and specifies the editor to be SourceTree.

Other things to note, you're not running multiple instances of SourceTree? Also, does the rebase sheet (showing your commits they you've amended) still show at this point? Sometimes if no custom messages are provided and a merge conflict appears it instead should prompt for a custom message from the user towards the end of the rebase process.

If this is a public repository, could we get access to it to attempt the merge ourselves? The problem here is finding a valid reproduction as we haven't yet encountered this problem.

Cheers

I have the same issue. When I run the command source tree is running on the command line, I get the following error:

git -c diff.mnemonicprefix=false -c core.quotepath=false -c sequence.editor='/Applications/SourceTree.app/Contents/Resources/stree_gri' -c core.editor='/Applications/SourceTree.app/Contents/Resources/stree_gri' rebase --continue

2013-08-07 13:51:47.357 stree_gri[13753:707] *** Terminating app due to uncaught exception 'NSInvalidArgumentException', reason: '-[__NSCFString hasPrefix:]: nil argument'

*** First throw call stack:

(

0 CoreFoundation 0x00007fff88799b06 __exceptionPreprocess + 198

1 libobjc.A.dylib 0x00007fff880913f0 objc_exception_throw + 43

2 CoreFoundation 0x00007fff887998dc +[NSException raise:format:] + 204

3 CoreFoundation 0x00007fff8875bb1a -[__NSCFString hasPrefix:] + 90

4 stree_gri 0x00000001000015c8 stree_gri + 5576

5 stree_gri 0x00000001000010f4 stree_gri + 4340

)

libc++abi.dylib: terminate called throwing an exception

error: /Applications/SourceTree.app/Contents/Resources/stree_gri died of signal 6

error: There was a problem with the editor '/Applications/SourceTree.app/Contents/Resources/stree_gri'.

Please supply the message using either -m or -F option.

It looks like the rebase is failing becuase it does not include a mandatory message. I was able to finish the rebase by running 'git rebase --continue' and including a message

Hi Matt,

It looks like you're using a slightly older version, I'm pretty certain that's not the call we make anymore as we use environment variables instead.

Regardless, it's good to know why it's hanging for some people. Have you got the full stack trace so I can finally locate where the problem lay?

I'll be taking a good look into it regardless.

Thanks very much!

I have version 1.6.2.2, that is the latest right? How can I get the full stack trace of that command?

Hi Matt,

You can open up an application on the Mac called "console" and look for SourceTree in the left and bar straight after you reproduce the crash bug.

Cheers

Process: stree_gri [13753]

Path: /Applications/SourceTree.app/Contents/Resources/stree_gri

Identifier: stree_gri

Version: ???

Code Type: X86-64 (Native)

Parent Process: git [13752]

User ID: 502

Date/Time: 2013-08-07 13:51:47.415 -0400

OS Version: Mac OS X 10.8.3 (12D78)

Report Version: 10

Sleep/Wake UUID: 47D752B0-9880-436F-9F4F-22D0B43EF4CE

Crashed Thread: 0 Dispatch queue: com.apple.main-thread

Exception Type: EXC_CRASH (SIGABRT)

Exception Codes: 0x0000000000000000, 0x0000000000000000

Application Specific Information:

*** Terminating app due to uncaught exception 'NSInvalidArgumentException', reason: '-[__NSCFString hasPrefix:]: nil argument'

objc[13753]: garbage collection is ON

abort() called

terminate called throwing an exception

Application Specific Backtrace 1:

0 CoreFoundation 0x00007fff88799b06 __exceptionPreprocess + 198

1 libobjc.A.dylib 0x00007fff880913f0 objc_exception_throw + 43

2 CoreFoundation 0x00007fff887998dc +[NSException raise:format:] + 204

3 CoreFoundation 0x00007fff8875bb1a -[__NSCFString hasPrefix:] + 90

4 stree_gri 0x00000001000015c8 stree_gri + 5576

5 stree_gri 0x00000001000010f4 stree_gri + 4340

Thread 0 Crashed:: Dispatch queue: com.apple.main-thread

0 libsystem_kernel.dylib 0x00007fff85045212 __pthread_kill + 10

1 libsystem_c.dylib 0x00007fff8488eb54 pthread_kill + 90

2 libsystem_c.dylib 0x00007fff848d2dce abort + 143

3 libc++abi.dylib 0x00007fff8c0c99eb abort_message + 257

4 libc++abi.dylib 0x00007fff8c0c739a default_terminate() + 28

5 libobjc.A.dylib 0x00007fff88091873 _objc_terminate() + 91

6 libc++abi.dylib 0x00007fff8c0c73c9 safe_handler_caller(void (*)()) + 8

7 libc++abi.dylib 0x00007fff8c0c7424 std::terminate() + 16

8 libc++abi.dylib 0x00007fff8c0c858b __cxa_throw + 111

9 libobjc.A.dylib 0x00007fff8809150c objc_exception_throw + 327

10 com.apple.CoreFoundation 0x00007fff887998dc +[NSException raise:format:] + 204

11 com.apple.CoreFoundation 0x00007fff8875bb1a -[__NSCFString hasPrefix:] + 90

12 stree_gri 0x00000001000015c8 0x100000000 + 5576

13 stree_gri 0x00000001000010f4 0x100000000 + 4340

Thread 1:

0 libsystem_kernel.dylib 0x00007fff850456d6 __workq_kernreturn + 10

1 libsystem_c.dylib 0x00007fff8488ff4c _pthread_workq_return + 25

2 libsystem_c.dylib 0x00007fff8488fd13 _pthread_wqthread + 412

3 libsystem_c.dylib 0x00007fff8487a1d1 start_wqthread + 13

Thread 2:: Dispatch queue: com.apple.libdispatch-manager

0 libsystem_kernel.dylib 0x00007fff85045d16 kevent + 10

1 libdispatch.dylib 0x00007fff897a3dea _dispatch_mgr_invoke + 883

2 libdispatch.dylib 0x00007fff897a39ee _dispatch_mgr_thread + 54

Thread 3:

0 libsystem_kernel.dylib 0x00007fff850456d6 __workq_kernreturn + 10

1 libsystem_c.dylib 0x00007fff8488ff4c _pthread_workq_return + 25

2 libsystem_c.dylib 0x00007fff8488fd13 _pthread_wqthread + 412

3 libsystem_c.dylib 0x00007fff8487a1d1 start_wqthread + 13

Thread 4:

0 libsystem_kernel.dylib 0x00007fff850456d6 __workq_kernreturn + 10

1 libsystem_c.dylib 0x00007fff8488ff4c _pthread_workq_return + 25

2 libsystem_c.dylib 0x00007fff8488fd13 _pthread_wqthread + 412

3 libsystem_c.dylib 0x00007fff8487a1d1 start_wqthread + 13

Thread 0 crashed with X86 Thread State (64-bit):

rax: 0x0000000000000000 rbx: 0x0000000000000006 rcx: 0x00007fff5fbfdfc8 rdx: 0x0000000000000000

rdi: 0x0000000000000707 rsi: 0x0000000000000006 rbp: 0x00007fff5fbfdff0 rsp: 0x00007fff5fbfdfc8

r8: 0x00007fff733ef278 r9: 0x00007fff5fbfdfd0 r10: 0x0000000020000000 r11: 0x0000000000000206

r12: 0x00007fff5fbfe150 r13: 0x00007fff88086240 r14: 0x00007fff733f0180 r15: 0x00007fff5fbfe030

rip: 0x00007fff85045212 rfl: 0x0000000000000206 cr2: 0x00007fff733e8ff0

Logical CPU: 0

Binary Images:

0x100000000 - 0x100002fff +stree_gri (???) <1E49E3C8-E07E-3556-9205-B8C1A1393B17> /Applications/SourceTree.app/Contents/Resources/stree_gri

0x7fff624a5000 - 0x7fff624d993f dyld (210.2.3) <A40597AA-5529-3337-8C09-D8A014EB1578> /usr/lib/dyld

0x7fff83345000 - 0x7fff83373ff7 libsystem_m.dylib (3022.6) <11B6081D-6212-3EAB-9975-BED6234BD6A5> /usr/lib/system/libsystem_m.dylib

0x7fff833fb000 - 0x7fff833fbfff libkeymgr.dylib (25) <CC9E3394-BE16-397F-926B-E579B60EE429> /usr/lib/system/libkeymgr.dylib

0x7fff84781000 - 0x7fff8478fff7 libsystem_network.dylib (77.10) <2AAA67A1-525E-38F0-8028-1D2B64716611> /usr/lib/system/libsystem_network.dylib

0x7fff84879000 - 0x7fff84945ff7 libsystem_c.dylib (825.26) <4C9EB006-FE1F-3F8F-8074-DFD94CF2CE7B> /usr/lib/system/libsystem_c.dylib

0x7fff84cd2000 - 0x7fff84ce9fff com.apple.GenerationalStorage (1.1 - 132.3) <FD4A84B3-13A8-3C60-A59E-25A361447A17> /System/Library/PrivateFrameworks/GenerationalStorage.framework/Versions/A/GenerationalStorage

0x7fff84f71000 - 0x7fff84f7efff libbz2.1.0.dylib (29) <CE9785E8-B535-3504-B392-82F0064D9AF2> /usr/lib/libbz2.1.0.dylib

0x7fff84f84000 - 0x7fff84f8bfff com.apple.NetFS (5.0 - 4.0) <195D8EC9-72BB-3E04-A64D-E1A89B4850C1> /System/Library/Frameworks/NetFS.framework/Versions/A/NetFS

0x7fff84f8c000 - 0x7fff84f94fff liblaunch.dylib (442.26.2) <2F71CAF8-6524-329E-AC56-C506658B4C0C> /usr/lib/system/liblaunch.dylib

0x7fff84fda000 - 0x7fff84fdbff7 libsystem_sandbox.dylib (220.2) <6838A6FD-8626-3356-BB4F-BB4787216207> /usr/lib/system/libsystem_sandbox.dylib

0x7fff85033000 - 0x7fff8504eff7 libsystem_kernel.dylib (2050.22.13) <5A961E2A-CFB8-362B-BC43-122704AEB047> /usr/lib/system/libsystem_kernel.dylib

0x7fff85240000 - 0x7fff85241ff7 libremovefile.dylib (23.2) <6763BC8E-18B8-3AD9-8FFA-B43713A7264F> /usr/lib/system/libremovefile.dylib

0x7fff8526d000 - 0x7fff855caff7 com.apple.Foundation (6.8 - 945.16) <89BD68FD-72C8-35C1-94C6-3A07F097C50D> /System/Library/Frameworks/Foundation.framework/Versions/C/Foundation

0x7fff855cb000 - 0x7fff8567cfff com.apple.LaunchServices (539.7 - 539.7) <DA7C602E-5E01-31B8-925D-B45360CA089F> /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/LaunchServices.framework/Versions/A/LaunchServices

0x7fff8637e000 - 0x7fff86380fff libquarantine.dylib (52) <4BE2E642-A14F-340A-B482-5BD2AEFD9C24> /usr/lib/system/libquarantine.dylib

0x7fff86381000 - 0x7fff86382fff libDiagnosticMessagesClient.dylib (8) <8548E0DC-0D2F-30B6-B045-FE8A038E76D8> /usr/lib/libDiagnosticMessagesClient.dylib

0x7fff8663c000 - 0x7fff8663dfff libsystem_blocks.dylib (59) <D92DCBC3-541C-37BD-AADE-ACC75A0C59C8> /usr/lib/system/libsystem_blocks.dylib

0x7fff87003000 - 0x7fff87007fff libpam.2.dylib (20) <C8F45864-5B58-3237-87E1-2C258A1D73B8> /usr/lib/libpam.2.dylib

0x7fff87282000 - 0x7fff872a4ff7 libxpc.dylib (140.42) <BBE558BD-5E55-35E4-89ED-1AA6B056D05A> /usr/lib/system/libxpc.dylib

0x7fff872a5000 - 0x7fff872dbff7 libsystem_info.dylib (406.17) <C9BA1024-043C-3BD5-908F-AF709E05DEE4> /usr/lib/system/libsystem_info.dylib

0x7fff87349000 - 0x7fff8734bfff com.apple.TrustEvaluationAgent (2.0 - 23) <A97D348B-32BF-3E52-8DF2-59BFAD21E1A3> /System/Library/PrivateFrameworks/TrustEvaluationAgent.framework/Versions/A/TrustEvaluationAgent

0x7fff8767d000 - 0x7fff877f2fff com.apple.CFNetwork (596.3.3 - 596.3.3) <3739DC8D-8610-3740-80EC-43E130779CB8> /System/Library/Frameworks/CFNetwork.framework/Versions/A/CFNetwork

0x7fff87891000 - 0x7fff87912fff com.apple.Metadata (10.7.0 - 707.5) <4140B1F6-7D73-33C7-B3F2-4DB349C31AE9> /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/Metadata.framework/Versions/A/Metadata

0x7fff87cf7000 - 0x7fff87d28ff7 com.apple.DictionaryServices (1.2 - 184.4) <2EC80C71-263E-3D63-B461-6351C876C50D> /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/DictionaryServices.framework/Versions/A/DictionaryServices

0x7fff88080000 - 0x7fff8819892f libobjc.A.dylib (532.2) <90D31928-F48D-3E37-874F-220A51FD9E37> /usr/lib/libobjc.A.dylib

0x7fff88199000 - 0x7fff88226ff7 com.apple.SearchKit (1.4.0 - 1.4.0) <54A8069C-E497-3B07-BEA7-D3BC9DB5B649> /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/SearchKit.framework/Versions/A/SearchKit

0x7fff8841a000 - 0x7fff88421fff libcopyfile.dylib (89) <876573D0-E907-3566-A108-577EAD1B6182> /usr/lib/system/libcopyfile.dylib

0x7fff88444000 - 0x7fff88541ff7 libxml2.2.dylib (22.3) <7FD09F53-83DA-3ECD-8DD9-870E1A2F0427> /usr/lib/libxml2.2.dylib

0x7fff88706000 - 0x7fff888f0ff7 com.apple.CoreFoundation (6.8 - 744.18) <A60C3C9B-3764-3291-844C-C487ACF77C2C> /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation

0x7fff888f1000 - 0x7fff88900ff7 libxar.1.dylib (105) <B6A7C8AA-3E20-3A1D-A7BA-4FD0052FA508> /usr/lib/libxar.1.dylib

0x7fff8890e000 - 0x7fff88920ff7 libz.1.dylib (43) <2A1551E8-A272-3DE5-B692-955974FE1416> /usr/lib/libz.1.dylib

0x7fff88b71000 - 0x7fff88b7ffff libcommonCrypto.dylib (60027) <BAAFE0C9-BB86-3CA7-88C0-E3CBA98DA06F> /usr/lib/system/libcommonCrypto.dylib

0x7fff88b95000 - 0x7fff88b9bfff com.apple.DiskArbitration (2.5.2 - 2.5.2) <C713A35A-360E-36CE-AC0A-25C86A3F50CA> /System/Library/Frameworks/DiskArbitration.framework/Versions/A/DiskArbitration

0x7fff8943e000 - 0x7fff894e4ff7 com.apple.CoreServices.OSServices (557.6 - 557.6) <1BDB5456-0CE9-301C-99C1-8EFD0D2BFCCD> /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/OSServices.framework/Versions/A/OSServices

0x7fff896ad000 - 0x7fff896b1ff7 com.apple.TCC (1.0 - 1) <76A86876-2280-3849-8478-450E1A8C0E01> /System/Library/PrivateFrameworks/TCC.framework/Versions/A/TCC

0x7fff896b2000 - 0x7fff896b7fff libcompiler_rt.dylib (30) <08F8731D-5961-39F1-AD00-4590321D24A9> /usr/lib/system/libcompiler_rt.dylib

0x7fff896b8000 - 0x7fff89725ff7 com.apple.datadetectorscore (4.1 - 269.2) <4FD4A7CE-BB00-3AAB-B7AA-AE395D5400EC> /System/Library/PrivateFrameworks/DataDetectorsCore.framework/Versions/A/DataDetectorsCore

0x7fff89726000 - 0x7fff89772ff7 libauto.dylib (185.1) <73CDC482-16E3-3FC7-9BB4-FBA2DA44DBC2> /usr/lib/libauto.dylib

0x7fff89773000 - 0x7fff89774ff7 libSystem.B.dylib (169.3) <EFACA0C5-1AC6-3F93-9E02-147D4B0A0112> /usr/lib/libSystem.B.dylib

0x7fff8979f000 - 0x7fff897b4ff7 libdispatch.dylib (228.23) <D26996BF-FC57-39EB-8829-F63585561E09> /usr/lib/system/libdispatch.dylib

0x7fff897b5000 - 0x7fff897bafff libcache.dylib (57) <65187C6E-3FBF-3EB8-A1AA-389445E2984D> /usr/lib/system/libcache.dylib

0x7fff8985a000 - 0x7fff898c3fff libstdc++.6.dylib (56) <08A26E98-26A7-3A23-A594-01EF923BA123> /usr/lib/libstdc++.6.dylib

0x7fff89987000 - 0x7fff899b2fff libxslt.1.dylib (11.3) <441776B8-9130-3893-956F-39C85FFA644F> /usr/lib/libxslt.1.dylib

0x7fff89a9e000 - 0x7fff89afdfff com.apple.AE (645.6 - 645.6) <44F403C1-660A-3543-AB9C-3902E02F936F> /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/AE.framework/Versions/A/AE

0x7fff89d28000 - 0x7fff89f28fff libicucore.A.dylib (491.11.2) <FD6282D8-DF3F-3842-8C2E-CF478D2B9669> /usr/lib/libicucore.A.dylib

0x7fff89fad000 - 0x7fff89fadfff libOpenScriptingUtil.dylib (148.3) <F8681222-0969-3B10-8BCE-C55A4B9C520C> /usr/lib/libOpenScriptingUtil.dylib

0x7fff89fb5000 - 0x7fff89fc3ff7 libkxld.dylib (2050.22.13) <4AAF0573-8632-3D06-BE32-C5675F77638D> /usr/lib/system/libkxld.dylib

0x7fff8a09d000 - 0x7fff8a19ffff libcrypto.0.9.8.dylib (47) <8926F842-23AB-35D6-A3CE-6FF5D504F875> /usr/lib/libcrypto.0.9.8.dylib

0x7fff8a1b7000 - 0x7fff8a1b9ff7 libunc.dylib (25) <2FDC94A7-3039-3680-85F3-2164E63B464D> /usr/lib/system/libunc.dylib

0x7fff8a208000 - 0x7fff8a20bff7 libdyld.dylib (210.2.3) <F59367C9-C110-382B-A695-9035A6DD387E> /usr/lib/system/libdyld.dylib

0x7fff8aee8000 - 0x7fff8b1b9ff7 com.apple.security (7.0 - 55179.11) <73958084-5BBC-3597-A751-7370B0C247E5> /System/Library/Frameworks/Security.framework/Versions/A/Security

0x7fff8b466000 - 0x7fff8b467ff7 libdnsinfo.dylib (453.19) <14202FFB-C3CA-3FCC-94B0-14611BF8692D> /usr/lib/system/libdnsinfo.dylib

0x7fff8bb12000 - 0x7fff8bb1dfff libsystem_notify.dylib (98.5) <C49275CC-835A-3207-AFBA-8C01374927B6> /usr/lib/system/libsystem_notify.dylib

0x7fff8bc4b000 - 0x7fff8bc4cfff liblangid.dylib (116) <864C409D-D56B-383E-9B44-A435A47F2346> /usr/lib/liblangid.dylib

0x7fff8bc61000 - 0x7fff8bc82ff7 libCRFSuite.dylib (33) <B49DA255-A4D9-33AF-95AB-B319570CDF7B> /usr/lib/libCRFSuite.dylib

0x7fff8bcab000 - 0x7fff8bda8fff libsqlite3.dylib (138.1) <ADE9CB98-D77D-300C-A32A-556B7440769F> /usr/lib/libsqlite3.dylib

0x7fff8c0c6000 - 0x7fff8c0ebff7 libc++abi.dylib (26) <D86169F3-9F31-377A-9AF3-DB17142052E4> /usr/lib/libc++abi.dylib

0x7fff8c653000 - 0x7fff8c66afff com.apple.CFOpenDirectory (10.8 - 151.10) <FFBBA538-00B5-334E-BA5B-C8AD6CDCDA14> /System/Library/Frameworks/OpenDirectory.framework/Versions/A/Frameworks/CFOpenDirectory.framework/Versions/A/CFOpenDirectory

0x7fff8c72e000 - 0x7fff8c73bff7 com.apple.NetAuth (4.0 - 4.0) <A4A21A2F-B26A-3DC9-95E4-DAFA43A4A2C3> /System/Library/PrivateFrameworks/NetAuth.framework/Versions/A/NetAuth

0x7fff8cbf2000 - 0x7fff8cbf2fff com.apple.CoreServices (57 - 57) <45F1466A-8264-3BB7-B0EC-E5E5BFBED143> /System/Library/Frameworks/CoreServices.framework/Versions/A/CoreServices

0x7fff8db89000 - 0x7fff8db8fff7 libunwind.dylib (35.1) <21703D36-2DAB-3D8B-8442-EAAB23C060D3> /usr/lib/system/libunwind.dylib

0x7fff8db90000 - 0x7fff8db98ff7 libsystem_dnssd.dylib (379.37) <616FC901-151E-38BF-B2C4-24A351C5FAAD> /usr/lib/system/libsystem_dnssd.dylib

0x7fff8e04f000 - 0x7fff8e0bdfff com.apple.framework.IOKit (2.0.1 - 755.22.5) <1547DA6F-9793-30A2-8E92-7368DE84D46C> /System/Library/Frameworks/IOKit.framework/Versions/A/IOKit

0x7fff8e613000 - 0x7fff8e619fff libmacho.dylib (829) <BF332AD9-E89F-387E-92A4-6E1AB74BD4D9> /usr/lib/system/libmacho.dylib

0x7fff8e6aa000 - 0x7fff8e6bdff7 libbsm.0.dylib (32) <F497D3CE-40D9-3551-84B4-3D5E39600737> /usr/lib/libbsm.0.dylib

0x7fff8ee1b000 - 0x7fff8f132ff7 com.apple.CoreServices.CarbonCore (1037.5 - 1037.5) <731D8F92-1C52-3613-BA01-EFEA54DADF41> /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/CarbonCore

0x7fff8f1d6000 - 0x7fff8f227ff7 com.apple.SystemConfiguration (1.12.2 - 1.12.2) <A4341BBD-A330-3A57-8891-E9C1A286A72D> /System/Library/Frameworks/SystemConfiguration.framework/Versions/A/SystemConfiguration

0x7fff8fe83000 - 0x7fff8fed2ff7 libcorecrypto.dylib (106.2) <CE0C29A3-C420-339B-ADAA-52F4683233CC> /usr/lib/system/libcorecrypto.dylib

0x7fff90054000 - 0x7fff900bcff7 libc++.1.dylib (65.1) <E5A0C88E-0837-3015-A987-F8C5A0D35DD6> /usr/lib/libc++.1.dylib

External Modification Summary:

Calls made by other processes targeting this process:

task_for_pid: 0

thread_create: 0

thread_set_state: 0

Calls made by this process:

task_for_pid: 0

thread_create: 0

thread_set_state: 0

Calls made by all processes on this machine:

task_for_pid: 3789

thread_create: 1

thread_set_state: 0

VM Region Summary:

ReadOnly portion of Libraries: Total=79.7M resident=56.7M(71%) swapped_out_or_unallocated=23.0M(29%)

Writable regions: Total=16.1G written=564K(0%) resident=1080K(0%) swapped_out=0K(0%) unallocated=16.1G(100%)

REGION TYPE VIRTUAL

=========== =======

MALLOC 197.6M

MALLOC (reserved) 15.9G reserved VM address space (unallocated)

MALLOC guard page 48K

STACK GUARD 56.0M

Stack 10.0M

VM_ALLOCATE 12K

__DATA 3276K

__LINKEDIT 52.0M

__TEXT 27.7M

__UNICODE 544K

mapped file 18.1M

shared memory 12K

=========== =======

TOTAL 16.2G

TOTAL, minus reserved VM space 365.3M

Has this been fixed yet?

I have 1.6.4.1 and when trying to rebase interactively and click 'edit message' it just hangs.

Matt

Hi Matt,

I'm sorry this is happening for you. Could you get me a crash report from the 'Console' application at the point the crash happens for you? With this I'll further be able to determine what the problem is.

Thanks in advance

(All Messages.log)

Is this what you are after?

I noticed it happens when you tick ammend commit beside a commit and then click the edit button below.

Matt

That's the clue I was looking for. That's easily reproducible, cheers. Usually users don't/shouldn't edit their message any way. When amending a commit you're then going into a mode to modify the commit and re-commit any way, so the message wouldn't make any sense. It had previously been blocked out but obviously there's a bug here.

I've created an issue on JAC here: https://jira.atlassian.com/browse/SRCTREE-1828

Thanks again for the extra information, I'll issue a fix out shortly.

Yeah I get that.

I've obviously clicked on the edit button without moving the selection to a commit which doesn't have 'amend commit' checked - because it is possible (as far as I know) to mark some as amend commit and edit the message directly on others.

Disabling the edit button for commits marked amend should fix it.

Matt

Hey Kieran,

I have run into the exact same issue as @Greg originally posted. I started an interactive rebase ran into some conflicts, fixed them, then continued the rebase and it just sits there spining forever. It doesn't hang so much as it just doesn't ever finish, so no crash logs, but an intersting notifcation does pop up in the console as soon as I continue the rebase, the message is "9/12/13 1:59:19.411 AM SourceTree[967]: File has no contents"

Sourcetree version: Version 1.6.4.1 (1.6.4.1)

Git Embedded Version: 1.7.11.1

Repo Path: /Users/toddbluhm/Development/JourneyScholar/Lessontrek/code

SourceTree Path: /Applications/SourceTree

If you need anything else let me know.

Thanks for the information, Todd. There's two or three issues with GRI that happen under certain circumstances. In most cases it's fine. The message you've mentioned could well be useful to us, I've created an issue on JAC here: https://jira.atlassian.com/browse/SRCTREE-1834

Cheers!

Hi Todd,

Could you let me know if the issue has been fixed? Some updates were issued that could've/should've resolved the issue.

Cheers

Hello Kieran, I can't say 100% for sure that it is fixed, because I did a manual rebase over the issue, but I haven't run into any more issues since. If I do run into any issues again I will create a new issue. Thanks for looking into this.

Thanks for the feedback Todd, I really appreciate your time on this. Fingers crossed things are OK. As I say, there's some weird edge cases that apply sometimes, not all environments are the same but I'm pretty certain all variants have been dealt with.

Thanks again!

Hello Kieran, I can't say 100% for sure that it is fixed, because I did a manual rebase over the issue, but I haven't run into any more issues since. If I do run into any problems again I will create a new issue. Thanks for looking into this.

The same issue occurs in 1.8.1 very frequently for me.

Update:

It occurs if I receive 3 conflicts in a row with exacly the same file (project.pbxproj)

I have tried both with embedded and extranl Git clients.

Hey Anton,

Is there any errors in Console? Does it crash or just completely hang? I'd love to narrow these down.

Cheers

Suggest an answer

Log in or Join to answer
Community showcase
Brian Ganninger
Published Jan 23, 2018 in Sourcetree

Tip from the team: workflow and keyboard shortcuts

Supported Platforms macOS Sourcetree has a lot to offer and, like many developer tools, finding and using it all can be a challenge, especially for a new user. Everyone might not love ...

231 views 0 3
Read article

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you
Atlassian Team Tour

Join us on the Team Tour

We're bringing product updates and pro tips on teamwork to ten cities around the world.

Save your spot