DPDK CI discussions
 help / color / Atom feed
* [dpdk-ci] [PATCH] Revert "tools: fix tree detection for orphan files"
@ 2020-01-20 15:31 David Marchand
  2020-01-21 18:14 ` Thomas Monjalon
  0 siblings, 1 reply; 2+ messages in thread
From: David Marchand @ 2020-01-20 15:31 UTC (permalink / raw)
  To: ci; +Cc: thomas, alialnu

The problem with this patch is that some files were with no git tree in
MAINTAINERS on purpose: some files are maintained in the main repository,
but we leave subtrees touch them like release notes or makefile/meson
files.

So reverting it, and adding a comment to document the reason.

Signed-off-by: David Marchand <david.marchand@redhat.com>
---
 tools/guess_git_tree.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/tools/guess_git_tree.py b/tools/guess_git_tree.py
index bc63674..c9eef39 100755
--- a/tools/guess_git_tree.py
+++ b/tools/guess_git_tree.py
@@ -146,11 +146,10 @@ class Maintainers(object):
         tree_list = []
         for _file in files:
             _tree = self._get_tree(_file)
-            # No identified tree for a file means that it should go through
-            # the main repository.
-            if not _tree:
-                _tree = 'dpdk'
-            tree_list.append(_tree)
+            # Having no tree means that we accept those changes going through a
+            # subtree (e.g. release notes).
+            if _tree:
+                tree_list.append(_tree)
         tree = self.get_common_denominator(tree_list)
         if tree == '':
             tree = 'dpdk'
-- 
2.23.0


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [dpdk-ci] [PATCH] Revert "tools: fix tree detection for orphan files"
  2020-01-20 15:31 [dpdk-ci] [PATCH] Revert "tools: fix tree detection for orphan files" David Marchand
@ 2020-01-21 18:14 ` Thomas Monjalon
  0 siblings, 0 replies; 2+ messages in thread
From: Thomas Monjalon @ 2020-01-21 18:14 UTC (permalink / raw)
  To: David Marchand; +Cc: ci, alialnu

20/01/2020 16:31, David Marchand:
> The problem with this patch is that some files were with no git tree in
> MAINTAINERS on purpose: some files are maintained in the main repository,
> but we leave subtrees touch them like release notes or makefile/meson
> files.
> 
> So reverting it, and adding a comment to document the reason.
> 
> Signed-off-by: David Marchand <david.marchand@redhat.com>
Acked-by: Thomas Monjalon <thomas@monjalon.net>

Applied, thanks

The solution is better specifying trees in MAINTAINERS
for components which must not be changed in a sub-tree.
Will merge your patches adding such info.



^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, back to index

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-20 15:31 [dpdk-ci] [PATCH] Revert "tools: fix tree detection for orphan files" David Marchand
2020-01-21 18:14 ` Thomas Monjalon

DPDK CI discussions

Archives are clonable:
	git clone --mirror http://inbox.dpdk.org/ci/0 ci/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 ci ci/ http://inbox.dpdk.org/ci \
		ci@dpdk.org
	public-inbox-index ci


Newsgroup available over NNTP:
	nntp://inbox.dpdk.org/inbox.dpdk.ci


AGPL code for this site: git clone https://public-inbox.org/ public-inbox