This is useful for the very rare cases where git rerere fails and
can't remember a conflict resolution. Or the rare cases with silent
conflicts.

Since this happens so seldom I always forget the precise patch file
naming convention and waste half an hour debugging dim. Help the
brainless a bit out here.

Also s/git apply/ patch/ since git apply is too picky about unresolved
merges (which occasionally also need to be fixed up).

Use rst2man and man to display if available, otherwise just use cat and
$PAGER.

Use rst2man and man to display if available, otherwise just use cat and
$PAGER.

We want to avoid the merge-window/early -rc craziness and so updated
drm-upstream for -nightly only manually. But that in turn caused
coordination headaches.

Add an optional sha1 to the tree specifier in nightly.conf to fix a
tree to a given revision. That way we can freeze drm-* to the last
version before the merge window and update it at our leisure.

With this fixed we can lift the ban and go back to auto-updating
drm-upstream.

v2: Pimp commit message and drop now outdated comment (Jani)

Much less noise when a bunch of the branches are just fast-forwards.

Useful to slurp in fixup patches.

v2: Do a bit a better check for dirty rerere-branch.

v3: Use -f/--force switch instead. No real getopts parsing though, so
better place it at the right spot!

v4: Unlazy and use the existing getopt stuff.

Damien Lespiau authored 11 years ago and Simona Vetter committed 11 years ago

On its own, "git push origin" will do something different depending on
the the push.default option. So let's speficy the full local:remote
branch here.

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

If I only use the local branch and not the remote one
it might be severly out of date.

commit ba7cfc44
Author: Jani Nikula <jani.nikula@intel.com>
Date:   Wed Feb 26 13:52:50 2014 +0200

    dim: add command line option parsing

didn't shuffle all the subcmds correctly.

While at it fix the parameter checking in pull-request-topic a bit -
it checked for $3, then used $2 and checked for $2 when using $3 ...

Damien stumbled over these. Imo not worth to make the setup code more
robust ...

I've screwed this up too often and applied patch fixes to the wrong
patch ...

... and track it in the rr-cache branch. This way the nightly rebuild
code should always have the latest configuration.

v2: Don't automatically update nightly.conf as requested by Jani.
Instead abort if it's not up-to-date.

v3: Unconditionalyl push the rerere-cache branch to make sure any
nightly.conf commits actually go out.

This way the vim shell folding doesn't get confused.

shifting without positional arguments bails out of the script due to
'set -e'.

We already push out any updates, now it goes both ways. Simplifies
collaboration.

Next up is making sure that we use the same sha1s for drm-upstream
branches.

Damien Lespiau authored 11 years ago and Simona Vetter committed 11 years ago

A ':' was missing (should have been ':+'), but I think we want ':-', not
':+' ie we want to substitute if the parameter is undefined or empty:

  http://www.gnu.org/software/bash/manual/bash.html#Shell-Parameter-Expansion



Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>

Damien Lespiau authored 11 years ago and Simona Vetter committed 11 years ago

This needs to be useremail, not username here.

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>

Damien Lespiau authored 11 years ago and Simona Vetter committed 11 years ago

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>

Damien Lespiau authored 11 years ago and Simona Vetter committed 11 years ago

Not everyone has that git c alias defined.

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>

http://mid.gmane.org/CAPM=9txV9Bi+fW=4Nsusisfv9jhepnokQbvMBh6Q80DPAit96w@mail.gmail.com

This is the one we use for pushing.

Otherwise update nightly may push to whatever branch the integration
repo has checked out.

Make sure copying the rr-cache from the rerere repo will succeed.

Fetch rerere resolutions done by others.

Also, if setup didn't clone drm-intel-rerere, mkdir won't fix it. Drop
it.

Local modifications still possible, beware. And some things won't dry
run the real thing because previous things weren't done for real.

Prepare for a dry run option, not used yet.

Let the user set DIM_MUA to a binary, alias, or shell function that
accepts a subset of mutt(1) parameters to start writing an email.

Rearrange parameters to make parsing them using shell getopts easier,
and reflow for clarity.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Define addresses directly in the file.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>

git ca -> git commit --amend

Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Not generally useful, I've moved this to my own linux kernel toolkit.