From: Nikolay Shustov <nikolay.shustov@gmail•com>
To: git@vger•kernel.org
Subject: git merge --no-ff failure
Date: Thu, 25 Sep 2025 09:31:47 -0400 [thread overview]
Message-ID: <5cbb5c0a-4c51-4d15-816d-6d7d4fdf4fe1@gmail.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 278 bytes --]
Hi,
Git is reporting error while I am trying to run "git merge --no-ff <my
branch>":
fatal: stash failed.
Please see attached the bug report, the output for same command with
trace2 enabled and output for the same command with trace2 and events
enabled.
Cheers,
- Nikolay
[-- Attachment #2: trace2 --]
[-- Type: text/plain, Size: 1247 bytes --]
09:05:38.704643 common-init.c:57 version 2.51.0.windows.1
09:05:38.704643 common-init.c:58 start 'C:\Program Files\Git\mingw64\bin\git.exe' merge --no-ff base-trunk-1
09:05:38.715667 repository.c:242 worktree C:/git/base-trunk
09:05:38.715667 git.c:477 cmd_name merge (merge)
09:05:38.804062 run-command.c:741 child_start[0] git stash create
09:05:38.820593 common-init.c:57 version 2.51.0.windows.1
09:05:38.820593 common-init.c:58 start git stash create
09:05:38.833241 repository.c:242 worktree C:/git/base-trunk
09:05:38.833241 git.c:477 cmd_name stash (merge/stash)
09:05:39.186518 git.c:750 exit elapsed:0.373105 code:1
09:05:39.186518 trace2/tr2_tgt_normal.c:128 atexit elapsed:0.373131 code:1
09:05:39.193545 run-command.c:997 child_exit[0] pid:1048 code:1 elapsed:0.389011
09:05:39.193545 usage.c:72 error stash failed
fatal: stash failed
09:05:39.193545 usage.c:86 exit elapsed:0.496921 code:128
09:05:39.193545 trace2/tr2_tgt_normal.c:128 atexit elapsed:0.496929 code:128
[-- Attachment #3: events --]
[-- Type: text/plain, Size: 19977 bytes --]
09:08:32.073386 common-init.c:57 version 2.51.0.windows.1
{"event":"version","sid":"20250925T130832.069351Z-H64ade170-P00008b60","thread":"main","time":"2025-09-25T13:08:32.073386Z","file":"common-init.c","line":57,"evt":"4","exe":"2.51.0.windows.1"}
09:08:32.073386 common-init.c:58 start 'C:\Program Files\Git\mingw64\bin\git.exe' merge --no-ff base-trunk-1
{"event":"start","sid":"20250925T130832.069351Z-H64ade170-P00008b60","thread":"main","time":"2025-09-25T13:08:32.073386Z","file":"common-init.c","line":58,"t_abs":0.008368,"argv":["C:\\Program Files\\Git\\mingw64\\bin\\git.exe","merge","--no-ff","base-trunk-1"]}
{"event":"data_json","sid":"20250925T130832.069351Z-H64ade170-P00008b60","thread":"main","time":"2025-09-25T13:08:32.085037Z","file":"compat/win32/trace2_win32_process_info.c","line":122,"repo":0,"t_abs":0.019853,"t_rel":0.019853,"nesting":1,"category":"process","key":"windows/ancestry","value":["bash.exe","bash.exe"]}
09:08:32.085037 repository.c:242 worktree C:/git/base-trunk
{"event":"def_repo","sid":"20250925T130832.069351Z-H64ade170-P00008b60","thread":"main","time":"2025-09-25T13:08:32.085037Z","file":"repository.c","line":242,"repo":1,"worktree":"C:/git/base-trunk"}
09:08:32.086060 git.c:477 cmd_name merge (merge)
{"event":"cmd_name","sid":"20250925T130832.069351Z-H64ade170-P00008b60","thread":"main","time":"2025-09-25T13:08:32.086060Z","file":"git.c","line":477,"name":"merge","hierarchy":"merge"}
{"event":"region_enter","sid":"20250925T130832.069351Z-H64ade170-P00008b60","thread":"main","time":"2025-09-25T13:08:32.087046Z","file":"read-cache.c","line":2370,"repo":1,"nesting":1,"category":"index","label":"do_read_index","msg":".git/index"}
{"event":"region_enter","sid":"20250925T130832.069351Z-H64ade170-P00008b60","thread":"main","time":"2025-09-25T13:08:32.096679Z","file":"cache-tree.c","line":643,"repo":1,"nesting":2,"category":"cache_tree","label":"read"}
{"event":"region_leave","sid":"20250925T130832.069351Z-H64ade170-P00008b60","thread":"main","time":"2025-09-25T13:08:32.098731Z","file":"cache-tree.c","line":645,"repo":1,"t_rel":0.001977,"nesting":2,"category":"cache_tree","label":"read"}
{"event":"data","sid":"20250925T130832.069351Z-H64ade170-P00008b60","thread":"main","time":"2025-09-25T13:08:32.099987Z","file":"read-cache.c","line":2319,"repo":1,"t_abs":0.035563,"t_rel":0.013557,"nesting":2,"category":"index","key":"read/version","value":"2"}
{"event":"data","sid":"20250925T130832.069351Z-H64ade170-P00008b60","thread":"main","time":"2025-09-25T13:08:32.099987Z","file":"read-cache.c","line":2321,"repo":1,"t_abs":0.035576,"t_rel":0.013570,"nesting":2,"category":"index","key":"read/cache_nr","value":"121152"}
{"event":"region_leave","sid":"20250925T130832.069351Z-H64ade170-P00008b60","thread":"main","time":"2025-09-25T13:08:32.099987Z","file":"read-cache.c","line":2375,"repo":1,"t_rel":0.013578,"nesting":1,"category":"index","label":"do_read_index","msg":".git/index"}
{"event":"region_enter","sid":"20250925T130832.069351Z-H64ade170-P00008b60","thread":"main","time":"2025-09-25T13:08:32.102019Z","file":"preload-index.c","line":132,"nesting":1,"category":"index","label":"preload"}
{"event":"data","sid":"20250925T130832.069351Z-H64ade170-P00008b60","thread":"main","time":"2025-09-25T13:08:32.169800Z","file":"preload-index.c","line":182,"t_abs":0.104730,"t_rel":0.067146,"nesting":2,"category":"index","key":"preload/sum_lstat","value":"121152"}
{"event":"region_leave","sid":"20250925T130832.069351Z-H64ade170-P00008b60","thread":"main","time":"2025-09-25T13:08:32.169800Z","file":"preload-index.c","line":183,"t_rel":0.067171,"nesting":1,"category":"index","label":"preload"}
{"event":"region_enter","sid":"20250925T130832.069351Z-H64ade170-P00008b60","thread":"main","time":"2025-09-25T13:08:32.169800Z","file":"read-cache.c","line":1526,"nesting":1,"category":"index","label":"refresh"}
{"event":"data","sid":"20250925T130832.069351Z-H64ade170-P00008b60","thread":"main","time":"2025-09-25T13:08:32.170888Z","file":"read-cache.c","line":1608,"t_abs":0.105975,"t_rel":0.001215,"nesting":2,"category":"index","key":"refresh/sum_lstat","value":"0"}
{"event":"data","sid":"20250925T130832.069351Z-H64ade170-P00008b60","thread":"main","time":"2025-09-25T13:08:32.170888Z","file":"read-cache.c","line":1609,"t_abs":0.105984,"t_rel":0.001224,"nesting":2,"category":"index","key":"refresh/sum_scan","value":"0"}
{"event":"region_leave","sid":"20250925T130832.069351Z-H64ade170-P00008b60","thread":"main","time":"2025-09-25T13:08:32.170888Z","file":"read-cache.c","line":1610,"t_rel":0.001228,"nesting":1,"category":"index","label":"refresh"}
{"event":"region_enter","sid":"20250925T130832.069351Z-H64ade170-P00008b60","thread":"main","time":"2025-09-25T13:08:32.170888Z","file":"preload-index.c","line":132,"nesting":1,"category":"index","label":"preload"}
{"event":"data","sid":"20250925T130832.069351Z-H64ade170-P00008b60","thread":"main","time":"2025-09-25T13:08:32.172904Z","file":"preload-index.c","line":182,"t_abs":0.108576,"t_rel":0.002083,"nesting":2,"category":"index","key":"preload/sum_lstat","value":"0"}
{"event":"region_leave","sid":"20250925T130832.069351Z-H64ade170-P00008b60","thread":"main","time":"2025-09-25T13:08:32.173888Z","file":"preload-index.c","line":183,"t_rel":0.002108,"nesting":1,"category":"index","label":"preload"}
{"event":"region_enter","sid":"20250925T130832.069351Z-H64ade170-P00008b60","thread":"main","time":"2025-09-25T13:08:32.173888Z","file":"read-cache.c","line":1526,"nesting":1,"category":"index","label":"refresh"}
{"event":"data","sid":"20250925T130832.069351Z-H64ade170-P00008b60","thread":"main","time":"2025-09-25T13:08:32.174862Z","file":"read-cache.c","line":1608,"t_abs":0.109677,"t_rel":0.001071,"nesting":2,"category":"index","key":"refresh/sum_lstat","value":"0"}
{"event":"data","sid":"20250925T130832.069351Z-H64ade170-P00008b60","thread":"main","time":"2025-09-25T13:08:32.174862Z","file":"read-cache.c","line":1609,"t_abs":0.109685,"t_rel":0.001079,"nesting":2,"category":"index","key":"refresh/sum_scan","value":"0"}
{"event":"region_leave","sid":"20250925T130832.069351Z-H64ade170-P00008b60","thread":"main","time":"2025-09-25T13:08:32.174862Z","file":"read-cache.c","line":1610,"t_rel":0.001083,"nesting":1,"category":"index","label":"refresh"}
09:08:32.174862 run-command.c:741 child_start[0] git stash create
{"event":"child_start","sid":"20250925T130832.069351Z-H64ade170-P00008b60","thread":"main","time":"2025-09-25T13:08:32.174862Z","file":"run-command.c","line":741,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","stash","create"]}
09:08:32.191691 common-init.c:57 version 2.51.0.windows.1
{"event":"version","sid":"20250925T130832.069351Z-H64ade170-P00008b60/20250925T130832.188496Z-H64ade170-P000084a4","thread":"main","time":"2025-09-25T13:08:32.191691Z","file":"common-init.c","line":57,"evt":"4","exe":"2.51.0.windows.1"}
09:08:32.191691 common-init.c:58 start git stash create
{"event":"start","sid":"20250925T130832.069351Z-H64ade170-P00008b60/20250925T130832.188496Z-H64ade170-P000084a4","thread":"main","time":"2025-09-25T13:08:32.191691Z","file":"common-init.c","line":58,"t_abs":0.009285,"argv":["git","stash","create"]}
{"event":"data_json","sid":"20250925T130832.069351Z-H64ade170-P00008b60/20250925T130832.188496Z-H64ade170-P000084a4","thread":"main","time":"2025-09-25T13:08:32.203536Z","file":"compat/win32/trace2_win32_process_info.c","line":122,"repo":0,"t_abs":0.020641,"t_rel":0.020641,"nesting":1,"category":"process","key":"windows/ancestry","value":["git.exe","bash.exe","bash.exe"]}
09:08:32.204521 repository.c:242 worktree C:/git/base-trunk
{"event":"def_repo","sid":"20250925T130832.069351Z-H64ade170-P00008b60/20250925T130832.188496Z-H64ade170-P000084a4","thread":"main","time":"2025-09-25T13:08:32.204521Z","file":"repository.c","line":242,"repo":1,"worktree":"C:/git/base-trunk"}
09:08:32.204521 git.c:477 cmd_name stash (merge/stash)
{"event":"cmd_name","sid":"20250925T130832.069351Z-H64ade170-P00008b60/20250925T130832.188496Z-H64ade170-P000084a4","thread":"main","time":"2025-09-25T13:08:32.204521Z","file":"git.c","line":477,"name":"stash","hierarchy":"merge/stash"}
{"event":"region_enter","sid":"20250925T130832.069351Z-H64ade170-P00008b60/20250925T130832.188496Z-H64ade170-P000084a4","thread":"main","time":"2025-09-25T13:08:32.205509Z","file":"read-cache.c","line":2370,"repo":1,"nesting":1,"category":"index","label":"do_read_index","msg":".git/index"}
{"event":"region_enter","sid":"20250925T130832.069351Z-H64ade170-P00008b60/20250925T130832.188496Z-H64ade170-P000084a4","thread":"main","time":"2025-09-25T13:08:32.214396Z","file":"cache-tree.c","line":643,"repo":1,"nesting":2,"category":"cache_tree","label":"read"}
{"event":"region_leave","sid":"20250925T130832.069351Z-H64ade170-P00008b60/20250925T130832.188496Z-H64ade170-P000084a4","thread":"main","time":"2025-09-25T13:08:32.216366Z","file":"cache-tree.c","line":645,"repo":1,"t_rel":0.001983,"nesting":2,"category":"cache_tree","label":"read"}
{"event":"data","sid":"20250925T130832.069351Z-H64ade170-P00008b60/20250925T130832.188496Z-H64ade170-P000084a4","thread":"main","time":"2025-09-25T13:08:32.217351Z","file":"read-cache.c","line":2319,"repo":1,"t_abs":0.035022,"t_rel":0.012687,"nesting":2,"category":"index","key":"read/version","value":"2"}
{"event":"data","sid":"20250925T130832.069351Z-H64ade170-P00008b60/20250925T130832.188496Z-H64ade170-P000084a4","thread":"main","time":"2025-09-25T13:08:32.217351Z","file":"read-cache.c","line":2321,"repo":1,"t_abs":0.035033,"t_rel":0.012698,"nesting":2,"category":"index","key":"read/cache_nr","value":"121152"}
{"event":"region_leave","sid":"20250925T130832.069351Z-H64ade170-P00008b60/20250925T130832.188496Z-H64ade170-P000084a4","thread":"main","time":"2025-09-25T13:08:32.217351Z","file":"read-cache.c","line":2375,"repo":1,"t_rel":0.012705,"nesting":1,"category":"index","label":"do_read_index","msg":".git/index"}
{"event":"region_enter","sid":"20250925T130832.069351Z-H64ade170-P00008b60/20250925T130832.188496Z-H64ade170-P000084a4","thread":"main","time":"2025-09-25T13:08:32.218854Z","file":"unpack-trees.c","line":1907,"repo":1,"nesting":1,"category":"unpack_trees","label":"unpack_trees"}
{"event":"region_enter","sid":"20250925T130832.069351Z-H64ade170-P00008b60/20250925T130832.188496Z-H64ade170-P000084a4","thread":"main","time":"2025-09-25T13:08:32.219848Z","file":"unpack-trees.c","line":2011,"repo":1,"nesting":2,"category":"unpack_trees","label":"traverse_trees"}
{"event":"region_leave","sid":"20250925T130832.069351Z-H64ade170-P00008b60/20250925T130832.188496Z-H64ade170-P000084a4","thread":"main","time":"2025-09-25T13:08:32.219848Z","file":"unpack-trees.c","line":2013,"repo":1,"t_rel":0.000022,"nesting":2,"category":"unpack_trees","label":"traverse_trees"}
{"event":"region_leave","sid":"20250925T130832.069351Z-H64ade170-P00008b60/20250925T130832.188496Z-H64ade170-P000084a4","thread":"main","time":"2025-09-25T13:08:32.219848Z","file":"unpack-trees.c","line":2110,"repo":1,"t_rel":0.001352,"nesting":1,"category":"unpack_trees","label":"unpack_trees"}
{"event":"region_enter","sid":"20250925T130832.069351Z-H64ade170-P00008b60/20250925T130832.188496Z-H64ade170-P000084a4","thread":"main","time":"2025-09-25T13:08:32.457547Z","file":"preload-index.c","line":132,"nesting":1,"category":"index","label":"preload"}
{"event":"data","sid":"20250925T130832.069351Z-H64ade170-P00008b60/20250925T130832.188496Z-H64ade170-P000084a4","thread":"main","time":"2025-09-25T13:08:32.514919Z","file":"preload-index.c","line":182,"t_abs":0.331630,"t_rel":0.057380,"nesting":2,"category":"index","key":"preload/sum_lstat","value":"106067"}
{"event":"region_leave","sid":"20250925T130832.069351Z-H64ade170-P00008b60/20250925T130832.188496Z-H64ade170-P000084a4","thread":"main","time":"2025-09-25T13:08:32.514919Z","file":"preload-index.c","line":183,"t_rel":0.057450,"nesting":1,"category":"index","label":"preload"}
{"event":"region_enter","sid":"20250925T130832.069351Z-H64ade170-P00008b60/20250925T130832.188496Z-H64ade170-P000084a4","thread":"main","time":"2025-09-25T13:08:32.514919Z","file":"preload-index.c","line":132,"nesting":1,"category":"index","label":"preload"}
{"event":"data","sid":"20250925T130832.069351Z-H64ade170-P00008b60/20250925T130832.188496Z-H64ade170-P000084a4","thread":"main","time":"2025-09-25T13:08:32.516956Z","file":"preload-index.c","line":182,"t_abs":0.334201,"t_rel":0.002185,"nesting":2,"category":"index","key":"preload/sum_lstat","value":"0"}
{"event":"region_leave","sid":"20250925T130832.069351Z-H64ade170-P00008b60/20250925T130832.188496Z-H64ade170-P000084a4","thread":"main","time":"2025-09-25T13:08:32.516956Z","file":"preload-index.c","line":183,"t_rel":0.002202,"nesting":1,"category":"index","label":"preload"}
{"event":"region_enter","sid":"20250925T130832.069351Z-H64ade170-P00008b60/20250925T130832.188496Z-H64ade170-P000084a4","thread":"main","time":"2025-09-25T13:08:32.516956Z","file":"read-cache.c","line":1526,"nesting":1,"category":"index","label":"refresh"}
{"event":"data","sid":"20250925T130832.069351Z-H64ade170-P00008b60/20250925T130832.188496Z-H64ade170-P000084a4","thread":"main","time":"2025-09-25T13:08:32.518322Z","file":"read-cache.c","line":1608,"t_abs":0.335297,"t_rel":0.001074,"nesting":2,"category":"index","key":"refresh/sum_lstat","value":"0"}
{"event":"data","sid":"20250925T130832.069351Z-H64ade170-P00008b60/20250925T130832.188496Z-H64ade170-P000084a4","thread":"main","time":"2025-09-25T13:08:32.518322Z","file":"read-cache.c","line":1609,"t_abs":0.335307,"t_rel":0.001084,"nesting":2,"category":"index","key":"refresh/sum_scan","value":"0"}
{"event":"region_leave","sid":"20250925T130832.069351Z-H64ade170-P00008b60/20250925T130832.188496Z-H64ade170-P000084a4","thread":"main","time":"2025-09-25T13:08:32.518322Z","file":"read-cache.c","line":1610,"t_rel":0.001088,"nesting":1,"category":"index","label":"refresh"}
{"event":"region_enter","sid":"20250925T130832.069351Z-H64ade170-P00008b60/20250925T130832.188496Z-H64ade170-P000084a4","thread":"main","time":"2025-09-25T13:08:32.518322Z","file":"read-cache.c","line":3152,"repo":1,"nesting":1,"category":"index","label":"do_write_index","msg":"C:/git/base-trunk/.git/index.lock"}
{"event":"region_enter","sid":"20250925T130832.069351Z-H64ade170-P00008b60/20250925T130832.188496Z-H64ade170-P000084a4","thread":"main","time":"2025-09-25T13:08:32.547551Z","file":"cache-tree.c","line":546,"repo":1,"nesting":2,"category":"cache_tree","label":"write"}
{"event":"region_leave","sid":"20250925T130832.069351Z-H64ade170-P00008b60/20250925T130832.188496Z-H64ade170-P000084a4","thread":"main","time":"2025-09-25T13:08:32.549498Z","file":"cache-tree.c","line":548,"repo":1,"t_rel":0.002315,"nesting":2,"category":"cache_tree","label":"write"}
{"event":"data","sid":"20250925T130832.069351Z-H64ade170-P00008b60/20250925T130832.188496Z-H64ade170-P000084a4","thread":"main","time":"2025-09-25T13:08:32.550471Z","file":"read-cache.c","line":3104,"repo":1,"t_abs":0.367736,"t_rel":0.032354,"nesting":2,"category":"index","key":"write/version","value":"2"}
{"event":"data","sid":"20250925T130832.069351Z-H64ade170-P00008b60/20250925T130832.188496Z-H64ade170-P000084a4","thread":"main","time":"2025-09-25T13:08:32.550471Z","file":"read-cache.c","line":3106,"repo":1,"t_abs":0.367747,"t_rel":0.032365,"nesting":2,"category":"index","key":"write/cache_nr","value":"121152"}
{"event":"region_leave","sid":"20250925T130832.069351Z-H64ade170-P00008b60/20250925T130832.188496Z-H64ade170-P000084a4","thread":"main","time":"2025-09-25T13:08:32.550471Z","file":"read-cache.c","line":3155,"repo":1,"t_rel":0.032369,"nesting":1,"category":"index","label":"do_write_index","msg":"C:/git/base-trunk/.git/index.lock"}
{"event":"region_enter","sid":"20250925T130832.069351Z-H64ade170-P00008b60/20250925T130832.188496Z-H64ade170-P000084a4","thread":"main","time":"2025-09-25T13:08:32.552418Z","file":"unpack-trees.c","line":1907,"repo":1,"nesting":1,"category":"unpack_trees","label":"unpack_trees"}
{"event":"region_enter","sid":"20250925T130832.069351Z-H64ade170-P00008b60/20250925T130832.188496Z-H64ade170-P000084a4","thread":"main","time":"2025-09-25T13:08:32.553392Z","file":"unpack-trees.c","line":2011,"repo":1,"nesting":2,"category":"unpack_trees","label":"traverse_trees"}
{"event":"region_leave","sid":"20250925T130832.069351Z-H64ade170-P00008b60/20250925T130832.188496Z-H64ade170-P000084a4","thread":"main","time":"2025-09-25T13:08:32.553392Z","file":"unpack-trees.c","line":2013,"repo":1,"t_rel":0.000011,"nesting":2,"category":"unpack_trees","label":"traverse_trees"}
{"event":"region_leave","sid":"20250925T130832.069351Z-H64ade170-P00008b60/20250925T130832.188496Z-H64ade170-P000084a4","thread":"main","time":"2025-09-25T13:08:32.554365Z","file":"unpack-trees.c","line":2110,"repo":1,"t_rel":0.001198,"nesting":1,"category":"unpack_trees","label":"unpack_trees"}
{"event":"data_json","sid":"20250925T130832.069351Z-H64ade170-P00008b60/20250925T130832.188496Z-H64ade170-P000084a4","thread":"main","time":"2025-09-25T13:08:32.555339Z","file":"compat/win32/trace2_win32_process_info.c","line":170,"repo":1,"t_abs":0.372402,"t_rel":0.372402,"nesting":1,"category":"process","key":"windows/memory","value":{"PageFaultCount":30184,"PeakWorkingSetSize":84586496,"PeakPagefileUsage":130809856}}
09:08:32.555339 git.c:750 exit elapsed:0.372412 code:1
{"event":"exit","sid":"20250925T130832.069351Z-H64ade170-P00008b60/20250925T130832.188496Z-H64ade170-P000084a4","thread":"main","time":"2025-09-25T13:08:32.555339Z","file":"git.c","line":750,"t_abs":0.372412,"code":1}
{"event":"data_json","sid":"20250925T130832.069351Z-H64ade170-P00008b60/20250925T130832.188496Z-H64ade170-P000084a4","thread":"main","time":"2025-09-25T13:08:32.555339Z","file":"tree-walk.c","line":186,"repo":1,"t_abs":0.372424,"t_rel":0.372424,"nesting":1,"category":"traverse_trees","key":"statistics","value":{"traverse_trees_count":2,"traverse_trees_max_depth":1}}
09:08:32.555339 trace2/tr2_tgt_normal.c:128 atexit elapsed:0.372429 code:1
{"event":"atexit","sid":"20250925T130832.069351Z-H64ade170-P00008b60/20250925T130832.188496Z-H64ade170-P000084a4","thread":"main","time":"2025-09-25T13:08:32.555339Z","file":"trace2/tr2_tgt_event.c","line":207,"t_abs":0.372429,"code":1}
09:08:32.562354 run-command.c:997 child_exit[0] pid:33956 code:1 elapsed:0.387172
{"event":"child_exit","sid":"20250925T130832.069351Z-H64ade170-P00008b60","thread":"main","time":"2025-09-25T13:08:32.562354Z","file":"run-command.c","line":997,"child_id":0,"pid":33956,"code":1,"t_rel":0.387172}
09:08:32.562354 usage.c:72 error stash failed
{"event":"error","sid":"20250925T130832.069351Z-H64ade170-P00008b60","thread":"main","time":"2025-09-25T13:08:32.562354Z","file":"usage.c","line":72,"msg":"stash failed","fmt":"stash failed"}
fatal: stash failed
{"event":"data_json","sid":"20250925T130832.069351Z-H64ade170-P00008b60","thread":"main","time":"2025-09-25T13:08:32.562354Z","file":"compat/win32/trace2_win32_process_info.c","line":170,"repo":1,"t_abs":0.497864,"t_rel":0.497864,"nesting":1,"category":"process","key":"windows/memory","value":{"PageFaultCount":30930,"PeakWorkingSetSize":82518016,"PeakPagefileUsage":127516672}}
09:08:32.562354 usage.c:86 exit elapsed:0.497876 code:128
{"event":"exit","sid":"20250925T130832.069351Z-H64ade170-P00008b60","thread":"main","time":"2025-09-25T13:08:32.562354Z","file":"usage.c","line":86,"t_abs":0.497876,"code":128}
09:08:32.562354 trace2/tr2_tgt_normal.c:128 atexit elapsed:0.497885 code:128
{"event":"atexit","sid":"20250925T130832.069351Z-H64ade170-P00008b60","thread":"main","time":"2025-09-25T13:08:32.562354Z","file":"trace2/tr2_tgt_event.c","line":207,"t_abs":0.497885,"code":128}
[-- Attachment #4: git-bugreport-2025-09-25-0911.txt --]
[-- Type: text/plain, Size: 2042 bytes --]
Thank you for filling out a Git bug report!
Please answer the following questions to help us understand your issue.
What did you do before the bug happened? (Steps to reproduce your issue)
1. Created repository using git p4 (master, only initial import)
2. Created branch "base-trunk-1"
3. Cloned this repository to Linux, "base-trunk-1" branch only
4. Updated the file in the working tree, made a commit
5. Did "git push" to push the changes to the base-trunk-1 branch of the repository on Windows
Can see it there just fine.
6. On Windows, while having master checked out, attempted "git merge --no-ff base-trunk-1"
What did you expect to happen? (Expected behavior)
Merge succeedes, creating a new commit.
What happened instead? (Actual behavior)
Operation failed producing "fatal: stash failed" error
What's different between what you expected and what actually happened?
Well, the difference is that it doesn't work :-)
Anything else you want to add:
1. I tired this a couple of times, for the same p4 depot, making things from the scratch,
always reproducible.
2. "git merge base-trunk-1" succeeds (does actual rebase)
3. I tried this from another p4 depot, works fine.
The p4 depot where it fails is much bigger comparing to the one that is succeeds.
4. I tried to clone the original repository locally on Windows, modified file on branch there,
created commit, merged it the same way to master (all in clone) - everything is fine.
[System Info]
git version:
git version 2.51.0.windows.1
cpu: x86_64
built from commit: 4d21a77b98af5cf479d8b6f863c2aa94257cd4e1
sizeof-long: 4
sizeof-size_t: 8
shell-path: D:/git-sdk-64-build-installers/usr/bin/sh
feature: fsmonitor--daemon
libcurl: 8.15.0
OpenSSL: OpenSSL 3.2.4 11 Feb 2025
zlib: 1.3.1
SHA-1: SHA1_DC
SHA-256: SHA256_BLK
default-ref-format: files
default-hash: sha1
uname: Windows 10.0 26100
compiler info: gnuc: 15.2
libc info: no libc information available
$SHELL (typically, interactive shell): C:\Program Files\Git\usr\bin\bash.exe
[Enabled Hooks]
next reply other threads:[~2025-09-25 13:31 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-25 13:31 Nikolay Shustov [this message]
2025-09-25 14:30 ` git merge --no-ff failure Nikolay Shustov
2025-09-26 9:55 ` Johannes Schindelin
2025-09-26 14:03 ` Nikolay Shustov
2025-09-26 17:41 ` Eric Sunshine
[not found] ` <CAEcERAxiuSAvpPCzsWSpoNQRmbgF0B92augTVgSqNN1jb7mJYA@mail.gmail.com>
2025-09-28 2:34 ` Nikolay Shustov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5cbb5c0a-4c51-4d15-816d-6d7d4fdf4fe1@gmail.com \
--to=nikolay.shustov@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox