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

Re: v1.7.0-rc0 shows lots of "unable to find <sha1>" on git-stash

From
Jonathan del Strother <maillist@steelskies.com>
Date
Jan 31, 2010, 19:21 UTC
Message-ID
<57518fd11001311121wf749cf3nd2b7ae55f3ea2e61@mail.gmail.com>
In-Reply-To
<57518fd11001311116t1bde882dub1dd3ca4af201b2e@mail.gmail.com>
On 31 January 2010 19:16, Jonathan del Strother <maillist@steelskies.com> wrote:
Show 73 quoted lines
> 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 :)

Previous: Jonathan del StrotherNext: Junio C Hamano
Message 11 of 13 in “v1.7.0-rc0 shows lots of "unable to find <sha1>" on git-stash”
  1. Jonathan del StrotherJan 29, 2010
  2. Jonathan del StrotherJan 30, 2010
  3. Jens LehmannJan 30, 2010
  4. Jonathan del StrotherJan 30, 2010
  5. Jens LehmannJan 30, 2010
  6. Jonathan del StrotherJan 30, 2010
  7. Junio C HamanoJan 30, 2010
  8. Junio C HamanoJan 30, 2010
  9. is_submodule_modified(): fix breakage with external GIT_INDEX_FILEJunio C Hamano, Jan 30, 2010
  10. Jonathan del StrotherJan 31, 2010
  11. Jonathan del StrotherJan 31, 2010
  12. Junio C HamanoJan 31, 2010
  13. Jens LehmannJan 30, 2010

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.