2014-11-21 7:00 GMT+08:00 Junio C Hamano gits...@pobox.com:
I've pushed out what should be -rc3 minus l10n changes and try to
make sure there will be no N_() and _() changes.
Let's do a 2.2-rc3 as the last round of this cycle tomorrow. I've
fetched up to your 7ba2ba7 but haven't merged it
No callers rely on $status so there's don't need to set
it during merge_cmd() for diffmerge, emerge, and kdiff3.
Signed-off-by: David Aguilar dav...@gmail.com
---
This is based on the mergetool/difftool cleanup patches.
mergetools/diffmerge | 1 -
mergetools/emerge| 1 -
mergetools/kdiff3
On 11/21/2014 10:14 AM, Michael Haggerty wrote:
Couldn't we save ourselves a lot of this save_errno boilerplate by
making error() and warning() preserve errno? [...]
Never mind; I see that Peff already submitted a patch to this effect.
Michael
--
Michael Haggerty
mhag...@alum.mit.edu
--
To
On 11/19/2014 02:37 AM, Jeff King wrote:
Now that error() does not clobber errno, we do not have to
take pains to save it ourselves.
Signed-off-by: Jeff King p...@peff.net
---
refs.c | 7 +--
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/refs.c b/refs.c
index
Some file systems do not support the executable bit:
a) The user executable bit is always 0, e.g. VFAT mounted with -onoexec
b) The user executable bit is always 1, e.g. cifs mounted with -ofile_mode=0755
c) There are system where user executable bit is 1 even if it should be 0
like b), but the
Hi Philip,
On Thu, 20 Nov 2014, Philip Oakley wrote:
Are the patches going in the right direction?
Yes.
A couple of general comments:
- please do not comment out code. Just remove it.
- the first three commit messages look funny, being indented by 4
spaces... unintentional?
Is the
Hi Philip,
On Thu, 20 Nov 2014, Philip Oakley wrote:
The i18n 5e9637c6 introduced an extra '-o' option
into the make file,
I take it you are referring to
https://github.com/git/git/commit/5e9637c6#diff-b67911656ef5d18c4ae36cb6741b7965R2195
diff --git
Hi Philip,
apart from adding dead code:
On Thu, 20 Nov 2014, Philip Oakley wrote:
diff --git a/contrib/buildsystems/engine.pl b/contrib/buildsystems/engine.pl
index 9144ea7..8e41808 100755
--- a/contrib/buildsystems/engine.pl
+++ b/contrib/buildsystems/engine.pl
@@ -243,7 +244,8 @@ sub
Hi Philip,
On Thu, 20 Nov 2014, Philip Oakley wrote:
Commit 4b623d80f7352 added an .obj file (invalidcontinue.obj) which was not
processed correctly.
The generate engine then mistakenly did a s/.o/.c/ to create a request
to compile invalidcontinue.cbj.
This is good. However, this:
Hi Philip,
On Thu, 20 Nov 2014, Philip Oakley wrote:
[...]
+Or, use the msvc-build script; also in /msysgit/bin/msvc-build
As I mentioned before, from a Git Bash on Windows, the path is
/bin/msvc-build (no /msysgit/). That is quite likely to stay the same with
the upcoming Git for Windows
On 20.11.14 23:37, Junio C Hamano wrote:
---
At a glance it is very hard to see what we might be _losing_ with this
change that claims to add new kinds of tests on top of existing ones.
I am guessing that add-check-warn roughly corresponds to the old
create-file-in-repo but they have
Hello,
is it allowed add alias '--abandone' for --abort option in git commands
(git am, git rebase, etc.)?
The word 'abort' have too negative meaning in the russian language.
For example, for git am we have three option names for continue
operation:
--continue, -r, --resolved
--
Vitaly
Aside from making the logic clearer, this avoids a call to
warn_dangling_symrefs(), which always does a for_each_rawref()
iteration.
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
builtin/remote.c | 39 +--
1 file changed, 21 insertions(+), 18
All of the callers have string_lists available already, whereas two of
them had to read data out of a string_list into an array of strings
just to call this function. So change repack_without_refs() to take
the list of refnames to omit as a string_list, and change the callers
accordingly.
Rename delete_refs_list to refs_to_prune. The new name is more
self-explanatory.
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
builtin/remote.c | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/builtin/remote.c b/builtin/remote.c
index 63a6709..efbf5fb
Also free them together at the end of the function.
In a moment, the array version will become redundant. Managing them
together makes later steps more obvious.
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
builtin/remote.c | 15 +--
1 file changed, 9 insertions(+), 6
Iterate over refs_to_prune using for_each_string_list_item() rather
than writing out the loop in longhand.
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
builtin/remote.c | 14 ++
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/builtin/remote.c
This is basically an atomized version of Ronnie/Jonathan/Stefan's
patch [1] refs.c: use a stringlist for repack_without_refs. But I've
actually rewritten most of it from scratch, using the original patch
as a reference.
I was reviewing the original patch and it looked mostly OK [2], but I
found
Inserting items into a list in sorted order is O(N^2) whereas
appending them unsorted and then sorting the list all at once is
O(N lg N).
string_list_insert() also removes duplicates, and this change loses
that functionality. But the strings in this list, which ultimately
come from a
On 11/21/2014 03:09 PM, Michael Haggerty wrote:
This is basically an atomized version of Ronnie/Jonathan/Stefan's
patch [1] refs.c: use a stringlist for repack_without_refs. But I've
actually rewritten most of it from scratch, using the original patch
as a reference.
Naturally, right after I
On Thu, 2014-11-20 at 09:13 -0800, Junio C Hamano wrote:
Paul Smith p...@mad-scientist.net writes:
+# don't recreate a workdir over an existing directory, unless it's empty
+if test -d $new_workdir
then
- die destination directory '$new_workdir' already exists.
+ if test $(ls -a1
Jeff King schrieb am 20.11.2014 um 19:20:
On Thu, Nov 20, 2014 at 09:23:21AM -0800, Junio C Hamano wrote:
diff --git a/builtin/add.c b/builtin/add.c
index ae6d3e2..1074e32 100644
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -284,7 +284,7 @@ static int add_files(struct dir_struct *dir, int
Vitaly Lipatov schrieb am 21.11.2014 um 13:41:
Hello,
is it allowed add alias '--abandone' for --abort option in git commands
(git am, git rebase, etc.)?
The word 'abort' have too negative meaning in the russian language.
But that is the english localisation. We do have git in other
I have downloaded the latest git from git-scm on my windows machine.
I am using git on windows, I am having trouble trying to get notepad++
as my commit message editor.
I have created a shell script called npp.sh which has the following content
/c/Program\ Files\ \(x86\)/Notepad++/notepad++.exe
git add foo bar adds neither foo nor bar when bar is ignored, but dies
to let the user recheck their command invocation. This becomes less
helpful when git add foo.* is subject to shell expansion and some of
the expanded files are ignored.
git add --ignore-errors is supposed to ignore errors when
On Fri, Nov 21, 2014 at 6:09 AM, Michael Haggerty mhag...@alum.mit.edu wrote:
Inserting items into a list in sorted order is O(N^2) whereas
appending them unsorted and then sorting the list all at once is
O(N lg N).
string_list_insert() also removes duplicates, and this change loses
that
Paul Smith p...@mad-scientist.net writes:
Why these changes? I thought you are making sure $cleandir is
absolute so that you do not have to do this and can just cd into
the new working tree, the same way the user would do once it is set
up.
I made cleandir absolute mainly because you asked
From: Fahad Ashfaque fahad...@gmail.com
I have downloaded the latest git from git-scm on my windows machine.
I am using git on windows, I am having trouble trying to get notepad++
as my commit message editor.
I have created a shell script called npp.sh which has the following
content
Michael Haggerty mhag...@alum.mit.edu writes:
On 11/21/2014 10:14 AM, Michael Haggerty wrote:
Couldn't we save ourselves a lot of this save_errno boilerplate by
making error() and warning() preserve errno? [...]
Never mind; I see that Peff already submitted a patch to this effect.
My
On Fri, Nov 21, 2014 at 09:48:19AM -0800, Junio C Hamano wrote:
Michael Haggerty mhag...@alum.mit.edu writes:
On 11/21/2014 10:14 AM, Michael Haggerty wrote:
Couldn't we save ourselves a lot of this save_errno boilerplate by
making error() and warning() preserve errno? [...]
Never
Michael J Gruber писал 2014-11-21 18:44:
Vitaly Lipatov schrieb am 21.11.2014 um 13:41:
Hello,
is it allowed add alias '--abandone' for --abort option in git
commands
(git am, git rebase, etc.)?
The word 'abort' have too negative meaning in the russian language.
But that is the english
Michael Haggerty mhag...@alum.mit.edu writes:
I don't think that those iterations changed anything substantial that
overlaps with my version, but TBH it's such a pain in the ass working
with patches in email that I don't think I'll go to the effort of
checking for sure unless somebody shows
On Fri, Nov 21, 2014 at 05:08:19PM +0100, Michael J Gruber wrote:
git add foo bar adds neither foo nor bar when bar is ignored, but dies
to let the user recheck their command invocation. This becomes less
helpful when git add foo.* is subject to shell expansion and some of
the expanded files
On Mon, Nov 17, 2014 at 05:21:03PM -0500, Daniel Hagerty wrote:
I don't think there is an easy way to get what you want. You would have
to write a new merge 3-way strategy that handles this case differently.
And most of the file-level heavy lifting in merge strategies is done by
the
Jeff King p...@peff.net writes:
On Fri, Nov 21, 2014 at 09:48:19AM -0800, Junio C Hamano wrote:
Michael Haggerty mhag...@alum.mit.edu writes:
On 11/21/2014 10:14 AM, Michael Haggerty wrote:
Couldn't we save ourselves a lot of this save_errno boilerplate by
making error() and warning()
Jeff King p...@peff.net writes:
This is the first use of gitattributes in the unpack-trees code path. I
cannot think offhand of any philosophical reason that should not be OK,
but it is something worth considering (i.e., this code path is deep
plumbing; are there cases where we would not want
David Aguilar dav...@gmail.com writes:
This is a cleanup series to remove the use of the $status
global variable in mergetool/difftool.
This should wait until after the current RC series is
over but figured I'd send it out.
David Aguilar (3):
mergetool--lib: remove use of $status global
Jiang Xin worldhello@gmail.com writes:
2014-11-21 7:00 GMT+08:00 Junio C Hamano gits...@pobox.com:
I've pushed out what should be -rc3 minus l10n changes and try to
make sure there will be no N_() and _() changes.
Let's do a 2.2-rc3 as the last round of this cycle tomorrow. I've
still don't get it.
I run /c/path/to/npp.sh just fine, Its only 'git commit' that is
teleporting me to a different world. So there is NO way I can refer to
folders outside of my repository in a shell script when it is used in
a config param ?
I will try setting the core.editor to the value
On Fri, Nov 21, 2014 at 10:00 AM, Junio C Hamano gits...@pobox.com wrote:
Michael Haggerty mhag...@alum.mit.edu writes:
I don't think that those iterations changed anything substantial that
overlaps with my version, but TBH it's such a pain in the ass working
with patches in email that I
From: Johannes Schindelin johannes.schinde...@gmx.de
Hi Philip,
On Thu, 20 Nov 2014, Philip Oakley wrote:
Are the patches going in the right direction?
Yes.
Magic. Glad of the confirmation
A couple of general comments:
- please do not comment out code. Just remove it.
It's my debugging
From: Johannes Schindelin johannes.schinde...@gmx.de
Hi Philip,
On Thu, 20 Nov 2014, Philip Oakley wrote:
The i18n 5e9637c6 introduced an extra '-o' option
into the make file,
I take it you are referring to
From: Johannes Schindelin johannes.schinde...@gmx.de
Hi Philip,
On Thu, 20 Nov 2014, Philip Oakley wrote:
Commit 4b623d80f7352 added an .obj file (invalidcontinue.obj) which
was not
processed correctly.
The generate engine then mistakenly did a s/.o/.c/ to create a
request
to compile
From: Johannes Schindelin johannes.schinde...@gmx.de
Hi Philip,
On Thu, 20 Nov 2014, Philip Oakley wrote:
[...]
+Or, use the msvc-build script; also in /msysgit/bin/msvc-build
As I mentioned before, from a Git Bash on Windows, the path is
/bin/msvc-build (no /msysgit/). That is quite likely
From: Fahad Ashfaque fahad...@gmail.com
still don't get it.
Do check each instance of bash separately. Each can have a different
virtual root.
I was caught by this just last week on Msysgit (the msys.bat) where that
has a different base address to the Git bash version in C:\program
Philip Oakley philipoak...@iee.org writes:
sub handleCompileLine
{
my ($line, $lineno) = @_;
-my @parts = split(' ', $line);
+# my @parts = split(' ', $line);
+my @parts = quotewords('\s+', 0, $line);
Can somebody enlighten me why/if quotewords is preferrable over
Dear git developers!
Jeff King wrote:
On Sun, Nov 16, 2014 at 03:31:10PM +, Patrick Schleizer wrote:
How safe are signed git tags? Especially because git uses SHA-1. There
is contradictory information around.
So if one verifies a git tag (`git tag -v tagname`), then `checksout`s
the
From: Junio C Hamano gits...@pobox.com
Philip Oakley philipoak...@iee.org writes:
sub handleCompileLine
{
my ($line, $lineno) = @_;
-my @parts = split(' ', $line);
+# my @parts = split(' ', $line);
+my @parts = quotewords('\s+', 0, $line);
Can somebody enlighten me why/if
Signed-off-by: Marc Branchaud marcn...@xiplink.com
---
Documentation/RelNotes/2.2.0.txt | 102 +++
1 file changed, 51 insertions(+), 51 deletions(-)
diff --git a/Documentation/RelNotes/2.2.0.txt b/Documentation/RelNotes/2.2.0.txt
index d4001c5..9d9d5d5 100644
Philip Oakley philipoak...@iee.org writes:
From: Junio C Hamano gits...@pobox.com
Philip Oakley philipoak...@iee.org writes:
sub handleCompileLine
{
my ($line, $lineno) = @_;
-my @parts = split(' ', $line);
+# my @parts = split(' ', $line);
+my @parts =
A release candidate Git v2.2.0-rc3 is now available for testing
at the usual places. I was planning to do the final one but we
found and fixed last-minute bugs in the code in -rc2, so this
is to doubly make sure the result is fit for the final one,
which I am planning to tag mid next week.
The
On Fri, Nov 21, 2014 at 11:28:03AM -0800, Junio C Hamano wrote:
David Aguilar dav...@gmail.com writes:
This is a cleanup series to remove the use of the $status
global variable in mergetool/difftool.
This should wait until after the current RC series is
over but figured I'd send it
-Original Message-
From: Patrick Schleizer
Sent: Friday, November 21, 2014 18:01
Dear git developers!
Jeff King wrote:
On Sun, Nov 16, 2014 at 03:31:10PM +, Patrick Schleizer wrote:
How safe are signed git tags? Especially because git uses
SHA-1. There
is
Good afternoon
http://www.juliemazziotta.com/wasnt.php?doesnt=60mqk35wyxzgc
ingarshol...@yahoo.no
Sent from my iPhone
--
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
54 matches
Mail list logo
