Re: Git doesn't always add files to a commit (amend)

2016-07-04 Thread Duy Nguyen
On Mon, Jul 04, 2016 at 04:50:38PM +0300, Yuri Kanivetsky wrote:
> Hi,
> 
> When intent to add a directory is made (`git add -N`), and then
> contents of any but the first file is staged, `git commit -v --amend`
> doesn't add it to the commit

Oops, a bug since 2012. Thanks for the report. I know what's wrong and
will prepare a proper patch in a couple of hours.

> , see for yourself:
> 
> #!/usr/bin/env bash
> set -eu
> rm -rf 1
> mkdir 1
> cd 1
> git init
> echo 1 > 1 && git add 1 && git commit -m 1
> mkdir 2
> echo 2/1 > 2/1
> echo 2/2 > 2/2
> git add -N 2
> # git add 2/1   # this file is added
> git add 2/2   # as opposed to this one
> git commit --amend -m 1
> git --no-pager log -p
> git reset
> git --no-pager status
> 
> I'm running git-2.9.0.
> 
> Regards,
> Yuri
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majord...@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Git doesn't always add files to a commit (amend)

2016-07-04 Thread Yuri Kanivetsky
Hi,

When intent to add a directory is made (`git add -N`), and then
contents of any but the first file is staged, `git commit -v --amend`
doesn't add it to the commit, see for yourself:

#!/usr/bin/env bash
set -eu
rm -rf 1
mkdir 1
cd 1
git init
echo 1 > 1 && git add 1 && git commit -m 1
mkdir 2
echo 2/1 > 2/1
echo 2/2 > 2/2
git add -N 2
# git add 2/1   # this file is added
git add 2/2   # as opposed to this one
git commit --amend -m 1
git --no-pager log -p
git reset
git --no-pager status

I'm running git-2.9.0.

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