So it sounds like the build scripts have somehow made these files "executable", which makes no sense for .java and .xml files. I'd prefer that we fix that rather than ignore mode diffs.
- Gordon -----Original Message----- From: Frédéric THOMAS [mailto:webdoubl...@hotmail.com] Sent: Wednesday, April 03, 2013 4:29 PM To: dev@flex.apache.org Subject: Re: How to get a clean working tree for flex-sdk I just read the git mode particularities from [1] In this case, you’re specifying a mode of 100644, which means it’s a normal file. Other options are 100755, which means it’s an executable file; and 120000, which specifies a symbolic link. The mode is taken from normal UNIX modes but is much less flexible — these three modes are the only ones that are valid for files (blobs) in Git (although other modes are used for directories and submodules). -Fred [1] http://git-scm.com/book/en/Git-Internals-Git-Objects -----Message d'origine----- From: Gordon Smith Sent: Thursday, April 04, 2013 1:26 AM To: dev@flex.apache.org Subject: RE: How to get a clean working tree for flex-sdk The Ant scripts are rewriting these files to inject version numbers. (Ugh!) So many your suggestion of ignoring mode differences is a good idea. However, I would still like to understand whether it is possible for Git to set the executable bit on scripts like mxmlc, like Subversion did. - Gordon -----Original Message----- From: Gordon Smith Sent: Wednesday, April 03, 2013 4:22 PM To: dev@flex.apache.org Subject: RE: How to get a clean working tree for flex-sdk I looked at these two files in Subversion. Both have only the svn:ol-style property set, like many other files. When you check out a Git branch, can some files get a different mode than others? In other words, does Git store a mode for each file? - Gordon -----Original Message----- From: Frédéric THOMAS [mailto:webdoubl...@hotmail.com] Sent: Wednesday, April 03, 2013 4:00 PM To: dev@flex.apache.org Subject: Re: How to get a clean working tree for flex-sdk You might be right, it's better to determinate why they're changed by the build, maybe we should find how they were in Svn, it might have happened that those modes changed during the migration. -Fred -----Message d'origine----- From: Gordon Smith Sent: Thursday, April 04, 2013 12:53 AM To: dev@flex.apache.org Subject: RE: How to get a clean working tree for flex-sdk I don't think there is any reason why the file mode of these files should be changing, so I'm not convinced we should start ignoring diffs of file modes. - Gordon -----Original Message----- From: Frédéric THOMAS [mailto:webdoubl...@hotmail.com] Sent: Wednesday, April 03, 2013 3:52 PM To: dev@flex.apache.org Subject: Re: How to get a clean working tree for flex-sdk Yes. -Fred -----Message d'origine----- From: Gordon Smith Sent: Thursday, April 04, 2013 12:50 AM To: dev@flex.apache.org Subject: RE: How to get a clean working tree for flex-sdk Are you saying that it tells Git to ignore differences in a file's mode? - Gordon -----Original Message----- From: Frédéric THOMAS [mailto:webdoubl...@hotmail.com] Sent: Wednesday, April 03, 2013 3:48 PM To: dev@flex.apache.org Subject: Re: How to get a clean working tree for flex-sdk It will avoid git to consider those files as modified, so they won't appear on git status -Fred -----Message d'origine----- From: Gordon Smith Sent: Thursday, April 04, 2013 12:39 AM To: dev@flex.apache.org Subject: RE: How to get a clean working tree for flex-sdk Please explain what that will do. And before we decide to do this, please be aware that there are some files that need to have their executable bit set, such as the mxmlc script. - Gordon -----Original Message----- From: Frédéric THOMAS [mailto:webdoubl...@hotmail.com] Sent: Wednesday, April 03, 2013 3:36 PM To: dev@flex.apache.org Subject: Re: How to get a clean working tree for flex-sdk or 'git config --global core.filemode false' for the general git settings. -Fred -----Message d'origine----- From: Frédéric THOMAS Sent: Thursday, April 04, 2013 12:34 AM To: dev@flex.apache.org Subject: Re: How to get a clean working tree for flex-sdk Then I guess everybody should run 'git config core.filemode false' on their repos, I will add it to the wiki. -Fred -----Message d'origine----- From: Gordon Smith Sent: Thursday, April 04, 2013 12:29 AM To: dev@flex.apache.org Subject: RE: How to get a clean working tree for flex-sdk > I'd be curious as to what did change in flex-config and Version.java. Something changed the mode of these two files: gosmith@GOSMITH-WIN7 /cygdrive/d/asf/flex-sdk $ git diff frameworks/flex-config.xml diff --git a/frameworks/flex-config.xml b/frameworks/flex-config.xml old mode 100644 new mode 100755 gosmith@GOSMITH-WIN7 /cygdrive/d/asf/flex-sdk $ git diff modules/asc/src/java/macromedia/asc/util/Version.java diff --git a/modules/asc/src/java/macromedia/asc/util/Version.java b/modules/asc/src/java/macromedia/asc/util/Version.java old mode 100644 new mode 100755 - Gordon -----Original Message----- From: Alex Harui [mailto:aha...@adobe.com] Sent: Tuesday, April 02, 2013 9:30 PM To: dev@flex.apache.org Subject: Re: How to get a clean working tree for flex-sdk "not stages" is like SVN saying a file is modified. "untracked" is like SVN saying a file is unversioned (not added to SVN). I'd be curious as to what did change in flex-config and Version.java. I thought Fred cleaned up the rest. Did you do a git pull to get synced up (like svn update). On 4/2/13 9:24 PM, "Gordon Smith" <gosm...@adobe.com> wrote: > After I build flex-sdk with 'ant clean main checkintests', 'git > status' shows a bunch of changes to my working tree that aren't > relevant. I think this means we need to add more entries to > .gitignore, but I don't understand why some files show up as "Changes > not staged for commit" and others as "Untracked files". Can somebody > who understands Git better explain this? > > - Gordon > > $ git status > # On branch develop > # Changes not staged for commit: > # (use "git add <file>..." to update what will be committed) > # (use "git checkout -- <file>..." to discard changes in working > directory) > # > # modified: frameworks/flex-config.xml > # modified: modules/asc/src/java/macromedia/asc/util/Version.java > # > # Untracked files: > # (use "git add <file>..." to include in what will be committed) > # > # flex-sdk-description.xml > # frameworks/projects/advancedgrids/bundles.properties > # frameworks/projects/airframework/bundles.properties > # frameworks/projects/airspark/bundles.properties > # frameworks/projects/apache/bundles.properties > # frameworks/projects/authoringsupport/bundles.properties > # frameworks/projects/automation/bundles.properties > # frameworks/projects/automation_agent/bundles.properties > # frameworks/projects/automation_air/bundles.properties > # frameworks/projects/automation_airspark/bundles.properties > # frameworks/projects/charts/bundles.properties > # frameworks/projects/core/bundles.properties > # frameworks/projects/experimental/bundles.properties > # frameworks/projects/flash-integration/bundles.properties > # frameworks/projects/framework/bundles.properties > # frameworks/projects/halo/bundles.properties > # frameworks/projects/mobilecomponents/bundles.properties > # frameworks/projects/mobiletheme/bundles.properties > # frameworks/projects/mx/bundles.properties > # frameworks/projects/rpc/bundles.properties > # frameworks/projects/spark/bundles.properties > # frameworks/projects/spark/manifest.xml > # frameworks/projects/spark_dmv/bundles.properties > # frameworks/projects/sparkskins/bundles.properties > # frameworks/projects/tool_air/bundles.properties > # frameworks/projects/wireframe/bundles.properties > no changes added to commit (use "git add" and/or "git commit -a") -- Alex Harui Flex SDK Team Adobe Systems, Inc. http://blogs.adobe.com/aharui
