Skip to content
Snippets Groups Projects
Commit 9a4e294d authored by Simona Vetter's avatar Simona Vetter
Browse files

dim: add error reporting for rerere cache pulling


This silently failed for me, and I had no idea what's happening.

v2: Use git pull -q (Jani).

v3: Use echoerr.

Acked-by: default avatarJani Nikula <jani.nikula@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
parent 36097395
No related branches found
No related tags found
No related merge requests found
......@@ -503,7 +503,14 @@ function update_rerere_cache
echo -n "Updating rerere cache... "
cd $DIM_PREFIX/drm-rerere/
git pull &> /dev/null
if ! git pull -q ; then
echoerr "Failed to update the rerere cache."
echoerr "Please manually run"
echoerr " $ cd $DIM_PREFIX/drm-rerere ; git pull"
echoerr "and fixup any issues."
return 1
fi
if [ ! -L $(rr_cache_dir) ] ; then
if [ -d $(rr_cache_dir) ] ; then
rm -Rf $(rr_cache_dir)
......@@ -524,7 +531,14 @@ function commit_rerere_cache
if git_is_current_branch rerere-cache ; then
remote=$(branch_to_remote rerere-cache)
git pull >& /dev/null
if ! git pull -q ; then
echoerr "Failed to update the rerere cache."
echoerr "Please manually run"
echoerr " $ cd $DIM_PREFIX/drm-rerere ; git pull"
echoerr "and fixup any issues."
return 1
fi
git add ./*.patch >& /dev/null || true
for file in $(git ls-files); do
if ! git log --since="60 days ago" --name-only -- $file | grep $file &> /dev/null; then
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment