From 7e78b41667c6003d2e36f8b90af1089b44fab43c Mon Sep 17 00:00:00 2001 From: Jonathan Liu Date: Fri, 31 May 2013 11:09:14 +0000 Subject: classes/buildhistory: record removals in buildhistory directory "git add ." does not record files that were removed in the buildhistory directory. Specify the -A flag to also record removals. This was discovered by the following warning added in Git 1.8.3: warning: You ran 'git add' with neither '-A (--all)' or '--ignore-removal', whose behaviour will change in Git 2.0 with respect to paths you removed. (From OE-Core master rev: a45a247e2cfa58892a0c9eb050d603a38cd839db) (From OE-Core rev: a27f04ac89b8e58931b7792fbd1adeabef21f7b0) Signed-off-by: Jonathan Liu Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/classes/buildhistory.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta/classes') diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass index 1ac1a8b202..ecff637807 100644 --- a/meta/classes/buildhistory.bbclass +++ b/meta/classes/buildhistory.bbclass @@ -500,7 +500,7 @@ END repostatus=`git status --porcelain | grep -v " metadata-revs$"` HOSTNAME=`hostname 2>/dev/null || echo unknown` if [ "$repostatus" != "" ] ; then - git add . + git add -A . # porcelain output looks like "?? packages/foo/bar" # Ensure we commit metadata-revs with the first commit for entry in `echo "$repostatus" | awk '{print $2}' | awk -F/ '{print $1}' | sort | uniq` ; do -- cgit v1.2.3-54-g00ecf