On Mon, Jan 8, 2018 at 10:46 PM, Stefan Beller <sbel...@google.com> wrote:
> On Mon, Jan 8, 2018 at 1:08 PM, Per Cederqvist <ced...@opera.com> wrote:
>> I have a situation where I have switched a directory from being a
>> subdirectory to being a submodule. I then
I have a situation where I have switched a directory from being a
subdirectory to being a submodule. I then try to cherry-pick a commit
from a taskbranch that was made before the switch to the master
branch. The commit touches a file outside the subdirectory/submodule.
Yet "git cherry-pick"
On Mon, May 23, 2016 at 9:26 PM, Junio C Hamano <gits...@pobox.com> wrote:
> Junio C Hamano <gits...@pobox.com> writes:
>
>> Per Cederqvist <ced...@opera.com> writes:
>>
>>> git log --invert-grep --author cibot
>>...
>> Yeah, the a
We have a repository that mostly contains configuration data.
This is updated by our continuous integration build system, but
every once in a while there are also more interesting commits
made by humans.
For several years I have suffered in silence, wishing for a way
to do something like
git
As this partially reverts 84ba959bbdf0 (submodule: fix regression for
> deinit without submodules, 2016-03-22), this also disallows the use
> of `git submodule deinit .` to deinit all submodules, when no
> submodules are present. `deinit .` continues to work on repositories,
> which have at least
It used to be possible to run
git submodule deinit -f .
to remove any submodules, no matter how many submodules you had. That
is no longer possible in projects that don't have any submodules at
all. The command will fail with:
error: pathspec '.' did not match any file(s) known to
The git-submodule(1) is inconsistent. In the synopsis, it says:
git submodule [--quiet] sync [--recursive] [--] [...]
The description of the sync does not mention --recursive, and the
description of --recursive says that it is only available for foreach,
update and status.
The option
On Mon, Aug 10, 2015 at 7:24 PM, Jeff King p...@peff.net wrote:
On Mon, Aug 10, 2015 at 06:38:10PM +0200, Johannes Schindelin wrote:
+const char *pipe_id_get(int fd)
+{
+ static struct strbuf id = STRBUF_INIT;
+ struct stat st;
+
+ if (fstat(fd, st) 0 || !S_ISFIFO(st.st_mode))
working on this, I also found two minor issues with
Documentation/Makefile.
/ceder
Per Cederqvist (5):
Fix generation of Documentation/usage-%.txt.
doc: guilt.xml depends on cmds.txt.
doc: don't use guilt-foo invocations in examples.
doc: don't use guilt-foo invocations in usage
to find the cause.
Signed-off-by: Per Cederqvist ced...@opera.com
---
Documentation/guilt-add.txt| 2 +-
Documentation/guilt-delete.txt | 2 +-
Documentation/guilt-diff.txt | 2 +-
Documentation/guilt-help.txt | 4 ++--
Documentation/guilt-new.txt| 6 +++---
Documentation/guilt-repair.txt
to .gitignore.
Signed-off-by: Per Cederqvist ced...@opera.com
---
Documentation/.gitignore | 3 +++
Documentation/Makefile | 2 ++
2 files changed, 5 insertions(+)
diff --git a/Documentation/.gitignore b/Documentation/.gitignore
index c4f0588..9b8d4da 100644
--- a/Documentation/.gitignore
+++ b
. This command is still very
fast compared to the docbook processing.
Signed-off-by: Per Cederqvist ced...@opera.com
---
Documentation/Makefile | 4 ++--
Documentation/usage.sh | 8 +++-
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/Documentation/Makefile b/Documentation
Signed-off-by: Per Cederqvist ced...@opera.com
---
Documentation/usage.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/usage.sh b/Documentation/usage.sh
index 629f546..9cc49f7
--- a/Documentation/usage.sh
+++ b/Documentation/usage.sh
@@ -2,4 +2,4 @@
name
Make them into reference to the man pages instead.
Signed-off-by: Per Cederqvist ced...@opera.com
---
Documentation/guilt-add.txt | 2 +-
Documentation/guilt-refresh.txt | 2 +-
Documentation/guilt-rm.txt | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git
times to ignore many files. Each argument is saved
to a temporary file and grep -v -f $TEMPORARY is used to filter out
the file names you want to ignore.
Also added a minimal test case and documentation.
Signed-off-by: Per Cederqvist ced...@opera.com
---
Documentation/guilt-graph.txt | 5
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-by: Per Cederqvist ced...@opera.com
---
guilt-graph | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/guilt-graph
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 on the corresponding guilt-*.txt file, but the usage.sh
script actually
repository. (That branch is
based on the doc-dash-2015-v1 branch that contains my documentation
fixes, so if you just want these two commits you will have to
cherry-pick.))
/ceder
Per Cederqvist (2):
guilt graph: Simplify getfiles.
Teach guilt graph the -x exclude-pattern option
{
- echo % $@
+ printf %% %s\n $*
if ! (
exec 31
rv=`(($@ 21; echo $? 4) | replace_path 3 ) 41`
On Sun, May 18, 2014 at 11:59:51PM +0200, Per Cederqvist wrote:
Try harder to create patch names that adhere to the rules in
git-check-ref-format(1) when
On Fri, May 16, 2014 at 5:20 PM, Jeff Sipek jef...@josefsipek.net wrote:
On Fri, May 16, 2014 at 04:46:01PM +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
On Fri, May 16, 2014 at 5:45 PM, Jeff Sipek jef...@josefsipek.net wrote:
On Fri, May 16, 2014 at 04:45:56PM +0200, Per Cederqvist wrote:
The cmd and shouldfail functions checked the exit status of the
replace_path function instead of the actual command that was running.
(The $? construct
contain non-ASCII characters. I
hope they survive the mail transfer; if not, please use the repo above
to fetch the commits.
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
Explicitly set guilt.diffstat to its default value. Without this, the
027 test (and possibly others) fail if guilt.diffstat is set to true
in ~/.gitconfig.
Signed-off-by: Per Cederqvist ced...@opera.com
Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net
---
regression/scaffold | 1 +
1
Signed-off-by: Per Cederqvist ced...@opera.com
Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net
---
guilt-delete | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/guilt-delete b/guilt-delete
index 3e394f8..967ac10 100755
--- a/guilt-delete
+++ b/guilt-delete
@@ -49,7
Signed-off-by: Per Cederqvist ced...@opera.com
Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net
---
guilt-import-commit | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/guilt-import-commit b/guilt-import-commit
index 20dcee2..f14647c 100755
--- a/guilt-import
Ensure that the file really is deleted.
Signed-off-by: Per Cederqvist ced...@opera.com
Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net
---
regression/t-026.out | 15 +++
regression/t-026.sh | 5 -
2 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/regression
$ guilt new empty-2
$ guilt pop
Now at empty-1
$ guilt fold empty-2
$ guilt pop
All patches popped.
$ guilt push
Applying patch..empty-1
fatal: unrecognized input
To force apply this patch, use 'guilt push -f'
Signed-off-by: Per Cederqvist ced...@opera.com
Signed
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.)
Signed-off-by: Per Cederqvist ced...@opera.com
Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net
---
regression/t-035.out | 467
error message if -m isn't followed by a message
argument.
Signed-off-by: Per Cederqvist ced...@opera.com
Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net
---
guilt-new | 7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/guilt-new b/guilt-new
index bb68924..9528438
Test that empty patches are handled correctly, both with and without
the guilt.diffstat configuration option.
Signed-off-by: Per Cederqvist ced...@opera.com
Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net
---
regression/t-020.out | 269
actually
succeeds.
Updated t-032.sh, which used shouldfail instead of cmd in one
place. (The comment in the script makes it clear that the command is
expected to succeed.)
Signed-off-by: Per Cederqvist ced...@opera.com
---
regression/scaffold | 23 ---
regression/t-032.sh | 2
and checking
the exit status, so the exit status was lost. (Actually, the exit
status was saved in $ERR, but nothing ever looked at $ERR.)
Signed-off-by: Per Cederqvist ced...@opera.com
Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net
---
regression/run-tests | 10 +++---
1 file
Signed-off-by: Per Cederqvist ced...@opera.com
Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net
---
regression/t-028.out | 7 +++
regression/t-028.sh | 4
2 files changed, 11 insertions(+)
diff --git a/regression/t-028.out b/regression/t-028.out
index 1564c09..ea72a3a 100644
accepts a unique regular expression.)
Signed-off-by: Per Cederqvist ced...@opera.com
Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net
---
guilt-header | 29 ++---
1 file changed, 26 insertions(+), 3 deletions(-)
diff --git a/guilt-header b/guilt-header
index 41e00cc
version of Git we are using (but
versions prior to 1.5.0 are not supported).
Refer to the git-check-ref-format(1) man page in the error messages
produced when valid_patchname indicates that the name is bad.
Added testcases that breaks most of the rules in that man-page.
Signed-off-by: Per Cederqvist
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
Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net
---
regression/t-021.sh | 2 +-
regression/t-025.sh | 2 +-
regression/t
new rules are added in the future).
Always append a .patch suffix to the patch name.
Added test cases.
Signed-off-by: Per Cederqvist ced...@opera.com
Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net
---
guilt-import-commit | 20 +-
regression/t-034.out | 567
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
Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net
---
guilt-graph | 9 +++--
regression/t-033.out | 3
expansion is
not portable; it is not supported by dash.)
Signed-off-by: Per Cederqvist ced...@opera.com
Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net
---
guilt-import-commit | 2 +-
regression/t-034.out | 14 +++---
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git
git branch names can contain commas. Check that guilt graph works
even in that case.
Signed-off-by: Per Cederqvist ced...@opera.com
Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net
---
regression/t-033.out | 65
regression/t-033.sh
This fix relies on the fact that git branch names can not contain :.
Signed-off-by: Per Cederqvist ced...@opera.com
Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net
---
guilt-graph | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/guilt-graph b/guilt-graph
index 56d0e77
Quote quotes with a backslash in the guilt graph output. Otherwise,
the dot file could contain syntax errors.
Added a test case.
Signed-off-by: Per Cederqvist ced...@opera.com
Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net
---
guilt-graph | 2 ++
regression/t-033.out | 22
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, the patch name will be less useful.
Modify the t-034.sh test case to demonstrate that this is needed.
Signed-off-by: Per
Signed-off-by: Per Cederqvist ced...@opera.com
Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net
---
guilt-patchbomb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/guilt-patchbomb b/guilt-patchbomb
index 1231418..164b10c 100755
--- a/guilt-patchbomb
+++ b/guilt
Signed-off-by: Per Cederqvist ced...@opera.com
Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net
---
guilt-rebase | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/guilt-rebase b/guilt-rebase
index fd28e48..a1714a0 100755
--- a/guilt-rebase
+++ b/guilt-rebase
@@ -66,7
there are no patches to apply.
Updated the test suite.
guilt push -a still does not fail. (It successfully manages to
ensure that all patches are pushed, even if it did not have to do
anything to make it so.)
Signed-off-by: Per Cederqvist ced...@opera.com
Signed-off-by: Josef 'Jeff' Sipek jef
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.
Updated the test suite.
Signed-off-by: Per Cederqvist ced...@opera.com
Signed-off-by: Josef 'Jeff' Sipek jef
Fix remove_topic() in t-061.sh so that it doesn't print a git hash.
Signed-off-by: Per Cederqvist ced...@opera.com
Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net
---
regression/t-061.out | 1 -
regression/t-061.sh | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git
Signed-off-by: Per Cederqvist ced...@opera.com
Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net
---
regression/t-061.sh | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/regression/t-061.sh b/regression/t-061.sh
index db26e12..bda50c7 100755
--- a/regression/t-061
a branch upstream with a
patch applied. While this might break guilt if a user is running both
version 0.35 and the current version against the same local
repository, it will not lead to data loss, and that situation is
probably rare.
Signed-off-by: Per Cederqvist ced...@opera.com
Signed-off-by: Josef
Signed-off-by: Per Cederqvist ced...@opera.com
Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net
---
.dir-locals.el | 3 +++
Documentation/Contributing | 15 +++
2 files changed, 18 insertions(+)
create mode 100644 .dir-locals.el
diff --git a/.dir-locals.el b/.dir
---
Documentation/guilt-header.txt | 5 -
regression/t-028.out | 9 +
regression/t-028.sh| 3 +++
3 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/Documentation/guilt-header.txt b/Documentation/guilt-header.txt
index 870bfaf..71b2e66 100644
---
---
Documentation/guilt-pop.txt | 3 +++
Documentation/guilt-push.txt | 3 +++
2 files changed, 6 insertions(+)
diff --git a/Documentation/guilt-pop.txt b/Documentation/guilt-pop.txt
index 36fea9e..b0b89cc 100644
--- a/Documentation/guilt-pop.txt
+++ b/Documentation/guilt-pop.txt
@@ -26,6 +26,9
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 comand that tries to ensure that the patch exist
would detect a match
Explicitly set guilt.diffstat to its default value. Without this, the
027 test (and possibly others) fail if guilt.diffstat is set to true
in ~/.gitconfig.
Signed-off-by: Per Cederqvist ced...@opera.com
Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net
---
regression/scaffold | 1 +
1
Signed-off-by: Per Cederqvist ced...@opera.com
Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net
---
guilt-delete | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/guilt-delete b/guilt-delete
index 3e394f8..967ac10 100755
--- a/guilt-delete
+++ b/guilt-delete
@@ -49,7
the commits.
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.
Allow guilt import-commit to run from a dir which contains spaces.
guilt new: Accept more than 4 arguments
Signed-off-by: Per Cederqvist ced...@opera.com
Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net
---
guilt-import-commit | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/guilt-import-commit b/guilt-import-commit
index 20dcee2..f14647c 100755
--- a/guilt-import
$ guilt new empty-2
$ guilt pop
Now at empty-1
$ guilt fold empty-2
$ guilt pop
All patches popped.
$ guilt push
Applying patch..empty-1
fatal: unrecognized input
To force apply this patch, use 'guilt push -f'
Signed-off-by: Per Cederqvist ced...@opera.com
Signed
Ensure that the file really is deleted.
Signed-off-by: Per Cederqvist ced...@opera.com
Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net
---
regression/t-026.out | 15 +++
regression/t-026.sh | 5 -
2 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/regression
error message if -m isn't followed by a message
argument.
Signed-off-by: Per Cederqvist ced...@opera.com
Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net
---
guilt-new | 7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/guilt-new b/guilt-new
index bb68924..9528438
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.)
Signed-off-by: Per Cederqvist ced...@opera.com
Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net
---
regression/t-035.out | 467
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 | 269 +++
regression/t-020.sh | 60
2 files
place. (The comment in the script makes it clear that the command is
expected to succeed.)
Signed-off-by: Per Cederqvist ced...@opera.com
---
regression/scaffold | 17 +++--
regression/t-032.sh | 2 +-
2 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/regression/scaffold
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
Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net
---
regression/t-021.sh | 2 +-
regression/t-025.sh | 2 +-
regression/t
and checking
the exit status, so the exit status was lost. (Actually, the exit
status was saved in $ERR, but nothing ever looked at $ERR.)
Signed-off-by: Per Cederqvist ced...@opera.com
Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net
---
regression/run-tests | 10 +++---
1 file
is bad.
Added testcases that breaks most of the rules in that man-page.
Git version 1.8.5 no longer allows the single character @ as a
branch name. Guilt always rejects that name, for increased
compatibility.
Signed-off-by: Per Cederqvist ced...@opera.com
Signed-off-by: Josef 'Jeff' Sipek jef
accepts a unique regular expression.)
Signed-off-by: Per Cederqvist ced...@opera.com
---
guilt-header | 29 ++---
1 file changed, 26 insertions(+), 3 deletions(-)
diff --git a/guilt-header b/guilt-header
index 41e00cc..c3d24f9 100755
--- a/guilt-header
+++ b/guilt-header
new rules are added in the future).
Always append a .patch suffix to the patch name.
Added test cases.
Signed-off-by: Per Cederqvist ced...@opera.com
Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net
---
guilt-import-commit | 20 +-
regression/t-034.out | 567
expansion is
not portable; it is not supported by dash.)
Signed-off-by: Per Cederqvist ced...@opera.com
Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net
---
guilt-import-commit | 2 +-
regression/t-034.out | 14 +++---
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git
This fix relies on the fact that git branch names can not contain :.
Signed-off-by: Per Cederqvist ced...@opera.com
Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net
---
guilt-graph | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/guilt-graph b/guilt-graph
index 56d0e77
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
Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net
---
guilt-graph | 9 +++--
regression/t-033.out | 3
git branch names can contain commas. Check that guilt graph works
even in that case.
Signed-off-by: Per Cederqvist ced...@opera.com
Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net
---
regression/t-033.out | 65
regression/t-033.sh
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, the patch name will be less useful.
Modify the t-034.sh test case to demonstrate that this is needed.
Signed-off-by: Per
Quote quotes with a backslash in the guilt graph output. Otherwise,
the dot file could contain syntax errors.
Added a test case.
Signed-off-by: Per Cederqvist ced...@opera.com
Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net
---
guilt-graph | 2 ++
regression/t-033.out | 22
, and changed disp and _disp to use printf
code %s instead of %b.
Signed-off-by: Per Cederqvist ced...@opera.com
Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net
---
guilt | 17 +
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/guilt b/guilt
index 23cc2da..9947acc 100755
Signed-off-by: Per Cederqvist ced...@opera.com
Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net
---
guilt-rebase | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/guilt-rebase b/guilt-rebase
index fd28e48..a1714a0 100755
--- a/guilt-rebase
+++ b/guilt-rebase
@@ -66,7
Signed-off-by: Per Cederqvist ced...@opera.com
Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net
---
guilt-patchbomb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/guilt-patchbomb b/guilt-patchbomb
index 1231418..164b10c 100755
--- a/guilt-patchbomb
+++ b/guilt
there are no patches to apply.
Updated the test suite.
guilt push -a still does not fail. (It successfully manages to
ensure that all patches are pushed, even if it did not have to do
anything to make it so.)
Signed-off-by: Per Cederqvist ced...@opera.com
Signed-off-by: Josef 'Jeff' Sipek jef
Fix remove_topic() in t-061.sh so that it doesn't print a git hash.
Signed-off-by: Per Cederqvist ced...@opera.com
Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net
---
regression/t-061.out | 1 -
regression/t-061.sh | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git
Signed-off-by: Per Cederqvist ced...@opera.com
---
regression/t-061.sh | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/regression/t-061.sh b/regression/t-061.sh
index db26e12..bda50c7 100755
--- a/regression/t-061.sh
+++ b/regression/t-061.sh
@@ -15,8 +15,7
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.
Updated the test suite.
Signed-off-by: Per Cederqvist ced...@opera.com
Signed-off-by: Josef 'Jeff' Sipek jef
a branch upstream with a
patch applied. While this might break guilt if a user is running both
version 0.35 and the current version against the same local
repository, it will not lead to data loss, and that situation is
probably rare.
Signed-off-by: Per Cederqvist ced...@opera.com
---
guilt
Signed-off-by: Per Cederqvist ced...@opera.com
Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net
---
.dir-locals.el | 3 +++
Documentation/Contributing | 15 +++
2 files changed, 18 insertions(+)
create mode 100644 .dir-locals.el
diff --git a/.dir-locals.el b/.dir
Signed-off-by: Per Cederqvist ced...@opera.com
Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net
---
regression/t-028.out | 7 +++
regression/t-028.sh | 4
2 files changed, 11 insertions(+)
diff --git a/regression/t-028.out b/regression/t-028.out
index 1564c09..ea72a3a 100644
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:
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
On Tue, May 13, 2014 at 11:13 PM, Jeff Sipek jef...@josefsipek.net wrote:
On Tue, May 13, 2014 at 10:30:42PM +0200, Per Cederqvist wrote:
A patch file consists of:
(1) the description
(2) optional diffstat
(3) the patches
When extracting the patch, we only want part 3. The do_get_patch
On Tue, May 13, 2014 at 11:30 PM, Jeff Sipek jef...@josefsipek.net wrote:
On Tue, May 13, 2014 at 10:30:43PM +0200, 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
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 this be $s?
Yes. Will fix that typo in v3 of the patch series.
/ceder
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 suite on each patch in the queue:
guilt pop -a;while guilt push
On Tue, May 13, 2014 at 11:29 PM, Per Cederqvist ced...@opera.com wrote:
On Tue, May 13, 2014 at 10:54 PM, Jeff Sipek jef...@josefsipek.net wrote:
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
On Wed, May 14, 2014 at 7:10 PM, Jeff Sipek jef...@josefsipek.net wrote:
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
the commits.
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
Explicitly set guilt.diffstat to its default value. Without this, the
027 test (and possibly others) fail if guilt.diffstat is set to true
in ~/.gitconfig.
Signed-off-by: Per Cederqvist ced...@opera.com
Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net
---
regression/scaffold | 1 +
1
Signed-off-by: Per Cederqvist ced...@opera.com
Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net
---
guilt-delete | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/guilt-delete b/guilt-delete
index 3e394f8..967ac10 100755
--- a/guilt-delete
+++ b/guilt-delete
@@ -49,7
Ensure that the file really is deleted.
Signed-off-by: Per Cederqvist ced...@opera.com
Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net
---
regression/t-026.out | 15 +++
regression/t-026.sh | 5 -
2 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/regression
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..f14647c 100755
--- a/guilt-import-commit
+++ b/guilt-import-commit
@@ -23,7 +23,7
guilt push empty-2
guilt pop
guilt fold empty-2
guilt pop
guilt push
Signed-off-by: Per Cederqvist ced...@opera.com
---
guilt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/guilt b/guilt
index 8701481..3fc524e 100755
--- a/guilt
+++ b/guilt
@@ -334,7 +334,7
error message if -m isn't followed by a message
argument.
Signed-off-by: Per Cederqvist ced...@opera.com
Signed-off-by: Josef 'Jeff' Sipek jef...@josefsipek.net
---
guilt-new | 7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/guilt-new b/guilt-new
index bb68924..9528438
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 +++
regression/t-020.sh | 60 +
2 files
1 - 100 of 166 matches
Mail list logo