diff options
author | Jonathan Liu <net147@gmail.com> | 2013-05-31 11:09:14 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-06-04 11:43:35 +0100 |
commit | 9ba5cedf9aaa51e80b7f07345c744af47fda34d3 (patch) | |
tree | 451817255a48f6e655a0489d49fced58892ba00e | |
parent | 6fa824ec8ff6dd1a945dee3009458ec1aeecbe93 (diff) | |
download | poky-9ba5cedf9aaa51e80b7f07345c744af47fda34d3.tar.gz |
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 rev: a45a247e2cfa58892a0c9eb050d603a38cd839db)
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/buildhistory.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass index d39408b9c8..b12da4ac98 100644 --- a/meta/classes/buildhistory.bbclass +++ b/meta/classes/buildhistory.bbclass | |||
@@ -510,7 +510,7 @@ END | |||
510 | repostatus=`git status --porcelain | grep -v " metadata-revs$"` | 510 | repostatus=`git status --porcelain | grep -v " metadata-revs$"` |
511 | HOSTNAME=`hostname 2>/dev/null || echo unknown` | 511 | HOSTNAME=`hostname 2>/dev/null || echo unknown` |
512 | if [ "$repostatus" != "" ] ; then | 512 | if [ "$repostatus" != "" ] ; then |
513 | git add . | 513 | git add -A . |
514 | # porcelain output looks like "?? packages/foo/bar" | 514 | # porcelain output looks like "?? packages/foo/bar" |
515 | # Ensure we commit metadata-revs with the first commit | 515 | # Ensure we commit metadata-revs with the first commit |
516 | for entry in `echo "$repostatus" | awk '{print $2}' | awk -F/ '{print $1}' | sort | uniq` ; do | 516 | for entry in `echo "$repostatus" | awk '{print $2}' | awk -F/ '{print $1}' | sort | uniq` ; do |