--- oslo-series-final/0000-cover-letter.patch +++ oslo-series-v2/v2-0000-cover-letter.patch @@ -1,9 +1,25 @@ -From 3f163b252b9b4e2f81e56fcecf1d73f6c5c5f844 Mon Sep 17 00:00:00 2001 +From a3b9dda1967106c741e508d376ee18971d18177e Mon Sep 17 00:00:00 2001 From: Per Cederqvist -Date: Fri, 21 Mar 2014 08:27:30 +0100 -Subject: [GUILT 00/28] Teach guilt import-commit how create legal patch names, and more +Date: Tue, 13 May 2014 21:48:55 +0200 +Subject: [GUILT v2 00/29] Teach guilt import-commit how create legal patch names, and more To: Jeff Sipek Cc: git@vger.kernel.org + +This is version two of the patch series I sent back on 21 Mar 2014. I +have addressed all feedback to date, updated the coding style, and +added signed-off-by lines from Jeff Sipek for those commits that I +have received an explicit approval from him (but only if I have not +made any other change to that particular commit). + +I have also added one more patch: a very limited coding style guide, +and accompanying settings for Emacs. See the last commit in the +series. All other commits have retained their numbering. + +To see how the patches have evolved, you might find +http://www.lysator.liu.se/~ceder/guilt-oslo-2014-v2/ useful. It +displays diffs of all the patches, in pdiffdiff output format. + +Here is the original blurb for the series, slightly edited: I recently found myself sitting on a train with a computer in front of me. I tried to use "guilt import-commit", which seemed to work, but @@ -39,6 +55,8 @@ false" to re-enable that. This patch sets the default value of guilt.reusebranch to true; it should in my opinion change to false a year or two after the next release. + + - The humble beginnings of a coding style guide. A more detailed overview of the patches: @@ -82,26 +100,28 @@ complexity, and you might want to skip them if you think the current behavior is better. +29. A coding style guide, with Emacs support. + This patch series is also available on -http://repo.or.cz/w/guilt/ceder.git in the "oslo-2014" branch. If you -already have a copy of guilt, you should be able to fetch that branch -with something like: +http://repo.or.cz/w/guilt/ceder.git in the "oslo-2014-v2" branch. If +you already have a copy of guilt, you should be able to fetch that +branch with something like: git remote add ceder http://repo.or.cz/r/guilt/ceder.git - git fetch ceder refs/heads/oslo-2014:refs/remotes/ceder/oslo-2014 + git fetch ceder refs/heads/oslo-2014-v2:refs/remotes/ceder/oslo-2014-v2 A few of the regression/t-*.out files contain non-ASCII characters. I hope they survive the mail transfer; if not, please use the repo above to fetch the commits. -Per Cederqvist (28): +Per Cederqvist (29): The tests should not fail if guilt.diffstat is set. Allow "guilt delete -f" to run from a dir which contains spaces. Added test case for "guilt delete -f". Allow "guilt import-commit" to run from a dir which contains spaces. "guilt new": Accept more than 4 arguments. - Fix and simplify the do_get_patch function. + Fix the do_get_patch function. Added test cases for "guilt fold". Added more test cases for "guilt new": empty patches. Test suite: properly check the exit status of commands. @@ -124,44 +144,48 @@ "guilt pop" now fails when there are no more patches to pop. Minor testsuite fix. Added guilt.reusebranch configuration option. - - guilt | 76 ++++-- - guilt-delete | 2 +- - guilt-fork | 2 +- - guilt-graph | 14 +- - guilt-header | 33 ++- - guilt-import | 2 +- - guilt-import-commit | 32 ++- - guilt-new | 9 +- - guilt-patchbomb | 2 +- - guilt-pop | 13 +- - guilt-push | 14 +- - guilt-rebase | 2 +- - regression/run-tests | 11 +- - regression/scaffold | 19 +- - regression/t-020.out | 339 ++++++++++++++++++++++++++ - regression/t-020.sh | 73 +++++- - regression/t-021.out | 2 + - regression/t-021.sh | 8 +- - regression/t-025.out | 426 ++++++++++++++++++++++++++++++++- - regression/t-025.sh | 14 +- - regression/t-026.out | 15 ++ - regression/t-026.sh | 5 +- - regression/t-028.out | 7 + - regression/t-028.sh | 6 +- - regression/t-032.out | 4 +- - regression/t-032.sh | 2 +- - regression/t-033.out | 87 +++++++ - regression/t-033.sh | 57 +++++ - regression/t-034.out | 569 ++++++++++++++++++++++++++++++++++++++++++++ - regression/t-034.sh | 74 ++++++ - regression/t-035.out | 659 +++++++++++++++++++++++++++++++++++++++++++++++++++ - regression/t-035.sh | 88 +++++++ - regression/t-061.out | 1 - - regression/t-061.sh | 9 +- - regression/t-062.out | 441 ++++++++++++++++++++++++++++++++++ - regression/t-062.sh | 140 +++++++++++ - 36 files changed, 3168 insertions(+), 89 deletions(-) + Added a short style guide, and Emacs settings. + + .dir-locals.el | 3 + + Documentation/Contributing | 15 ++ + guilt | 68 ++++-- + guilt-delete | 2 +- + guilt-fork | 2 +- + guilt-graph | 13 +- + guilt-header | 28 ++- + guilt-import | 2 +- + guilt-import-commit | 30 ++- + guilt-new | 9 +- + guilt-patchbomb | 2 +- + guilt-pop | 17 +- + guilt-push | 19 +- + guilt-rebase | 2 +- + regression/run-tests | 10 +- + regression/scaffold | 19 +- + regression/t-020.out | 339 +++++++++++++++++++++++++++ + regression/t-020.sh | 73 +++++- + regression/t-021.out | 2 + + regression/t-021.sh | 8 +- + regression/t-025.out | 426 ++++++++++++++++++++++++++++++++- + regression/t-025.sh | 14 +- + regression/t-026.out | 15 ++ + regression/t-026.sh | 5 +- + regression/t-028.out | 7 + + regression/t-028.sh | 6 +- + regression/t-032.out | 4 +- + regression/t-032.sh | 2 +- + regression/t-033.out | 90 +++++++ + regression/t-033.sh | 61 +++++ + regression/t-034.out | 569 +++++++++++++++++++++++++++++++++++++++++++++ + regression/t-034.sh | 73 ++++++ + regression/t-035.out | 467 +++++++++++++++++++++++++++++++++++++ + regression/t-035.sh | 62 +++++ + regression/t-061.out | 1 - + regression/t-061.sh | 8 +- + regression/t-062.out | 441 +++++++++++++++++++++++++++++++++++ + regression/t-062.sh | 137 +++++++++++ + 38 files changed, 2966 insertions(+), 85 deletions(-) + create mode 100644 .dir-locals.el create mode 100644 regression/t-033.out create mode 100755 regression/t-033.sh create mode 100644 regression/t-034.out