This is slightly more robust (checking ! test -f would not
notice a directory of the same name, though that is not
likely to happen here). It also makes debugging easier, as
the test script will output a message on failure.
Signed-off-by: Jeff King p...@peff.net
---
t/t5304-prune.sh | 46
These patches are pulled out of the prune-mtime series I posted
earlier[1]. The discussion veered off and there's no reason that the two
topics need to be part of the same series.
The first patch is the same cleanup as before.
The second one uses Michael's suggested verbose function, like:
$
For small outputs, we sometimes use:
test $(some_cmd) = something we expect
instead of a full test_cmp. The downside of this is that
when it fails, there is no output at all from the script.
Let's introduce a small helper to make tests easier to
debug.
Signed-off-by: Jeff King p...@peff.net
Usually running a test under -v makes it clear which
command is failing. However, sometimes it can be useful to
also see a complete trace of the shell commands being run in
the test. You can do so without any support from the test
suite by running sh -x t-foo.sh. However, this
produces quite a
On Fri, Oct 10, 2014 at 02:13:55AM -0400, Jeff King wrote:
Having finally figured out how to drop the set +x from the output, I
have noticed that I kind of liked the test_eval_ret=$? part of the
trace (which is now gone, too), because it pretty explicitly tells you
that the last traced
On Fri, Oct 10, 2014 at 02:13:55AM -0400, Jeff King wrote:
+ -x)
+ test_eval_start_='set -x'
[...]
+ eval $test_eval_start_ $*
+}
Hmph. I had originally intended to make this set -x; with a semicolon,
to keep it split from $*. But I forgot to, and much to my surprise,
Hi Ray,
On Fri, 10 Oct 2014, Ray Donnelly wrote:
On Thu, Oct 9, 2014 at 8:47 PM, Johannes Schindelin
johannes.schinde...@gmx.de wrote:
On Thu, 9 Oct 2014, Ray Donnelly wrote:
On Thu, Oct 9, 2014 at 8:22 PM, Johannes Schindelin
johannes.schinde...@gmx.de wrote:
On Wed, 8 Oct
On Fri, Oct 10, 2014 at 02:21:56AM -0400, Jeff King wrote:
diff --git a/t/test-lib.sh b/t/test-lib.sh
index a60ec75..81ceb23 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -237,7 +237,11 @@ do
shift ;;
-x)
test_eval_start_='set -x'
-
On Thu, Oct 09, 2014 at 11:36:00AM -0700, Junio C Hamano wrote:
David Aguilar dav...@gmail.com writes:
Avoid filenames with multiple dots so that overly-picky tools do
not misinterpret their extension.
Previously, foo/bar.ext in the worktree would result in e.g.
On Wed, Oct 08, 2014 at 12:52:24PM -0700, Junio C Hamano wrote:
The whole reason why the actualy diff.*.command and textconv
commands are defined in .git/config while the filetype label is
assigned by in-tree .gitattributes is because these commands are
platform dependant. So textconv on
Avoid filenames with multiple dots so that overly-picky tools do
not misinterpret their extension.
Previously, foo/bar.ext in the worktree would result in e.g.
./foo/bar.ext.BASE.1234.ext
This can be improved by having only a single .ext and using
underscore instead of dot so that the
From: Charles Bailey cbaile...@bloomberg.net
git-difftool used to create a command list script containing $( ... )
and explicitly calls sh -c with this list.
Instead, allow mergetool --tool-help to take a mode parameter and call
mergetool directly to invoke the show_tool_help function. This mode
From: Charles Bailey cbaile...@bloomberg.net
Signed-off-by: Charles Bailey cbaile...@bloomberg.net
Signed-off-by: David Aguilar dav...@gmail.com
---
Changes since v1:
NONGIT_OK=Yes was added to make it actually work outside of a git repo.
git-mergetool.sh | 4 +++-
1 file changed, 3
While you have the lid of this section of code, should we consider
(optionally?) using a tmpdir to alleviate the eclipse issue where it wants
temporary merge files to be the canonical locations for definitions of things
that it finds when scanning source files in the project tree?
[Apologies
On 10 Oct 2014, at 09:51, David Aguilar dav...@gmail.com wrote:
Changes since v1:
NONGIT_OK=Yes was added to make it actually work outside of a git repo.
Does this actually work? The reason that I haven't got around to resending my
re-roll is that I found that I needed changes to
Hi,
On Fri, 10 Oct 2014, Johannes Schindelin wrote:
With this [mingw-w64] compiler, and the 'w64' branch from
https://github.com/dscho/git – intended to be merged into
https://github.com/git-for-windows/git – the following command-line
produces 64-bit Git:
David Aguilar wrote:
Avoid filenames with multiple dots so that overly-picky tools do
not misinterpret their extension.
Previously, foo/bar.ext in the worktree would result in e.g.
./foo/bar.ext.BASE.1234.ext
This can be improved by having only a single .ext and using
underscore
Just wanted to share that with at least wine 1.7.23 I can install
msysgit using the netboot method, clone and build git ok. I had to do
this to make gcc works actually, but it's probably no big deal
$ mkdir -p ~/.wine/drive_c/usr/libexec/gcc/mingw32 -p
$ cp
Am 10.10.2014 um 13:58 schrieb Duy Nguyen:
Just wanted to share that with at least wine 1.7.23 I can install
msysgit using the netboot method, clone and build git ok. I had to do
this to make gcc works actually, but it's probably no big deal
$ mkdir -p ~/.wine/drive_c/usr/libexec/gcc/mingw32
On Fri, Oct 10, 2014 at 7:02 PM, Thomas Braun
thomas.br...@virtuell-zuhause.de wrote:
Are you compiling git.git or msysgit.git?
git.git
And how about the test suite?
running right now, fingers crossed.. kinda slow, not sure if it's wine
or it's the msys thing.
--
Duy
--
To unsubscribe from
Ok. thanks!
David: I'm pretty sure matlab won't do that change soon :)
Sergio
On Wed, Oct 8, 2014 at 2:25 PM, Junio C Hamano gits...@pobox.com wrote:
David Aguilar dav...@gmail.com writes:
In any case, it might be worth adjusting mergetool to use a more
conservative path (underscores instead
I have found many uses for the feature that lets a pre-commit hook stage
changes in the index that will be included in the commit. But now I seem
to have found a bug in the support for that, involving partial commits.
It seems that, after a partial commit in which the pre-commit hook
stages a
On Fri, Oct 10, 2014 at 10:07:20AM +0100, Charles Bailey wrote:
While you have the lid of this section of code, should we
consider (optionally?) using a tmpdir to alleviate the eclipse
issue where it wants temporary merge files to be the canonical
locations for definitions of things that it
On Fri, Oct 10, 2014 at 01:19:40PM +0200, Jakub Narębski wrote:
David Aguilar wrote:
Avoid filenames with multiple dots so that overly-picky tools do
not misinterpret their extension.
Previously, foo/bar.ext in the worktree would result in e.g.
./foo/bar.ext.BASE.1234.ext
This can
The git-log documentation page
http://git-scm.com/docs/git-log
enters into a quoted block for the description of the format:string
option and never exits.
-Cameron
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More
Am 10.10.2014 um 20:48 schrieb David Aguilar:
On Fri, Oct 10, 2014 at 01:19:40PM +0200, Jakub Narębski wrote:
David Aguilar wrote:
Avoid filenames with multiple dots so that overly-picky tools do
not misinterpret their extension.
Previously, foo/bar.ext in the worktree would result in e.g.
Jakub Narębski jna...@gmail.com writes:
Why use expr and not POSIX shell parameter substitution?
BASE=${MERGED%.*}
ext=.${MERGED##*.}
Or something like that...
Because they are insufficient. See David's illustrations for how.
Parameter expansion (e.g. ${parameter%word}) is fine for the
Joey Hess j...@kitenet.net writes:
I have found many uses for the feature that lets a pre-commit hook stage
changes in the index that will be included in the commit. But now I seem
to have found a bug in the support for that, involving partial commits.
It seems that, after a partial commit
On Fri, Oct 10, 2014 at 02:50:15PM -0400, Cameron Smith wrote:
The git-log documentation page
http://git-scm.com/docs/git-log
enters into a quoted block for the description of the format:string
option and never exits.
Thanks for the report. Someone noticed that a few days ago and I sent a
The Everyday GIT With 20 Commands Or So is not accessible via the
Git help system. Move everyday.txt to giteveryday.txt so that git
help everyday works, and create a new placeholder file everyday.html
to refer people who follow existing URLs to the updated location.
giteveryday.txt now formats
Helped-by: Junio C Hamano gits...@pobox.com
Signed-off-by: Philip Oakley philipoak...@iee.org
---
Documentation/Makefile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Documentation/Makefile b/Documentation/Makefile
index cea0e7a..3b56714 100644
--- a/Documentation/Makefile
This is hopefully the final revision of the patch...
and integrates Junio's comments.
I've eye-balled the man page and web page results, and corrected a few quote /
back tick
items to be more consistent.
Re: [PATCH v3 1/3] doc: modernise everyday.txt wording and format in man page
style
From:
Refresh the contents of everyday.txt contents to a more modern
command style. Also update the mark-up so that it can be formatted
as a man page with AsciiDoc ready for transfer to the Git guides.
The transfer is in subsequent commits.
Guidance on modernising the command style provided by Junio at
Thanks.
Looked alright from a cursory read; I tweaked s/10/-10/ where you
gave examples of limiting output from git log before queuing.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at
34 matches
Mail list logo
