On Fri, Oct 10, 2014 at 10:01:57AM +0100, Charles Bailey wrote:
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
On 11 Oct 2014, at 09:29, David Aguilar dav...@gmail.com wrote:
Thanks for the heads-up.
I tested mergetool and it seems fine but indeed there's an
`if test -e $GIT_DIR/MERGE_RR` in there that is surely not
working as intended.
One solution would be to move the work done in the test
From: Charles Bailey cbaile...@bloomberg.net
Signed-off-by: Charles Bailey cbaile...@bloomberg.net
Signed-off-by: David Aguilar dav...@gmail.com
---
Changes since v2:
This now uses the new git_dir_init function.
git-mergetool.sh | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff
Signed-off-by: David Aguilar dav...@gmail.com
---
This is a new patch since the last round, prep for 2/3
git-sh-setup.sh | 8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index 9447980..d968760 100644
--- a/git-sh-setup.sh
+++
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
Hi Ray,
On Fri, 10 Oct 2014, Ray Donnelly wrote:
what's the difference between https://github.com/msysgit/git and
https://github.com/git-for-windows/git ? I noticed that your fork is
forked from msysgit, not git-for-windows?
I am glad you asked!
Git for Windows was developed using the
From: Junio C Hamano gits...@pobox.com
Thanks.
Looked alright from a cursory read; I tweaked s/10/-10/ where you
gave examples of limiting output from git log before queuing.
That was my mis-reading. I'd even noticed that it looked 'different'
but just didn't see the leading '-' when checking
The argv_array used in unpack() is never freed. Instead of adding
explicit calls to argv_array_clear() use the args member of struct
child_process and let run_command() and friends clean up for us.
Signed-off-by: Rene Scharfe l@web.de
---
builtin/receive-pack.c | 18 --
1
Hi,
On Fri, 10 Oct 2014, Johannes Schindelin wrote:
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
Signed-off-by: Etienne Buira etienne.bu...@gmail.com
---
builtin/index-pack.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index eebf1a8..0f88f4b 100644
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -185,6 +185,9 @@ static void
Threads count being defaulted to 0 (autodetect), and --disable-pthreads
build checking that thread count==1, there were spurious warnings about
threads being ignored, despite not specified on command line/conf.
Fixes tests 5521 and 5526 that were broken in --disable-pthreads builds
because of
Replace atexit()s calls with cmd_atexit that is atexit() on threaded
builds, but handles the callbacks list internally for unthreaded builds.
This is needed because on unthreaded builds, asyncs inherits parent's
atexit() list, that gets run as soon as the async exit()s (and again at
the end of
Some options may be configured globally for a remote (e.g, tagopt).
The presence of such options in a global config should not cause
git remote or get fetch to believe that remote is configured
for every repository. Change to require definition of remote.foo.url
for the remote to be included in
$git checkout tab was taking about 3.5 seconds to respond on one
repository having four remotes with about 100 total refs (measured on
Cygwin). All of the time was being claimed in git for-each-ref to do
its work. This working directory was created using git-new-workdir, and
thus .git/refs and
Teach mergetool to write files in a temporary directory when
'mergetool.writeToTemp' is true.
This is helpful for tools such as Eclipse which cannot cope with
multiple copies of the same file in the worktree.
Suggested-by: Charles Bailey char...@hashpling.org
Signed-off-by: David Aguilar
Asciidoctor takes slightly different arguments from AsciiDoc in some
cases. It has a different name for the HTML backend and the docbook
backend produces DocBook 5, not DocBook 4.5. Also, Asciidoctor does not
accept the -f option. Move these values into variables so that they can
be overridden
The documentation for git-imap-send uses block delimiters with
mismatched lengths, which Asciidoctor doesn't support. As a result, the
page is misrendered. Adjust the delimiters so that they are of the same
length.
Signed-off-by: brian m. carlson sand...@crustytoothpaste.net
---
AsciiDoc specification states that in two-line titles, the title
underline has to be the same length as the title text, plus or minus two
characters. Asciidoctor, however, requires that this must be plus or
minus one character. Adjust the underlines to be the same length as the
title text to
AsciiDoc uses a configuration file to implement macros like linkgit,
while Asciidoctor uses Ruby extensions. Implement a Ruby extension that
implements the linkgit macro for Asciidoctor in the same way that
asciidoc.conf does for AsciiDoc.
Signed-off-by: brian m. carlson
This series is designed to implement the changes necessary to build Git
using Asciidoctor instead of AsciiDoc.
The first two patches are bug fixes. Asciidoctor is stricter about
title underline lengths (± 1 character instead of 2) and requires
matching delimiter lengths[0]. They're needed
I have what appears to be a fairly straightforward rebase operation and I can't
figure out why it seems to effectively hang 'git rebase'.
I have a handful of commits that I made last summer and haven't touched since.
I'm trying to rebase them against latest on upstream.
git status
On branch
On Sat, Oct 11, 2014 at 01:00:16PM +0200, René Scharfe wrote:
The argv_array used in unpack() is never freed. Instead of adding
explicit calls to argv_array_clear() use the args member of struct
child_process and let run_command() and friends clean up for us.
Looks good. I notice that the
I have the pattern `*.out` defined in my `core.excludesfile`.
According to the documentation[1], patterns defined in
`$GIT_DIR/info/exclude` take precedence over `core.excludesfile`, so
for one particular project that needs to track some `.out` files, I
created `$GIT_DIR/info/exclude` with just
Hi.
These are fixes of issues with submodules with use of multiple working
trees.
To be applied on top of the $gmane/257559, (6b4ce012cb in current pu).
Max Kirillov (4):
checkout: do not fail if target is an empty directory
submodule refactor: use git_path_submodule() in
Non-recursive checkout creates empty directpries in place of submodules.
If then I try to checkout --to submodules there, it refuses to do so,
because directory already exists.
Fix by allowing checking out to empty directory. Add test and modify the
existing one so that it uses non-empty
Currently git_path_submodule() does not handle submodules being a linked
checkout. The visible result is that git diff --submodule fails to
report changes in the submodule.
Perform the same resolution as with parent repository, but ignore the
GIT_COMMON_DIR environment variable, because it would
Each working directory of main repository has its own working directory
of submodule, and in most cases they should be checked out to different
revisions. So they should be separated.
It looks logical to make submodule instances in different working
directories to reuse the submodule directory in
Signed-off-by: Max Kirillov m...@max630.net
---
submodule.c | 28 ++--
1 file changed, 10 insertions(+), 18 deletions(-)
diff --git a/submodule.c b/submodule.c
index 34094f5..4aad3d4 100644
--- a/submodule.c
+++ b/submodule.c
@@ -122,43 +122,35 @@ void
28 matches
Mail list logo
