- Oct 11, 2017
-
-
Jani Nikula authored
Make it easier to debug potential issues in rerere cache handling. Adding the commit message using a temp file also makes it easier to add more breadcrumbs in the future. Very-much-acked-by:
Daniel Vetter <daniel.vetter@ffwll.ch> Reviewed-by:
Jani Nikula <jani.nikula@intel.com>
-
Jani Nikula authored
Bail out early on errors to reduce indent. Add local decls while at it. Reviewed-by:
-
Simona Vetter authored
Otherwise the tree rebuilding fails. This might be the reason why some git versions create different conflicts, since checking git-sources/rerere.c didn't provide any hint at all about what has changed. Note this is only --local, i.e. for the current git repo, not --global or --system. But with worktrees that includes a lot more than just the drm-tip repo. But then we just force the default, so hopefully the impact is minimal. Cc: Maxime Ripard <maxime.ripard@free-electrons.com> Cc: Noralf Trønnes <noralf@tronnes.org> Cc: Chris Wilson <chris@chris-wilson.co.uk> Tested-by:
Maxime Ripard <maxime.ripard@free-electrons.com> Acked-by:
Daniel Vetter <daniel.vetter@intel.com>
-
Jani Nikula authored
Broken since introduction in cad37e19 ("dim: auto-add remotes"), the remote asked from the user gets ignored. Get the remote name to the remote variable. Also bail out on non-zero returns from read. Cc: Daniel Vetter <daniel@ffwll.ch> Acked-by:
Daniel Vetter <daniel@ffwll.ch> Signed-off-by:
-
- Oct 09, 2017
-
-
Jani Nikula authored
While at it, drop an old drm-intel reference. Reviewed-by:
-
Jani Nikula authored
No reason for the function to be so specific, make it more flexible in case we need to choose ssh URLs later on. Also rename it appropriately. Remove the fallback of converting ssh:// URLs to git:// URLs now that we have all the URLs with all the accepted protocols defined in nightly.conf since drm-rerere commit 7aa4d6332234 ("nightly.conf: add url lists to all repos"). Reviewed-by: -
Jani Nikula authored
We have a helper for this, use it. Reviewed-by:
-
Jani Nikula authored
dim setup is now the only place that may use them. Going forward, dim setup could go one step further and dig out nightly.conf directly from the repo before we've created a worktree checkout for it. Reviewed-by:
-
Jani Nikula authored
Since drm_tip_repos now contains drm-tip, we can use it to reduce dependency on URLs hard-coded in dim. Reviewed-by:
-
Jani Nikula authored
Since commit 1c228d7de23c ("nightly.conf: add drm-tip and linux-upstream to drm_tip_repos") in drm-rerere, nightly.conf has drm-tip and linux-upstream. Don't handle them specially. Reviewed-by:
-
- Oct 06, 2017
-
-
Jani Nikula authored
Don't assume current directory works. Reviewed-by:
-
Jani Nikula authored
Look up the remotes using the repo names in nightly.conf. Reviewed-by:
-
Jani Nikula authored
We have all the plumbing necessary to figure out the drm-intel remote. No need to configure it separately. Reviewed-by:
-
Jani Nikula authored
The maintainer repo hasn't been Intel specific for a while now. Rename the variable. DIM_DRM_INTEL is used as a default for DIM_REPO for backward compatibility. Reviewed-by:
-
Jani Nikula authored
The hard-coded list of remotes and branches has gone stale. Reviewed-by:
-
Jani Nikula authored
Since commit cad37e19 ("dim: auto-add remotes") url_to_remote can't really fail. Same for repo_to_remote when the repo exists. Redirecting their output when the remote isn't there leads to url_to_remote waiting for user input without prompting, giving an appearance of a hang. While at it, change the exit to a return. set -e at the top takes care of aborting. Using git worktrees is now practically required because we need all the remotes everywhere. Worktrees have been the default for a while now, and you have to go out of your way to set dim up without worktrees. You can still get by without, but it'll be clumsy. Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> Cc: Sean Paul <seanpaul@chromium.org> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Reviewed-by:
-
Jani Nikula authored
No longer consider drm-intel as the default. All repos need to be explicitly specified. Improve error reporting in repo_to_remote for unknown repos. Reviewed-by:
-
- Oct 02, 2017
-
-
Jani Nikula authored
Add new environment variable $DIM_GPG_KEYID for configuring the GPG key ID of the key to use for signing tags for pull requests. The tags will be signed if the key ID is set, otherwise annotated tags will be used like before. The drm-intel-testing tags are left unsigned, at least for now. Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> Cc: Sean Paul <seanpaul@chromium.org> Acked-by:
-
Jani Nikula authored
Presumably an oversight while converting update-next-continue to use annotated tags. Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Acked-by:
Ewelina Musial <ewelina.musial@intel.com> Signed-off-by:
-
Jani Nikula authored
Signed tags have the signature at the end. Strip them out when preparing pull mail overviews. Acked-by:
-
Jani Nikula authored
It's not perfect or exactly the same, but prefer fewer lines of special casing anyway. Acked-by:
-
Jani Nikula authored
Reviewed-by:
Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Signed-off-by:
-
Jani Nikula authored
Avoid extra pipelines for no good reason. Reviewed-by:
-
- Sep 29, 2017
-
-
Jani Nikula authored
This lets us configure a space separated list of URLs for each repo in drm_tip_repos, with all accepted protocols and sources, and the first one found gets picked. This way we don't have to have a complicated set of rules for converting between ssh, git and https protocol URLs. Acked-by:
-
- Sep 28, 2017
-
-
Rodrigo Vivi authored
Most of internal patches are nowadays organized in quilt subdirectories, but qf was never updated to check for unused patches there. Cc: Paulo Zanoni <paulo.r.zanoni@intel.com> Signed-off-by:
Rodrigo Vivi <rodrigo.vivi@intel.com> Acked-by:
-
Simona Vetter authored
Unfortunately there's a little bit of hardcoded stuff still. Cc: Alex Deucher <alexander.deucher@amd.com> Cc: Harry Wentland <harry.wentland@amd.com> Acked-by:
Sean Paul <seanpaul@chromium.org> Signed-off-by:
-
Simona Vetter authored
Well, bother to at least prompt. Prep work for adding drm-amd.git. v2: Only print how to add the remove if it's not auto-added (Rodrigo). Acked-by:
-
Simona Vetter authored
This reverts commit 41dddc02 and then tries a different approach because from the commit that originally introduced this: commit 3dd25f23 Author: Benjamin Gaignard <benjamin.gaignard@linaro.org> Date: Wed Jul 26 14:07:49 2017 +0200 dim: add checks for author and committer sign-off-by we have "Use real names for people with many different email addresses." to work around outlook we need to convert the "Last, First" firm into what git expects instead, which also should solve the problem Rodrigo has. Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> Cc: Jani Nikula <jani.nikula@intel.com> Acked-by:
-
- Sep 26, 2017
-
-
Simona Vetter authored
Suggested by Chris Wilson and Jani Nikula. To do this properly we need to again push the reading of nightly.conf to be after the basic sanity checks, like it was before commit 12976ee3 Author: Jani Nikula <jani.nikula@intel.com> Date: Fri Oct 28 12:40:46 2016 +0300 dim: switch to using remote agnostic integration branch config v2: Don't fail on setup. v3: Rewrite and squash. v4: Typing code with jetlag, hard it is. Cc: Jani Nikula <jani.nikula@intel.com> Cc: Chris Wilson <chris@chris-wilson.co.uk> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Acked-by:
-
Simona Vetter authored
It also wants to delete drm-rerere/nightly.conf when that hasn't been touched in a while. Prevent that in the future. Chris Wilson hit that snag, which then seems to have percolated to some other committers. Cc: Chris Wilson <chris@chris-wilson.co.uk> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Acked-by:
-
- Sep 21, 2017
-
-
Rodrigo Vivi authored
It seems Patchwork or SMTP servers are messing some patches and changing the original git's author name on git per "Last, First". So we end up with a mismatch were signed-off uses one name format and author is using another format. So, let's check for email addresses instead. v2: Avoid useles warning and only check for email. Cc: Jani Nikula <jani.nikula@intel.com> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Signed-off-by:
-
- Sep 11, 2017
-
-
Jani Nikula authored
Make it easier to add/remove people as needed. Add Joonas, Rodrigo and Sean as new recipients for pull requests. Replace Daniel with Joonas and Rodrigo as test request recipients. Perhaps we'll want to make the list branch specific in the future, but get the low hanging fruit first. Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> Cc: Sean Paul <seanpaul@chromium.org> Reviewed-by:
-
Jani Nikula authored
I think adding a new config for this would be overkill, and this is bound to be more correct than "Cheers, Daniel". Leave the generic "Hi all" salute in place though. Reviewed-by:
-
Jani Nikula authored
Historical baggage from the times this was just Daniel's maintainer script. Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Reviewed-by:
-
Jani Nikula authored
git format-patch adds *** SUBJECT HERE *** and similar to remind about things that need to be filled in. Follow suit. Reviewed-by:
-
Jani Nikula authored
git commit -s option should DTRT. Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Reviewed-by:
-
- Sep 08, 2017
-
-
Simona Vetter authored
We've now had two reports (from Chris and Sean each one) that dim stumbled over uncommitted state in drm-rerere/. In both cases a bunch of git rm have been staged, but not committed. I didn't really figure out what exactly happend, but best explanation is that one of the commands failed, but silently, since we &> /dev/null the output. Make sure no matter what happens, we get at least to the commit step to not leave a broken state behind and add a || true everywhere it's missing. Cc: Chris Wilson <chris@chris-wilson.co.uk> Cc: Sean Paul <seanpaul@chromium.org> Reviewed-by:
-
- Aug 30, 2017
-
-
Simona Vetter authored
They're just temporary files used by git. From rerere.c in the git sources: /* * Normalize the conflicts in path and write it out to * "thisimage" temporary file. */ Reported by Rodrigo. v2: use find, not grep (Jani). v3: Don't piss of shellcheck (Rodrigo). Signed-off-by:
-
- Aug 24, 2017
-
-
Rodrigo Vivi authored
Soon we will need to extend qf for very specific usages of our internal maintenance and rebase bot. So let's start with the only environment configuration we have but also let's allow qfrc to extend qf commands and aliases. v2: Add missing "/" (Daniel). Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: Jani Nikula <jani.nikula@intel.com> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Signed-off-by:
-
Rodrigo Vivi authored
Now that all of our issues caught by shellcheck are fixed let's add qf to shellcheck part of make check so any further change is protected by this cool shell scan tool. Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: Jani Nikula <jani.nikula@intel.com> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Signed-off-by:
-
