From: Luke Diamand <luke@diamand.org>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
Lars Schneider <larsxschneider@gmail.com>,
Miguel Torroja <miguel.torroja@gmail.com>,
Merland Romain <merlorom@yahoo.fr>,
George Vanburgh <gvanburgh@bloomberg.net>,
Luke Diamand <luke@diamand.org>
Subject: [PATCHv3 0/1] git-p4 unshelve
Date: Tue, 15 May 2018 11:01:28 +0100 [thread overview]
Message-ID: <20180515100129.1454-1-luke@diamand.org> (raw)
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 reply other threads:[~2018-05-15 10:01 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-15 10:01 Luke Diamand [this message]
2018-05-15 10:01 ` [PATCHv3 1/1] git-p4: add unshelve command Luke Diamand
2018-06-15 22:03 ` [PATCHv3 0/1] git-p4 unshelve Luke Diamand
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180515100129.1454-1-luke@diamand.org \
--to=luke@diamand.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=gvanburgh@bloomberg.net \
--cc=larsxschneider@gmail.com \
--cc=merlorom@yahoo.fr \
--cc=miguel.torroja@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).