Some strange behavior of git

git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed

* Some strange behavior of git
@ 2016-02-24 22:43 Olga Pshenichnikova
  2016-02-24 22:57 ` Stefan Beller
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Olga Pshenichnikova @ 2016-02-24 22:43 UTC (permalink / raw)
  To: git

Hello,
we use git in our project.
What can be cause for further confusing behavior?

     git@ip5server:~$ git status
     On branch master
     Untracked files:
       (use "git add <file>..." to include in what will be committed)

         app/addons/arliteks/

     nothing added to commit but untracked files present (use "git add" 
to track)
     git@ip5server:~$ git clean -dn
     Would remove app/addons/arliteks/
     Would remove design/
     Would remove js/
     Would remove var/langs/en/

Why I don't see all 4 directories in first command?

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: Some strange behavior of git
  2016-02-24 22:43 Some strange behavior of git Olga Pshenichnikova
@ 2016-02-24 22:57 ` Stefan Beller
  2016-02-24 23:10 ` Randall S. Becker
  2016-02-25  9:57 ` Thomas Gummerer
  2 siblings, 0 replies; 6+ messages in thread
From: Stefan Beller @ 2016-02-24 22:57 UTC (permalink / raw)
  To: Olga Pshenichnikova; +Cc: git@vger.kernel.org

On Wed, Feb 24, 2016 at 2:43 PM, Olga Pshenichnikova <olga@ip-5.ru> wrote:
> Hello,
> we use git in our project.
> What can be cause for further confusing behavior?
>
>     git@ip5server:~$ git status
>     On branch master
>     Untracked files:
>       (use "git add <file>..." to include in what will be committed)
>
>         app/addons/arliteks/
>
>     nothing added to commit but untracked files present (use "git add" to
> track)
>     git@ip5server:~$ git clean -dn
>     Would remove app/addons/arliteks/
>     Would remove design/
>     Would remove js/
>     Would remove var/langs/en/
>
> Why I don't see all 4 directories in first command?

Look at the effects of the .gitignore file

https://git-scm.com/docs/gitignore

> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 6+ messages in thread

* RE: Some strange behavior of git
  2016-02-24 22:43 Some strange behavior of git Olga Pshenichnikova
  2016-02-24 22:57 ` Stefan Beller
@ 2016-02-24 23:10 ` Randall S. Becker
  2016-02-25  9:57 ` Thomas Gummerer
  2 siblings, 0 replies; 6+ messages in thread
From: Randall S. Becker @ 2016-02-24 23:10 UTC (permalink / raw)
  To: 'Olga Pshenichnikova', git

On February 24, 2016 5:43 PM, Olga Pshenichnikova wrote
> What can be cause for further confusing behavior?
> 
>      git@ip5server:~$ git status
>      On branch master
>      Untracked files:
>        (use "git add <file>..." to include in what will be committed)
> 
>          app/addons/arliteks/
> 
>      nothing added to commit but untracked files present (use "git add"
> to track)
>      git@ip5server:~$ git clean -dn
>      Would remove app/addons/arliteks/
>      Would remove design/
>      Would remove js/
>      Would remove var/langs/en/
> 
> Why I don't see all 4 directories in first command?

What do your .gitignore files contain in this project?

Cheers,
Randall
-- Brief whoami: NonStop&UNIX developer since approximately UNIX(421664400)/NonStop(211288444200000000)
-- In my real life, I talk too much.

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: Some strange behavior of git
  2016-02-24 22:43 Some strange behavior of git Olga Pshenichnikova
  2016-02-24 22:57 ` Stefan Beller
  2016-02-24 23:10 ` Randall S. Becker
@ 2016-02-25  9:57 ` Thomas Gummerer
       [not found]   ` <56CED1F8.60601@ip-5.ru>
  2 siblings, 1 reply; 6+ messages in thread
From: Thomas Gummerer @ 2016-02-25  9:57 UTC (permalink / raw)
  To: Olga Pshenichnikova; +Cc: git

On 02/25, Olga Pshenichnikova wrote:
> Hello,
> we use git in our project.
> What can be cause for further confusing behavior?
>
>     git@ip5server:~$ git status
>     On branch master
>     Untracked files:
>       (use "git add <file>..." to include in what will be committed)
>
>         app/addons/arliteks/
>
>     nothing added to commit but untracked files present (use "git add" to
> track)
>     git@ip5server:~$ git clean -dn
>     Would remove app/addons/arliteks/
>     Would remove design/
>     Would remove js/
>     Would remove var/langs/en/
>
> Why I don't see all 4 directories in first command?

Are the design/, js/ and var/langs/en/ directories empty?  Git doesn't
track empty directories, so they won't show up in git status, but with
git clean -d you specify that Git should also remove untracked
directories, which is why you see them here.

> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

--
Thomas

^ permalink raw reply	[flat|nested] 6+ messages in thread

[parent not found: <56CED1F8.60601@ip-5.ru>]

* Re: Some strange behavior of git
       [not found]   ` <56CED1F8.60601@ip-5.ru>
