Commit graph

16 commits

Author SHA1 Message Date
Javier Martinez Canillas
682540cbf5
do-rebase: add more options to not depend on the user git configuration
The patches generated by do-rebase depend on the user having core.abbrv=11
in their .gitconfig and also a diff.orderFile set.

These assumptions were removed for the git format-patch command by passing
all the configuration as options, but it was still present for git diff.

Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
2018-10-23 12:23:21 +02:00
Peter Jones
15a207211f Roll upstream's patches into one big patch here.
I don't really need to watch 150+ patches from upstream get applied.

Signed-off-by: Peter Jones <pjones@redhat.com>
2018-07-31 10:57:52 -04:00
Peter Jones
7b06e73552 Make do-rebase re-set the url if the directory is already there.
Signed-off-by: Peter Jones <pjones@redhat.com>
2018-07-17 16:31:30 -04:00
Peter Jones
b5667e66a1 do-rebase: Fix quoting in usage
Signed-off-by: Peter Jones <pjones@redhat.com>
2018-07-16 15:29:25 -04:00
Peter Jones
b887897c3c do-rebase: use --no-signature as well
This adds --no-signature to do-rebase's diff format-patch invocation, so the
only things that change are the actual patch contents.

Signed-off-by: Peter Jones <pjones@redhat.com>
2018-07-12 10:55:34 -04:00
Peter Jones
a52365a0df Port several fixes from the F28 tree and a WIP tree.
Signed-off-by: Peter Jones <pjones@redhat.com>
2018-07-11 16:49:50 -04:00
Peter Jones
31cddd6fc0 Add some features to do-rebase
Signed-off-by: Peter Jones <pjones@redhat.com>
2018-07-10 15:11:55 -04:00
Javier Martinez Canillas
655e9ec04f Allow do-rebase to pull the patches from different repositories
Currently the script always pull the patches from rhboot Github repo, but
for testing and developing purposes may be useful to use a different one.

Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
2018-05-14 15:23:31 -04:00
Javier Martinez Canillas
9fefeed59c Set default in parameter expasion to avoid do-rebase exit due an unset var
The script has set -u so calling do-rebase --help fails with the following:

  $ ./do-rebase --help
  ./do-rebase: line 16: $1: unbound variable

Avoid this by setting a default value when doing the parameter expansion
for the positional parameter $1 passed to the usage() function.

Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
2018-05-14 15:23:31 -04:00
Javier Martinez Canillas
bbce628672 Make do-rebase generate proper patches regardless of git config
The do-rebase script generate patches with git-format-patch, but the pkg
expects some non-default git configurations for the diffs and stats.

So instead requiring developers to setup these config options, pass them
to git-format-patch in do-rebase to generate the proper patches.

Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
2018-05-11 10:53:16 -04:00
Peter Jones
17281fd098 Make do-rebase rebase from grub-2.02 not master.
Signed-off-by: Peter Jones <pjones@redhat.com>
2018-01-17 15:40:07 -05:00
Peter Jones
4aae85d216 do-rebase: move the upstream source 2017-07-11 07:38:34 -04:00
Peter Jones
5c99bbbbf1 update do-rebase for newer git
Signed-off-by: Peter Jones <pjones@redhat.com>
2016-12-01 17:17:38 -05:00
Peter Jones
1713515a59 Rebased to newer f24 code
Signed-off-by: Peter Jones <pjones@redhat.com>
2016-04-07 10:46:33 -04:00
Peter Jones
b9efc549fa Bump for grub-2.02-beta3
Signed-off-by: Peter Jones <pjones@redhat.com>
2016-03-04 14:08:54 -05:00
Peter Jones
52f24b72a1 Make a "do-rebase" script we can use when we've rebased the github repo.
This rebuilds our patchset automatically.

Signed-off-by: Peter Jones <pjones@redhat.com>
2016-03-04 13:28:38 -05:00