From: Harris, James R <james.r.harris at intel.com>
To: spdk@lists.01.org
Subject: Re: [SPDK] Git submodule dirty
Date: Tue, 07 Aug 2018 15:59:50 +0000 [thread overview]
Message-ID: <CF95400D-93D0-4141-B05A-285BE5B226AE@intel.com> (raw)
In-Reply-To: 3A48112D-8CE3-4970-81C1-C687DE713701@netapp.com
[-- Attachment #1: Type: text/plain, Size: 3469 bytes --]
Hi John,
We could also try changing the Vagrant script to use -l which should preserve the symlink.
Jim
Sent from my iPhone
On Aug 7, 2018, at 8:02 AM, Meneghini, John <John.Meneghini(a)netapp.com<mailto:John.Meneghini(a)netapp.com>> wrote:
I think Jim Harris was correct.
The problem came from the rsync of my spdk repository. This rsync is done by the vagrant script that creates my VM.
The solution to the problem is to remove the submodule directories from the SPDK repository on my MacBook.
> git submodule deinit –all
There is no need to keep the spdk submodules initialized on my MacBook.
/John
From: SPDK <spdk-bounces(a)lists.01.org<mailto:spdk-bounces(a)lists.01.org>> on behalf of "Luse, Paul E" <paul.e.luse(a)intel.com<mailto:paul.e.luse(a)intel.com>>
Reply-To: Storage Performance Development Kit <spdk(a)lists.01.org<mailto:spdk(a)lists.01.org>>
Date: Tuesday, August 7, 2018 at 10:48 AM
To: Storage Performance Development Kit <spdk(a)lists.01.org<mailto:spdk(a)lists.01.org>>
Subject: Re: [SPDK] Git submodule dirty
Or, on your local branch, you can try “git submodule sync” then the cmd below… Seth passed that tip on to me once and it worked great
Thx
Paul
From: SPDK [mailto:spdk-bounces(a)lists.01.org] On Behalf Of John Barnard
Sent: Tuesday, August 7, 2018 7:40 AM
To: Storage Performance Development Kit <spdk(a)lists.01.org<mailto:spdk(a)lists.01.org>>
Subject: Re: [SPDK] Git submodule dirty
I saw that last week after I updated one of my branches to the master. I did a "git submodule update" and it went away.
-John Barnard
On Tue, Aug 7, 2018 at 7:16 AM, John Meneghini <john.a.meneghini(a)gmail.com<mailto:john.a.meneghini(a)gmail.com>> wrote:
Has anyone seen this problem before?
After updating the master branch I see that my dpdk submodule is dirty.
Fedora:vagrant:spdk(vagrant_hugepgs) > git status
On branch vagrant_hugepgs
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)
(commit or discard the untracked or modified content in submodules)
modified: dpdk (modified content)
no changes added to commit (use "git add" and/or "git commit -a")
Fedora:vagrant:spdk(vagrant_hugepgs) > git diff
diff --git a/dpdk b/dpdk
--- a/dpdk
+++ b/dpdk
@@ -1 +1 @@
-Subproject commit b6ae5bcff6ca09a7e1536eaa449aa6f4e704a6d9
+Subproject commit b6ae5bcff6ca09a7e1536eaa449aa6f4e704a6d9-dirty
Fedora:vagrant:spdk(vagrant_hugepgs) > cd dpdk
Fedora:vagrant:dpdk((b6ae5bcff...)) > git status
HEAD detached at b6ae5bcff
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)
typechange: app/test-bbdev/turbo_dec_default.data
typechange: app/test-bbdev/turbo_enc_default.data
More at:
https://stackoverflow.com/questions/4873980/git-diff-says-subproject-is-dirty
John Meneghini
john.a.meneghini(a)gmail.com<mailto:john.a.meneghini(a)gmail.com>
_______________________________________________
SPDK mailing list
SPDK(a)lists.01.org<mailto:SPDK(a)lists.01.org>
https://lists.01.org/mailman/listinfo/spdk
_______________________________________________
SPDK mailing list
SPDK(a)lists.01.org<mailto:SPDK(a)lists.01.org>
https://lists.01.org/mailman/listinfo/spdk
[-- Attachment #2: attachment.html --]
[-- Type: text/html, Size: 11718 bytes --]
next reply other threads:[~2018-08-07 15:59 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-07 15:59 Harris, James R [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-08-07 15:00 [SPDK] Git submodule dirty Meneghini, John
2018-08-07 14:48 Luse, Paul E
2018-08-07 14:40 John Barnard
2018-08-07 14:32 Harris, James R
2018-08-07 14:16 John Meneghini
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=CF95400D-93D0-4141-B05A-285BE5B226AE@intel.com \
--to=spdk@lists.01.org \
/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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox