All of lore.kernel.org
 help / color / mirror / Atom feed
* Git Ignore Exception bug
@ 2016-09-09 21:39 Nathan Williams
  2016-09-14 11:26 ` Dennis Kaarsemaker
  0 siblings, 1 reply; 2+ messages in thread
From: Nathan Williams @ 2016-09-09 21:39 UTC (permalink / raw)
  To: git; +Cc: Eric Severtson

it ignore doesn't seem to be working properly when adding exceptions.

Environment:

Mac, running latest El Capitan (10.11.6)

% git --version
git version 2.9.0

-----------cut here-------------
#!/bin/sh
TEMP=mktemp

# Create a temporary repo
mkdir repo
cd repo

git init

echo "foo/*" >> .gitignore
echo "!foo/bar" >> .gitignore
git add .gitignore
git commit -m "Ignore file with exceptions"

# Create the directory structure
mkdir foo
mkdir foo/bar

# Create files to be ignored
touch foo/1
touch foo/2

# Create files that should be identified
touch foo/bar/a
touch foo/bar/b

# Should ignore foo and indicate that all the files in foo/bar are un-committed
git status

# Move back to the regular directory
cd ..
-----------cut here-------------

Expected results
% git st
On branch master
Untracked files:
  (use "git add <file>..." to include in what will be committed)

        foo/bar/


Nate

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

* Re: Git Ignore Exception bug
  2016-09-09 21:39 Git Ignore Exception bug Nathan Williams
@ 2016-09-14 11:26 ` Dennis Kaarsemaker
  0 siblings, 0 replies; 2+ messages in thread
From: Dennis Kaarsemaker @ 2016-09-14 11:26 UTC (permalink / raw)
  To: Nathan Williams, git; +Cc: Eric Severtson

On vr, 2016-09-09 at 15:39 -0600, Nathan Williams wrote:
> it ignore doesn't seem to be working properly when adding exceptions.

>8 -- snip testcase

> Expected results
> % git st
> On branch master
> Untracked files:
>   (use "git add <file>..." to include in what will be committed)
> 
>         foo/bar/

That expectation is wrong, it should show foo/. And indeed it does
(tested with 2.9.0 and 2.10.0-rc1)

$ sh -x testscript
+ rm -rf repo
+ mkdir repo
+ cd repo
+ git init
Initialized empty Git repository in /home/dennis/code/git/repo/.git/
+ echo foo/*
+ echo !foo/bar
+ git add .gitignore
+ git commit -m Ignore file with exceptions
[master (root-commit) 7e1b82a] Ignore file with exceptions
 1 file changed, 2 insertions(+)
 create mode 100644 .gitignore
+ mkdir foo
+ mkdir foo/bar
+ touch foo/1
+ touch foo/2
+ touch foo/bar/a
+ touch foo/bar/b
+ git status
On branch master
Untracked files:
  (use "git add <file>..." to include in what will be committed)

	foo/

nothing added to commit but untracked files present (use "git add" to track)
-- 
Dennis Kaarsemaker
http://www.kaarsemaker.net



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

end of thread, other threads:[~2016-09-14 11:26 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-09-09 21:39 Git Ignore Exception bug Nathan Williams
2016-09-14 11:26 ` Dennis Kaarsemaker

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.