--- oslo-series-v2/v2-0000-cover-letter.patch +++ oslo-series-v3/v3-0000-cover-letter.patch @@ -1,23 +1,30 @@ -From a3b9dda1967106c741e508d376ee18971d18177e Mon Sep 17 00:00:00 2001 +From 2abb575647fe4b330cfe15a3ecd62e0c4d8b4310 Mon Sep 17 00:00:00 2001 From: Per Cederqvist -Date: Tue, 13 May 2014 21:48:55 +0200 -Subject: [GUILT v2 00/29] Teach guilt import-commit how to create legal patch names, and more +Date: Fri, 16 May 2014 16:31:32 +0200 +Subject: [GUILT v3 00/31] Teach guilt import-commit how to 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 +This is version 3 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. +I have added two new patches: + +* Patch 28/31 fixes coding style issues in t-061.sh. I inserted it +before the new patch 29/31 since 29/31 copies t-061.sh as t-062.sh, +and by fixing the style issues in the origin it is easier to track the +changes. This means that v2 patches 28 and 29 are now numbered 29 and +30. Sorry about that. + +* Patch 31/31 removes all use of "git log -p" in the test suite. 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. +http://www.lysator.liu.se/~ceder/guilt-oslo-2014-v3/ useful. It +displays diffs of all the patches between v2 and v3, in pdiffdiff +output format. Here is the original blurb for the series, slightly edited: @@ -91,7 +98,9 @@ 25-26. "guilt push" and "guilt pop" should fail when there is nothing to do. -27-28. These two commits were things I intended to contribute a while +28. Fix coding style problems in a test case. + +27, 29. These two commits were things I intended to contribute a while back, when contributing the "Change git branch when patches are applied" change (commit 67d3af63f422). These commits makes that behavior optional, and it defaults to being disabled, so @@ -100,22 +109,23 @@ complexity, and you might want to skip them if you think the current behavior is better. -29. A coding style guide, with Emacs support. +30. A coding style guide, with Emacs support. + +31. Avoid using "git log -p". This patch series is also available on -http://repo.or.cz/w/guilt/ceder.git in the "oslo-2014-v2" branch. If +http://repo.or.cz/w/guilt/ceder.git in the "oslo-2014-v3" 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-v2:refs/remotes/ceder/oslo-2014-v2 + git fetch ceder refs/heads/oslo-2014-v3:refs/remotes/ceder/oslo-2014-v3 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 (29): +Per Cederqvist (31): 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". @@ -143,18 +153,20 @@ "guilt push" now fails when there are no more patches to push. "guilt pop" now fails when there are no more patches to pop. Minor testsuite fix. + Fix coding style errors in t-061.sh. Added guilt.reusebranch configuration option. Added a short style guide, and Emacs settings. + Don't use "git log -p" in the test suite. .dir-locals.el | 3 + - Documentation/Contributing | 15 ++ - guilt | 68 ++++-- + Documentation/Contributing | 15 + + guilt | 64 +++- guilt-delete | 2 +- guilt-fork | 2 +- guilt-graph | 13 +- - guilt-header | 28 ++- + guilt-header | 29 +- guilt-import | 2 +- - guilt-import-commit | 30 ++- + guilt-import-commit | 30 +- guilt-new | 9 +- guilt-patchbomb | 2 +- guilt-pop | 17 +- @@ -162,29 +174,29 @@ 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-020.out | 924 +++++++-------------------------------------- + regression/t-020.sh | 73 +++- + regression/t-021.out | 901 +------------------------------------------ + regression/t-021.sh | 18 +- + regression/t-025.out | 426 ++++++++++++++++++++- regression/t-025.sh | 14 +- - regression/t-026.out | 15 ++ + 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-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 | 61 +++ 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(-) + regression/t-061.sh | 12 +- + regression/t-062.out | 420 +++++++++++++++++++++ + regression/t-062.sh | 130 +++++++ + 38 files changed, 2745 insertions(+), 1772 deletions(-) create mode 100644 .dir-locals.el create mode 100644 regression/t-033.out create mode 100755 regression/t-033.sh @@ -195,9 +207,6 @@ create mode 100644 regression/t-062.out create mode 100755 regression/t-062.sh -Yours, - /ceder - -- 1.8.3.1