From: Jonathan del Strother <maillist@steelskies.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jens Lehmann <Jens.Lehmann@web.de>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: v1.7.0-rc0 shows lots of "unable to find <sha1>" on git-stash
Date: Sun, 31 Jan 2010 19:21:10 +0000 [thread overview]
Message-ID: <57518fd11001311121wf749cf3nd2b7ae55f3ea2e61@mail.gmail.com> (raw)
In-Reply-To: <57518fd11001311116t1bde882dub1dd3ca4af201b2e@mail.gmail.com>
On 31 January 2010 19:16, Jonathan del Strother <maillist@steelskies.com> wrote:
> On 30 January 2010 20:25, Junio C Hamano <gitster@pobox.com> wrote:
>> Junio C Hamano <gitster@pobox.com> writes:
>>
>>> Please try this.
>>
>> oops, but with this, too.
>>
>>> diff --git a/submodule.c b/submodule.c
>>> index ca0527f..8bd0a30 100644
>>> --- a/submodule.c
>>> +++ b/submodule.c
>>> ...
>>> @@ -142,7 +142,9 @@ int is_submodule_modified(const char *path)
>>> env[0] = strbuf_detach(&buf, NULL);
>>> strbuf_addf(&buf, "GIT_DIR=%s/.git", path);
>>> env[1] = strbuf_detach(&buf, NULL);
>>> - env[2] = NULL;
>>> + strbuf_addf(&buf, "GIT_INDEX_FILE=");
>>
>> This should be:
>>
>> strbuf_addf(&buf, "GIT_INDEX_FILE");
>>
>>> + env[2] = strbuf_detach(&buf, NULL);
>>> + env[3] = NULL;
>>>
>>> memset(&cp, 0, sizeof(cp));
>>> cp.argv = argv;
>>
>
> Sorry, I'm not sure I follow your amendment - it looks exactly like
> the patch you originally supplied?
>
> With that original patch applied, I no longer get the 'unable to find'
> errors on stashing. However, git-status shows all my submodules as
> being modified, but there appear to be no local changes :
>
> [jon@gir:Developer/AudioBooWeb]$ git status
> # On branch giterror
> # Changed but not updated:
> # (use "git add <file>..." to update what will be committed)
> # (use "git checkout -- <file>..." to discard changes in working directory)
> #
> # modified: shared/vendor/plugins/acts_as_list
> # modified: shared/vendor/plugins/cucumber
> # modified: shared/vendor/plugins/delayed_job
> # modified: shared/vendor/plugins/haml
> # modified: shared/vendor/plugins/hoptoad_notifier
> # modified: shared/vendor/plugins/machinist
> # modified: shared/vendor/plugins/newrelic_rpm
> # modified: shared/vendor/plugins/rspec
> # modified: shared/vendor/plugins/rspec-rails
> # modified: shared/vendor/rails
> #
> no changes added to commit (use "git add" and/or "git commit -a")
>
> [jon@gir:Developer/AudioBooWeb]$ git diff
> diff --git a/shared/vendor/plugins/acts_as_list
> b/shared/vendor/plugins/acts_as_list
> diff --git a/shared/vendor/plugins/cucumber b/shared/vendor/plugins/cucumber
> diff --git a/shared/vendor/plugins/delayed_job
> b/shared/vendor/plugins/delayed_job
> diff --git a/shared/vendor/plugins/haml b/shared/vendor/plugins/haml
> diff --git a/shared/vendor/plugins/hoptoad_notifier
> b/shared/vendor/plugins/hoptoad_notifier
> diff --git a/shared/vendor/plugins/machinist b/shared/vendor/plugins/machinist
> diff --git a/shared/vendor/plugins/newrelic_rpm
> b/shared/vendor/plugins/newrelic_rpm
> diff --git a/shared/vendor/plugins/rspec b/shared/vendor/plugins/rspec
> diff --git a/shared/vendor/plugins/rspec-rails
> b/shared/vendor/plugins/rspec-rails
> diff --git a/shared/vendor/rails b/shared/vendor/rails
>
... however, the latest version of master
(b0883aa6c77111e88496bd0afe073caf68ab9f99) gives me no errors, and
(correctly) doesn't show my submodules as being modified. I still
don't quite follow exactly what was wrong, but thanks :)
next prev parent reply other threads:[~2010-01-31 19:21 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-29 15:12 v1.7.0-rc0 shows lots of "unable to find <sha1>" on git-stash Jonathan del Strother
[not found] ` <7vzl3wiz59.fsf@alter.siamese.dyndns.org>
2010-01-30 0:46 ` Jonathan del Strother
2010-01-30 12:31 ` Jens Lehmann
2010-01-30 13:23 ` Jonathan del Strother
2010-01-30 14:10 ` Jens Lehmann
2010-01-30 16:36 ` Jonathan del Strother
2010-01-30 20:01 ` Junio C Hamano
2010-01-30 20:25 ` Junio C Hamano
2010-01-30 20:30 ` [PATCH] is_submodule_modified(): fix breakage with external GIT_INDEX_FILE Junio C Hamano
2010-01-31 19:16 ` v1.7.0-rc0 shows lots of "unable to find <sha1>" on git-stash Jonathan del Strother
2010-01-31 19:21 ` Jonathan del Strother [this message]
2010-01-31 19:21 ` Junio C Hamano
2010-01-30 20:44 ` Jens Lehmann
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=57518fd11001311121wf749cf3nd2b7ae55f3ea2e61@mail.gmail.com \
--to=maillist@steelskies.com \
--cc=Jens.Lehmann@web.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.
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 NNTP newsgroup(s).