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

Re: how are "untracked working tree files" even possible in this case?

From
G. Sylvie Davies <sylvie@bit-booster.com>
Date
Feb 15, 2017, 20:44 UTC
Message-ID
<CAAj3zPz7swme+fXXyWhhObk8u+8TL2A_QLR-uHkMhGzAWUFCow@mail.gmail.com>
In-Reply-To
<CAAj3zPyz8m3nGC_897k9SJOmfqvC2VczxFyphabkDho34nuPUw@mail.gmail.com>

On Wed, Feb 15, 2017 at 12:38 PM, G. Sylvie Davies <sylvie@bit-booster.com> wrote:

Show 41 quoted lines
> On Wed, Feb 15, 2017 at 12:36 PM, G. Sylvie Davies
> <sylvie@bit-booster.com> wrote:
>> Hi,
>>
>> I have a script that runs the following sequence of commands within a clone:
>>
>> -----
>> /usr/bin/git rebase --abort (took 148ms)
>> /usr/bin/git cherry-pick --abort (took 103ms)
>> /usr/bin/git clean -d -f -x (took 2007ms)
>> /usr/bin/git reflog expire --expire=now --all (took 106ms)
>> /usr/bin/git reset --hard --quiet
>> 181def85d58597dfb28729029b2ad76b9fbb09f5 -- (took 60103ms)
>> /usr/bin/git merge --squash 333def1a1513f84c1eb79e5341ed6ebca0d359a1
>> (took 1795ms)
>> Err: '/usr/bin/git merge --squash 333def1a1513f84c1eb79e5341ed6ebca0d359a1'
>> Exit=128
>> error: The following untracked working tree files would be overwritten by merge:
>> .gitignore
>>
>> [...many more files...]
>>
>> Please move or remove them before you can merge.
>> Aborting
>> -----
>>
>>
>> I don't understand how untracked working tree files are possible after
>> "git clean -d -f -x" and "git reset --hard" !
>>
>> I don't have access to this particular repo, but it's around 30GB when
>> cloned (git directory plus working tree), and around 500,000 files in
>> the working tree when checked out.  Note:  the "reset --hard" takes 60
>> seconds here.
>>
>>
>
> p.s.  environment is:  Git-2.7.4 / Bitbucket-4.10.1 /
> Linux-4.4.0-59-generic (amd64)
>
>

Also, one of the "untracked files" that shows up is called ".gitmodules". Could submodules be causing this? (I have no experience with submodules).

>>
>>
>> - Sylvie
Previous: G. Sylvie DaviesNext: Stefan Beller
Message 3 of 4 in “how are "untracked working tree files" even possible in this case?”
  1. G. Sylvie DaviesFeb 15, 2017
  2. G. Sylvie DaviesFeb 15, 2017
  3. G. Sylvie DaviesFeb 15, 2017
  4. Stefan BellerFeb 15, 2017

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.