--- oslo-series-v3/v3-0000-cover-letter.patch +++ oslo-series-v4/v4-0000-cover-letter.patch @@ -1,29 +1,29 @@ -From 2abb575647fe4b330cfe15a3ecd62e0c4d8b4310 Mon Sep 17 00:00:00 2001 +From f6910c57bbfc32ae63926d4c4bfcaf69c0203773 Mon Sep 17 00:00:00 2001 From: Per Cederqvist -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 +Date: Sun, 18 May 2014 23:35:43 +0200 +Subject: [GUILT v4 00/33] Teach guilt import-commit how to create legal patch names, and more To: Jeff Sipek Cc: git@vger.kernel.org -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). +This is version 4 of the patch series I sent back on 21 Mar 2014. I +have addressed all feedback to date, update the documentation where +needed, improved the error handling in the "cmd" and "shouldfail" +functions in the test suite, fixed compatibility with older Git +versions, 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 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. +* Patch 32/33 adds documentation and test cases for the new regexp +functionality of "guilt header". This could be folded into patch 12. + +* Patch 33/33 adds documentation for the exit value of "guilt push" +and "guilt pop". This could be folded into patches 25-26. To see how the patches have evolved, you might find -http://www.lysator.liu.se/~ceder/guilt-oslo-2014-v3/ useful. It -displays diffs of all the patches between v2 and v3, in pdiffdiff +http://www.lysator.liu.se/~ceder/guilt-oslo-2014-v4/ useful. It +displays diffs of all the patches between v3 and v4, in pdiffdiff output format. Here is the original blurb for the series, slightly edited: @@ -113,19 +113,23 @@ 31. Avoid using "git log -p". +32. Test case + doc for "guilt header". + +33. Doc for "guilt push" and "guilt pop." + This patch series is also available on -http://repo.or.cz/w/guilt/ceder.git in the "oslo-2014-v3" branch. If +http://repo.or.cz/w/guilt/ceder.git in the "oslo-2014-v4" 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-v3:refs/remotes/ceder/oslo-2014-v3 + git fetch ceder refs/heads/oslo-2014-v4:refs/remotes/ceder/oslo-2014-v4 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 (31): +Per Cederqvist (33): 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". @@ -157,46 +161,51 @@ 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 | 64 +++- - guilt-delete | 2 +- - guilt-fork | 2 +- - guilt-graph | 13 +- - guilt-header | 29 +- - 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 | 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.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 | 61 +++ - regression/t-061.out | 1 - - regression/t-061.sh | 12 +- - regression/t-062.out | 420 +++++++++++++++++++++ - regression/t-062.sh | 130 +++++++ - 38 files changed, 2745 insertions(+), 1772 deletions(-) + Improved doc and tests for guilt header. + Document the exit status of guilt push and guilt pop. + + .dir-locals.el | 3 + + Documentation/Contributing | 15 + + Documentation/guilt-header.txt | 5 +- + Documentation/guilt-pop.txt | 3 + + Documentation/guilt-push.txt | 3 + + guilt | 89 +++- + guilt-delete | 2 +- + guilt-fork | 2 +- + guilt-graph | 13 +- + guilt-header | 29 +- + 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 | 25 +- + 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.sh | 5 +- + regression/t-028.out | 16 + + regression/t-028.sh | 9 +- + 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 | 61 +++ + regression/t-061.out | 1 - + regression/t-061.sh | 12 +- + regression/t-062.out | 420 +++++++++++++++++++ + regression/t-062.sh | 130 ++++++ + 41 files changed, 2800 insertions(+), 1771 deletions(-) create mode 100644 .dir-locals.el create mode 100644 regression/t-033.out create mode 100755 regression/t-033.sh