Re: [git-users] git subtree add: Import only specified folder from remote git

2017-11-20 Thread Zvi Vered
Hi,

I tried:
git subtree split --prefix=windows 
and got:
adb5b0b26c0793db6cf86ee7647a4a649c2c7a8d

Then I tried to run : add+commit+push but got:
nothing to commit, working tree clean

What should be the next step ? 

Thank you,
Zvika 

On Monday, November 20, 2017 at 10:17:25 AM UTC+2, Konstantin Khomoutov 
wrote:
>
> On Sun, Nov 19, 2017 at 08:15:53PM -0800, Zvi Vered wrote: 
>
> > I'm using the following command to create subtree: 
> > git subtree add --prefix=DRV1 https://github.com/zviered/DRV1.git 
> master 
> > 
> > The repo https://github.com/zviered/DRV1.git contains few folders. 
> > I want my subtree to contain only one specified folder. 
> > 
> > Is it possible ? 
>
> Yes, but not in the way you tried it. 
>
> You first need to use the `git subtree split` command to prepare a 
> synthetic history conststing of commits which modified only the code 
> under that specific directly in DRV1. 
>
> Then you will be able to `git subtree add` that line of history. 
>
>

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.


Re: [git-users] Git on Windows marks file as "modified" even it has no changes

2017-11-20 Thread Philip Oakley
I think this is just a misunderstanding about how Git is working, which can be 
hard to appreciate at first.

Because Git has the Staging Area/Index (equivalent to an old style Out box for 
things that are Done but not yet filed) the act of adding the file makes it 
appear to go away.

In addition if the file simply has a change of modification dates then Git 
ignores that. As a version control system, the only date that matters is the 
date that it is 'committed' (i.e. approved) for storing in the respository. All 
other dates are transitory. This can also be unexpected, but is the norm for 
version systems (as opposed to say a Zip file).

Hope that helps in the understanding...

--
Philio
  - Original Message - 
  From: IL Ka 
  To: Git for human beings 
  Sent: Monday, November 20, 2017 2:06 PM
  Subject: [git-users] Git on Windows marks file as "modified" even it has no 
changes


  Hi all.
  I copied file from different folder over file in my repository. Contents are 
the same, only modification date differs.
  But file is marked as "changed". But when I "stage" it -- it simply 
disappears from list. 


  Modified:
  >git status | findstr flake8

  modified:   flake8_v3_plugin.py




  No diff:
  >git diff flake8_v3_plugin.py
  warning: LF will be replaced by CRLF in 
python/helpers/pycharm/teamcity/flake8_v3_plugin.py.
  The file will have its original line endings in your working directory.


  And after staging
  >git stage flake8_v3_plugin.py
  warning: LF will be replaced by CRLF in 
python/helpers/pycharm/teamcity/flake8_v3_plugin.py.
  The file will have its original line endings in your working directory.


  It disappeared
  >git status | findstr flake8


  Some kind of known issue, or should I report bug?


  Ilya.

  -- 
  You received this message because you are subscribed to the Google Groups 
"Git for human beings" group.
  To unsubscribe from this group and stop receiving emails from it, send an 
email to git-users+unsubscr...@googlegroups.com.
  For more options, visit https://groups.google.com/d/optout.

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.


Re: [git-users] git subtree add: Import only specified folder from remote git

2017-11-20 Thread Zvi Vered


On Monday, November 20, 2017 at 10:17:25 AM UTC+2, Konstantin Khomoutov 
wrote:
>
> On Sun, Nov 19, 2017 at 08:15:53PM -0800, Zvi Vered wrote: 
>
> > I'm using the following command to create subtree: 
> > git subtree add --prefix=DRV1 https://github.com/zviered/DRV1.git 
> master 
> > 
> > The repo https://github.com/zviered/DRV1.git contains few folders. 
> > I want my subtree to contain only one specified folder. 
> > 
> > Is it possible ? 
>
> Yes, but not in the way you tried it. 
>
> You first need to use the `git subtree split` command to prepare a 
> synthetic history conststing of commits which modified only the code 
> under that specific directly in DRV1. 
>
> Then you will be able to `git subtree add` that line of history. 
>
>

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.


[git-users] Git on Windows marks file as "modified" even it has no changes

2017-11-20 Thread IL Ka
Hi all.
I copied file from different folder over file in my repository. Contents 
are the same, only modification date differs.
But file is marked as "changed". But when I "stage" it -- it simply 
disappears from list. 

Modified:
>git status | findstr flake8
modified:   flake8_v3_plugin.py


No diff:
>git diff flake8_v3_plugin.py
warning: LF will be replaced by CRLF in 
python/helpers/pycharm/teamcity/flake8_v3_plugin.py.
The file will have its original line endings in your working directory.

And after staging
>git stage flake8_v3_plugin.py
warning: LF will be replaced by CRLF in 
python/helpers/pycharm/teamcity/flake8_v3_plugin.py.
The file will have its original line endings in your working directory.

It disappeared
>git status | findstr flake8

Some kind of known issue, or should I report bug?

Ilya.

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.


Re: [git-users] git subtree add: Import only specified folder from remote git

2017-11-20 Thread Konstantin Khomoutov
On Sun, Nov 19, 2017 at 08:15:53PM -0800, Zvi Vered wrote:

> I'm using the following command to create subtree:
> git subtree add --prefix=DRV1 https://github.com/zviered/DRV1.git master
> 
> The repo https://github.com/zviered/DRV1.git contains few folders. 
> I want my subtree to contain only one specified folder.
> 
> Is it possible ?

Yes, but not in the way you tried it.

You first need to use the `git subtree split` command to prepare a
synthetic history conststing of commits which modified only the code
under that specific directly in DRV1.

Then you will be able to `git subtree add` that line of history.

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.