On 23.07.2012 05:42, David Aguilar wrote:
Organize the script so that it has a single main() function which
calls out to dir_diff() and file_diff() functions. This eliminates
dir-diff-specific variables that do not need to be calculated when
performing a regular file-diff.
Funny, I just have
On Sun, Jul 22, 2012 at 11:13 PM, Sebastian Schuberth
sschube...@gmail.com wrote:
On 23.07.2012 05:42, David Aguilar wrote:
Organize the script so that it has a single main() function which
calls out to dir_diff() and file_diff() functions. This eliminates
dir-diff-specific variables that do
On Sun, Jul 22, 2012 at 11:30 PM, Sebastian Schuberth
sschube...@gmail.com wrote:
On Mon, Jul 23, 2012 at 8:21 AM, David Aguilar dav...@gmail.com wrote:
Funny, I just have prepared a patch along the same lines so that one can
call git-difftool -h and --tool-help also outside a repository, see
On Mon, Jul 23, 2012 at 8:44 AM, David Aguilar dav...@gmail.com wrote:
Well, I'm not asking for a test. From my side, I'd be happy if you
could just try it and confirm that it works, as I currently cannot
easily apply your patch.
Heheh.. I was hoping you could provide a test ;-)
;-)
I
This series introduce various minor clean-ups and improvements to the merge /
diff tool scripts and documentation.
Sebastian Schuberth (4):
Use variables for the lists of tools that support merging / diffing
Explicitly list all valid diff tools and document --tool-help as an
option
This series introduces various minor clean-ups and improvements to the merge /
diff tool scripts and documentation.
Sorry, the first version was missing a patch.
Sebastian Schuberth (5):
Sort the list of tools that support both merging and diffing
alphabetically
Use variables for the
Also, add a few comments that clarify the meaning of these variables.
Signed-off-by: Sebastian Schuberth sschube...@gmail.com
---
contrib/completion/git-completion.bash | 11 +--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/contrib/completion/git-completion.bash
2012/7/23 Sitaram Chamarty sitar...@gmail.com:
On Mon, Jul 23, 2012 at 2:24 AM, Junio C Hamano gits...@pobox.com wrote:
mer...@stonehenge.com (Randal L. Schwartz) writes:
Darek == Darek Bridges darek.brid...@me.com writes:
Darek I use git for many things, but I am trying to work out the
Signed-off-by: Sebastian Schuberth sschube...@gmail.com
---
contrib/completion/git-completion.bash | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/contrib/completion/git-completion.bash
b/contrib/completion/git-completion.bash
index 5be9dee..f2c4894 100755
---
Signed-off-by: Sebastian Schuberth sschube...@gmail.com
---
mergetools/araxis | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/mergetools/araxis b/mergetools/araxis
index 64f97c5..aeba1b9 100644
--- a/mergetools/araxis
+++ b/mergetools/araxis
@@ -16,5 +16,11 @@ merge_cmd
2012/7/23 Junio C Hamano gits...@pobox.com:
I find one test case failed, and correct it in PATCH 3/7.
That test used i18ncmp already, so the update to expected string
would be sufficient. I was worried if there were existing tests
that have been expecting that the output from am/rebase/merge
Signed-off-by: Sebastian Schuberth sschube...@gmail.com
---
git-mergetool--lib.sh | 6 ++
1 file changed, 6 insertions(+)
diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index ed630b2..ac9a8f0 100644
--- a/git-mergetool--lib.sh
+++ b/git-mergetool--lib.sh
@@ -112,14 +112,17 @@
On Mon, Jul 23, 2012 at 2:32 PM, Jiang Xin worldhello@gmail.com wrote:
If build git with GETTEXT_POISON and test, lots of test cases failed.
It seems that we haven't run these test cases for i18n for a long time.
Gaah.. I should have resent the poison-fix series but so far
procrastination
Signed-off-by: Sebastian Schuberth sschube...@gmail.com
---
Documentation/git-difftool.txt | 9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt
index 31fc2e3..5dd54f1 100644
---
Dan Johnson computerdr...@gmail.com writes:
On Tue, Jul 17, 2012 at 10:06 AM, Matthieu Moy matthieu@imag.fr wrote:
Traditionnally, pages named Foo:Bar are page 'Bar' in namespace 'Foo'.
However, it is also possible to call a page Foo:Bar if 'Foo' is not a
namespace. In this case, the
Florian Achleitner florian.achleitner.2.6...@gmail.com writes:
But my remote-helper didn't advertise the refspec capability, so transport-
helper assumed it imports to refs/heads/master, which is the default import
refspec.
The man page for git-remote-helpers says:
refspec refspec
[...]
2012/7/23 Nguyen Thai Ngoc Duy pclo...@gmail.com:
On Mon, Jul 23, 2012 at 2:32 PM, Jiang Xin worldhello@gmail.com wrote:
If build git with GETTEXT_POISON and test, lots of test cases failed.
It seems that we haven't run these test cases for i18n for a long time.
Gaah.. I should have
Florian Achleitner wrote:
But when I fetch from a git repo that imported from svn, the notes are not
fetched automatically. In this case I currently loose marks and notes.
What can I do?
In the long term, git will need to be tweaked to automatically fetch
notes along with branches by
To ease testing without depending on a reachable svn server, this
compact python script mimics parts of svnrdumps behaviour.
It requires the remote url to start with sim://.
Start and end revisions are evaluated.
If the requested revision doesn't exist, as it is the case with
incremental imports,
Florian Achleitner wrote:
To ease testing without depending on a reachable svn server, this
compact python script mimics parts of svnrdumps behaviour.
Thanks. Mind if I forge your sign-off?
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to
On Monday 23 July 2012 07:59:21 Jonathan Nieder wrote:
Florian Achleitner wrote:
To ease testing without depending on a reachable svn server, this
compact python script mimics parts of svnrdumps behaviour.
Thanks. Mind if I forge your sign-off?
Ups. No problem, anyways I've added it
To ease testing without depending on a reachable svn server, this
compact python script mimics parts of svnrdumps behaviour.
It requires the remote url to start with sim://.
Start and end revisions are evaluated.
If the requested revision doesn't exist, as it is the case with
incremental imports,
Florian Achleitner florian.achleitner.2.6...@gmail.com writes:
It requires the remote url to start with sim://.
Start and end revisions are evaluated.
It is a bit unclear where start and end comes from, and if
evaluated is the most important aspect of the handling of these
two values. Do you
Florian Achleitner florian.achleitner.2.6...@gmail.com writes:
I had to fix the missing sign-off anyways..
contrib/svn-fe/svnrdump_sim.py | 53
You also have whitespace damages (i.e. line wrapping introduced by your
mailer). Using git-send-email
David Aguilar dav...@gmail.com writes:
Teach difftool's --dir-diff mode to use symlinks to represent
files from the working copy, and make it the default behavior
for the non-Windows platforms.
Using symlinks is simpler and safer since we do not need to
worry about copying files back into
Sebastian Schuberth sschube...@gmail.com writes:
Also, add a few comments that clarify the meaning of these variables.
Signed-off-by: Sebastian Schuberth sschube...@gmail.com
---
contrib/completion/git-completion.bash | 11 +--
1 file changed, 9 insertions(+), 2 deletions(-)
diff
Sebastian Schuberth sschube...@gmail.com writes:
Signed-off-by: Sebastian Schuberth sschube...@gmail.com
---
Documentation/git-difftool.txt | 9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt
index
Sebastian Schuberth sschube...@gmail.com writes:
Signed-off-by: Sebastian Schuberth sschube...@gmail.com
---
mergetools/araxis | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/mergetools/araxis b/mergetools/araxis
index 64f97c5..aeba1b9 100644
---
This way we do not have to risk the list of tools go out of sync
between the implementation and the documentation.
Signed-off-by: Junio C Hamano gits...@pobox.com
---
Junio C Hamano gits...@pobox.com writes:
+--tool-help::
+List the supported and available diff tools.
This part is a good
On Sat, Jul 21, 2012 at 03:26:26PM +0100, Ramana Kumar wrote:
If I forget to set user.email and user.name config options and do a commit
(possibly the --amend option also required to make this show up), then git
1.7.11.2 will drops me into an editor for a commit message, then after that
Am 23.07.2012 07:09, schrieb Junio C Hamano:
Daniel Graña dan...@gmail.com writes:
A common way to track dotfiles with git is using GIT_DIR and
GIT_WORK_TREE to move repository out of ~/.git with something like:
git init --bare ~/.dotfiles
alias dotfiles=GIT_DIR=~/.dotfiles
On Mon, Jul 23, 2012 at 6:27 PM, Jeff King p...@peff.net wrote:
On Sat, Jul 21, 2012 at 03:26:26PM +0100, Ramana Kumar wrote:
If I forget to set user.email and user.name config options and do a commit
(possibly the --amend option also required to make this show up), then git
1.7.11.2 will
I find the output of `git branch' to be quite bare, and would like to
see more information; most importantly, what the state of the branch
is in relation to its upstream. For some time I have been using my
own script to do this. It produces output like this:
$ git lsb
commodity-market-lua
Jens Lehmann jens.lehm...@web.de writes:
Am 23.07.2012 07:09, schrieb Junio C Hamano:
Daniel Graña dan...@gmail.com writes:
A common way to track dotfiles with git is using GIT_DIR and
GIT_WORK_TREE to move repository out of ~/.git with something like:
git init --bare ~/.dotfiles
On Mon, Jul 23, 2012 at 2:38 PM, Jens Lehmann jens.lehm...@web.de wrote:
Am 23.07.2012 07:09, schrieb Junio C Hamano:
Daniel Graña dan...@gmail.com writes:
A common way to track dotfiles with git is using GIT_DIR and
GIT_WORK_TREE to move repository out of ~/.git with something like:
On Mon, Jul 23, 2012 at 7:09 AM, Junio C Hamano gits...@pobox.com wrote:
I think this is in line with what we discussed earlier on list when
the interaction between GIT_DIR/GIT_WORK_TREE and submodules came up
the last time. Jens?
Yes, it is.
I still have your email marked as TODO to get
PPS: Yes, I know that I am replying in a patch thread. I will try it asap.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Also, add a few comments that clarify the meaning of these variables and
sort the list of tools alphabetically.
Signed-off-by: Sebastian Schuberth sschube...@gmail.com
---
contrib/completion/git-completion.bash | 15 +++
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git
Hi,
I am a new user to git and I found an interesting behavior in git. I
am not sure if this is a bug, but I thought I would report this
anyway!
So I can create a local branch called --tracking like this:
git checkout -b --tracking origin/somebranch
I messed up the syntax while trying to create
John Bartholomew jpa.bartholo...@gmail.com writes:
I find the output of `git branch' to be quite bare, and would like to
see more information; most importantly, what the state of the branch
is in relation to its upstream.
That is already present: just run git branch -vv.
--
Thomas Rast
abhisek...@gmail.com abhisek...@gmail.com writes:
Now I cannot delete this branch. Running:
git branch -d --tracking
gives an error: unknown option `tracking'
I do not think this is supposed to work, but it does by accident.
$ git branch -d -- --tracking
Deleted branch --tracking
On Mon, Jul 23, 2012 at 01:27:26PM -0400, Jeff King wrote:
On Sat, Jul 21, 2012 at 03:26:26PM +0100, Ramana Kumar wrote:
If I forget to set user.email and user.name config options and do a commit
(possibly the --amend option also required to make this show up), then git
1.7.11.2 will
The advise() function takes a variable number of arguments
and converts them into a va_list object to pass to strbuf
for handling. However, we accidentally called strbuf_addf
(that takes a variable number of arguments) instead of
strbuf_vaddf (that takes a va_list).
This bug dates back to
The identity of the committer will ultimately be pulled from
the ident code by commit_tree(). However, we make an attempt
to check the author and committer identity early, before the
user has done any manual work like inputting a commit
message. That lets us abort without them having to worry
If we launch an editor for the user to create a commit
message, they may put significant work into doing so.
Typically we try to check common mistakes that could cause
the commit to fail early, so that we die before the user
goes to the trouble.
We may still experience some errors afterwards,
On 23.07.2012 19:21, Junio C Hamano wrote:
This way we do not have to risk the list of tools go out of sync
between the implementation and the documentation.
Signed-off-by: Junio C Hamano gits...@pobox.com
Thanks! I've squashed this with
[PATCH v2 5/5] Add a few more code comments and
This way we do not have to risk the list of tools go out of sync
between the implementation and the documentation. Adjust the documentation
accordingly to not explicitly list the tools but refer to --tool-help.
Signed-off-by: Junio C Hamano gits...@pobox.com
Signed-off-by: Sebastian Schuberth
== Work done in the previous 13 weeks ==
- Definition of a tentative index file v5 format [1]. This differs
from the proposal in making it possible to bisect the directory
entries and file entries, to do a binary search. The exact bits
for each section were also defined. To further compress
Max Horn m...@quendi.de writes:
On 06.07.2012, at 21:18, Junio C Hamano wrote:
Max Horn m...@quendi.de writes:
+'rev{caret}!', e.g. 'HEAD{caret}!'::
+ A suffix '{caret}' followed by an exclamation mark
+ means commit 'rev' but forces all of its parents to be excluded. For
+ commands
On Monday 23 July 2012 18:24:40 Matthieu Moy wrote:
You also have whitespace damages (i.e. line wrapping introduced by your
mailer). Using git-send-email avoids this kind of problem (there are
also some advices for some mailers in Documentation/SubmittingPatches).
Damn. That's usually no
Signed-off-by: Sebastian Schuberth sschube...@gmail.com
---
mergetools/araxis | 9 -
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/mergetools/araxis b/mergetools/araxis
index 64f97c5..f8899f8 100644
--- a/mergetools/araxis
+++ b/mergetools/araxis
@@ -16,5 +16,12 @@
Florian Achleitner florian.achleitner.2.6...@gmail.com writes:
On Monday 23 July 2012 18:24:40 Matthieu Moy wrote:
You also have whitespace damages (i.e. line wrapping introduced by your
mailer). Using git-send-email avoids this kind of problem (there are
also some advices for some mailers in
Sebastian Schuberth sschube...@gmail.com writes:
This way we do not have to risk the list of tools go out of sync
between the implementation and the documentation. Adjust the documentation
accordingly to not explicitly list the tools but refer to --tool-help.
Signed-off-by: Junio C Hamano
On Mon, Jul 23, 2012 at 09:46:49PM +0200, Matthieu Moy wrote:
Damn. That's usually no problem with kmail either, if the config is right.
I've already used git-send-email several times.
But for replying to threads and adding several Cc: addresses it's a little
cumbersome.
How do you do
To ease testing without depending on a reachable svn server, this
compact python script mimics parts of svnrdumps behaviour.
It requires the remote url to start with sim://.
Eventual slashes at the end of the url are stripped.
The url specifies the path of the svn dump file (as created by
On Mon, Jul 23, 2012 at 9:52 PM, Junio C Hamano gits...@pobox.com wrote:
-t tool::
--tool=tool::
- Use the diff tool specified by tool. Valid values include
- emerge, kompare, meld, and vimdiff. Run `git difftool --tool-help`
- for the list of valid tool settings.
+ Use
Jens Lehmann jens.lehm...@web.de writes:
We could get rid of the core.worktree setting by assuming that the
directory a gitfile was found in is the root of the repo's work
tree (unless configured otherwise).
Now you lost me. If you have .git that is not a directory but is a
gitfile, then you
Florian Achleitner florian.achleitner.2.6...@gmail.com writes:
To ease testing without depending on a reachable svn server, this
compact python script mimics parts of svnrdumps behaviour.
It requires the remote url to start with sim://.
Eventual slashes at the end of the url are stripped.
On Mon, Jul 23, 2012 at 1:14 PM, Sebastian Schuberth
sschube...@gmail.com wrote:
On Mon, Jul 23, 2012 at 9:52 PM, Junio C Hamano gits...@pobox.com wrote:
-t tool::
--tool=tool::
- Use the diff tool specified by tool. Valid values include
- emerge, kompare, meld, and vimdiff. Run
Sebastian Schuberth sschube...@gmail.com writes:
Signed-off-by: Sebastian Schuberth sschube...@gmail.com
---
mergetools/araxis | 9 -
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/mergetools/araxis b/mergetools/araxis
index 64f97c5..f8899f8 100644
---
Jeff King p...@peff.net writes:
If we launch an editor for the user to create a commit
message, they may put significant work into doing so.
Typically we try to check common mistakes that could cause
the commit to fail early, so that we die before the user
goes to the trouble.
We may still
Jeff King p...@peff.net writes:
Incidentally, this bug was masked prior to 060d4bb, as the
initial loose call would taint the later strict call. So the
commit would succeed (albeit with a bogus committer line in
the commit object), and nobody noticed that our early check
did not match the
On Mon, Jul 23, 2012 at 01:49:55PM -0700, Junio C Hamano wrote:
Jeff King p...@peff.net writes:
If we launch an editor for the user to create a commit
message, they may put significant work into doing so.
Typically we try to check common mistakes that could cause
the commit to fail
On Mon, Jul 23, 2012 at 01:51:25PM -0700, Junio C Hamano wrote:
diff --git a/builtin/commit.c b/builtin/commit.c
index 95eeab1..20cef95 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -725,7 +725,7 @@ static int prepare_to_commit(const char *index_file,
const char *prefix,
Jeff King p...@peff.net writes:
On Mon, Jul 23, 2012 at 01:49:55PM -0700, Junio C Hamano wrote:
Jeff King p...@peff.net writes:
If we launch an editor for the user to create a commit
message, they may put significant work into doing so.
Typically we try to check common mistakes that
On Mon, Jul 23, 2012 at 10:47 PM, Junio C Hamano gits...@pobox.com wrote:
For example, when the user tells it to install in /home/ss/bin, if
it installs its compare program in /home/ss/bin/araxis/compare
without allowing the /araxis/ part to be stripped away, the above
heuristics is
On Mon, Jul 23, 2012 at 02:00:19PM -0700, Junio C Hamano wrote:
Liberal use of atexit() for something like this makes me cringe
somewhat.
I don't like it either, but there's not really a better way. The die()
that Ramana triggered in the initial report is deep inside the ident
code.
David Aguilar dav...@gmail.com writes:
On Mon, Jul 23, 2012 at 1:14 PM, Sebastian Schuberth
sschube...@gmail.com wrote:
On Mon, Jul 23, 2012 at 9:52 PM, Junio C Hamano gits...@pobox.com wrote:
-t tool::
--tool=tool::
- Use the diff tool specified by tool. Valid values include
-
Sebastian Schuberth sschube...@gmail.com writes:
Please feel free to ignore the patch if you feel the heuristics is not
sufficiently safe. I'm currently unable to come up with a safer
solution while maintaining portability, i.e. not use which or doing
rather laborious string parsing on the
On Mon, Jul 23, 2012 at 11:16 PM, Junio C Hamano gits...@pobox.com wrote:
There are only five or six classes of environment that matter in the
real world for the purpose of giving well known examples: Windows,
MacOS X, Gnome, KDE and Linux terminal. By picking a representative
one from each
On Mon, Jul 23, 2012 at 11:24 PM, Junio C Hamano gits...@pobox.com wrote:
Does Araxis compare take --version and behave in a way that is
cheaply controllable? If it opens a GUI window and pops up a dialog
that says Option not understood, then it is not controllable,
Araxis opens up a GUI
On Mon, Jul 23, 2012 at 2:24 PM, Junio C Hamano gits...@pobox.com wrote:
Sebastian Schuberth sschube...@gmail.com writes:
We have no such assurance. That's why you correctly call it a
heuristics after all
ImageMagick compare takes --version and says something like
this to its standard
Jeff King p...@peff.net writes:
Here's a documentation patch.
-- 8 --
Subject: [PATCH] commit: document the temporary commit message file
We do not document COMMIT_EDITMSG at all, but users may want
to know about it for two reasons:
1. They may want to tell their editor to configure
Jeff King p...@peff.net writes:
On Mon, Jul 23, 2012 at 02:35:01PM -0700, Junio C Hamano wrote:
...
I also wondered if something like the following might be useful, but
it probably falls into the water under the bridge category.
builtin/commit.c | 5 +
1 file changed, 5 insertions(+)
Sebastian Schuberth sschube...@gmail.com writes:
Personally, I've valued the gain of
the patch to not list araxis as an available diff tool by git
difftool --tool-help when in fact just ImageMagick is in PATH higher
than the loss to support araxis installations that are in a path not
Junio C Hamano skrev 2012-07-22 23.08:
Thomas Rast tr...@student.ethz.ch writes:
Hum, I'm a bit lost now.
What is the status quo? I take it JGit does not have any of ctime, dev,
ino etc., and either leaves the existing value or puts a 0
an argument in favor of splitting stat_crc into its
Sebastian Schuberth sschube...@gmail.com writes:
On Mon, Jul 23, 2012 at 11:16 PM, Junio C Hamano gits...@pobox.com wrote:
There are only five or six classes of environment that matter in the
real world for the purpose of giving well known examples: Windows,
MacOS X, Gnome, KDE and Linux
On Tue, Jul 24, 2012 at 12:22 AM, Junio C Hamano gits...@pobox.com wrote:
On the other hand, if the user has bought and installed Araxis, but
we incorrectly identify it as unusable, the user has wasted good
money and there is no easy recourse as far as I can see in your
patch.
Agreed.
If
On 24.07.2012 00:41, Junio C Hamano wrote:
+ if test -f $(dirname $(type --path compare))/AraxisMerge
We would need additional quotes around the whole path here as the Windows
installation path is usually something like C:\Program Files\Araxis\Araxis
Merge and contains spaces.
Hi Junio. I've just noticed a minor typo in the commit message ...
On 07/19/2012 09:50 AM, Stefano Lattarini wrote:
This provides a reduced but still useful sibling of the Automake's
automatic Makefile rebuild feature. It's important to note that
we take care to enable the new rules only if
Am 23.07.2012 22:34, schrieb Junio C Hamano:
Jens Lehmann jens.lehm...@web.de writes:
We could get rid of the core.worktree setting by assuming that the
directory a gitfile was found in is the root of the repo's work
tree (unless configured otherwise).
Now you lost me. If you have .git
Stefano Lattarini stefano.lattar...@gmail.com writes:
... and here we should add invocation:
... the make install invocation ...
falls back to the default prefix of '$HOME', thus installing git
in the user's home directory -- definitely unexpected.
Can you fix those nits locally
Jens Lehmann jens.lehm...@web.de writes:
Not inside the submodule, me thinks they only make sense in the
superproject (that's why we clean the environment before working
inside the submodule).
Yes, that is fundamental and the only sane behaviour that comes from
what submodules are. They are
On Tue, Jul 24, 2012 at 2:08 AM, Thomas Gummerer t.gumme...@gmail.com wrote:
- We added a POC, for partial loading in git grep. This is still a
pretty hacky implementation, but it demonstrates pretty well
how much can be gained. Here are the timings Thomas posted on
IRC yesterday. The
A release candidate Git v1.7.12-rc0 is now available for testing
at the usual places.
The release tarballs are found at:
http://code.google.com/p/git-core/downloads/list
and their SHA-1 checksums are:
09016e819a69b49090756e9bc5c97a4df25c2f78 git-1.7.12.rc0.tar.gz
85 matches
Mail list logo
