Re: [PATCH] guilt: update reflog with annotations of guilt-command being run

2016-08-11 Thread Josef 'Jeff' Sipek
HEAD@{14}: guilt-push: > respect-nobarrier-mount-option-in-nojournal-mode > d08854f HEAD@{15}: guilt-pop: updating HEAD > d08854f HEAD@{16}: guilt-pop: updating HEAD > d08854f HEAD@{17}: guilt-push: > optimize-ext4_should_retry_alloc-to-improve-ENOSPC-performance > > Signed-off

Re: [GUILT 3/5] doc: don't use guilt-foo invocations in examples.

2015-01-23 Thread Jeff Sipek
select+ in another file. I know too little docbook to be able to find the cause. Yeah, a bit of a mystery to me too. Regardless, Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net Signed-off-by: Per Cederqvist ced...@opera.com --- Documentation/guilt-add.txt| 2

Re: [GUILT 1/5] Fix generation of Documentation/usage-%.txt.

2015-01-23 Thread Jeff Sipek
On Fri, Jan 23, 2015 at 03:33:03PM +0100, Per Cederqvist wrote: On Fri, Jan 23, 2015 at 3:21 PM, Jeff Sipek jef...@josefsipek.net wrote: On Fri, Jan 23, 2015 at 02:24:55PM +0100, Per Cederqvist wrote: The old rule worked, most of the time, but had several issues: - It depended

Re: [GUILT 1/2] guilt graph: Simplify getfiles.

2015-01-23 Thread Jeff Sipek
Neat. Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net On Fri, Jan 23, 2015 at 03:21:06PM +0100, Per Cederqvist wrote: git diff-tree by default emits TAB-separated fields. cut by defaults processes TAB-separated fields. Simplify getfiles() by using TAB as the separator. Signed-off

Re: [GUILT 2/2] Teach guilt graph the -x exclude-pattern option.

2015-01-23 Thread Jeff Sipek
d90c2f1..4d5fe46 100755 --- a/guilt-graph +++ b/guilt-graph @@ -3,7 +3,7 @@ # Copyright (c) Josef Jeff Sipek, 2007-2013 # -USAGE=[patchname] +USAGE=[-x exclude-pattern]... [patchname] if [ -z $GUILT_VERSION ]; then echo Invoking `basename $0` directly is no longer supported. 2

Re: [GUILT 1/5] Fix generation of Documentation/usage-%.txt.

2015-01-23 Thread Jeff Sipek
On Fri, Jan 23, 2015 at 02:24:55PM +0100, Per Cederqvist wrote: The old rule worked, most of the time, but had several issues: - It depended on the corresponding guilt-*.txt file, but the usage.sh script actually reads ../guilt-foo. - Actually, each usage-%.txt depended on all

Re: [GUILT 2/5] doc: guilt.xml depends on cmds.txt.

2015-01-23 Thread Jeff Sipek
Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net On Fri, Jan 23, 2015 at 02:24:56PM +0100, Per Cederqvist wrote: Specify an explicit dependency, to stop make from trying to generate guilt.xml if cmds.txt could not be created. The asciidoc will fail and produce an error message

Re: [GUILT 4/5] doc: don't use guilt-foo invocations in usage messages.

