Re: Making file permissions match

2016-08-03 Thread Johannes Schindelin
Hi Jon,

On Wed, 3 Aug 2016, jonsm...@gmail.com wrote:

> I'm working with some Windows programmers that don't believe in file
> permissions They keep sending me zip files of their source tree.  I
> have my copy of the tree in git on Linux with all of the correct file
> permissions.
> 
> So I unzip the archive they send me and to see what they changed. I
> unzip it on top of my git tree. But now all of the file permissions
> don't match. The code deltas are there but there is also all of this
> noise from the file permissions.
> 
> Is there an easy way to deal with this? I want to keep the code deltas
> and ignore the permission changes. Since there are about 100K files
> this is too much to do manually.

Maybe setting core.filemode=false before committing?

Ciao,
Johannes
--
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


Re: Making file permissions match

2016-08-03 Thread Torsten Bögershausen
On Wed, Aug 03, 2016 at 09:46:06AM -0400, jonsm...@gmail.com wrote:
> I'm working with some Windows programmers that don't believe in file
> permissions They keep sending me zip files of their source tree.  I
> have my copy of the tree in git on Linux with all of the correct file
> permissions.
> 
> So I unzip the archive they send me and to see what they changed. I
> unzip it on top of my git tree. But now all of the file permissions
> don't match. The code deltas are there but there is also all of this
> noise from the file permissions.
> 
> Is there an easy way to deal with this? I want to keep the code deltas
> and ignore the permission changes. Since there are about 100K files
> this is too much to do manually.

(I'm not sure if I understand "match" correctly)

You can ignore changes in the executable permissions:
git config core.filemode false

Please let us know if it works
--
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


Re: Making file permissions match

2016-08-03 Thread jonsm...@gmail.com
On Wed, Aug 3, 2016 at 10:07 AM, Torsten Bögershausen  wrote:
> On Wed, Aug 03, 2016 at 09:46:06AM -0400, jonsm...@gmail.com wrote:
>> I'm working with some Windows programmers that don't believe in file
>> permissions They keep sending me zip files of their source tree.  I
>> have my copy of the tree in git on Linux with all of the correct file
>> permissions.
>>
>> So I unzip the archive they send me and to see what they changed. I
>> unzip it on top of my git tree. But now all of the file permissions
>> don't match. The code deltas are there but there is also all of this
>> noise from the file permissions.
>>
>> Is there an easy way to deal with this? I want to keep the code deltas
>> and ignore the permission changes. Since there are about 100K files
>> this is too much to do manually.
>
> (I'm not sure if I understand "match" correctly)
>
> You can ignore changes in the executable permissions:
> git config core.filemode false
>
> Please let us know if it works

Thanks, that might work. It will take a few hours to check since the
repo is huge.

-- 
Jon Smirl
jonsm...@gmail.com
--
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