On Sun, Mar 24, 2013 at 02:29:40PM -0700, David Aguilar wrote:
This makes me wonder whether the modifiable mode should be made
more explicit, either in the documentation or via a flag.
Imagine if --dir-diff also honored --edit and --no-edit flags.
Right now --edit is the default. If we
On Sat, Mar 23, 2013 at 10:19:36PM -0700, Junio C Hamano wrote:
In the longer term, difftool probably needs to learn to warn the user
instead of overwrite any changes that have been made to the working tree
file.
Questionable.
Admittedly I do not use difftool myself, and I have long
On Sun, Mar 24, 2013 at 09:31:45AM -0400, Matt McClure wrote:
On Sun, Mar 24, 2013 at 8:36 AM, John Keeping j...@keeping.me.uk wrote:
In the
non-symlink case I think a user might find it surprising if the
(unmodified) file used by their diff tool were suddenly copied over the
working tree
On Fri, Mar 22, 2013 at 09:56:17PM -0700, David Aguilar wrote:
On Fri, Mar 22, 2013 at 9:52 AM, Christoph Anton Mitterer
cales...@scientia.net wrote:
Hi.
Right now, when I use difftool --dir-diff, the temp dirs are creates as
e.g.:
/tmp/git-difftool.QqP8x/left
/difftool-dir-diff-edit-fix in the context lines but I
don't believe there is any logical conflict.
John Keeping (3):
t7800: don't hide grep output
t7800: fix tests when difftool uses --no-symlinks
t7800: run --dir-diff tests with and without symlinks
t/t7800-difftool.sh | 73
Remove the stdin_contains and stdin_doesnt_contain helper functions
which add nothing but hide the output of grep, hurting debugging.
Suggested-by: Johannes Sixt j.s...@viscovery.net
Signed-off-by: John Keeping j...@keeping.me.uk
---
t/t7800-difftool.sh | 44
probably needs to learn to warn the user
instead of overwrite any changes that have been made to the working tree
file.
Signed-off-by: John Keeping j...@keeping.me.uk
---
Changes since v1:
- Fix the actual cause of the issue in the test instead of masking it by
moving the output file under .git
so that they do not depend on the environment but
run explicitly with both --symlinks and --no-symlinks, protecting the
--symlinks version with a SYMLINKS prerequisite.
Signed-off-by: John Keeping j...@keeping.me.uk
---
Changes since v1:
- -chain from the symlinks=... line
t/t7800-difftool.sh
(which tries to read a single item) is nread != 1.
Signed-off-by: John Keeping j...@keeping.me.uk
---
I found this because Clang generated a tautological comparison warning
on this line.
refs.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/refs.c b/refs.c
index 56cc93d..de2d8eb
On Fri, Mar 22, 2013 at 08:13:46AM +0100, Johannes Sixt wrote:
Am 3/21/2013 8:41, schrieb Johannes Sixt:
Am 3/20/2013 23:59, schrieb David Aguilar:
I started digging in and the @worktree_files (aka @worktree above)
is populated from the output of git diff --raw
Seeing the output
On Fri, Mar 22, 2013 at 12:14:27PM +0100, Johannes Sixt wrote:
Am 3/22/2013 11:00, schrieb John Keeping:
On Fri, Mar 22, 2013 at 08:13:46AM +0100, Johannes Sixt wrote:
Am 3/21/2013 8:41, schrieb Johannes Sixt:
Am 3/20/2013 23:59, schrieb David Aguilar:
I started digging
How about doing this?
The first patch is a cleanup as suggested by Johannes[1], the second
fixes the test failure on Windows and the third makes the test behaviour
more explicit and would have helped to detect this issue earlier.
[1/3] t7800: don't hide grep output
[2/3] t7800: fix tests
to the working tree
file.
Signed-off-by: John Keeping j...@keeping.me.uk
---
t/t7800-difftool.sh | 24
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
index e694972..1eed439 100755
--- a/t/t7800-difftool.sh
+++ b/t
so that they do not depend on the environment but
run explicitly with both --symlinks and --no-symlinks, protecting the
--symlinks version with a SYMLINKS prerequisite.
Signed-off-by: John Keeping j...@keeping.me.uk
---
t/t7800-difftool.sh | 19 +++
1 file changed, 15 insertions
so that they do not depend on the environment but
run explicitly with both --symlinks and --no-symlinks, protecting the
--symlinks version with a SYMLINKS prerequisite.
Signed-off-by: John Keeping j...@keeping.me.uk
---
The previous version of this was missing half the intended change :-(
Sorry
On Fri, Mar 22, 2013 at 03:53:38PM -0700, Junio C Hamano wrote:
John Keeping j...@keeping.me.uk writes:
When 'git difftool --dir-diff' is using --no-symlinks (either explicitly
or implicitly because it's running on Windows), any working tree files
that have been copied to the temporary
On Tue, Mar 19, 2013 at 08:58:23AM +0700, Duy Nguyen wrote:
On Tue, Mar 19, 2013 at 1:26 AM, John Keeping j...@keeping.me.uk wrote:
On Fri, Mar 15, 2013 at 01:06:42PM +0700, Nguyễn Thái Ngọc Duy wrote:
This passes the pathspec, more or less unmodified, to
git-add--interactive. The command
On Fri, Mar 15, 2013 at 01:06:42PM +0700, Nguyễn Thái Ngọc Duy wrote:
This passes the pathspec, more or less unmodified, to
git-add--interactive. The command itself does not process pathspec. It
simply passes the pathspec to other builtin commands. So if all those
commands support pathspec,
On Wed, Mar 13, 2013 at 08:41:29PM -0700, David Aguilar wrote:
On Wed, Mar 13, 2013 at 1:33 PM, John Keeping j...@keeping.me.uk wrote:
diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
index eb1d3f8..8102ce1 100755
--- a/t/t7800-difftool.sh
+++ b/t/t7800-difftool.sh
@@ -370,6
On Thu, Mar 14, 2013 at 01:34:54PM +0100, Michal Novotny wrote:
This patch adds the option to specify SHA-1 commit hash using --points-at
option of git tag to create a tag pointing to a historical commit.
What does this do that git tag name commit doesn't?
This was pretty easy in the past for
On Thu, Mar 14, 2013 at 09:43:00AM +, John Keeping wrote:
On Wed, Mar 13, 2013 at 09:45:47AM -0700, Junio C Hamano wrote:
Does the temporary checkout correctly apply the smudge filter and
crlf conversion, by the way? If not, regardless of the topic in
this thread, that may want
This is from the recent difftool --dir-diff discussion. With these
patches applied I think difftool --dir-diff should correctly apply
filters to the files that it checks out with no changes to the
git-difftool code.
John Keeping (2):
t2003: modernize style
entry: fix streaming filter path
- Description goes on the test_expect_* line
- Open SQ of test goes on the test_expect_* line
- Closing SQ of test goes on its own line
- Use TAB for indent
Also remove three comments that appear to relate to the development of
the patch before it was committed.
Signed-off-by: John Keeping j
of the t7800 hunk so it should apply
to master as well.
John Keeping (3):
git-difftool(1): fix formatting of --symlink description
difftool: avoid double slashes in symlink targets
difftool --dir-diff: symlink all files matching the working tree
Documentation/git-difftool.txt | 8 +---
git
Signed-off-by: John Keeping j...@keeping.me.uk
---
Documentation/git-difftool.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt
index e0e12e9..e575fea 100644
--- a/Documentation/git-difftool.txt
+++ b
When we add tests for symlinks in git difftool --dir-diff it's easier
to check the target path if we don't have to worry about double slashes
separating directories. Remove the trailing slash (if present) from
$workdir before creating the symlinks in order to avoid this.
Signed-off-by: John
hash-object based check.
Signed-off-by: John Keeping j...@keeping.me.uk
---
Documentation/git-difftool.txt | 4 +++-
git-difftool.perl | 21 ++---
t/t7800-difftool.sh| 22 ++
3 files changed, 43 insertions(+), 4 deletions(-)
diff --git
On Thu, Mar 14, 2013 at 02:28:31PM -0700, Junio C Hamano wrote:
John Keeping j...@keeping.me.uk writes:
diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
index 3aab6e1..70e09b6 100755
--- a/t/t7800-difftool.sh
+++ b/t/t7800-difftool.sh
@@ -340,6 +340,28 @@ test_expect_success
On Tue, Mar 12, 2013 at 08:26:21PM -0400, Matt McClure wrote:
On Tue, Mar 12, 2013 at 3:24 PM, John Keeping j...@keeping.me.uk wrote:
If so I think you want some new mode of operation for difftool instead
of this patch which will also affect unrelated commands.
Are you suggesting
in their diff tool and
expect to have those changes reflected in the working tree.
Author: John Keeping j...@keeping.me.uk
The correct way to credit authorship is via a From: header at the top
of the message. In this particular case, I think this change also
requires a documentation update
On Wed, Mar 13, 2013 at 09:45:47AM -0700, Junio C Hamano wrote:
Junio C Hamano gits...@pobox.com writes:
David Aguilar dav...@gmail.com writes:
The implementation of Junio's suggestion is relatively straightforward
(this is untested, although t7800 passes, and can probably be improved
On Wed, Mar 13, 2013 at 10:40:55AM -0700, Junio C Hamano wrote:
John Keeping j...@keeping.me.uk writes:
git-hash-object(1) implies that it will apply the clean filter and EOL
conversion when it's given a path to a file in the working tree (as it
is here). Is that not the case
Here's the proper patch. It grew into a series because I noticed a
minor formatting error in the difftool documentation, which the first
commit fixes.
The content of the second patch is the same as was previously posted.
John Keeping (2):
git-difftool(1): fix formatting of --symlink
Signed-off-by: John Keeping j...@keeping.me.uk
---
Documentation/git-difftool.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt
index e0e12e9..e575fea 100644
--- a/Documentation/git-difftool.txt
+++ b
hash-object based check.
Reported-by: Matt McClure matthewlmccl...@gmail.com
Signed-off-by: John Keeping j...@keeping.me.uk
---
Documentation/git-difftool.txt | 4 +++-
git-difftool.perl | 21 ++---
t/t7800-difftool.sh| 14 ++
3 files changed, 35
difftool -d formerly knew how to symlink to the work tree when the work
tree contains uncommitted changes. In practice, prior to this change, it
would not symlink to the work tree in case there were no uncommitted
changes, even when the user invoked difftool with the form:
git difftool
On Tue, Mar 12, 2013 at 01:39:17PM -0700, Junio C Hamano wrote:
John Keeping j...@keeping.me.uk writes:
How about something like --symlink-all where the everything in the
right-hand tree is symlink'd?
Does it even have to be conditional? What is the situation when you
do not want
On Tue, Mar 12, 2013 at 05:12:28PM -0600, Matt McClure wrote:
On Mar 12, 2013, at 1:25 PM, John Keeping j...@keeping.me.uk wrote:
When I tried this I got the expected behaviour even without this patch.
git diff --raw commit
emits the null SHA1 if the working tree file's stat differs
On Tue, Mar 12, 2013 at 04:48:16PM -0600, Matt McClure wrote:
On Mar 12, 2013, at 4:16 PM, Junio C Hamano gits...@pobox.com wrote:
Matt McClure matthewlmccl...@gmail.com writes:
* If you are comparing two trees, and especially if your RHS is not
HEAD, you will send everything to a
On Thu, Mar 07, 2013 at 09:36:06AM +0100, Miklós Fazekas wrote:
Sorry for the late turnaround here is an improved version. Now chdir
has an optional argument client_path, if it's true then we don't do
os.getcwd. I think that my first patch is also valid too - when the
path is absolute no need
On Tue, Mar 05, 2013 at 10:14:42PM +0100, Jose Garcia Juanino wrote:
Is there any hook in Git similar to start-commit subversion hook? The
requirements would be:
1- A hook on the server side (as pre-receive)
2- It will execute the actions *before* the begin of transaction
(pre-receive hook
On Sat, Mar 02, 2013 at 08:16:13PM +0100, Thomas Rast wrote:
John Keeping j...@keeping.me.uk writes:
This reverts commit ba35480439d05b8f6cca50527072194fe3278bbb.
CGit uses these symbols to output the correct HTML around graph
elements. Making these symbols private means that CGit
On Sun, Mar 03, 2013 at 01:08:50PM -0800, Junio C Hamano wrote:
John Keeping j...@keeping.me.uk writes:
On Sat, Mar 02, 2013 at 08:16:13PM +0100, Thomas Rast wrote:
John Keeping j...@keeping.me.uk writes:
This reverts commit ba35480439d05b8f6cca50527072194fe3278bbb.
CGit uses
On Sun, Mar 03, 2013 at 02:49:12PM -0800, Junio C Hamano wrote:
John Keeping j...@keeping.me.uk writes:
On Sun, Mar 03, 2013 at 01:08:50PM -0800, Junio C Hamano wrote:
Additionally, it seems that Johan added graph_set_column_colors
specifically so that CGit should use it - there's
that we avoid reintroducing
this problem in the future and suggest to those modifying this API
that they might want to discuss it with the CGit developers.
Signed-off-by: John Keeping j...@keeping.me.uk
---
On Sun, Mar 03, 2013 at 03:32:08PM -0800, Junio C Hamano wrote:
John Keeping j...@keeping.me.uk
-02-12).
Suggested-by: Junio C Hamano gits...@pobox.com
Signed-off-by: John Keeping j...@keeping.me.uk
---
On Tue, Feb 12, 2013 at 03:09:53PM -0800, Junio C Hamano wrote:
A longer term fix is to introduce runtime_{man,html,info}dir variables
to hold these funny values, and make {man,html,info}dir
On Tue, Feb 19, 2013 at 03:40:16PM -0800, Junio C Hamano wrote:
I am not sure if such a layout can be actually used for installing,
though. Didn't we see some issues around the relativeness of
htmldir and mandir vs passing them down to Documentation/Makefile,
or is it not an issue when
On Fri, Feb 15, 2013 at 10:58:38AM -0800, Brandon Casey wrote:
On Thu, Feb 14, 2013 at 9:58 AM, John Keeping j...@keeping.me.uk wrote:
As Jonathan Nieder wondered before [1], this changes the behaviour when
the commit message is empty. Before this commit, there is an empty line
followed
On Tue, Feb 12, 2013 at 02:33:42AM -0800, Brandon Casey wrote:
Teach append_signoff to detect whether a blank line exists at the position
that the signed-off-by line will be added, and refrain from adding an
additional one if one already exists. Or, add an additional line if one
is needed to
On Mon, Feb 11, 2013 at 04:13:31PM -0800, Junio C Hamano wrote:
John Keeping j...@keeping.me.uk writes:
@@ -179,7 +182,9 @@ die_abort () {
}
has_action () {
- sane_grep '^[^#]' $1 /dev/null
+ echo space stripped actions: 2
+ git stripspace --strip-comments $1 2
On Tue, Feb 12, 2013 at 11:11:17AM -, Philip Oakley wrote:
Obviously (?) this is generated from the command-list.txt file, though I
don't see a shell script that would generate the
'cmds-mainporcelain.txt' (etc.) files
(//github.com/gitster/git-htmldocs). They are also part of the
On Tue, Feb 12, 2013 at 09:29:26AM -0800, Junio C Hamano wrote:
John Keeping j...@keeping.me.uk writes:
... the following fixup is also needed to avoid relying on the shell
emitting a literal backslash when a backslash isn't followed by a known
escape character.
-- 8 --
diff --git
On Tue, Feb 12, 2013 at 10:00:26AM -0800, Junio C Hamano wrote:
So it needs to be more like this, and I think it still is more
readable.
Agreed. Will you squash this in or do you want a re-roll?
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index
A simple style fix; no functional change.
Signed-off-by: John Keeping j...@keeping.me.uk
---
Documentation/Makefile | 42 +-
1 file changed, 21 insertions(+), 21 deletions(-)
diff --git a/Documentation/Makefile b/Documentation/Makefile
index 62dbd9a
are simple style fixes. The third one fixes the
issue described above.
John Keeping (3):
Documentation/Makefile: fix spaces around assignments
Documentation/Makefile: move infodir to be with other '*dir's
Documentation/Makefile: fix inherited {html,info,man}dir
Documentation/Makefile | 88
) prepended.
Fix this by changing the defaults to be paths relative to $(prefix) and
introducing new variables {html,info,man}_instdir which contain the full
installation paths.
Signed-off-by: John Keeping j...@keeping.me.uk
---
I'm not sure if this is the best approach - the alternative would
Signed-off-by: John Keeping j...@keeping.me.uk
---
Documentation/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/Makefile b/Documentation/Makefile
index af3d8a4..0cfdc36 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -81,6 +81,7
On Tue, Feb 12, 2013 at 01:01:38PM -0800, Jonathan Nieder wrote:
John Keeping wrote:
Signed-off-by: John Keeping j...@keeping.me.uk
[...]
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -81,6 +81,7 @@ DOC_MAN7 = $(patsubst %.txt,%.7,$(MAN7_TXT))
prefix ?= $(HOME
On Tue, Feb 12, 2013 at 02:25:08PM -0800, Jonathan Nieder wrote:
John Keeping wrote:
Documentation/Makefile: fix inherited {html,info,man}dir
This doesn't seem to have hit the list.
Hmm... it made it to gmane:
http://article.gmane.org/gmane.comp.version-control.git/216188
On Tue, Feb 12, 2013 at 02:45:34PM -0800, Junio C Hamano wrote:
Jonathan Nieder jrnie...@gmail.com writes:
John Keeping wrote:
Documentation/Makefile: fix inherited {html,info,man}dir
This doesn't seem to have hit the list.
More importantly,
When using the top-level install
On Tue, Feb 12, 2013 at 02:57:25PM -0800, Junio C Hamano wrote:
Junio C Hamano gits...@pobox.com writes:
I _think_ exporting mandir/html/infodir from the top-level Makefile
is wrong to begin with. We should drop the export mandir from
there.
Ah, it is this thing, isn't it?
commit
,html,info}dir variables
to hold these funny values, and make {man,html,info}dir variables
to have real paths whose default values begin with $(prefix), but
as a first step, stop exporting them from the top-level Makefile.
Makes sense.
Reported-by: John Keeping j...@keeping.me.uk
Reviewed
On Mon, Feb 11, 2013 at 08:42:21AM -0800, Junio C Hamano wrote:
John Keeping j...@keeping.me.uk writes:
Perhaps it's best to leave the patch as it originally was to guarantee
that we can't get stuck in graph_show_commit(), even when it's called at
an unexpected time, but I see you've
-by: John Keeping j...@keeping.me.uk
---
git-rebase--interactive.sh| 85 ++-
t/t3404-rebase-interactive.sh | 16
2 files changed, 60 insertions(+), 41 deletions(-)
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 8ed7fcc
On Mon, Feb 11, 2013 at 12:17:01PM -0800, Junio C Hamano wrote:
John Keeping j...@keeping.me.uk writes:
+comment_char=$(git config --get core.commentchar 2/dev/null | cut -c1)
+: ${comment_char:=#}
Hmm, somewhat ugly. I wonder if we can do this without pipe and cut.
Yeah, but I can't see
-by: John Keeping j...@keeping.me.uk
---
Changes since v1:
- use '\' as the comment character in tests
- use git stripspace --strip-comments where appropriate
- use git stripspace --comment-lines where appropriate
- use printf instead of echo when the string contains $comment_char
- quote
---
On Sat, Feb 09, 2013 at 03:39:33PM -0800, Junio C Hamano wrote:
* jk/diff-graph-cleanup (2013-02-07) 6 commits
- combine-diff.c: teach combined diffs about line prefix
- diff.c: use diff_line_prefix() where applicable
- diff: add diff_line_prefix function
- diff.c: make constant
On Sun, Feb 10, 2013 at 11:30:39AM -0800, Junio C Hamano wrote:
John Keeping j...@keeping.me.uk writes:
Can you squash this into the first commit before you do?
Matthieu is correct that the graph_is_commit_finished() check isn't
needed in the loop now that we've pulled it out
On Thu, Feb 07, 2013 at 01:12:59PM +0900, Miles Bader wrote:
John Keeping j...@keeping.me.uk writes:
I generally like to get rid of the pointless warnings so that the useful
ones can't hide in the noise. Perhaps CFLAGS += -Wno-string-plus-int
would be better for this particular warning
Signed-off-by: John Keeping j...@keeping.me.uk
---
diff.c | 115 -
1 file changed, 20 insertions(+), 95 deletions(-)
diff --git a/diff.c b/diff.c
index ed14d5d..f441f6c 100644
--- a/diff.c
+++ b/diff.c
@@ -402,12 +402,7 @@ static
Signed-off-by: John Keeping j...@keeping.me.uk
---
diff.c | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/diff.c b/diff.c
index bf95235..73ae02d 100644
--- a/diff.c
+++ b/diff.c
@@ -2123,7 +2123,8 @@ static unsigned char *deflate_it(char *data,
return deflated
Write the prefix for an output line to the same file as the actual
content.
Signed-off-by: John Keeping j...@keeping.me.uk
---
diff.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/diff.c b/diff.c
index 348f71b..bf95235 100644
--- a/diff.c
+++ b/diff.c
@@ -4485,7 +4485,7
for the same commit (this was changed by commit 656197a -
graph.c: infinite loop in git whatchanged --graph -m from the previous
behaviour of looping infinitely).
Change this so that if the graph code believes it has already shown the
commit it prints a single padding line.
Signed-off-by: John Keeping j
This is a helper function to call the diff output_prefix function and
return its value as a C string, allowing us to greatly simplify
everywhere that needs to get the output prefix.
Signed-off-by: John Keeping j...@keeping.me.uk
---
diff.c | 10 ++
diff.h | 3 +++
2 files changed, 13
. This affects the
output of git log --graph --cc [-p|--raw].
[1] http://article.gmane.org/gmane.comp.version-control.git/215630
John Keeping (6):
graph: output padding for merge subsequent parents
diff: write prefix to the correct file
diff.c: make constant string arguments const
diff: add
diff_line_prefix()
before each line.
Signed-off-by: John Keeping j...@keeping.me.uk
---
combine-diff.c | 47 ++-
1 file changed, 30 insertions(+), 17 deletions(-)
diff --git a/combine-diff.c b/combine-diff.c
index bb1cc96..35c817b 100644
--- a/combine-diff.c
+++ b
On Thu, Feb 07, 2013 at 01:05:19PM -0800, Junio C Hamano wrote:
Matt Kraai kr...@ftbfs.org writes:
-#if defined(__GNUC__) ! defined(__clang__)
-#define error(fmt, ...) (error((fmt), ##__VA_ARGS__), -1)
-#endif
+#define error(...) (error(__VA_ARGS__), -1)
Before your change, we only
On Wed, Feb 06, 2013 at 07:33:08PM +0100, Matthieu Moy wrote:
John Keeping j...@keeping.me.uk writes:
I would argue that the line should start with | | , since it really is
just a continuation of the same commit.
| |
| | commit a393ed598e9fb11436f85bd58f1a38c82f2cadb7 (from
Signed-off-by: John Keeping j...@keeping.me.uk
---
On Sun, Feb 03, 2013 at 04:24:52PM -0800, Junio C Hamano wrote:
Ideally it should also have test cases
to show git diff --cc --raw blob1 blob2...blob$n for n=4 and n=40
(or any two values clearly below and above
Signed-off-by: John Keeping j...@keeping.me.uk
---
Changes since v1:
- more spaces around '|'
- create trees with line feeds and use 'sed -e 4q'
---
t/t4038-diff-combined.sh | 24
1 file changed, 24 insertions(+)
diff --git a/t/t4038-diff-combined.sh b/t/t4038-diff
.
Will merge to 'next', after squashing the fixup! commits from John
Keeping.
* jk/mergetool (2013-01-28) 8 commits
- mergetools: simplify how we handle vim and defaults
- mergetool--lib: don't call exit in setup_tool
- mergetool--lib: improve show_tool_help() output
/gmane.comp.version-control.git/213817
[2] http://article.gmane.org/gmane.comp.version-control.git/213849
Antoine Pelisse (1):
fix clang -Wtautological-compare with unsigned enum
John Keeping (2):
combine-diff: suppress a clang warning
builtin/apply: tighten (dis)similarity index parsing
From: Antoine Pelisse apeli...@gmail.com
Create a GREP_HEADER_FIELD_MIN so we can check that the field value is
sane and silent the clang warning.
Clang warning happens because the enum is unsigned (this is
implementation-defined, and there is no negative fields) and the check
is then
indexing to silence this warning
prefix = COLONS + offset;
^
[ ]
Suppress this by making the suggested change.
Signed-off-by: John Keeping j...@keeping.me.uk
---
combine-diff.c | 2 +-
1 file changed, 1
.
[1] http://article.gmane.org/gmane.comp.version-control.git/213857
Signed-off-by: John Keeping j...@keeping.me.uk
---
builtin/apply.c | 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/builtin/apply.c b/builtin/apply.c
index 6c11e8b..4745e75 100644
--- a/builtin/apply.c
On Mon, Feb 04, 2013 at 02:20:06AM +0800, Tay Ray Chuan wrote:
On Sun, Feb 3, 2013 at 10:37 PM, John Keeping j...@keeping.me.uk wrote:
When compiling combine-diff.c, clang 3.2 says:
combine-diff.c:1006:19: warning: adding 'int' to a string does not
append to the string
On Sun, Feb 03, 2013 at 11:58:15AM -0800, Junio C Hamano wrote:
John Keeping j...@keeping.me.uk writes:
When compiling combine-diff.c, clang 3.2 says:
combine-diff.c:1006:19: warning: adding 'int' to a string does not
append to the string [-Wstring-plus-int
On Sun, Feb 03, 2013 at 01:07:48PM -0800, Junio C Hamano wrote:
John Keeping j...@keeping.me.uk writes:
A quick search turned up the original thread where this feature was
added to Clang [1]. It seems that it does find genuine bugs where
people try to log values by doing:
log
On Fri, Feb 01, 2013 at 09:39:39AM +0100, Michael Haggerty wrote:
On 01/30/2013 09:31 PM, John Keeping wrote:
On Wed, Jan 30, 2013 at 11:05:10AM +0100, Michael Haggerty wrote:
[...] maybe we should establish a small Python library of
compatibility utilities (like a small six). [...]
But I
and does not find it.
Fix this by renaming git-remote-helpers.txt to
gitremote-helpers.txt.
Signed-off-by: John Keeping j...@keeping.me.uk
---
On Wed, Jan 30, 2013 at 12:28:49PM -0800, Junio C Hamano wrote:
John Keeping j...@keeping.me.uk writes:
Does this mean that git-remote-helpers.txt
and does not find it.
Fix this by renaming git-remote-helpers.txt to
gitremote-helpers.txt.
Signed-off-by: John Keeping j...@keeping.me.uk
---
Changes since v1:
- add gitremote-helpers.txt to the Makefile since it is no longer caught
by git-*.txt.
- add a simple git-remote-helpers.html to help
On Thu, Jan 31, 2013 at 02:13:10PM -0800, Junio C Hamano wrote:
John Keeping j...@keeping.me.uk writes:
When looking up a topic via git help topic, git-help prepends git-
to topics that are the names of commands (either builtin or found on the
path) and git (no hyphen) to any other topic
On Thu, Jan 31, 2013 at 02:43:20PM -0800, Junio C Hamano wrote:
John Keeping j...@keeping.me.uk writes:
Yes. Should I change it to git-remote-helpers.html.in and then copy
it into place? That seems like the simplest answer and means that
*.html will continue to refer only to generated
On Wed, Jan 30, 2013 at 12:46:47PM +0100, Max Horn wrote:
does anybody know a website where one can view that latest git
documentation? Here, latest means latest release (though being
also able to access it for next would of course be a nice bonus,
likewise for older versions). While I do have
On Wed, Jan 30, 2013 at 11:17:15AM -0800, Junio C Hamano wrote:
Let's do something like this on top of the topic.
This looks good to me.
INSTALL | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/INSTALL b/INSTALL
index b96e16d..2dc3b61 100644
--- a/INSTALL
+++
Signed-off-by: John Keeping j...@keeping.me.uk
---
git-mergetool--lib.sh | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index 25631cd..b6ed2fa 100644
--- a/git-mergetool--lib.sh
+++ b/git-mergetool--lib.sh
@@ -34,9 +34,9
Signed-off-by: John Keeping j...@keeping.me.uk
---
git-mergetool--lib.sh | 41 -
1 file changed, 40 insertions(+), 1 deletion(-)
diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index b44a2c8..e338be5 100644
--- a/git-mergetool--lib.sh
+++ b/git
git-config to the '--tool-help' output.
[1] http://article.gmane.org/gmane.comp.version-control.git/214964
John Keeping (3):
fixup! mergetool--lib: add functions for finding available tools
fixup! doc: generate a list of valid merge tools
mergetool--lib: list user configured tools in '--tool
Signed-off-by: John Keeping j...@keeping.me.uk
---
git-mergetool--lib.sh | 40 ++--
1 file changed, 22 insertions(+), 18 deletions(-)
diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index b6ed2fa..b44a2c8 100644
--- a/git-mergetool--lib.sh
+++ b/git
clean.
Signed-off-by: Junio C Hamano gits...@pobox.com
Looks obviously correct to me. Sorry for missing this at the time.
FWIW:
Reviewed-by: John Keeping j...@keeping.me.uk
---
git_remote_helpers/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
601 - 700 of 839 matches
Mail list logo
