From 333f4cb3357f3daa5fe3b467ef19b5669161106a Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Thu, 4 Apr 2013 16:55:01 -0700 Subject: [PATCH] Use git diff instead of git diff-index. In the manage projects script git will sometimes report that there is a difference between old and new acl files when there isn't one. This causes the script to fail on those files when trying to commit them. Use git diff instead of git diff-index to resolve this problem. Change-Id: I9f2d7b3066a9bfe6e64282e9e7c009d4008e133e Reviewed-on: https://review.openstack.org/26172 Reviewed-by: Jeremy Stanley Reviewed-by: James E. Blair Reviewed-by: Monty Taylor Approved: James E. Blair Tested-by: Jenkins --- jeepyb/cmd/manage_projects.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jeepyb/cmd/manage_projects.py b/jeepyb/cmd/manage_projects.py index 2137ea0..9c5bf52 100644 --- a/jeepyb/cmd/manage_projects.py +++ b/jeepyb/cmd/manage_projects.py @@ -146,7 +146,7 @@ def copy_acl_config(project, repo_path, acl_config): status, _ = run_command("cp %s %s" % (acl_config, acl_dest), status=True) if status == 0: - status = git_command(repo_path, "diff-index --quiet HEAD --") + status = git_command(repo_path, "diff --quiet") if status != 0: return True return False