2015-01-23 Thread Jeff Sipek
-e 's/^guilt-/guilt /'`' $u usage-$name.txt Tiny nitpick: spaces around the |, otherwise looks good. Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net -- 2.1.0 -- Si hoc legere scis nimium eruditionis habes. -- To unsubscribe from this list: send the line unsubscribe git

Re: [GUILT 5/5] doc: git doesn't use git-foo invocations.

2015-01-23 Thread Jeff Sipek
Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net On Fri, Jan 23, 2015 at 02:24:59PM +0100, Per Cederqvist wrote: Make them into reference to the man pages instead. Signed-off-by: Per Cederqvist ced...@opera.com --- Documentation/guilt-add.txt | 2 +- Documentation/guilt

Re: [GUILT v4 15/33] Produce legal patch names in guilt-import-commit.

2015-01-22 Thread Jeff Sipek
'Jeff' Sipek jef...@josefsipek.net --- guilt-import-commit | 20 +- regression/t-034.out | 567 +++ regression/t-034.sh | 71 +++ 3 files changed, 656 insertions(+), 2 deletions(-) create mode 100644 regression/t-034.out create mode

Re: [GUILT v4 14/33] Use git check-ref-format to validate patch names.

2015-01-22 Thread Jeff Sipek
Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net On Sun, May 18, 2014 at 11:59:50PM +0200, Per Cederqvist wrote: The valid_patchname now lets git check-ref-format do its job instead of trying (and failing) to implement the same rules. See git-check-ref-format(1) for a list of the rules

Re: [GUILT v4 33/33] Document the exit status of guilt push and guilt pop.

2015-01-22 Thread Jeff Sipek
Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net Ok, I think this is all of the patches. I'll wait for you to tell me if the cmd() echo to printf change breaks anything for you. If not, I'll pull your series (via git), tag a 0.36-rc1, and push the whole thing to repo.or.cz. :) Sorry

Re: [GUILT v4 09/33] Test suite: properly check the exit status of commands.

2015-01-22 Thread Jeff Sipek
command.) Print an explicit error message if a command that should fail actually succeeds. This is a god idea. The patch still looks good. Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net Updated t-032.sh, which used shouldfail instead of cmd in one place. (The comment in the script

Re: [GUILT v4 32/33] Improved doc and tests for guilt header.

2015-01-22 Thread Jeff Sipek
Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net On Mon, May 19, 2014 at 12:00:08AM +0200, Per Cederqvist wrote: --- Documentation/guilt-header.txt | 5 - regression/t-028.out | 9 + regression/t-028.sh| 3 +++ 3 files changed, 16 insertions(+), 1

[ANNOUNCE] Guilt v0.36-rc1

2015-01-22 Thread Josef 'Jeff' Sipek
v0.36. Yes, it's been *way* too long since the last release, but hopefully that will change going forward. By far, the most changes come from Per Cederqvist who cleaned up some rather dark corners in the code. Thanks! As always, patches, and other feedback is welcome. Josef Jeff Sipek

Re: [GUILT v2 12/29] guilt header: more robust header selection.

2014-05-16 Thread Jeff Sipek
On Fri, May 16, 2014 at 11:51:37AM +0200, Per Cederqvist wrote: On Fri, May 16, 2014 at 12:46 AM, Jeff Sipek jef...@josefsipek.net wrote: On Tue, May 13, 2014 at 10:30:48PM +0200, Per Cederqvist wrote: If you run something like guilt header '.*' the command would crash, because the grep

Re: [GUILT v3 08/31] Added more test cases for guilt new: empty patches.

2014-05-16 Thread Jeff Sipek
Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net On Fri, May 16, 2014 at 04:45:55PM +0200, Per Cederqvist wrote: Test that empty patches are handled correctly, both with and without the guilt.diffstat configuration option. Signed-off-by: Per Cederqvist ced...@opera.com

Re: [GUILT v3 12/31] guilt header: more robust header selection.

2014-05-16 Thread Jeff Sipek
Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net On Fri, May 16, 2014 at 04:45:59PM +0200, Per Cederqvist wrote: If you run something like guilt header '.*' the command would crash, because the grep comand that tries to ensure that the patch exist would detect a match, but the later

Re: [GUILT v3 29/31] Added guilt.reusebranch configuration option.

2014-05-16 Thread Jeff Sipek
Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net On Fri, May 16, 2014 at 04:46:16PM +0200, Per Cederqvist wrote: When the option is true, Guilt does not create a new Git branch when patches are applied. This way, you can switch between Guilt 0.35 and the current version of Guilt

Re: [GUILT v3 14/31] Use git check-ref-format to validate patch names.

2014-05-16 Thread Jeff Sipek
-off-by: Per Cederqvist ced...@opera.com Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net --- guilt| 21 ++- guilt-fork | 2 +- guilt-import | 2 +- guilt-new| 2 +- regression/t-025.out | 426

Re: [GUILT v3 09/31] Test suite: properly check the exit status of commands.

2014-05-16 Thread Jeff Sipek
0 - return 1 + ( + exec 31 + rv=`(($@ 21; echo $? 4) | replace_path 3 ) 41` Wow. This took a while to decipher :) Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net + exit $rv + ) + return $? } # usage: shouldfail cmd

Re: [GUILT v2 28/29] Added guilt.reusebranch configuration option.

2014-05-15 Thread Jeff Sipek
On Thu, May 15, 2014 at 09:37:05AM +0200, Per Cederqvist wrote: On Wed, May 14, 2014 at 5:53 PM, Jeff Sipek jef...@josefsipek.net wrote: On Tue, May 13, 2014 at 10:31:04PM +0200, Per Cederqvist wrote: ... + +for i in `seq 5`; do + if [ $i -ge 5 ]; then + shouldfail guilt

Re: [GUILT v2 12/29] guilt header: more robust header selection.

2014-05-15 Thread Jeff Sipek
On Tue, May 13, 2014 at 10:30:48PM +0200, Per Cederqvist wrote: If you run something like guilt header '.*' the command would crash, because the grep comand that tries to ensure that the patch exist would detect a match, but the later code expected the match to be exact. Fixed by comparing

Re: [GUILT v2 13/29] Check that guilt header '.*' fails.

2014-05-15 Thread Jeff Sipek
Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net On Tue, May 13, 2014 at 10:30:49PM +0200, Per Cederqvist wrote: Signed-off-by: Per Cederqvist ced...@opera.com --- regression/t-028.out | 7 +++ regression/t-028.sh | 4 2 files changed, 11 insertions(+) diff --git

Re: [GUILT v2 14/29] Use git check-ref-format to validate patch names.

2014-05-15 Thread Jeff Sipek
. Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net Signed-off-by: Per Cederqvist ced...@opera.com --- guilt| 21 ++- guilt-fork | 2 +- guilt-import | 2 +- guilt-new| 2 +- regression/t-025.out | 426

Re: [GUILT v2 15/29] Produce legal patch names in guilt-import-commit.

2014-05-15 Thread Jeff Sipek
the patch name x (to ensure that the code is future-proof in case new rules are added in the future). Always append a .patch suffix to the patch name. Added test cases. Also very nice. Thanks, Jeff. Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net -- We have joy, we have fun, we

Re: [GUILT v2 16/29] Fix backslash handling when creating names of imported patches.

2014-05-14 Thread Jeff Sipek
On Wed, May 14, 2014 at 10:56:18AM +0200, Per Cederqvist wrote: On Wed, May 14, 2014 at 12:09 AM, Jeff Sipek jef...@josefsipek.net wrote: On Tue, May 13, 2014 at 10:30:52PM +0200, Per Cederqvist wrote: The 'echo %s' construct sometimes processes escape sequences. (This %s? Should

Re: [GUILT v2 25/29] guilt push now fails when there are no more patches to push.

2014-05-14 Thread Jeff Sipek
On Wed, May 14, 2014 at 11:27:19AM +0200, Per Cederqvist wrote: On Tue, May 13, 2014 at 11:41 PM, Jeff Sipek jef...@josefsipek.net wrote: On Tue, May 13, 2014 at 10:31:01PM +0200, Per Cederqvist wrote: This makes it easier to script operations on the entire queue, for example run the test

Re: [GUILT v2 28/29] Added guilt.reusebranch configuration option.

2014-05-14 Thread Jeff Sipek
On Tue, May 13, 2014 at 10:31:04PM +0200, Per Cederqvist wrote: When the option is true (the default), Guilt does not create a new Git branch when patches are applied. This way, you can switch between Guilt 0.35 and the current version of Guilt with no issues. At a future time, maybe a year

Re: [GUILT v2 08/29] Added more test cases for guilt new: empty patches.

2014-05-14 Thread Jeff Sipek
On Tue, May 13, 2014 at 10:30:44PM +0200, Per Cederqvist wrote: Test that empty patches are handled correctly, both with and without the guilt.diffstat configuration option. Signed-off-by: Per Cederqvist ced...@opera.com --- regression/t-020.out | 250

Re: [GUILT v2 00/29] Teach guilt import-commit how to create legal patch names, and more

2014-05-13 Thread Jeff Sipek
On Tue, May 13, 2014 at 04:45:47PM -0400, Theodore Ts'o wrote: On Tue, May 13, 2014 at 10:30:36PM +0200, Per Cederqvist wrote: ... - Changed behavior: by default, guilt no longer changes branch when you push a patch. You need to do git config guilt.reusebranch false to re-enable

Re: [GUILT v2 29/29] Added a short style guide, and Emacs settings.

2014-05-13 Thread Jeff Sipek
else. + +Please check that you change does not break make test. Please add +new testcases for any new functionality, and if you fix a bug. + Adding this blurb here is a good idea. Thanks! Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net 2) Make a patch: Use diff -up or diff

Re: [GUILT v2 04/29] Allow guilt import-commit to run from a dir which contains spaces.

2014-05-13 Thread Jeff Sipek
Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net On Tue, May 13, 2014 at 10:30:40PM +0200, Per Cederqvist wrote: Signed-off-by: Per Cederqvist ced...@opera.com --- guilt-import-commit | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/guilt-import-commit b

Re: [GUILT v2 06/29] Fix the do_get_patch function.

2014-05-13 Thread Jeff Sipek
error: No changes $ guilt pop All patches popped. $ guilt pu Applying patch..a error: No changes To force apply this patch, use 'guilt push -f' The diff itself is good. Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net Signed-off-by: Per Cederqvist ced...@opera.com --- guilt | 2 +- 1

Re: [GUILT v2 07/29] Added test cases for guilt fold.

2014-05-13 Thread Jeff Sipek
] + then I know that this is before patch 29, but ... style? ;) Otherwise, looks good. I like this way better than the unrolled loop in v1 of this patch. Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net + suffixa=-1

Re: [GUILT 19/28] Check that guilt graph works when working on a branch with a comma.

2014-05-13 Thread Jeff Sipek
On Fri, Mar 21, 2014 at 08:31:57AM +0100, Per Cederqvist wrote: git branch names can contain commas. Check that guilt graph works even in that case. Signed-off-by: Per Cederqvist ced...@opera.com --- regression/t-033.out | 62

Re: [GUILT 19/28] Check that guilt graph works when working on a branch with a comma.

2014-05-13 Thread Jeff Sipek
Sorry, I accidentally replied to the v1 of this patch... On Tue, May 13, 2014 at 05:33:21PM -0400, Jeff Sipek wrote: On Fri, Mar 21, 2014 at 08:31:57AM +0100, Per Cederqvist wrote: git branch names can contain commas. Check that guilt graph works even in that case. Signed-off-by: Per

Re: [GUILT v2 19/29] Check that guilt graph works when working on a branch with a comma.

2014-05-13 Thread Jeff Sipek
Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net On Tue, May 13, 2014 at 10:30:55PM +0200, Per Cederqvist wrote: git branch names can contain commas. Check that guilt graph works even in that case. Signed-off-by: Per Cederqvist ced...@opera.com --- regression/t-033.out | 65

Re: [GUILT v2 25/29] guilt push now fails when there are no more patches to push.

2014-05-13 Thread Jeff Sipek
don't particularly care for the git-log. Otherwise it looks good. Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net + +# # pop all # cmd guilt pop --all @@ -61,7 +72,7 @@ cmd guilt pop --all npatches=`guilt series | wc -l` for n in `_seq -2 $npatches`; do - if [ $n -ge 0

Re: [GUILT v2 24/29] disp no longer processes backslashes.

2014-05-13 Thread Jeff Sipek
that should be used when backslash processing is required, and changed disp and _disp to use printf code %s instead of %b. Minor nit: %s (to match %b) Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net Signed-off-by: Per Cederqvist ced...@opera.com --- guilt | 17 + 1

Re: [GUILT v2 20/29] guilt graph: Handle patch names containing quotes.

2014-05-13 Thread Jeff Sipek
] pname=? + pname=`printf \%s\ \$pname\ | sed 's/\/\/g'` Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net + disp # checking rev $current disp \$current\ [label=\$pname\] diff --git a/regression/t-033.out b/regression/t-033.out index 3d1c61f..c120d4f 100644

Re: [GUILT v2 17/29] guilt graph no longer loops when no patches are applied.

2014-05-13 Thread Jeff Sipek
Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net On Tue, May 13, 2014 at 10:30:53PM +0200, Per Cederqvist wrote: Give an error message if no patches are applied. Added a test case that never terminates unless this fix is applied. Signed-off-by: Per Cederqvist ced...@opera.com

Re: [GUILT v2 10/29] Run test_failed if the exit status of a test script is bad.

2014-05-13 Thread Jeff Sipek
Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net On Tue, May 13, 2014 at 10:30:46PM +0200, Per Cederqvist wrote: There were two problems with the old code: - Since set -e is in effect (that is set in scaffold) the run-test script exited immediately if a t-*.sh script failed

Re: [GUILT v2 16/29] Fix backslash handling when creating names of imported patches.

2014-05-13 Thread Jeff Sipek
On Tue, May 13, 2014 at 10:30:52PM +0200, Per Cederqvist wrote: The 'echo %s' construct sometimes processes escape sequences. (This %s? Should this be $s? Otherwise, looks good. happens, for instance, under Ubuntu 14.04 when /bin/sh is actually dash.) We don't want that to happen when we

Re: [GUILT v2 26/29] guilt pop now fails when there are no more patches to pop.

2014-05-13 Thread Jeff Sipek
Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net On Tue, May 13, 2014 at 10:31:02PM +0200, Per Cederqvist wrote: This is analogous to how guilt push now fails when there are no more patches to push. Like push, the --all argument still succeeds even if there was no need to pop anything

Re: [GUILT 07/28] Added test cases for guilt fold.

2014-05-08 Thread Jeff Sipek
On Thu, May 08, 2014 at 09:41:22PM +0200, Per Cederqvist wrote: On Wed, May 7, 2014 at 11:06 PM, Jeff Sipek jef...@josefsipek.net wrote: On Wed, May 07, 2014 at 10:59:56PM +0200, Per Cederqvist wrote: On Tue, May 6, 2014 at 9:40 PM, Jeff Sipek jef...@josefsipek.net wrote: On Fri, Mar 21

Re: [GUILT 07/28] Added test cases for guilt fold.

2014-05-07 Thread Jeff Sipek
On Wed, May 07, 2014 at 10:59:56PM +0200, Per Cederqvist wrote: On Tue, May 6, 2014 at 9:40 PM, Jeff Sipek jef...@josefsipek.net wrote: On Fri, Mar 21, 2014 at 08:31:45AM +0100, Per Cederqvist wrote: Test that we can combine any combination of patches with empty and non-empty messages, both

Re: [GUILT 27/28] Minor testsuite fix.

2014-05-07 Thread Jeff Sipek
Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net On Fri, Mar 21, 2014 at 08:32:05AM +0100, Per Cederqvist wrote: Fix remove_topic() in t-061.sh so that it doesn't print a git hash. Signed-off-by: Per Cederqvist ced...@opera.com --- regression/t-061.out | 1 - regression/t-061.sh

Re: [GUILT 24/28] disp no longer processes backslashes.

2014-05-07 Thread Jeff Sipek
On Fri, Mar 21, 2014 at 08:32:02AM +0100, Per Cederqvist wrote: Only one invocation of disp or _disp actually needed backslash processing. In quite a few instances, it was wrong to do backslash processing, as the message contained data derived from the user. Created the new function disp_e

Re: [GUILT 25/28] guilt push now fails when there are no more patches to push.

2014-05-07 Thread Jeff Sipek
On Fri, Mar 21, 2014 at 08:32:03AM +0100, Per Cederqvist wrote: This makes it easier to script operations on the entire queue, for example run the test suite on each patch in the queue: guilt pop -a;while guilt push; do make test||break; done This brings guilt push in line with the

Re: [GUILT 04/28] Allow guilt import-commit to run from a dir which contains spaces.

2014-05-06 Thread Jeff Sipek
On Sun, Mar 23, 2014 at 10:13:53PM +0100, Per Cederqvist wrote: On Sun, Mar 23, 2014 at 9:07 PM, Jeff Sipek jef...@josefsipek.net wrote: On Sun, Mar 23, 2014 at 08:57:08PM +0100, Per Cederqvist wrote: On Sun, Mar 23, 2014 at 6:04 PM, Jeff Sipek jef...@josefsipek.net wrote: On Fri, Mar 21

Re: [GUILT 06/28] Fix and simplify the do_get_patch function.

2014-05-06 Thread Jeff Sipek
On Sun, Mar 23, 2014 at 10:03:48PM +0100, Per Cederqvist wrote: On Sun, Mar 23, 2014 at 6:09 PM, Jeff Sipek jef...@josefsipek.net wrote: On Fri, Mar 21, 2014 at 08:31:44AM +0100, Per Cederqvist wrote: When extracting the patch, we only want the actual patches. We don't want

Re: [GUILT 07/28] Added test cases for guilt fold.

2014-05-06 Thread Jeff Sipek
On Fri, Mar 21, 2014 at 08:31:45AM +0100, Per Cederqvist wrote: Test that we can combine any combination of patches with empty and non-empty messages, both with and without guilt.diffstat. (All patches are empty.) I feel like we should have *some* content there - most of the time, I care more

Re: [GUILT 10/28] Run test_failed if the exit status of a test script is bad.

2014-05-06 Thread Jeff Sipek
On Fri, Mar 21, 2014 at 08:31:48AM +0100, Per Cederqvist wrote: There were two problems with the old code: - Since set -e is in effect (that is set in scaffold) the run-test script exited immediately if a t-*.sh script failed. This is not nice, as we want the error report that

Re: [GUILT 11/28] test suite: remove pointless redirection.

2014-05-06 Thread Jeff Sipek
Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net On Fri, Mar 21, 2014 at 08:31:49AM +0100, Per Cederqvist wrote: The shouldfail function already redirects stderr to stdout, so there is no need to do the same in t-028.sh and t-021.sh. Signed-off-by: Per Cederqvist ced...@opera.com

Re: [GUILT 17/28] guilt graph no longer loops when no patches are applied.

2014-05-06 Thread Jeff Sipek
Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net On Fri, Mar 21, 2014 at 08:31:55AM +0100, Per Cederqvist wrote: Give an error message if no patches are applied. Added a test case that never terminates unless this fix is applied. Signed-off-by: Per Cederqvist ced...@opera.com

Re: [GUILT 18/28] guilt-graph: Handle commas in branch names.

2014-05-06 Thread Jeff Sipek
Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net On Fri, Mar 21, 2014 at 08:31:56AM +0100, Per Cederqvist wrote: This fix relies on the fact that git branch names can not contain :. Signed-off-by: Per Cederqvist ced...@opera.com --- guilt-graph | 2 +- 1 file changed, 1 insertion

Re: [GUILT 19/28] Check that guilt graph works when working on a branch with a comma.

2014-05-06 Thread Jeff Sipek
On Fri, Mar 21, 2014 at 08:31:57AM +0100, Per Cederqvist wrote: git branch names can contain commas. Check that guilt graph works even in that case. Signed-off-by: Per Cederqvist ced...@opera.com --- regression/t-033.out | 62

Re: [GUILT 20/28] guilt graph: Handle patch names containing quotes.

2014-05-06 Thread Jeff Sipek
On Fri, Mar 21, 2014 at 03:57:37AM -0400, Eric Sunshine wrote: On Fri, Mar 21, 2014 at 3:31 AM, Per Cederqvist ced...@opera.com wrote: Quote quotes with a backslash in the guitl graph output. Otherwise, s/guitl/guilt/ Yep. the dot file could contain syntax errors. Added a test case.

Re: [GUILT 21/28] The log.decorate setting should not influence import-commit.

2014-05-06 Thread Jeff Sipek
Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net On Fri, Mar 21, 2014 at 08:31:59AM +0100, Per Cederqvist wrote: Use --no-decorate in the call to git log that tries to read the commit message to produce patch names. Otherwise, if the user has set log.decorate to short or full

Re: [GUILT 22/28] The log.decorate setting should not influence patchbomb.

2014-05-06 Thread Jeff Sipek
Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net On Fri, Mar 21, 2014 at 08:32:00AM +0100, Per Cederqvist wrote: Signed-off-by: Per Cederqvist ced...@opera.com --- guilt-patchbomb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guilt-patchbomb b/guilt-patchbomb

Re: [GUILT 23/28] The log.decorate setting should not influence guilt rebase.

2014-05-06 Thread Jeff Sipek
Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net On Fri, Mar 21, 2014 at 08:32:01AM +0100, Per Cederqvist wrote: Signed-off-by: Per Cederqvist ced...@opera.com --- guilt-rebase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guilt-rebase b/guilt-rebase index

Re: [GUILT 04/28] Allow guilt import-commit to run from a dir which contains spaces.

2014-03-23 Thread Jeff Sipek
On Fri, Mar 21, 2014 at 08:31:42AM +0100, Per Cederqvist wrote: Signed-off-by: Per Cederqvist ced...@opera.com --- guilt-import-commit | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/guilt-import-commit b/guilt-import-commit index 20dcee2..9488ded 100755 ---

Re: [GUILT 06/28] Fix and simplify the do_get_patch function.

2014-03-23 Thread Jeff Sipek
On Fri, Mar 21, 2014 at 08:31:44AM +0100, Per Cederqvist wrote: When extracting the patch, we only want the actual patches. We don't want the --- delimiter. Simplify the extraction by simply deleting everything before the first diff line. (Use sed instead of awk to simplify the code.)

Re: [GUILT 04/28] Allow guilt import-commit to run from a dir which contains spaces.

2014-03-23 Thread Jeff Sipek
On Sun, Mar 23, 2014 at 08:57:08PM +0100, Per Cederqvist wrote: On Sun, Mar 23, 2014 at 6:04 PM, Jeff Sipek jef...@josefsipek.net wrote: On Fri, Mar 21, 2014 at 08:31:42AM +0100, Per Cederqvist wrote: Signed-off-by: Per Cederqvist ced...@opera.com --- guilt-import-commit | 6

Re: [GUILT 00/28] Teach guilt import-commit how create legal patch names, and more

2014-03-21 Thread Jeff Sipek
On Fri, Mar 21, 2014 at 08:31:38AM +0100, Per Cederqvist wrote: 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 when I tried to guilt push the commits I had just imported I got some errors. It turned out

Re: [GUILT] add FreeBSD support

2013-08-20 Thread Josef 'Jeff' Sipek
On Tue, Aug 20, 2013 at 03:44:16PM +0800, Zheng Liu wrote: Hi Josef, On Fri, Aug 09, 2013 at 11:20:46AM -0400, Josef 'Jeff' Sipek wrote: On Fri, Aug 09, 2013 at 11:04:45PM +0800, gnehzuil.liu wrote: ?? 2013-8-9??10:46??Josef 'Jeff' Sipek jef...@josefsipek.net д On Fri, Aug

Re: [GUILT] add FreeBSD support

2013-08-09 Thread Josef 'Jeff' Sipek
On Fri, Aug 09, 2013 at 08:32:28PM +0800, Zheng Liu wrote: From: Zheng Liu gnehzuil@gmail.com Currently guilt doesn't support FreeBSD platform. This commit tries to add this support. The file called 'os.FreeBSD' is copied from os.Darwin due to these two platforms have almost the same

Re: [GUILT] add FreeBSD support

2013-08-09 Thread Josef 'Jeff' Sipek
On Fri, Aug 09, 2013 at 11:04:45PM +0800, gnehzuil.liu wrote: �� 2013-8-9��10:46��Josef 'Jeff' Sipek jef...@josefsipek.net д On Fri, Aug 09, 2013 at 08:32:28PM +0800, Zheng Liu wrote: From: Zheng Liu gnehzuil@gmail.com Currently guilt doesn't support FreeBSD platform

Re: [PATCH] guilt: fix date parsing

2013-05-22 Thread Josef 'Jeff' Sipek
On Wed, May 22, 2013 at 08:10:10AM -0400, Theodore Ts'o wrote: On Tue, May 21, 2013 at 11:39:21PM -0400, Josef 'Jeff' Sipek wrote: I applied this one and the guilt: skip empty line after... patch. Thanks! BTW, it looks like you are not using git am -s to apply these patches? The reason

Re: [PATCH] Added guilt.reusebranch configuration option.

2013-05-22 Thread Josef 'Jeff' Sipek
On Wed, May 22, 2013 at 03:01:36PM +0200, Per Cederqvist wrote: When the option is true (the default), Guilt does not create a new Git branch when patches are applied. This way, you can switch between Guilt 0.35 and the current version of Guilt with no issues. At a future time, maybe a year

Re: [PATCH] Added guilt.reusebranch configuration option.

2013-05-22 Thread Josef 'Jeff' Sipek
On Wed, May 22, 2013 at 10:45:31AM -0400, Theodore Ts'o wrote: I just had another idea (although I haven't had a chance to code up anything yet). Perhaps instead of, or in addition to, a global setting (i.e., guilt.reusebranch), perhaps we should have a per-branch setting, such as

Re: [PATCH] guilt: force the use of bare branches

2013-05-21 Thread Josef 'Jeff' Sipek
On Tue, May 21, 2013 at 10:55:57PM -0400, Theodore Ts'o wrote: To make it harder to accidentally do git push with a guilt patch applied, guilt push changes branch from e.g. master to guilt/master starting with commit 67d3af63f422. This is a feature which I use for ext4 development; I actually

Re: [PATCH] guilt: fix date parsing

2013-05-21 Thread Josef 'Jeff' Sipek
I applied this one and the guilt: skip empty line after... patch. Jeff. On Tue, May 21, 2013 at 11:13:31PM -0400, Theodore Ts'o wrote: If the date field has a space in it, such as: Date: Tue, 14 May 2013 18:37:15 +0200 previously guilt would go belly up: + export

Re: [PATCH 0/7] guilt patches, including git 1.8 support

2013-01-27 Thread Josef 'Jeff' Sipek
On Tue, Jan 15, 2013 at 06:26:06PM -0800, Jonathan Nieder wrote: Hi Jeff and other guilty parties, I collected all the guilt patches I could find on-list and added one of my own. Completely untested, except for running the regression tests. These are also available via git protocol from

Re: [PATCH 0/7] guilt patches, including git 1.8 support

2013-01-20 Thread Josef 'Jeff' Sipek
On Sun, Jan 20, 2013 at 10:19:39PM +0100, Per Cederqvist wrote: On 01/16/13 03:26, Jonathan Nieder wrote: Hi Jeff and other guilty parties, I collected all the guilt patches I could find on-list and added one of my own. Completely untested, except for running the regression tests. These

Re: [PATCH 0/7] guilt patches, including git 1.8 support

2013-01-16 Thread Josef 'Jeff' Sipek
On Tue, Jan 15, 2013 at 10:26:06PM -0500, Theodore Ts'o wrote: On Tue, Jan 15, 2013 at 06:26:06PM -0800, Jonathan Nieder wrote: Hi Jeff and other guilty parties, I collected all the guilt patches I could find on-list and added one of my own. Completely untested, except for running the