Re: Add a bugzilla website

2014-01-08 Thread David Aguilar
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

[PATCH 1/2] pull: add pull.ff configuration

2014-01-15 Thread David Aguilar
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

[PATCH 2/2] pull: add --ff-only to the help text

2014-01-15 Thread David Aguilar
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

Re: Determining update/merge/current state of a workspace

2014-02-02 Thread David Aguilar
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

Re: Fwd: Git Directory Diff for submodule

2014-02-20 Thread David Aguilar
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

Re: difftool sends malformed path to exernal tool on Windows

2014-02-21 Thread David Aguilar
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

[PATCH] difftool: support repositories with .git-files

2014-02-23 Thread David Aguilar
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

Re: difftool sends malformed path to exernal tool on Windows

2014-03-02 Thread David Aguilar
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

Re: difftool sends malformed path to exernal tool on Windows

2014-03-05 Thread David Aguilar
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

[PATCH] t7800: add a difftool test for .git-files

2014-03-05 Thread David Aguilar
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

Re: difftool sends malformed path to exernal tool on Windows

2014-03-16 Thread David Aguilar
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.

Re: [PATCH 2/2] mergetool: run prompt only if guessed tool

2014-04-21 Thread David Aguilar
[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

Re: [PATCH] mergetools: add vimdiff3 mode

2014-04-21 Thread David Aguilar
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

Re: What is missing from Git v2.0

2014-04-21 Thread David Aguilar
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

Re: [PATCH 2/2] mergetool: run prompt only if guessed tool

2014-04-23 Thread David Aguilar
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

Re: [PATCH 08/10] git-mergetool.sh: don't use the -a or -b option with the test command

2014-05-16 Thread David Aguilar
://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

Re: Improving the git remote command

2014-08-27 Thread David Aguilar
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

[PATCH 1/2] bisect: remove unnecessary redirection

2014-08-30 Thread David Aguilar
`git rev-parse` is being called with --quiet so there's no need to redirect to /dev/null. Signed-off-by: David Aguilar dav...@gmail.com --- git-bisect.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-bisect.sh b/git-bisect.sh index 1e0d602..c1c2321 100755 --- a/git

[PATCH 2/2] stash: prefer --quiet over shell redirection

2014-08-30 Thread David Aguilar
Use `git rev-parse --quiet` instead of redirecting to /dev/null. Signed-off-by: David Aguilar dav...@gmail.com --- git-stash.sh | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/git-stash.sh b/git-stash.sh index bcc757b..5a5185b 100755 --- a/git-stash.sh +++ b

Re: [PATCH 2/2] stash: prefer --quiet over shell redirection

2014-08-31 Thread David Aguilar
On Sat, Aug 30, 2014 at 11:07:13PM +0200, Johannes Sixt wrote: Am 30.08.2014 21:30, schrieb David Aguilar: @@ -392,12 +392,12 @@ parse_flags_and_rev() ;; esac - REV=$(git rev-parse --quiet --symbolic --verify $1 2/dev/null) || { + REV=$(git rev-parse --quiet

[PATCH v2] stash: prefer --quiet over shell redirection

2014-08-31 Thread David Aguilar
Use `git rev-parse --verify --quiet` instead of redirecting stderr to /dev/null. Signed-off-by: David Aguilar dav...@gmail.com --- git-stash.sh | 13 +++-- 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/git-stash.sh b/git-stash.sh index bcc757b..2ff8b94 100755 --- a/git

[RFC PATCH 2/3] headers: improve header dependencies

2014-08-31 Thread David Aguilar
Add missing includes or forward declarations where needed. Signed-off-by: David Aguilar dav...@gmail.com --- If enum date_type were moved to object.h then we wouldn't need to include cache.h from commit.h, but this patch doesn't touch that. If we want to avoid including cache.h, another

[RFC PATCH 1/3] stylefix: pointers bind to the variable, not the type

2014-08-31 Thread David Aguilar
Signed-off-by: David Aguilar dav...@gmail.com --- This is an RFC patch but this is probably fine as-is, and is orthogonal to the next two patches. builtin/clone.c | 7 --- commit.c| 2 +- commit.h| 2 +- reflog-walk.c | 2 +- reflog-walk.h | 2 +- refs.h | 2

[RFC PATCH 3/3] core: improve header dependencies

2014-08-31 Thread David Aguilar
Remove includes that have already been included by another header. Signed-off-by: David Aguilar dav...@gmail.com --- This patch is the culmination of the previous patches and is a pure removal. builtin/add.c | 3 --- builtin/blame.c | 4 builtin/branch.c| 4

Re: [RFC PATCH 3/3] core: improve header dependencies

2014-09-02 Thread David Aguilar
On Tue, Sep 02, 2014 at 11:32:02AM -0700, Junio C Hamano wrote: David Aguilar dav...@gmail.com writes: Remove includes that have already been included by another header. Hmm, I am not sure if that is a good move, and suspect that it is incompatible with what your 2/3 attempts to do

[RFC PATCH 1/2] Makefile: add check-headers target

2014-09-06 Thread David Aguilar
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

[RFC PATCH 2/2] headers: include dependent headers

2014-09-06 Thread David Aguilar
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

Re: [RFC PATCH 1/2] Makefile: add check-headers target

2014-09-06 Thread David Aguilar
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

Re: [RFC PATCH 1/2] Makefile: add check-headers target

2014-09-06 Thread David Aguilar
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

[RFC PATCH v2 1/2] Makefile: add check-headers target

2014-09-06 Thread David Aguilar
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

[RFC PATCH v2 2/2] headers: include dependent headers

2014-09-06 Thread David Aguilar
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

[PATCH v3 2/2] headers: include dependent headers

2014-09-07 Thread David Aguilar
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

Re: [RFC PATCH v2 2/2] headers: include dependent headers

2014-09-07 Thread David Aguilar
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

Re: [PATCH v3 2/2] headers: include dependent headers

2014-09-07 Thread David Aguilar
On Sun, Sep 07, 2014 at 12:01:00PM +0100, Ramsay Jones wrote: On 07/09/14 11:35, René Scharfe wrote: Am 07.09.2014 um 11:36 schrieb David Aguilar: Add dependent headers so that including a header does not require including additional headers. This makes it so that gcc -c $header

Re:

2014-09-09 Thread David Aguilar
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

Re: [RFC PATCH v2 1/2] Makefile: add check-headers target

2014-09-09 Thread David Aguilar
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

Re: [PATCH v2] stash: prefer --quiet over shell redirection

2014-09-13 Thread David Aguilar
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

[PATCH] refs: make rev-parse --quiet actually quiet

2014-09-13 Thread David Aguilar
() 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

[PATCH v4 2/2] headers: include dependent headers

2014-09-13 Thread David Aguilar
-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

[PATCH v4 1/2] Makefile: add check-headers target

2014-09-13 Thread David Aguilar
-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

[PATCH] help: ensure that common-cmds.h is only included by help.c

2014-09-13 Thread David Aguilar
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

Re: [PATCH] help: ensure that common-cmds.h is only included by help.c

2014-09-14 Thread David Aguilar
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

[PATCH 1/2] check-headers: add header usage checks for .c files

2014-09-14 Thread David Aguilar
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

[PATCH 2/2] cleanups: ensure that git-compat-util.h is included first

2014-09-14 Thread David Aguilar
-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

[PATCH] t1503: test rev-parse --verify --quiet with deleted reflogs

2014-09-14 Thread David Aguilar
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

Re: [PATCH] help: ensure that common-cmds.h is only included by help.c

2014-09-14 Thread David Aguilar
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

Re: [PATCH] t1503: test rev-parse --verify --quiet with deleted reflogs

2014-09-14 Thread David Aguilar
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

[PATCH v2 1/2] t1503: test rev-parse --verify --quiet with deleted reflogs

2014-09-14 Thread David Aguilar
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

[PATCH v2 2/2] t1503: use test_must_be_empty

2014-09-14 Thread David Aguilar
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

[PATCH v3 3/3] Documentation: a note about stdout for git rev-parse --verify --quiet

2014-09-15 Thread David Aguilar
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

[PATCH v3 1/3] t1503: test rev-parse --verify --quiet with deleted reflogs

2014-09-15 Thread David Aguilar
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

[PATCH v3 2/3] t1503: use test_must_be_empty

2014-09-15 Thread David Aguilar
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

Re: [PATCH 1/2] check-headers: add header usage checks for .c files

2014-09-15 Thread David Aguilar
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

Re: [PATCH v3 1/3] t1503: test rev-parse --verify --quiet with deleted reflogs

2014-09-15 Thread David Aguilar
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

[PATCH v4 2/3] refs: make rev-parse --quiet actually quiet

2014-09-15 Thread David Aguilar
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

[PATCH v4 1/3] t1503: use test_must_be_empty

2014-09-15 Thread David Aguilar
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

[PATCH v4 3/3] stash: prefer --quiet over shell redirection of the standard error stream

2014-09-15 Thread David Aguilar
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

[PATCH 2/2] rev-parse: honor --quiet when asking for reflog dates that do not exist

2014-09-16 Thread David Aguilar
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

[PATCH 1/2] fixup! refs: make rev-parse --quiet actually quiet

2014-09-16 Thread David Aguilar
--- 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(-)

[PATCH v2] refs: make rev-parse --quiet actually quiet

2014-09-18 Thread David Aguilar
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

Re: [PATCH 2/2] rev-parse: honor --quiet when asking for reflog dates that do not exist

2014-09-18 Thread David Aguilar
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

Re: What's cooking in git.git (Sep 2014, #09; Tue, 30)

2014-09-30 Thread David Aguilar
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???

[PATCH] completion: add --show-signature for log and show

2014-10-04 Thread David Aguilar
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

Re: configure names for temporary files

2014-10-08 Thread David Aguilar
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

[PATCH] mergetool: use more conservative temporary filenames

2014-10-08 Thread David Aguilar
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

Re: [PATCH] mergetool: use more conservative temporary filenames

2014-10-10 Thread David Aguilar
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

[PATCH v2] mergetool: use more conservative temporary filenames

2014-10-10 Thread David Aguilar
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

[PATCH v2 2/2] difftool: don't assume that default sh is sane

2014-10-10 Thread David Aguilar
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

[PATCH v2 1/2] mergetool: don't require a work tree for --tool-help

2014-10-10 Thread David Aguilar
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

Re: [PATCH] mergetool: use more conservative temporary filenames

2014-10-10 Thread David Aguilar
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

Re: [PATCH v2] mergetool: use more conservative temporary filenames

2014-10-10 Thread 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. ./foo/bar.ext.BASE.1234.ext This can

Re: [PATCH v2 1/2] mergetool: don't require a work tree for --tool-help

2014-10-11 Thread David Aguilar
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

[PATCH v3 2/3] mergetool: don't require a work tree for --tool-help

2014-10-11 Thread David Aguilar
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

[PATCH v3 1/3] git-sh-setup: move GIT_DIR initialization into a function

2014-10-11 Thread David Aguilar
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

[PATCH v3 3/3] difftool: don't assume that default sh is sane

2014-10-11 Thread David Aguilar
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

[PATCH] mergetool: add an option for writing to a temporary directory

2014-10-11 Thread David Aguilar
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

Re: [PATCH v3 2/3] mergetool: don't require a work tree for --tool-help

2014-10-15 Thread David Aguilar
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

Re: [PATCH] mergetool: add an option for writing to a temporary directory

2014-10-15 Thread David Aguilar
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

Re: [PATCH v3 2/3] mergetool: don't require a work tree for --tool-help

2014-10-15 Thread David Aguilar
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

[PATCH] mergetools/meld: do not rely on the output of `meld --help`

2014-10-15 Thread David Aguilar
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

[PATCH 4/5] t7610-mergetool: prefer test_config over git config

2014-10-15 Thread David Aguilar
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

[PATCH 5/5] test-lib-functions: adjust style to match CodingGuidelines

2014-10-15 Thread David Aguilar
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

[PATCH 3/5] t7610-mergetool: add test cases for mergetool.writeToTemp

2014-10-15 Thread David Aguilar
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

[PATCH 1/5] t7610-mergetool: use tabs instead of a mix of tabs and spaces

2014-10-15 Thread David Aguilar
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

[PATCH 2/5] t7610-mergetool: add missing and remove commented-out code

2014-10-15 Thread David Aguilar
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

[PATCH v2] mergetools/meld: make usage of `--output` configurable and more robust

2014-10-15 Thread David Aguilar
-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

[PATCH v2 4/5] t7610-mergetool: use test_config to isolate tests

2014-10-15 Thread David Aguilar
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

Re: [PATCH] Copy mergetool bc3 as bc4

2014-10-21 Thread David Aguilar
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

[PATCH] difftool: add support for --trust-exit-code

2014-10-25 Thread David Aguilar
-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

[PATCH v2] difftool: add support for --trust-exit-code

2014-10-25 Thread David Aguilar
-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

Re: difftool--helper: exit when reading a prompt answer fails

2014-10-26 Thread David Aguilar
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.

Re: difftool--helper: exit when reading a prompt answer fails

2014-10-26 Thread David Aguilar
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

[PATCH v3 1/2] t7800-difftool: use test_must_fail grep instead of ! grep

2014-10-26 Thread David Aguilar
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

[PATCH v3 2/2] difftool: add support for --trust-exit-code

2014-10-26 Thread David Aguilar
-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

Re: [PATCH v3 2/2] difftool: add support for --trust-exit-code

2014-10-28 Thread David Aguilar
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

Re: CommonCrypto in git

2013-07-25 Thread David Aguilar
[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

[PATCH] imap-send: use Apple's Security framework for base64 encoding

2013-07-27 Thread David Aguilar
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

Re: [PATCH] imap-send: use Apple's Security framework for base64 encoding

2013-07-29 Thread David Aguilar
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

Re: [PATCH] More typofixes.

2013-07-29 Thread David Aguilar
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

[PATCH v2] imap-send: use Apple's Security framework for base64 encoding

2013-07-29 Thread David Aguilar
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

  1   2   3   4   5   6   >