On Fri, Nov 15, 2013 at 2:34 AM, ycollette.nos...@free.fr wrote:
OK, thanks for these informations.
From a user perspective, having this volume of devel mails flooding all the
bugs mail is very annoying.
And following the status of a bug and the history of this bug is very hard
too.
The
Add a `pull.ff` configuration option that is analogous
to the `merge.ff` option.
This allows us to control the fast-forward behavior for
pull-initiated merges only.
Signed-off-by: David Aguilar dav...@gmail.com
---
Documentation/config.txt | 10 ++
git-pull.sh | 15
Signed-off-by: David Aguilar dav...@gmail.com
---
git-pull.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-pull.sh b/git-pull.sh
index 7dbf6b1..68b2e40 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -4,7 +4,7 @@
#
# Fetch one or more remote refs and merge it/them
On Sun, Feb 02, 2014 at 04:15:09PM -0600, Stephen Leake wrote:
I'm working on the DVC Emacs front-end for git
(http://www.emacswiki.org/emacs/DistributedVersionControl), adding
features similar to the ones I added for monotone
(http://www.monotone.ca). I'm used to monotone and new to git, so
On Thu, Feb 20, 2014 at 1:03 PM, Jens Lehmann jens.lehm...@web.de wrote:
Sorry for the late reply, but here we go ...
Am 10.02.2014 07:33, schrieb Gábor Lipták:
Hi Jens,
So git status says:
liptak@liptak-kubuntu:~/Projects/MAIN_MODULE/platform/SUBMODULE
[master]$ git status
# On branch
On Mon, Feb 17, 2014 at 03:14:01PM -0700, Paul Lotz wrote:
From the Git Bash command line, I enter
$ git difftool
and type y when the file I want to difference appears. Git correctly
calls the external diff tool (LVCompare.exe), but the path for the remote
file Git passes to that tool is
gabor.lip...@gmail.com
Helped-by: Jens Lehmann jens.lehm...@web.de
Helped-by: John Keeping j...@keeping.me.uk
Signed-off-by: David Aguilar dav...@gmail.com
---
git-difftool.perl | 18 ++
1 file changed, 2 insertions(+), 16 deletions(-)
diff --git a/git-difftool.perl b/git-difftool.perl
On Mon, Feb 24, 2014 at 8:44 AM, Paul Lotz pl...@lsst.org wrote:
David,
Thanks for the helpful reply.
As you suggested, I modified the .gitconfig file to have:
[difftool test]
cmd = echo \$LOCAL\ \$REMOTE\
and ran
$ git difftool -t test
An example of the the resulting console
On Mon, Mar 03, 2014 at 04:24:15PM -0700, Paul Lotz wrote:
David,
OK, I did as you suggested, and the results were revealing.
First, I replaced echo with cat. Result: The contents of both files
appeared in the Git Bash Window.
Then I tried calling LVCompare from the Git Bash and
From: Junio C Hamano gits...@pobox.com
Signed-off-by: David Aguilar dav...@gmail.com
---
This is a replacement patch for the current tip of da/difftool.
t/t7800-difftool.sh | 14 ++
1 file changed, 14 insertions(+)
diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
index
On Fri, Mar 7, 2014 at 8:07 AM, Paul Lotz pl...@lsst.org wrote:
David,
I investigated further and found that \$LOCAL\ \$REMOTE\ return the
remote and local files (reversed). (One can easily see this in my 2/28
e-mail.) Reversing these (\$REMOTE\ \$LOCAL\) does indeed reverse the
output.
[Cc:ing Charles in case he has an opinion, this behavior dates back to the
original MT]
On Sun, Apr 20, 2014 at 07:17:34PM -0500, Felipe Contreras wrote:
It's annoying to see the prompt:
Hit return to start merge resolution tool (foo):
Every time the user does 'git mergetool' even if
with merge.conflictstyle=diff3.
This is a nice addition, thanks.
FWIW,
Acked-by: David Aguilar dav...@gmail.com
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
How a conflict looks:
http://felipec.org/vimdiff3-conflict.png
How it looks resolved:
http://felipec.org/vimdiff3-resolved.png
On Sun, Apr 20, 2014 at 05:41:05PM -0500, Felipe Contreras wrote:
= Reject non-fast-forward pulls by default =
Many new-comers end up making merges by mistake when they pull because
they don't understand what is a non-fast-forward and what they should
actually be doing. Most people, even
On Tue, Apr 22, 2014 at 10:19 AM, Junio C Hamano gits...@pobox.com wrote:
David Aguilar dav...@gmail.com writes:
[Cc:ing Charles in case he has an opinion, this behavior dates back to the
original MT]
On Sun, Apr 20, 2014 at 07:17:34PM -0500, Felipe Contreras wrote:
It's annoying to see
://permalink.gmane.org/gmane.comp.version-control.git/137056
Looks good, thanks.
Acked-by: David Aguilar dav...@gmail.com
git-mergetool.sh |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/git-mergetool.sh b/git-mergetool.sh
index 332528f..88e853f 100755
--- a/git-mergetool.sh
On Tue, Aug 26, 2014 at 01:33:12PM -0400, Jeff King wrote:
On Tue, Aug 26, 2014 at 10:24:35AM -0700, Junio C Hamano wrote:
Jeff King p...@peff.net writes:
... But we are left with three options:
1. Add git remote list with verbose output. This is bad because it
differs
This allows us to ensure that each header can be included
individually without needing to include other headers first.
Signed-off-by: David Aguilar dav...@gmail.com
---
This patch demonstrates how to verify PATCH 2/2.
Makefile | 6 ++
check-headers.sh | 26
Add dependent headers so that including a header does not
require including additional headers.
This makes it so that gcc -c $header succeeds for each header.
Signed-off-by: David Aguilar dav...@gmail.com
---
This patch was prepared by using the check-headers target introduced
by PATCH 1/2
On Sat, Sep 06, 2014 at 11:20:32PM +0200, René Scharfe wrote:
Am 06.09.2014 um 21:20 schrieb David Aguilar:
This allows us to ensure that each header can be included
individually without needing to include other headers first.
Sounds like a good objective.
Signed-off-by: David Aguilar dav
On Sat, Sep 06, 2014 at 07:58:09PM -0400, Jeff King wrote:
On Sat, Sep 06, 2014 at 03:57:39PM -0700, David Aguilar wrote:
This checks all .h files in the top directory. Would it be better
to check all files in LIB_H instead? Or even all .h files in the
tree (using git ls-files '*.h
This allows us to ensure that each header can be included
individually without needing to include other headers first.
Signed-off-by: David Aguilar dav...@gmail.com
---
Changes since v1:
We now include xdiff, ewah, and vcs-svn headers.
Makefile | 6 ++
check-headers.sh | 29
Add dependent headers so that including a header does not
require including additional headers.
This makes it so that gcc -c $header succeeds for each header.
Signed-off-by: David Aguilar dav...@gmail.com
---
Addresses René's note to not include strbuf.h when cache.h is already
included
Add dependent headers so that including a header does not
require including additional headers.
This makes it so that gcc -c $header succeeds for each header.
Helped-by: René Scharfe l@web.de
Signed-off-by: David Aguilar dav...@gmail.com
---
Replacement patch with René's suggestions squashed
On Sun, Sep 07, 2014 at 12:49:18PM -0700, Jonathan Nieder wrote:
David Aguilar wrote:
Add dependent headers so that including a header does not
require including additional headers.
I agree with this goal, modulo the compat-util.h caveat. Thanks
for working
On Mon, Sep 08, 2014 at 04:36:49PM +0200, R. Klomp wrote:
Ok great! That indeed fixed the issue.
Although I still don't understand why it didn't work without -solo..
since it didn't work when no instance of Beyond Compare was running as
well.
There must be something not quite right in
On Mon, Sep 08, 2014 at 12:57:46PM -0700, Junio C Hamano wrote:
Matthieu Moy matthieu@grenoble-inp.fr writes:
Junio C Hamano gits...@pobox.com writes:
David Aguilar dav...@gmail.com writes:
+IFS='
+'
+git ls-files *.h ewah/*.h vcs-svn/*.h xdiff/*.h |
Hmm. This is only
On Fri, Sep 12, 2014 at 12:05:48PM -0700, Junio C Hamano wrote:
David Aguilar dav...@gmail.com writes:
Use `git rev-parse --verify --quiet` instead of redirecting
stderr to /dev/null.
Signed-off-by: David Aguilar dav...@gmail.com
---
Has this patch ever been tested? t3903 seems
()
so that read_ref_at() can suppress the message.
Use get_sha1_with_context1() instead of get_sha1() in rev-parse
so that the --quiet flag is honored.
Signed-off-by: David Aguilar dav...@gmail.com
---
This should be applied before stash: prefer --quiet over shell redirection
which is currently in pu
-off-by: David Aguilar dav...@gmail.com
---
Changes since last time:
This patch was redone to no longer add git-compat-util.h
additions, as it was run using the new check-headers.
The unicode interval types were moved into unicode_width.h
to minimize dependencies.
archive.h | 1 +
attr.h
-by: Junio C Hamano gits...@pobox.com
Helped-by: Matthieu Moy matthieu@grenoble-inp.fr
Signed-off-by: David Aguilar dav...@gmail.com
---
Changes since last time:
We now automatically include git-compat-util.h during the check
per the CodingGuidelines rule to always include it in all .c files.
We now
Add a #ifndef guard to ensure that common-cmds.h can only
be included by help.c.
Suggested-by: Junio C Hamano gits...@pobox.com
Signed-off-by: David Aguilar dav...@gmail.com
---
generate-cmdlist.sh | 4
help.c | 3 ++-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git
On Sat, Sep 13, 2014 at 10:23:03PM -0700, Junio C Hamano wrote:
On Sat, Sep 13, 2014 at 7:00 PM, Perry Hutchison per...@pluto.rain.com
wrote:
David Aguilar dav...@gmail.com wrote:
Add a #ifndef guard to ensure that common-cmds.h can only
be included by help.c.
This strikes me
Teach check-header.sh to ensure that the first included header in .c
files is either git-compat-util.h, builtin.h, or cache.h.
Ensure that common-cmds.h is only included by help.c.
Move the logic into functions so that we can skip parts of the check.
Signed-off-by: David Aguilar dav
-by: David Aguilar dav...@gmail.com
---
bulk-checkin.c| 1 +
bulk-checkin.h| 2 --
http.c| 1 +
merge-recursive.c | 2 +-
sigchain.c| 2 +-
test-regex.c | 2 +-
test-sigchain.c | 2 +-
varint.c | 1 +
varint.h | 2 --
9 files changed, 7 insertions
Ensure that rev-parse --verify --quiet is silent when asked
about deleted reflog entries.
Signed-off-by: David Aguilar dav...@gmail.com
---
This verifies and depends on refs: make rev-parse --quiet actually quiet.
t/t1503-rev-parse-verify.sh | 9 +
1 file changed, 9 insertions(+)
diff
On Sun, Sep 14, 2014 at 12:55:41AM -0700, Perry Hutchison wrote:
Junio C Hamano gits...@pobox.com wrote:
On Sat, Sep 13, 2014 at 7:00 PM, Perry Hutchison per...@pluto.rain.com
wrote:
David Aguilar dav...@gmail.com wrote:
Add a #ifndef guard to ensure that common-cmds.h can only
On Sun, Sep 14, 2014 at 06:20:57PM +0200, Fabian Ruch wrote:
Hi David,
On 09/14/2014 10:30 AM, David Aguilar wrote:
Ensure that rev-parse --verify --quiet is silent when asked
about deleted reflog entries.
Signed-off-by: David Aguilar dav...@gmail.com
---
This verifies and depends
Ensure that rev-parse --verify --quiet is silent when asked
about deleted reflog entries.
Helped-by: Fabian Ruch baf...@gmail.com
Signed-off-by: David Aguilar dav...@gmail.com
---
Changes since last time:
Use git branch test instead of low-level plumbing commands.
Capture both stdout and stderr
Use `test_must_be_be_empty file` instead of `test -z $(cat file)`.
Suggested-by: Fabian Ruch baf...@gmail.com
Signed-off-by: David Aguilar dav...@gmail.com
---
t/t1503-rev-parse-verify.sh | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/t/t1503-rev-parse-verify.sh
Signed-off-by: David Aguilar dav...@gmail.com
---
This patch is new: we now mention that stdout contains the valid object name
when --quiet is used, which may not be clear when reading this paragraph in
isolation.
Documentation/git-rev-parse.txt | 1 +
1 file changed, 1 insertion(+)
diff --git
Ensure that rev-parse --verify --quiet is silent when asked
about deleted reflog entries.
Helped-by: Fabian Ruch baf...@gmail.com
Signed-off-by: David Aguilar dav...@gmail.com
---
Differences since last time:
This goes back to the original approach of using git update-ref
plumbing instead of git
Use `test_must_be_be_empty file` instead of `test -z $(cat file)`.
Suggested-by: Fabian Ruch baf...@gmail.com
Signed-off-by: David Aguilar dav...@gmail.com
---
Unchanged since last time, but rebased for the change in the
previous patch.
t/t1503-rev-parse-verify.sh | 12 ++--
1 file
On Mon, Sep 15, 2014 at 12:19:06PM -0700, Junio C Hamano wrote:
Junio C Hamano gits...@pobox.com writes:
David Aguilar dav...@gmail.com writes:
Teach check-header.sh to ensure that the first included header in .c
files is either git-compat-util.h, builtin.h, or cache.h.
Ensure
On Mon, Sep 15, 2014 at 03:32:37PM -0700, Junio C Hamano wrote:
David Aguilar dav...@gmail.com writes:
Ensure that rev-parse --verify --quiet is silent when asked
about deleted reflog entries.
Helped-by: Fabian Ruch baf...@gmail.com
Signed-off-by: David Aguilar dav...@gmail.com
that
read_ref_at() can suppress the message.
Use get_sha1_with_context1() instead of get_sha1() in rev-parse
so that the --quiet flag is honored.
Signed-off-by: David Aguilar dav...@gmail.com
---
This patch now has the t1503 test case squashed into it.
It was previously a separate patch
Use `test_must_be_be_empty file` instead of `test -z $(cat file)`.
Suggested-by: Fabian Ruch baf...@gmail.com
Signed-off-by: David Aguilar dav...@gmail.com
---
This patch should probably be applied on top of the
da/rev-parse-verify-quiet which is currently in pu
and contains the rev-parse
Use `git rev-parse --verify --quiet` instead of redirecting
stderr to /dev/null.
Signed-off-by: David Aguilar dav...@gmail.com
---
This patch is unchanged from when it was first written,
but is now correct thanks to the preceding patch.
git-stash.sh | 13 +++--
1 file changed, 7
Make rev-parse --verify --quiet ref@{1.year.ago} when the reflog
does not go back that far succeed silently with --quiet.
Signed-off-by: David Aguilar dav...@gmail.com
---
sha1_name.c | 19 ---
t/t1503-rev-parse-verify.sh | 10 ++
2 files changed, 22
---
This is a fixup for da/rev-parse-verify-quiet in pu
We now exit(128) and handle the Log for XXX only has DDD entries case.
refs.c | 2 +-
sha1_name.c | 3 +++
t/t1503-rev-parse-verify.sh | 10 +-
3 files changed, 13 insertions(+), 2 deletions(-)
that
read_ref_at() can suppress the message.
Use get_sha1_with_context1() instead of get_sha1() in rev-parse
so that the --quiet flag is honored.
Signed-off-by: David Aguilar dav...@gmail.com
---
This is a replacement patch for refs: make rev-parse --quiet actually quiet
from da/rev-parse-verify
On Thu, Sep 18, 2014 at 09:12:44AM -0700, Junio C Hamano wrote:
David Aguilar dav...@gmail.com writes:
@@ -514,8 +514,11 @@ static int get_sha1_basic(const char *str, int len,
unsigned char *sha1,
if (warn_ambiguous_refs
(refs_found 1 ||
-!get_short_sha1(str
On Tue, Sep 30, 2014 at 01:23:18PM -0700, Junio C Hamano wrote:
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
* da/include-compat-util-first-in-c (2014-09-15) 4 commits
- SQUASH???
Signed-off-by: David Aguilar dav...@gmail.com
---
contrib/completion/git-completion.bash | 2 ++
1 file changed, 2 insertions(+)
diff --git a/contrib/completion/git-completion.bash
b/contrib/completion/git-completion.bash
index 5ea5b82..2ed230a 100644
--- a/contrib/completion/git
On Tue, Oct 07, 2014 at 11:33:16AM -0300, Sergio Ferrero wrote:
Hello,
I'd like to configure git with a specific merge tool to merge Simulink
model files.
I have followed the steps to configure the merge tool successfully.
I typed the following on Git Bash:
git config --system
that the extension cannot be
misinterpreted. The resulting path becomes:
foo/bar_BASE_1234.ext
Suggested-by: Sergio Ferrero sferr...@ensoftcorp.com
Signed-off-by: David Aguilar dav...@gmail.com
---
git-mergetool.sh | 14 +-
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git
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.
foo/bar.ext.BASE
that the extension cannot be
misinterpreted. The resulting path becomes:
./foo/bar_BASE_1234.ext
Suggested-by: Sergio Ferrero sferr...@ensoftcorp.com
Helped-by: Junio C Hamano gits...@pobox.com
Signed-off-by: David Aguilar dav...@gmail.com
---
Changes since v1
The commit message changed to say
parameter is intented for use solely by difftool.
Signed-off-by: Charles Bailey cbaile...@bloomberg.net
Helped-by: John Keeping j...@keeping.me.uk
Signed-off-by: David Aguilar dav...@gmail.com
---
Changes since v1:
The case statement for --tool-help=* was made simpler
thanks to John.
git
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 insertions
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
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
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
+++ b/git-sh
parameter is intented for use solely by difftool.
Signed-off-by: Charles Bailey cbaile...@bloomberg.net
Helped-by: John Keeping j...@keeping.me.uk
Signed-off-by: David Aguilar dav...@gmail.com
---
No changes since v2.
git-difftool.perl | 6 +-
git-mergetool.sh | 4
2 files changed, 5
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 dav
On Mon, Oct 13, 2014 at 12:16:55PM -0700, Junio C Hamano wrote:
David Aguilar dav...@gmail.com writes:
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
On Mon, Oct 13, 2014 at 12:24:41PM -0700, Junio C Hamano wrote:
David Aguilar dav...@gmail.com writes:
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
On Tue, Oct 14, 2014 at 11:35:11PM -0700, David Aguilar wrote:
On Mon, Oct 13, 2014 at 12:16:55PM -0700, Junio C Hamano wrote:
David Aguilar dav...@gmail.com writes:
From: Charles Bailey cbaile...@bloomberg.net
Signed-off-by: Charles Bailey cbaile...@bloomberg.net
Signed-off
behavior and make the --output mode the default.
Reported-by: Andrey Novoseltsev novos...@gmail.com
Signed-off-by: David Aguilar dav...@gmail.com
---
Documentation/config.txt | 7 +++
mergetools/meld | 4 ++--
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/Documentation
Signed-off-by: David Aguilar dav...@gmail.com
---
t/t7610-mergetool.sh | 20 +---
1 file changed, 9 insertions(+), 11 deletions(-)
diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh
index 1a15e06..7eeb207 100755
--- a/t/t7610-mergetool.sh
+++ b/t/t7610-mergetool.sh
@@ -14,7
Prefer test over [ ] for conditionals.
Prefer $() over backticks for command substitutions.
Avoid control structures on a single line with semicolons.
Signed-off-by: David Aguilar dav...@gmail.com
---
t/test-lib-functions.sh | 30 ++
1 file changed, 18 insertions
Add tests to ensure that filenames start with ./ when
mergetool.writeToTemp is false and do not start with ./ when
mergetool.writeToTemp is true.
Signed-off-by: David Aguilar dav...@gmail.com
---
t/t7610-mergetool.sh | 23 +++
1 file changed, 23 insertions(+)
diff --git a/t
Signed-off-by: David Aguilar dav...@gmail.com
---
t/t7610-mergetool.sh | 918 +--
1 file changed, 459 insertions(+), 459 deletions(-)
diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh
index 05d9db0..875c8af 100755
--- a/t/t7610-mergetool.sh
Signed-off-by: David Aguilar dav...@gmail.com
---
t/t7610-mergetool.sh | 10 ++
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh
index 875c8af..214edfb 100755
--- a/t/t7610-mergetool.sh
+++ b/t/t7610-mergetool.sh
@@ -192,7 +192,7
-by: Junio C Hamano gits...@pobox.com
Signed-off-by: David Aguilar dav...@gmail.com
---
Changes since v1:
This uses Junio's improved approach of checking for both --help
styles and uses more focused name for the configuration variable.
The documentation was reworded accordingly.
Documentation
Signed-off-by: David Aguilar dav...@gmail.com
---
This is a replacement patch for
t7610-mergetool: prefer test_config over git config
in da/mergetool-tests.
Changes since v1:
The changes are more surgical and the commit message mentions
why we are using test_config.
t/t7610-mergetool.sh | 8
On Mon, Oct 20, 2014 at 11:40:23AM -0700, Junio C Hamano wrote:
Sebastian Schuberth sschube...@gmail.com writes:
Perhaps something like this, so that existing users can still use
bc3 and other people can use bc if it bothers them that they
have to say 3 when the backend driver works with
-by: David Aguilar dav...@gmail.com
---
Documentation/git-difftool.txt | 14 ++
git-difftool--helper.sh| 7 +++
git-difftool.perl | 12
t/t7800-difftool.sh| 43 ++
4 files changed, 76 insertions
-by: David Aguilar dav...@gmail.com
---
Changes since v1:
This fixes typos in the documentation (s/an an/an/) and tests.
I'll wait until tomorrow before sending follow-ups in case anyone spots
any other issues.
Documentation/git-difftool.txt | 14 ++
git-difftool--helper.sh| 7
On Sun, Oct 26, 2014 at 09:09:20AM +0100, Johannes Sixt wrote:
An attempt to quit difftool by hitting Ctrl-D (EOF) at its prompt does
not quit it, but is treated as if 'yes' was answered to the prompt and
all following prompts, which is contrary to the user's intent. Fix the
error check.
On Sun, Oct 26, 2014 at 05:41:49PM -0700, David Aguilar wrote:
On Sun, Oct 26, 2014 at 09:09:20AM +0100, Johannes Sixt wrote:
An attempt to quit difftool by hitting Ctrl-D (EOF) at its prompt does
not quit it, but is treated as if 'yes' was answered to the prompt and
all following prompts
Signed-off-by: David Aguilar dav...@gmail.com
---
This patch is new since v2.
This series now depends on difftool--helper: exit when reading a prompt answer
fails.
t/t7800-difftool.sh | 16
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/t/t7800-difftool.sh b/t
-by: Johannes Sixt j...@kdbg.org
Signed-off-by: David Aguilar dav...@gmail.com
---
Changes since v2:
This series now depends on difftool--helper: exit when reading a prompt answer
fails.
A missing git reset -- for-diff was missing from the test.
Setting and testing of the status variable was moved
On Mon, Oct 27, 2014 at 11:45:14AM -0700, Junio C Hamano wrote:
David Aguilar dav...@gmail.com writes:
+write_script .git/fail-right-file \EOF
+echo $2
+exit 1
+EOF
This should be inside the next one, no?
+test_expect_success PERL 'difftool stops on error with --trust-exit-code
[cc:ed Eric Sunshine and the Git list since folks might be
interested.. not quite [PATCH] ready yet, but it's not too far...]
On Thu, Jul 25, 2013 at 6:00 PM, Jeremy Huddleston Sequoia
jerem...@apple.com wrote:
On Jul 25, 2013, at 17:40, David Aguilar dav...@gmail.com wrote:
On Thu, Jul 25
From: Jeremy Huddleston jerem...@apple.com
Use Apple's supported functions for base64 encoding instead
of the deprecated OpenSSL functions.
Signed-off-by: Jeremy Huddleston jerem...@apple.com
Signed-off-by: David Aguilar dav...@gmail.com
---
This is Jeremy's original patch rebased onto
On Sun, Jul 28, 2013 at 8:35 PM, Jonathan Nieder jrnie...@gmail.com wrote:
Hi,
David Aguilar wrote:
--- a/imap-send.c
+++ b/imap-send.c
@@ -22,14 +22,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
USA
*/
-#include cache.h
-#include exec_cmd.h
On Mon, Jul 29, 2013 at 1:18 AM, Ondřej Bílka nel...@seznam.cz wrote:
Hi,
I improved my tool and it catched following additional typos.
As with any big project best way to catch errors is to have automated
checks that catch them ( Other possibility would be to read everything ten
times to
From: Jeremy Huddleston jerem...@apple.com
Use Apple's supported functions for base64 encoding instead
of the deprecated OpenSSL functions.
Signed-off-by: Jeremy Huddleston jerem...@apple.com
Signed-off-by: David Aguilar dav...@gmail.com
---
This version moves the tricky #ifdefs into git-compat
On Tue, Jul 30, 2013 at 8:54 AM, Junio C Hamano gits...@pobox.com wrote:
David Aguilar dav...@gmail.com writes:
From: Jeremy Huddleston jerem...@apple.com
Use Apple's supported functions for base64 encoding instead
of the deprecated OpenSSL functions.
Signed-off-by: Jeremy Huddleston jerem
adding
these libraries there is correct.
COMPAT_CFLAGS and SHA1_HEADER enable the common crypto SHA1 only.
BLK_SHA1 provides its own SHA1 so they're not needed there.
I tested the tip of da/darwin (pu) w/ and w/out BLK_SHA1.
Tested-by: David Aguilar dav...@gmail.com
--
David
--
To unsubscribe from
On Mon, Aug 5, 2013 at 11:00 AM, Junio C Hamano gits...@pobox.com wrote:
Brian Gernhardt br...@gernhardtsoftware.com writes:
compat/apple-common-crypto.h uses die() in one of its macros, but was
included in git-compat-util.h before the definition of die.
Fix by simply moving the relevant
On Tue, Aug 6, 2013 at 5:30 PM, Daniel Convissor
dani...@analysisandsolutions.com wrote:
Hi Folks:
On Sat, Aug 03, 2013 at 12:52:15PM -0400, Daniel Convissor wrote:
Yeah. I had contemplated using the following commands:
git config remote.wp.fetch \
On Sat, Aug 31, 2013 at 12:46 AM, René Scharfe l@web.de wrote:
Am 29.08.2013 22:36, schrieb Felipe Contreras:
On Thu, Aug 29, 2013 at 3:03 PM, René Scharfe l@web.de wrote:
If you have a --work-tree option then parseopt accepts --work as well,
unless it's ambiguous, i.e. another
On Thu, Aug 9, 2012 at 9:22 AM, Sebastian Schuberth
sschube...@gmail.com wrote:
On Thu, Aug 9, 2012 at 6:03 PM, Junio C Hamano gits...@pobox.com wrote:
I still agree that not listing all mergetools in multiple places is a
good thing. But doing the whole stuff of extending --tool-help for
Add an entry for --tool-help to the mergetool documentation.
Move --tool-help in the difftool documentation so that it is
listed immediately after --tool so that it is easier to find.
Signed-off-by: David Aguilar dav...@gmail.com
---
Based on work in next.
This is not urgent as the current
Add an entry for --tool-help to the mergetool documentation.
Move --tool-help in the difftool documentation so that it is
listed immediately after --tool so that it is easier to find.
Signed-off-by: David Aguilar dav...@gmail.com
---
If you want to have --tool-help mentioned, use this patch
Remove the entry for --tool-help in the documentation as it is
already mentioned in the documentation for --tool.
Signed-off-by: David Aguilar dav...@gmail.com
---
Incompatible with the previous patch, but if you prefer to
mention --tool-help in the docs for --tool only, then choose
this one
1 - 100 of 533 matches
Mail list logo
