Skip to contentSkip to conversation

buildhistory: record removals with Git 2.0 and later

PATCH In review Jonathan Liu 2 participants 6 messages May 31, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 buildhistory: record removals with Git 2.0 and later

There is a behavior change with Git 2.0 where "git add ." will no longer record removals by default unless -A (--all) is specified. Change to "git add -A ." so removals are recorded with Git 2.0 and later.

---
 meta/classes/buildhistory.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes/buildhistory.bbclass +1 -1
index d39408b..b12da4a 100644
@@ -510,7 +510,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
Signature · 1 line
1.8.3
#1 lore raw
Quoted 9 lines · Jonathan Liu

There is a behavior change with Git 2.0 where "git add ." will no longer record removals by default unless -A (--all) is specified. Change to "git add -A ." so removals are recorded with Git 2.0 and later.

---
  meta/classes/buildhistory.bbclass | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

Hmm... looks like I interpreted the Git warning incorrectly. Maybe I need to look into this a bit more and perhaps change the commit message.

The following appears after a build with buildhistory enabled:
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. Paths like 'test.txt' that are
removed from your working tree are ignored with this version of Git.

* 'git add --ignore-removal <pathspec>', which is the current default, ignores paths you removed from your working tree.

* 'git add --all <pathspec>' will let you also record the removals.

Run 'git status' to check the paths you removed from your working tree.

Regards,
Jonathan

#2 lore raw
Quoted 21 lines · Jonathan Liu
Quoted 9 lines · Jonathan Liu

There is a behavior change with Git 2.0 where "git add ." will no longer record removals by default unless -A (--all) is specified. Change to "git add -A ." so removals are recorded with Git 2.0 and later.

---
  meta/classes/buildhistory.bbclass | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

Hmm... looks like I interpreted the Git warning incorrectly. Maybe I need to look into this a bit more and perhaps change the commit message.

The following appears after a build with buildhistory enabled:
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. Paths like 'test.txt' that are
removed from your working tree are ignored with this version of Git.

* 'git add --ignore-removal <pathspec>', which is the current default, ignores paths you removed from your working tree.

Quoted 6 lines

* 'git add --all <pathspec>' will let you also record the removals.

Run 'git status' to check the paths you removed from your working tree.

Regards,
Jonathan

The warning appears in Git 1.8.3. The path removed was the package information for a kernel module after updating from 3.8.11 to 3.8.13.

Regards,
Jonathan

#3 lore raw
In reply to Jonathan Liu
Quoted 21 lines · On Friday 31 May 2013 20:29:19 Jonathan Liu wrote:
Quoted 10 lines · Jonathan Liu

There is a behavior change with Git 2.0 where "git add ." will no longer record removals by default unless -A (--all) is specified. Change to "git add -A ." so removals are recorded with Git 2.0 and later.

---

  meta/classes/buildhistory.bbclass | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

Hmm... looks like I interpreted the Git warning incorrectly. Maybe I need to look into this a bit more and perhaps change the commit message.

The following appears after a build with buildhistory enabled:
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. Paths like 'test.txt' that are
removed from your working tree are ignored with this version of Git.

Quoted 6 lines

* 'git add --ignore-removal <pathspec>', which is the current default, ignores paths you removed from your working tree.

* 'git add --all <pathspec>' will let you also record the removals.

Run 'git status' to check the paths you removed from your working tree.

So it seems the change is reasonable but yes perhaps the commit message should change to mention that it also avoids a warning with 1.8.3.

Cheers,
Paul

Signature · 2 lines
Paul Eggleton
Intel Open Source Technology Centre
#4 lore raw
Quoted 25 lines · On Friday 31 May 2013 11:42:27 Paul Eggleton wrote:
Quoted 24 lines · On Friday 31 May 2013 20:29:19 Jonathan Liu wrote:
Quoted 10 lines · Jonathan Liu

There is a behavior change with Git 2.0 where "git add ." will no longer record removals by default unless -A (--all) is specified. Change to "git add -A ." so removals are recorded with Git 2.0 and later.

---

  meta/classes/buildhistory.bbclass | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

Hmm... looks like I interpreted the Git warning incorrectly. Maybe I need to look into this a bit more and perhaps change the commit message.

The following appears after a build with buildhistory enabled:
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. Paths like 'test.txt' that are
removed from your working tree are ignored with this version of Git.

* 'git add --ignore-removal <pathspec>', which is the current default,

Quoted 8 lines
Quoted 5 lines

ignores paths you removed from your working tree.

* 'git add --all <pathspec>' will let you also record the removals.

Run 'git status' to check the paths you removed from your working tree.

So it seems the change is reasonable but yes perhaps the commit message should change to mention that it also avoids a warning with 1.8.3.

Hmm, I misread - looks like we should be using -A or --all right now since we do want deleted files to be recorded.

Cheers,
Paul

Signature · 2 lines
Paul Eggleton
Intel Open Source Technology Centre
#5 lore raw
Quoted 29 lines · Paul Eggleton
Quoted 28 lines · On Friday 31 May 2013 11:42:27 Paul Eggleton wrote:
Quoted 27 lines · On Friday 31 May 2013 20:29:19 Jonathan Liu wrote:
Quoted 10 lines · Jonathan Liu

There is a behavior change with Git 2.0 where "git add ." will no longer record removals by default unless -A (--all) is specified. Change to "git add -A ." so removals are recorded with Git 2.0 and later.

---

   meta/classes/buildhistory.bbclass | 2 +-
   1 file changed, 1 insertion(+), 1 deletion(-)

Hmm... looks like I interpreted the Git warning incorrectly. Maybe I need to look into this a bit more and perhaps change the commit message.

The following appears after a build with buildhistory enabled:
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. Paths like 'test.txt' that are
removed from your working tree are ignored with this version of Git.

* 'git add --ignore-removal <pathspec>', which is the current default,

ignores paths you removed from your working tree.

* 'git add --all <pathspec>' will let you also record the removals.

Quoted 9 lines
Quoted 3 lines
Quoted 1 line

Run 'git status' to check the paths you removed from your working tree.

So it seems the change is reasonable but yes perhaps the commit message should change to mention that it also avoids a warning with 1.8.3.

Hmm, I misread - looks like we should be using -A or --all right now since we do want deleted files to be recorded.

Cheers,
Paul

Updated patch submitted.

Regards,
Jonathan