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
