[ https://issues.apache.org/jira/browse/HAWQ-888?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15361132#comment-15361132 ]
ASF GitHub Bot commented on HAWQ-888: ------------------------------------- GitHub user paul-guo- opened a pull request: https://github.com/apache/incubator-hawq/pull/768 HAWQ-888. Hack to avoid deleted files being shown in "git status" aft… …er building. You can merge this pull request into a Git repository by running: $ git pull https://github.com/paul-guo-/incubator-hawq make Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-hawq/pull/768.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #768 ---- commit 0e206f294f39d6882a9af4416ac41252502e8268 Author: Paul Guo <paul...@gmail.com> Date: 2016-07-04T09:59:24Z HAWQ-888. Hack to avoid deleted files being shown in "git status" after building. ---- > Hack to avoid deleted files being shown in "git status" after building. > ----------------------------------------------------------------------- > > Key: HAWQ-888 > URL: https://issues.apache.org/jira/browse/HAWQ-888 > Project: Apache HAWQ > Issue Type: Bug > Components: Build > Reporter: Paul Guo > Assignee: Lei Chang > > After building with pgcrypto, plr, orca, the git repos will have the > following tracked files. > Changes not staged for commit: > (use "git add/rm <file>..." to update what will be committed) > (use "git checkout -- <file>..." to discard changes in working directory) > deleted: gp-xerces/git_keep_empty_directory.readme > deleted: gporca/git_keep_empty_directory.readme > deleted: gpos/git_keep_empty_directory.readme > deleted: postgres/git_keep_empty_directory.readme > deleted: ../../src/pl/plr/git_keep_empty_directory.readme > Those files are just to remind developers to not write the directory (git > does not save empty directories). This is really annoying. .gitignore does > not resolve this issue. > A simple and elegant solution is: > git update-index --assume-unchanged > however followering error is seen after parallel building, > fatal: Unable to create '/data2/github/incubator-hawq/.git/index.lock': File > exists. > If no other git process is currently running, this probably means a > git process crashed in this repository earlier. Make sure no other git > process is running and remove the file manually to continue. > I do not want to waste too much time in digging into git internals, instead, > I'd try another simple solution: > - rm -f git_keep_empty_directory.readme; \ > + mv -f gporca.git_keep_empty_directory.readme ..; \ > [ ! -d .git ] && git clone $(gporca_git) . && git checkout > $(gporca_branch); \ > + mv -f ../gporca.git_keep_empty_directory.readme .; \ -- This message was sent by Atlassian JIRA (v6.3.4#6332)