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

[PATCHv3 0/1] git-p4 unshelve

From
Luke Diamand <luke@diamand.org>
Date
May 15, 2018, 10:01 UTC
Message-ID
<20180515100129.1454-1-luke@diamand.org>

This is a git-p4 unshelve command which detects when extra changes are going to be included, and refuses to unhshelve.

As in my earlier unshelve change, this uses git fast-import to do the actual delta generation, but now checks to see if the files unshelved are based on the same revisions that fast-import will be using, using the revision numbers in the "p4 describe -S" command output. If they're different, it refuses to unshelve.

That makes it safe to use, rather than potentially generating deltas that contain bits from other changes.

I have added a test for this case.
Luke Diamand (1):
  git-p4: add unshelve command
 Documentation/git-p4.txt |  32 ++++++
 git-p4.py                | 207 ++++++++++++++++++++++++++++++++-------
 t/t9832-unshelve.sh      | 153 +++++++++++++++++++++++++++++
 3 files changed, 356 insertions(+), 36 deletions(-)
 create mode 100755 t/t9832-unshelve.sh
-- 
2.17.0.392.gdeb1a6e9b7
Next: Luke Diamand
Message 1 of 3 in “[PATCHv3 0/1] git-p4 unshelve”
  1. Luke DiamandMay 15, 2018
  2. 1/1 git-p4: add unshelve commandLuke Diamand, May 15, 2018
  3. Luke DiamandJun 15, 2018

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.