I'm guessing Kirill meant to send this to the list and not just to me.
It looks to me like the segfault is in MSys's mkdir.exe and not a Git
process.
- Forwarded message from Kirill Berezin ene...@develop-project.ru -
From: Kirill Berezin ene...@develop-project.ru
To: John Keeping j
On Thu, May 23, 2013 at 12:29:59PM +0200, Andreas Krey wrote:
On Thu, 23 May 2013 05:48:38 +, John Szakmeister wrote:
...
This is a feature of `git pull` that I really despise. I really wish
`git pull` treated the remote as the first parent in its merge
operation.
I'd actually only
On Thu, May 23, 2013 at 09:01:15AM -0700, Junio C Hamano wrote:
John Keeping j...@keeping.me.uk writes:
I've been annoyed by this at $DAYJOB recently. A lot of people seem to
blindly git pull without much thought about how the history is ending
up and what they actually want to do.
I
On Thu, May 23, 2013 at 02:01:39PM -0700, Junio C Hamano wrote:
John Keeping j...@keeping.me.uk writes:
I have to wonder how often git pull with no arguments actually does
what users really want (even if they don't know it!) when it doesn't
result in a fast-forward (and pull.rebase isn't
On Fri, May 24, 2013 at 01:57:12AM +0200, Petr Baudis wrote:
Just to clear up on what the best practice is, I'd imagine the setup
to be something like:
(a) Makefile contains inclusion of Makefile.include.
(b) There is a file like Makefile.include.template containing
a
On Thu, May 23, 2013 at 06:53:36PM -0500, Felipe Contreras wrote:
The alternatives are these:
a) you annoy the vast majority of the user-base by making 'git pull' a
dangerous operation that should be avoided, and replaced with 'git
fetch'+'git rebase'.
b) you annoy a minority of the
On Fri, May 24, 2013 at 11:40:07AM +0200, Petr Baudis wrote:
On Fri, May 24, 2013 at 09:22:53AM +0100, John Keeping wrote:
On Fri, May 24, 2013 at 01:57:12AM +0200, Petr Baudis wrote:
Just to clear up on what the best practice is, I'd imagine the setup
to be something like
On Fri, May 24, 2013 at 12:14:16PM +0200, Petr Baudis wrote:
On Fri, May 24, 2013 at 11:06:12AM +0100, John Keeping wrote:
I don't see anything wrong with having a template file documenting the
parameters, but I think it's important that there are sensible defaults
in place when the user's
On Fri, May 24, 2013 at 01:03:22PM +0200, Petr Baudis wrote:
On Fri, May 24, 2013 at 11:40:18AM +0100, John Keeping wrote:
So that it continues to Just Work for people using buildroot but you can
create Makefile.config to override those defaults.
Indeed, that doesn't cover some corner
On Fri, May 24, 2013 at 03:34:26PM +, Jim Greenleaf wrote:
Phil Hord phil.hord at gmail.com writes:
The wording of --ignore-changes suffers the same lack of clarity that
--assume-unchanged does.
What's better? --sequester is probably too obscure. Maybe --hold.
Or --silence. Or
On Fri, May 24, 2013 at 03:42:37PM +, Jim Greenleaf wrote:
John Keeping john at keeping.me.uk writes:
I wonder if this would be better as a file rather than another option to
git-update-index. We already have .git/info/exclude so we could add
.git/info/freeze or .git/info/local
On Fri, May 24, 2013 at 02:15:55PM -0700, Junio C Hamano wrote:
* jk/submodule-subdirectory-ok (2013-04-24) 3 commits
(merged to 'next' on 2013-04-24 at 6306b29)
+ submodule: fix quoting in relative_path()
(merged to 'next' on 2013-04-22 at f211e25)
+ submodule: drop the top-level
On Sat, May 25, 2013 at 05:20:29PM +0530, Ramkumar Ramachandra wrote:
Antoine Pelisse wrote:
Is it not possible for color to be used uninitialized here ?
My compiler didn't complain; what am I missing? Doesn't the
declaration char color[COLOR_MAXLEN]; initialize an empty string?
Why would
On Mon, May 27, 2013 at 12:00:46AM +0900, Kenichi Saita wrote:
After running the user's diff tool, git difftool --dir-dif --no-symlink
currently copied back a temporary file to working tree only when a file
contains unstaged changes in the working tree.
Change this behavior so that temporary
On Sun, May 26, 2013 at 08:09:56PM +0200, Gioele Barabucci wrote:
Il 26/05/2013 20:00, Andreas Schwab ha scritto:
Simple, I keep all my projects on the same server, so I would like to
refer to that server + path using 'remote-repo'.
git+ssh://git.example.org//users/gioele/projects
On Sun, May 26, 2013 at 08:21:45PM +0200, Gioele Barabucci wrote:
Il 26/05/2013 20:14, John Keeping ha scritto:
On Sun, May 26, 2013 at 08:09:56PM +0200, Gioele Barabucci wrote:
Il 26/05/2013 20:00, Andreas Schwab ha scritto:
Simple, I keep all my projects on the same server, so I would
this by setting the missing_ok flag when calling get_fetch_map.
Signed-off-by: John Keeping j...@keeping.me.uk
---
builtin/fetch.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/fetch.c b/builtin/fetch.c
index e41cc0d..d15a734 100644
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
On Mon, May 27, 2013 at 11:42:52AM -0400, Jeff King wrote:
On Mon, May 27, 2013 at 12:40:25PM +0100, John Keeping wrote:
Since commit f269048 (fetch: opportunistically update tracking refs,
2013-05-11) we update tracking refs opportunistically when fetching
remote branches. However
occurs.
Fix this by setting the missing_ok flag when calling get_fetch_map.
Test-added-by: Jeff King p...@peff.net
Signed-off-by: John Keeping j...@keeping.me.uk
Acked-by: Jeff King p...@peff.net
---
On Mon, May 27, 2013 at 12:19:34PM -0400, Jeff King wrote:
On Mon, May 27, 2013 at 05:01:29PM +0100
On Tue, May 28, 2013 at 01:40:20AM +0200, Jason A. Donenfeld wrote:
My commit author name is Jason A. Donenfeld. Because this has a dot,
SMTP handling likes to put it in quotes.
git-send-email has this line:
if (defined $author and $author ne $sender) {
With my name, this
On Tue, May 28, 2013 at 11:06:13AM -0700, Junio C Hamano wrote:
Kenichi Saita nito...@gmail.com writes:
When deciding whether or not we should link a working tree file into
the temporary right-hand directory for a directory diff, we
currently behave differently in the --symlink and
On Tue, May 28, 2013 at 11:57:08AM -0700, Junio C Hamano wrote:
John Keeping j...@keeping.me.uk writes:
Yeah, the commit message is still quite focused on the end effect of
copying files back. But that's not what's being changed here.
In my suggested commit message I tried to make
On Thu, May 30, 2013 at 11:38:32AM +0100, Alex Bennée wrote:
One factor might be the size of my repo (.git is around 2.4G). Could
this just be due to computational cost of searching through large
packs to walk the commit chain? Is there any way to make this easier
for git to do?
What does git
still seems to be active over
at SourceForge... let's see if this email reaches him.
Here's a link for his reference just in case he missed your original email:
http://thread.gmane.org/gmane.comp.version-control.git/222646
On 04/27/13 10:18, John Keeping wrote:
I got a bounce with 550
On Thu, May 30, 2013 at 10:38:59PM +0530, Ramkumar Ramachandra wrote:
Matthieu Moy wrote:
I find it a bit weird that Git sets the configuration for external
commands, but it may make sense. No strong opinion here.
I don't mean a setenv() kind of thing: how would we unset it after
that?
On Thu, May 30, 2013 at 06:21:55PM +0200, Thomas Rast wrote:
Alex Bennée kernel-hac...@bennee.com writes:
On 30 May 2013 16:33, Thomas Rast tr...@inf.ethz.ch wrote:
Alex Bennée kernel-hac...@bennee.com writes:
41.58% git libcrypto.so.1.0.0 [.] sha1_block_data_order_ssse3
33.62%
On Fri, May 31, 2013 at 09:14:49AM +0100, Alex Bennée wrote:
On 30 May 2013 20:30, John Keeping j...@keeping.me.uk wrote:
On Thu, May 30, 2013 at 06:21:55PM +0200, Thomas Rast wrote:
Alex Bennée kernel-hac...@bennee.com writes:
On 30 May 2013 16:33, Thomas Rast tr...@inf.ethz.ch wrote
On Fri, May 31, 2013 at 09:49:57AM +0100, Alex Bennée wrote:
On 31 May 2013 09:32, John Keeping j...@keeping.me.uk wrote:
Thomas is suggesting that you might have a tag that does not point at a
commit but instead points to a blob object.
It's looking like I just have some very heavy
On Thu, May 30, 2013 at 09:23:40PM +0200, Jens Lehmann wrote:
Am 30.05.2013 01:58, schrieb Junio C Hamano:
* jk/submodule-subdirectory-ok (2013-04-24) 3 commits
(merged to 'next' on 2013-04-24 at 6306b29)
+ submodule: fix quoting in relative_path()
(merged to 'next' on 2013-04-22 at
On Fri, May 31, 2013 at 04:22:37PM -0400, Roland Schulz wrote:
Hi,
the gitignore rules work so that if a directory is ignored, all files
in that directory are ignored. While that behavior isn't clearly
documented in gitignore, this behavior is consistent across all git
tools (status,
On Mon, Jun 03, 2013 at 11:47:23PM +0200, Jens Lehmann wrote:
Am 31.05.2013 21:40, schrieb John Keeping:
The current version does make '$sm_path' relative in submodule
foreach, although it's hard to spot because we have to leave doing so
until right before the eval.
Yes. If I read
On Tue, Jun 04, 2013 at 09:17:17PM +1000, Heiko Voigt wrote:
On Tue, Jun 04, 2013 at 09:10:45AM +0100, John Keeping wrote:
On Tue, Jun 04, 2013 at 03:29:51PM +1000, Heiko Voigt wrote:
On Mon, Jun 03, 2013 at 11:23:41PM +0100, John Keeping wrote:
Sorry, I should have been more specific
On Tue, Jun 04, 2013 at 11:39:25PM +0200, Jens Lehmann wrote:
Am 04.06.2013 14:48, schrieb John Keeping:
The problem is that sometimes you do want to adjust the path and
sometimes you don't. Reading git-submodule(1), it says:
This may be either an absolute URL, or (if it begins
On Tue, Jun 04, 2013 at 06:57:34PM -0400, Phil Hord wrote:
On Tue, Jun 4, 2013 at 8:48 AM, John Keeping j...@keeping.me.uk wrote:
The problem is that sometimes you do want to adjust the path and
sometimes you don't. Reading git-submodule(1), it says:
This may be either an absolute
On Sun, Jun 09, 2013 at 08:26:32PM +0530, Ramkumar Ramachandra wrote:
Felipe Contreras wrote:
The plan is simple; make libgit.a a proper library, starting by
clarifying what goes into libgit.a, and what doesn't. If there's any
hopes of ever having a public library, it's clear what code
On Sun, Jun 09, 2013 at 10:40:32AM -0500, Felipe Contreras wrote:
On Sun, Jun 9, 2013 at 10:12 AM, John Keeping j...@keeping.me.uk wrote:
On Sun, Jun 09, 2013 at 08:26:32PM +0530, Ramkumar Ramachandra wrote:
Felipe Contreras wrote:
The plan is simple; make libgit.a a proper library
On Sun, Jun 09, 2013 at 11:22:06AM -0500, Felipe Contreras wrote:
On Sun, Jun 9, 2013 at 11:02 AM, John Keeping j...@keeping.me.uk wrote:
But we make a distinction between things that are specific to one
command (especially argument parsing and user interaction) and more
generally useful
On Sun, Jun 09, 2013 at 12:13:41PM -0500, Felipe Contreras wrote:
On Sun, Jun 9, 2013 at 12:03 PM, Ramkumar Ramachandra
artag...@gmail.com wrote:
John Keeping wrote:
Calling across from one builtin/*.c file to another is just as wrong as
calling into a builtin/*.c file from a top-level
On Sun, Jun 09, 2013 at 07:33:42PM +0200, SZEDER Gábor wrote:
On Sun, Jun 09, 2013 at 12:23:01PM -0500, Felipe Contreras wrote:
On Sun, Jun 9, 2013 at 12:18 PM, SZEDER Gábor sze...@ira.uka.de wrote:
On Sun, Jun 09, 2013 at 11:40:22AM -0500, Felipe Contreras wrote:
We should free objects
On Sun, Jun 09, 2013 at 12:53:38PM -0500, Felipe Contreras wrote:
On Sun, Jun 9, 2013 at 12:37 PM, John Keeping j...@keeping.me.uk wrote:
On Sun, Jun 09, 2013 at 07:33:42PM +0200, SZEDER Gábor wrote:
On Sun, Jun 09, 2013 at 12:23:01PM -0500, Felipe Contreras wrote:
On Sun, Jun 9, 2013
On Mon, Jun 10, 2013 at 09:53:24AM +0300, Michael S. Tsirkin wrote:
I vaguely remember there was some way to say
head of the remote I am tracking - but I could not find it.
Where are all the tricks like foo^{} documented?
gitrevisions(7) is what you're looking for here.
In this case I think
On Mon, Jun 10, 2013 at 05:11:41PM -0400, Jeff King wrote:
On Mon, Jun 10, 2013 at 12:28:55PM -0700, Junio C Hamano wrote:
John Keeping j...@keeping.me.uk writes:
I think the first thing to do is read the diff.algorithm setting in
git-add--interactive and pass its value
On Tue, Jun 11, 2013 at 10:00:56AM -0700, Junio C Hamano wrote:
Michael Haggerty mhag...@alum.mit.edu writes:
* When reviewing other peoples' code, be tactful and constructive. Set
high expectations, but do what you can to help the submitter achieve
them. Don't demand changes based only
On Tue, Jun 11, 2013 at 08:52:05PM +0200, Michael Haggerty wrote:
That's a very good point (and a good illustration, too). How do you
like the new second and third sentences below?
* When reviewing other peoples' code, be tactful and constructive.
Remember that submitting patches for public
On Wed, Jun 12, 2013 at 12:16:28AM +0530, Ramkumar Ramachandra wrote:
John Keeping wrote:
Ugh, why this roundabout-passive-past tone? Use imperative tone
like this:
...
vs.
We normally use the imperative in commit messages, perhaps like
can call git-add--interactive). If a user want
to override the value on the command line they can use:
git -c diff.algorithm=$ALGO ...
Signed-off-by: John Keeping j...@keeping.me.uk
---
On Mon, Jun 10, 2013 at 05:56:56PM -0400, Jeff King wrote:
On Mon, Jun 10, 2013 at 10:46:38PM +0100
On Fri, Jun 07, 2013 at 11:47:07AM -0700, Junio C Hamano wrote:
Scott McPeak smcp...@coverity.com writes:
I suggest that this problem could easily have been avoided if git
stash refused to run with a pending merge (present MERGE_HEAD file),
since this is crucial repository state that it
On Fri, Jun 14, 2013 at 06:13:33PM +0530, Ramkumar Ramachandra wrote:
The following command
$ git format-patch -o outgoing master
does not ensure that the output-directory outgoing doesn't already
exist. As a result, it's possible for patches from two different series
to get mixed up
On Fri, Jun 14, 2013 at 06:45:19PM +0530, Ramkumar Ramachandra wrote:
John Keeping wrote:
I don't think this is the correct behaviour. I can think of cases where
I would want to output multiple things into the same directory.
format.cleanOutputDirectory = true|false?
Maybe, but I
On Sat, Jun 15, 2013 at 06:18:46PM +0200, Thomas Koch wrote:
I'm using vcsh[1] to have my dotfiles in GIT. With that I use a .gitignore
file
referenced by core.excludesfile that looks like this:
# ignore everything by default
*
# but do not ignore emacs stuff
!.emacs.d/
# but than
Only leading whitespace is changed in this patch.
Signed-off-by: John Keeping j...@keeping.me.uk
---
t/t7401-submodule-summary.sh | 80 ++--
1 file changed, 40 insertions(+), 40 deletions(-)
diff --git a/t/t7401-submodule-summary.sh b/t/t7401-submodule
and matches the sm_path variable.
* I audited the code again and fixed a few more cases that weren't
printing relative paths (notably submodule init and submodule
foreach).
* More tests.
John Keeping (6):
t7401: make indentation consistent
t7403: modernize style
t7403: add missing
Change the indentation to use tabs consistently and start content on the
line after the paren opening a subshell.
Also don't put a space in file and remove : from : file to be
consistent with the majority of tests elsewhere.
Signed-off-by: John Keeping j...@keeping.me.uk
---
t/t7403-submodule
-by: John Keeping j...@keeping.me.uk
---
git-submodule.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-submodule.sh b/git-submodule.sh
index 79bfaac..bdb438b 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -485,7 +485,7 @@ cmd_foreach
relative URLs
in git submodule add when not at the top level of the working tree.
Signed-off-by: John Keeping j...@keeping.me.uk
---
git-submodule.sh | 135 ---
t/t7400-submodule-basic.sh | 80 +
t/t7401-submodule
Signed-off-by: John Keeping j...@keeping.me.uk
---
t/t7403-submodule-sync.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t7403-submodule-sync.sh b/t/t7403-submodule-sync.sh
index 38f6cc4..bf90098 100755
--- a/t/t7403-submodule-sync.sh
+++ b/t/t7403-submodule-sync.sh
of
the working tree but need to handle relative paths given by the user on
the command line.
Signed-off-by: John Keeping j...@keeping.me.uk
---
Documentation/git-rev-parse.txt | 16 +++
builtin/rev-parse.c | 24 ---
t/t1513-rev-parse-prefix.sh | 96
A simple style fix; no functional change.
Signed-off-by: John Keeping j...@keeping.me.uk
---
Nothing in maint..pu is touching this at the moment, so hopefully this
is a good time to fix the whitespace here.
Documentation/Makefile | 42 +-
1 file changed
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
Instead of needing a wrapper to call the diff/merge command, simply
provide the diff_cmd and merge_cmd functions for user-specified tools in
the same way as we do for built-in tools.
Signed-off-by: John Keeping j...@keeping.me.uk
---
git-mergetool--lib.sh | 82
On Tue, Jun 18, 2013 at 03:25:22PM +0200, Alexander Nestorov wrote:
Recently I had to write some automation scripts and I found
that git reset --hard actually restores each file's permissions.
That is causing both the created and the last-modified dates
of the file to get changed to the time
On Fri, Jun 21, 2013 at 02:21:47AM -0700, Dave Abrahams wrote:
The docs for fast-import seem to imply that I can use ls to get the
SHA1 of a commit for which I have a mark:
Reading from a named tree
The dataref can be a mark reference (:idnum) or the full
40-byte
Signed-off-by: John Keeping j...@keeping.me.uk
---
contrib/completion/git-completion.bash | 2 ++
t/t9902-completion.sh | 1 +
2 files changed, 3 insertions(+)
diff --git a/contrib/completion/git-completion.bash
b/contrib/completion/git-completion.bash
index 8fbf941..c3290af
, the completion only handles the stuck form --git-dir=path
and not --git-dir path, so fix this as well.
Signed-off-by: John Keeping j...@keeping.me.uk
---
contrib/completion/git-completion.bash | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/contrib/completion/git
On Sat, Jun 22, 2013 at 05:13:29PM +0530, Ramkumar Ramachandra wrote:
Corresponding to woman.
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
---
Documentation/git-help.txt | 3 +++
builtin/help.c | 11 ---
2 files changed, 11 insertions(+), 3 deletions(-)
On Sat, Jun 22, 2013 at 07:16:48PM -0700, Dave Abrahams wrote:
on Sat Jun 22 2013, John Keeping john-AT-keeping.me.uk wrote:
On Fri, Jun 21, 2013 at 02:21:47AM -0700, Dave Abrahams wrote:
The docs for fast-import seem to imply that I can use ls to get the
SHA1 of a commit for which I
On Sun, Jun 23, 2013 at 07:19:25AM -0700, Dave Abrahams wrote:
on Sun Jun 23 2013, John Keeping john-AT-keeping.me.uk wrote:
In this case, I think I do now understand why the mode is 0: in
parse_ls a new tree object is created and the SHA1 of the original is
copied in but the mode is left
This prevents a failure later when we lift the restriction on ls with
the empty path.
Signed-off-by: John Keeping j...@keeping.me.uk
---
fast-import.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/fast-import.c b/fast-import.c
index 23f625f..bdbadea 100644
--- a/fast-import.c
+++ b/fast
://article.gmane.org/gmane.comp.version-control.git/228586
John Keeping (4):
t9300: document fast-import empty path issues
fast-import: set valid mode on root tree in ls
fast-import: allow ls or filecopy of the root tree
fast-import: allow moving the root tree
fast-import.c | 58
...@boostpro.com
Signed-off-by: John Keeping j...@keeping.me.uk
---
t/t9300-fast-import.sh | 65 ++
1 file changed, 65 insertions(+)
diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh
index ac6f3b6..f4b9355 100755
--- a/t/t9300-fast-import.sh
+++ b/t
is invalid).
However, the implementation also caught the empty path, which should
represent the root tree. Relax this restriction so that the empty path
is explicitly allowed and refers to the root tree.
Reported-by: Dave Abrahams d...@boostpro.com
Signed-off-by: John Keeping j...@keeping.me.uk
path and handling it.
Signed-off-by: John Keeping j...@keeping.me.uk
---
fast-import.c | 21 ++---
t/t9300-fast-import.sh | 2 +-
2 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/fast-import.c b/fast-import.c
index e2c9d50..21db3fc 100644
--- a/fast
On Sun, Jun 23, 2013 at 12:19:05PM -0700, Junio C Hamano wrote:
John Keeping j...@keeping.me.uk writes:
+my $diff_algorithm = ($repo-config('diff.algorithm') or 'default');
+
my $use_readkey = 0;
my $use_termcap = 0;
my %term_escapes;
@@ -731,6 +733,9 @@ sub run_git_apply
On Wed, Jun 26, 2013 at 11:06:41PM +0300, Kevin Bracey wrote:
git am was previously modified to provide --continue for consistency
with rebase, merge etc, and the documentation changed to showing
--continue as the primary form.
Complete the work by replacing remaining uses of --resolved by
On Thu, Jun 27, 2013 at 11:05:09AM -0700, Junio C Hamano wrote:
John Szakmeister j...@szakmeister.net writes:
On Thu, Jun 27, 2013 at 1:27 PM, Junio C Hamano gits...@pobox.com wrote:
[snip]
diff --git a/git-am.sh b/git-am.sh
index 9f44509..ad67194 100755
--- a/git-am.sh
+++
Hi Junio, I don't think you've picked this up. Are you expecting a
re-roll or did it just get lost in the noise?
On Sat, Jun 22, 2013 at 12:25:17PM +0100, John Keeping wrote:
git-completion.bash's parsing of the command name relies on everything
preceding it starting with '-' unless
On Thu, Jun 27, 2013 at 12:48:52PM -0700, Junio C Hamano wrote:
Because letting a trivial merge automatically handled by Git is so
easy with git pull, a person who is new to Git may not realize
that the project s/he is interacting with may prefer rebase
workflow. Add a safety valve to fail
On Fri, Jun 28, 2013 at 10:22:57AM -0700, Junio C Hamano wrote:
John Keeping j...@keeping.me.uk writes:
test_expect_success \
'merge-setup part 3' \
-'git pull . branch1'
+'git pull --merge . branch1'
I think the --merge should be implied here because the suer has
On Fri, May 24, 2013 at 01:23:24AM +0200, Alois Mahdal wrote:
Hello!
This [has been reported][1] to this list about half a year ago
but with no response so I'm not even sure if it's been
acknowledged as bug.
[1]: http://marc.info/?l=gitm=135215709307126q=raw
When I use `git log
On Tue, Jul 02, 2013 at 11:51:42AM +0200, Thomas Rast wrote:
Lukas Fleischer g...@cryptocrack.de writes:
On Tue, Jul 02, 2013 at 10:19:36AM +0100, John Keeping wrote:
[...]
$ git log --oneline --follow builtin/clone.c | wc -l
125
$ git log --oneline --follow --reverse
On Wed, Jul 03, 2013 at 12:53:39AM +0530, Ramkumar Ramachandra wrote:
class CommandError(Exception):
def __init__(self, cmd, retcode):
self.cmd = cmd
self.retcode = retcode
Exception.__init__(
self,
'Command %s failed with retcode
On Fri, Jun 28, 2013 at 03:41:34PM -0700, Junio C Hamano wrote:
John Keeping j...@keeping.me.uk writes:
Here, git pull . branch1 is merely saying I want to integrate
the work on my current branch with that of branch1 without saying
how that integration wants to happen.
The change
On Wed, Jul 03, 2013 at 10:02:34AM +0200, Michael Haggerty wrote:
On 07/03/2013 12:21 AM, Junio C Hamano wrote:
Ramkumar Ramachandra artag...@gmail.com writes:
def get(self, name, default=''):
try:
values = self._split(read_git_output(
On Wed, Jul 03, 2013 at 09:29:02AM +0100, John Keeping wrote:
Doesn't git config --get return an error if there are multiple values?
The answer is apparently no - I wrote the text below from
git-config(1) and then checked the behaviour. This seems to be a
regression in git-config (bisect
My system doesn't have the en_US.UTF-8 locale (or plain en_US), which
causes t4205 to fail by counting bytes instead of UTF-8 codepoints.
Instead of using sed for this, use Perl which behaves predictably
whatever locale is in use.
Signed-off-by: John Keeping j...@keeping.me.uk
---
This patch
On Wed, Jul 03, 2013 at 02:41:06PM -0700, Junio C Hamano wrote:
John Keeping j...@keeping.me.uk writes:
My system doesn't have the en_US.UTF-8 locale (or plain en_US), which
causes t4205 to fail by counting bytes instead of UTF-8 codepoints.
Instead of using sed for this, use Perl which
On Thu, Jul 04, 2013 at 12:47:28PM +0300, Orgad Shaneh wrote:
Hi,
If a prepare-commit-msg hook is used, git gui executes it for New Commit.
If the New Commit is selected, and then immediately Amend (before
the hook returns), when the hook returns the message is replaced with
the one
On Thu, Jul 04, 2013 at 01:59:10PM +0300, Orgad Shaneh wrote:
On Thu, Jul 4, 2013 at 1:34 PM, John Keeping j...@keeping.me.uk wrote:
On Thu, Jul 04, 2013 at 12:47:28PM +0300, Orgad Shaneh wrote:
Hi,
If a prepare-commit-msg hook is used, git gui executes it for New Commit.
If the New
On Thu, Jul 04, 2013 at 08:10:07PM +0200, Ævar Arnfjörð Bjarmason wrote:
On Thu, Jul 4, 2013 at 7:56 PM, Thomas Koch tho...@koch.ro wrote:
we're evaluating Git to be used in our companies Tool. But a hard
requirement
is the possibility to set an intend-to-edit flag on a file (better path).
On Fri, Jul 05, 2013 at 03:48:31PM +0530, Ramkumar Ramachandra wrote:
Due to a recent change in the Net::SMTP::SSL module, send-email emits
the following ugly warning everytime a email is sent via SSL:
***
Using the default of
On Fri, Jul 05, 2013 at 10:20:11AM -0700, Junio C Hamano wrote:
brian m. carlson sand...@crustytoothpaste.net writes:
You've covered the STARTTLS case, but not the SSL one right above it.
Someone using smtps on port 465 will still see the warning. You can
pass SSL_verify_mode to
On Fri, Jul 05, 2013 at 11:30:11AM -0700, Junio C Hamano wrote:
John Keeping j...@keeping.me.uk writes:
On Fri, Jul 05, 2013 at 10:20:11AM -0700, Junio C Hamano wrote:
brian m. carlson sand...@crustytoothpaste.net writes:
You've covered the STARTTLS case, but not the SSL one right
On Fri, Jul 05, 2013 at 11:25:36PM -0700, Junio C Hamano wrote:
John Keeping j...@keeping.me.uk writes:
I'd rather have '$smtp_ssl_cert_path ne ' in the first if condition
(instead of the '-d $smtp_ssl_cert_path') ...
I agree. The signal for no certs should be an explicit nonsense
On Sat, Jul 06, 2013 at 09:12:31PM -0700, Junio C Hamano wrote:
John Keeping j...@keeping.me.uk writes:
@@ -1096,19 +1101,18 @@ sub smtp_auth_maybe {
# Helper to come up with SSL/TLS certification validation params
# and warn when doing no verification
sub ssl_verify_params
On Wed, Jul 03, 2013 at 11:47:50AM -0700, Junio C Hamano wrote:
John Keeping j...@keeping.me.uk writes:
Since commit 00b347d (git-config: do not complain about duplicate
entries, 2012-10-23), git config --get does not exit with an error if
there are multiple values for the specified key
(in terms of being a command) and seems to cover the
merge and rebase cases nicely.
John Keeping (2):
push: avoid suggesting merging remote changes
pull: change the description to integrate changes
Documentation/git-pull.txt | 2 +-
builtin/push.c | 12 ++--
git-pull.sh
'git pull' to 'git pull ...' to hint to users
that they may want to add other parameters.
Suggested-by: Philip Oakley philipoak...@iee.org
Signed-off-by: John Keeping j...@keeping.me.uk
---
builtin/push.c | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/builtin
Since git-pull learned the --rebase option it has not just been about
merging changes from a remote repository (where merge is in the sense
of git merge). Change the description to use integrate instead of
merge in order to reflect this.
Signed-off-by: John Keeping j...@keeping.me.uk
In order to clarify which value is used when there are multiple values
defined for a key, re-order the list of file locations so that it runs
from least specific to most specific. Then add a paragraph which simply
says that the last value will be used.
Signed-off-by: John Keeping j
On Mon, Jul 08, 2013 at 12:00:02AM +0200, Robin Rosenberg wrote:
Signed-off-by: Robin Rosenberg robin.rosenb...@dewire.com
---
Documentation/git-config.txt | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt
101 - 200 of 839 matches
Mail list logo
