git/list[1] front-page[2] threads[3] people[4] search[5] about
 

stgit: lost all my patches again

From
Jon Smirl <jonsmirl@gmail.com>
Date
Oct 4, 2007, 05:29 UTC
Message-ID
<9e4733910710032229m38fb4e47k5aa0b2b2e0eb2251@mail.gmail.com>
I believe this command did it:
stg refresh -p pcm030_bsp_powerpc -e

that patch whitespace errors in it I edited the description and removed the last line it was 10th patch down in the stack

for some reason the refresh from that command didn't close. Then stg pushed all the patches back after the edit and they got included into that patch.

stg should definitely have an assert that the previous patch is closed before auto pushing. There is a bug somewhere that caused that edit refresh not to get closed.

I am using stg version: 5ae6fcce77a29221e15f6a4e8348bd4276960ba1

It might also be good to make a log that lets me rollback commands. All of the info is still in the system.

This refresh failed to close: jonsmirl@terra:~/mpc5200b$ stg log pcm030_bsp_powerpc 95a8e03b [push ] Thu Oct 4 00:27:53 2007 -0400 6094a0a5 [refresh] Thu Oct 4 00:00:41 2007 -0400 0c4f5480 [push(f)] Wed Oct 3 22:10:38 2007 -0400 9a685ae9 [push(f)] Wed Oct 3 22:05:47 2007 -0400

This push ended up in the bsp patch: jonsmirl@terra:~/mpc5200b$ stg log mpc52xx_restart 801962ed [push ] Thu Oct 4 00:33:42 2007 -0400 9e0c7417 [push ] Thu Oct 4 00:27:53 2007 -0400 37822491 [push ] Thu Oct 4 00:00:41 2007 -0400 9aff07ff [push(f)] Wed Oct 3 22:10:38 2007 -0400 c41c9cb3 [push(f)] Wed Oct 3 22:05:47 2007 -0400

and so one for nine more patches. The ten messed up patches still have their descriptions, the are just missing the changes.

---------------------------------
After an export stg puts the patches into patches-m25
Looking back in my command logs I had done:
  stg export
  cd patches-m25
  grep for some things
  stg refresh -p pcm030_bsp_powerpc -e

I did the 'stg refresh' from a directory that was not being tracked by git. It is in the .gitignore list. This appears to be the root of the problem.

-- 
Jon Smirl
jonsmirl@gmail.com
Next: Karl Hasselström
Message 1 of 7 in “stgit: lost all my patches again”
  1. Jon SmirlOct 4, 2007
  2. Karl HasselströmOct 4, 2007
  3. Jon SmirlOct 4, 2007
  4. Jon SmirlOct 4, 2007
  5. Karl HasselströmOct 4, 2007
  6. David BrownOct 4, 2007
  7. Karl HasselströmOct 4, 2007

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.