@ 2016-02-25 16:14     ` Thomas Gummerer
  2016-02-25 16:43       ` Olga Pshenichnikova
  0 siblings, 1 reply; 6+ messages in thread
From: Thomas Gummerer @ 2016-02-25 16:14 UTC (permalink / raw)
  To: Olga Pshenichnikova; +Cc: git

[Please keep everyone cc'd in the conversation, especially the mailing
list.  I added it back for now.
Also please don't top post on the list]

On 02/25, Olga Pshenichnikova wrote:
> No, it isn't empty, but I found the problem.
> Problem was that I handled subdirectories structure in exclude file:
>
> design/dir1
> design/dir2
>
> But
>
> design/dir3 wasn't ignored and wasn't controlled.
>
> So, my problem take place when some sub directory both isn't ignored AND
> isn't controlled even if it isn't empty.

I think that's a bug, I think this directory should only be removed if
-x is given.  I haven't come up with a patch yet, but here's a test
demonstrating the failure.

diff --git a/t/t7300-clean.sh b/t/t7300-clean.sh
index 86ceb38..0961007 100755
--- a/t/t7300-clean.sh
+++ b/t/t7300-clean.sh
@@ -653,4 +653,13 @@ test_expect_success 'git clean -d respects pathspecs (pathspec is prefix of dir)
 	test_path_is_dir foobar
 '

+test_expect_failure 'git clean -d does not clean ignored files in subdir' '
+	mkdir -p sub/dir &&
+	>sub/dir/file &&
+	test_when_finished rm .gitignore &&
+	echo sub/dir/ >.gitignore &&
+	git clean -df sub &&
+	test_path_is_file sub/dir/file
+'
+
 test_done


> Thank you for response!

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: Some strange behavior of git
  2016-02-25 16:14     ` Thomas Gummerer
@ 2016-02-25 16:43       ` Olga Pshenichnikova
  0 siblings, 0 replies; 6+ messages in thread
From: Olga Pshenichnikova @ 2016-02-25 16:43 UTC (permalink / raw)
  To: Thomas Gummerer; +Cc: git

Thanx )

On 02/25/2016 07:14 PM, Thomas Gummerer wrote:
> [Please keep everyone cc'd in the conversation, especially the mailing
> list.  I added it back for now.
> Also please don't top post on the list]
>
> On 02/25, Olga Pshenichnikova wrote:
>> No, it isn't empty, but I found the problem.
>> Problem was that I handled subdirectories structure in exclude file:
>>
>> design/dir1
>> design/dir2
>>
>> But
>>
>> design/dir3 wasn't ignored and wasn't controlled.
>>
>> So, my problem take place when some sub directory both isn't ignored AND
>> isn't controlled even if it isn't empty.
> I think that's a bug, I think this directory should only be removed if
> -x is given.  I haven't come up with a patch yet, but here's a test
> demonstrating the failure.
>
> diff --git a/t/t7300-clean.sh b/t/t7300-clean.sh
> index 86ceb38..0961007 100755
> --- a/t/t7300-clean.sh
> +++ b/t/t7300-clean.sh
> @@ -653,4 +653,13 @@ test_expect_success 'git clean -d respects pathspecs (pathspec is prefix of dir)
>   	test_path_is_dir foobar
>   '
>
> +test_expect_failure 'git clean -d does not clean ignored files in subdir' '
> +	mkdir -p sub/dir &&
> +	>sub/dir/file &&
> +	test_when_finished rm .gitignore &&
> +	echo sub/dir/ >.gitignore &&
> +	git clean -df sub &&
> +	test_path_is_file sub/dir/file
> +'
> +
>   test_done
>
>
>> Thank you for response!

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2016-02-25 16:43 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-24 22:43 Some strange behavior of git Olga Pshenichnikova
2016-02-24 22:57 ` Stefan Beller
2016-02-24 23:10 ` Randall S. Becker
2016-02-25  9:57 ` Thomas Gummerer
     [not found]   ` <56CED1F8.60601@ip-5.ru>
2016-02-25 16:14     ` Thomas Gummerer
2016-02-25 16:43       ` Olga Pshenichnikova

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).