Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

manageiq log folder and dirty git #18639

Closed
ghost opened this issue Apr 9, 2019 · 9 comments
Closed

manageiq log folder and dirty git #18639

ghost opened this issue Apr 9, 2019 · 9 comments
Assignees
Labels

Comments

@ghost
Copy link

ghost commented Apr 9, 2019

No description provided.

@agrare
Copy link
Member

agrare commented Apr 11, 2019

I'm guessing that you did a git clean -fdx or some equivalent?

Yeah it looks like we don't have a log/.keep file which would be a nice addition, you want to put in a pull request to add this?

@ghost ghost closed this as completed Apr 25, 2019
@agrare
Copy link
Member

agrare commented Apr 25, 2019

@sckhg1367 did you put a PR in?

@Fryguy
Copy link
Member

Fryguy commented May 14, 2019

We intentionally don't have the .keep file. If I recall it's because on the appliance we replace the log directory with a mount point, to allow bigger disks. If the .keep file is there, then the git instance on the appliance is in an always-dirty state.

@Fryguy
Copy link
Member

Fryguy commented May 14, 2019

See #17663

@Fryguy
Copy link
Member

Fryguy commented May 14, 2019

Reopening @agrare

@Fryguy Fryguy reopened this May 14, 2019
@Fryguy Fryguy added the bug label May 14, 2019
@Fryguy
Copy link
Member

Fryguy commented May 14, 2019

It seems that the rationale for having a clean git history was broken by ManageIQ/manageiq-appliance-build@3fb3528#diff-59d2b58eb2d092c0658886c3db5af71dR17 , and we should just fix the clean git history on the appliance

cc @kbrock

@kbrock
Copy link
Member

kbrock commented Jun 6, 2019

@Fryguy Git does not track directories, it only tracks files. So if there are not files under log/ checked into git, then git should not be aware of log.

Why would a symbolic link cause a stale git state?
Seems it would say "added file" but it should allow us to change branches and stash and stuff. no?

@agrare
Copy link
Member

agrare commented Jun 6, 2019

@kbrock because a symlink is a file

@kbrock
Copy link
Member

kbrock commented Jun 6, 2019

@agrare ok, so git knows the file is there, but it is not tracking it. so you can stash pop, checkout a different branch and you don't have to deal with a deleted file log/.keep

Maybe add log to .gitignore?

EDIT: ignore this, I looked at the PR. I'm good now

@ghost ghost changed the title manageiq/log folder disappear manageiq Jun 17, 2019
@ghost ghost changed the title manageiq m Jun 17, 2019
@Fryguy Fryguy changed the title m manageiq log folder and dirty git Aug 3, 2019
@ghost ghost closed this as completed Sep 3, 2019
This issue was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

No branches or pull requests

3 participants