-
Type:
Bug
-
Resolution: Unresolved
-
Priority:
Highest
-
None
-
Affects Version/s: 3.4.14
-
Component/s: Git
-
None
-
Severity 1 - Critical
During rebases, sourcetree encounters problems and deletes commits. In a large rebase, these can go unnoticed. Sourcetree does report an error while this happens, but Sourcetree reports index errors ALL THE TIME due to its own internal race conditions between auto-refresh of repos code and user action code. So, the errors are ignored by my users because "errors are normal for Sourcetree and you just select Continue Rebase anyway."
Attached is a screenshot showing the missing commit along with the sourcetree.log file.
When I click on Attachments, the button vanishes from the toolbar here.
Log:
ERROR [2023-08-31 16:28:52,081] [1] [SourceTree.Diagnostics.FailureHandler] [Log] - 'git apply' failed with code 128: Checking patch bootloader/bootloader_main.c... Applied patch bootloader/bootloader_main.c cleanly. error: Unable to write new index fileSee C:\Users\hchapman\AppData\Local\Atlassian\SourceTree\LastFailedPatch.txt for patch details (C:\work\g\dolphin_bootloader\Onicon) ERROR [2023-09-01 12:21:16,273] [1] [SourceTree.Diagnostics.FailureHandler] [Log] - 'git apply' failed with code 1: Checking patch bootloader/bootloader_main.c... error: bootloader/bootloader_main.c: does not exist in indexSee C:\Users\hchapman\AppData\Local\Atlassian\SourceTree\LastFailedPatch.txt for patch details (C:\work\g\dolphin_bootloader\Onicon) ERROR [2023-09-01 16:03:35,697] [41] [SourceTree.Scheduler.SourceTreeDispatcher] [Log] - Unable to get Dispatcher Application.Current is null ERROR [2023-09-01 16:03:35,698] [41] [SourceTree.Scheduler.SourceTreeDispatcher] [Log] - Unable to get Thread dispatcher is null ERROR [2023-09-01 16:03:35,721] [49] [SourceTree.Scheduler.SourceTreeDispatcher] [Log] - Unable to get Dispatcher Application.Current is null ERROR [2023-09-01 16:03:35,721] [49] [SourceTree.Scheduler.SourceTreeDispatcher] [Log] - Unable to get Thread dispatcher is null ERROR [2023-09-01 17:10:51,362] [4] [SourceTree.Scheduler.SourceTreeDispatcher] [Log] - Unable to get Dispatcher Application.Current is null ERROR [2023-09-01 17:10:51,364] [4] [SourceTree.Scheduler.SourceTreeDispatcher] [Log] - Unable to get Thread dispatcher is null ERROR [2023-09-01 17:10:51,387] [15] [SourceTree.Scheduler.SourceTreeDispatcher] [Log] - Unable to get Dispatcher Application.Current is null ERROR [2023-09-01 17:10:51,388] [15] [SourceTree.Scheduler.SourceTreeDispatcher] [Log] - Unable to get Thread dispatcher is null ERROR [2023-09-01 17:10:51,389] [16] [SourceTree.Scheduler.SourceTreeDispatcher] [Log] - Unable to get Dispatcher Application.Current is null ERROR [2023-09-01 17:10:51,389] [16] [SourceTree.Scheduler.SourceTreeDispatcher] [Log] - Unable to get Thread dispatcher is null ERROR [2023-09-01 17:24:03,832] [48] [SourceTree.Scheduler.SourceTreeDispatcher] [Log] - Unable to get Dispatcher Application.Current is null ERROR [2023-09-01 17:24:03,833] [48] [SourceTree.Scheduler.SourceTreeDispatcher] [Log] - Unable to get Thread dispatcher is null ERROR [2023-09-01 17:24:03,857] [37] [SourceTree.Scheduler.SourceTreeDispatcher] [Log] - Unable to get Dispatcher Application.Current is null ERROR [2023-09-01 17:24:03,857] [37] [SourceTree.Scheduler.SourceTreeDispatcher] [Log] - Unable to get Thread dispatcher is null ERROR [2023-09-06 13:48:05,912] [1] [SourceTree.Diagnostics.FailureHandler] [Log] - 'git apply' failed with code 128: Checking patch drivers/common/od_throttledTimer.h... Applied patch drivers/common/od_throttledTimer.h cleanly. error: Unable to write new index fileSee C:\Users\hchapman\AppData\Local\Atlassian\SourceTree\LastFailedPatch.txt for patch details (C:\work\g\dolphin_bootloader\Onicon) ERROR [2023-09-06 13:48:36,975] [1] [SourceTree.Diagnostics.FailureHandler] [Log] - 'git apply' failed with code 128: Checking patch drivers/common/od_throttledTimer.c... Applied patch drivers/common/od_throttledTimer.c cleanly. error: Unable to write new index fileSee C:\Users\hchapman\AppData\Local\Atlassian\SourceTree\LastFailedPatch.txt for patch details (C:\work\g\dolphin_bootloader\Onicon) ERROR [2023-09-07 11:49:02,690] [1] [SourceTree.Diagnostics.FailureHandler] [Log] - 'git apply' failed with code 128: Checking patch F3500_FreeRTOS/Core/Src/OniconHalLayer/halBootloaderData.c... Applied patch F3500_FreeRTOS/Core/Src/OniconHalLayer/halBootloaderData.c cleanly. error: Unable to write new index fileSee C:\Users\hchapman\AppData\Local\Atlassian\SourceTree\LastFailedPatch.txt for patch details (C:\work\g\NPD_Landshark_FreeRtos) ERROR [2023-09-07 12:15:50,555] [1] [SourceTree.Diagnostics.FailureHandler] [Log] - 'git apply' failed with code 1: Checking patch Remora_FreeRTOS/STM32F412RGTX_FLASH.ld... error: while searching for: /* Memories definition */ MEMORY { RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 252K USER_RESERVED_RAM (xrw) : ORIGIN = ORIGIN(RAM) + LENGTH(RAM), LENGTH = 4K BOOTLOADER1 (rx) : ORIGIN = 0x8000000, LENGTH = 32K CONFIG (r) : ORIGIN = ORIGIN(BOOTLOADER1) + LENGTH(BOOTLOADER1), LENGTH = 32K RESERVED (r) : ORIGIN = ORIGIN(CONFIG) + LENGTH(CONFIG), LENGTH = 64K - BOOTLOADER2 (rx) : ORIGIN = ORIGIN(RESERVED) + LENGTH(RESERVED), LENGTH = 128K - 4K - BOOTLOADER_DATA (rw) : ORIGIN = ORIGIN(BOOTLOADER2) + LENGTH(BOOTLOADER2) LENGTH = 4K - APPLICATION (xrw) : ORIGIN = ORIGIN(BOOTLOADER_DATA) + LENGTH(BOOTLOADER_DATA), LENGTH = 512K + BOOTLOADER2 (rx) : ORIGIN = ORIGIN(RESERVED) + LENGTH(RESERVED), LENGTH = 128K + APPLICATION (xrw) : ORIGIN = ORIGIN(BOOTLOADER2) + LENGTH(BOOTLOADER2), LENGTH = 512K VELOCITY_TABLES (r) : ORIGIN = ORIGIN(CONFIG) + LENGTH(CONFIG), LENGTH = 128K FACTORY_DEFAULTS (r) : ORIGIN = ORIGIN(VELOCITY_TABLES) + LENGTH(VELOCITY_TABLES), LENGTH = 128K } +_Application_Flash_Sector_First = 6;error: patch failed: Remora_FreeRTOS/STM32F412RGTX_FLASH.ld:36 Applying patch Remora_FreeRTOS/STM32F412RGTX_FLASH.ld with 1 reject... Rejected hunk #1.See C:\Users\hchapman\AppData\Local\Atlassian\SourceTree\LastFailedPatch.txt for patch details (C:\work\g\NPD_Landshark_FreeRtos) ERROR [2023-09-07 12:15:59,702] [1] [SourceTree.Diagnostics.FailureHandler] [Log] - 'git apply' failed with code 1: Checking patch Remora_FreeRTOS/STM32F412RGTX_FLASH.ld... error: while searching for: /* Memories definition */ MEMORY { RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 252K USER_RESERVED_RAM (xrw) : ORIGIN = ORIGIN(RAM) + LENGTH(RAM), LENGTH = 4K BOOTLOADER1 (rx) : ORIGIN = 0x8000000, LENGTH = 32K CONFIG (r) : ORIGIN = ORIGIN(BOOTLOADER1) + LENGTH(BOOTLOADER1), LENGTH = 32K RESERVED (r) : ORIGIN = ORIGIN(CONFIG) + LENGTH(CONFIG), LENGTH = 64K - BOOTLOADER2 (rx) : ORIGIN = ORIGIN(RESERVED) + LENGTH(RESERVED), LENGTH = 128K - 4K - BOOTLOADER_DATA (rw) : ORIGIN = ORIGIN(BOOTLOADER2) + LENGTH(BOOTLOADER2) LENGTH = 4K - APPLICATION (xrw) : ORIGIN = ORIGIN(BOOTLOADER_DATA) + LENGTH(BOOTLOADER_DATA), LENGTH = 512K + BOOTLOADER2 (rx) : ORIGIN = ORIGIN(RESERVED) + LENGTH(RESERVED), LENGTH = 128K + APPLICATION (xrw) : ORIGIN = ORIGIN(BOOTLOADER2) + LENGTH(BOOTLOADER2), LENGTH = 512K VELOCITY_TABLES (r) : ORIGIN = ORIGIN(CONFIG) + LENGTH(CONFIG), LENGTH = 128K FACTORY_DEFAULTS (r) : ORIGIN = ORIGIN(VELOCITY_TABLES) + LENGTH(VELOCITY_TABLES), LENGTH = 128K } +_Application_Flash_Sector_First = 6;error: patch failed: Remora_FreeRTOS/STM32F412RGTX_FLASH.ld:36 Applying patch Remora_FreeRTOS/STM32F412RGTX_FLASH.ld with 1 reject... Rejected hunk #1.See C:\Users\hchapman\AppData\Local\Atlassian\SourceTree\LastFailedPatch.txt for patch details (C:\work\g\NPD_Landshark_FreeRtos) ERROR [2023-09-07 12:51:07,306] [90] [SourceTree.ViewModel.RepoDialogContainer] [Log] - This type of CollectionView does not support changes to its SourceCollection from a thread different from the Dispatcher thread. System.NotSupportedException: This type of CollectionView does not support changes to its SourceCollection from a thread different from the Dispatcher thread. at System.Windows.Data.CollectionView.OnCollectionChanged(Object sender, NotifyCollectionChangedEventArgs args) at System.Collections.ObjectModel.ObservableCollection`1.OnCollectionChanged(NotifyCollectionChangedEventArgs e) at System.Collections.ObjectModel.ObservableCollection`1.InsertItem(Int32 index, T item) at SourceTree.ViewModel.Git.GitCherryPickDialogViewModel.<InitAsync>d__31.MoveNext() --- End of stack trace from previous location where exception was thrown --- at System.Runtime.ExceptionServices.ExceptionDispatchInfo.Throw() at System.Runtime.CompilerServices.TaskAwaiter.HandleNonSuccessAndDebuggerNotification(Task task) at System.Runtime.CompilerServices.TaskAwaiter.GetResult() at SourceTree.ViewModel.RepoDialogContainer.<>c__DisplayClass9_0.<<PushDialog>b__0>d.MoveNext()