* Re: [PATCH] mingw_rmdir: do not prompt for retry when non-empty
From: Johannes Schindelin @ 2012-12-04 16:35 UTC (permalink / raw)
To: Erik Faye-Lund; +Cc: git, msysgit
In-Reply-To: <1354617713-7436-1-git-send-email-kusmabite@gmail.com>
Hi kusma,
On Tue, 4 Dec 2012, Erik Faye-Lund wrote:
> in ab1a11be ("mingw_rmdir: set errno=ENOTEMPTY when appropriate"),
> a check was added to prevent us from retrying to delete a directory
> that is both in use and non-empty.
>
> However, this logic was slightly flawed; since we didn't return
> immediately, we end up falling out of the retry-loop, but right into
> the prompting loop.
>
> Fix this by simply returning from the function instead of breaking
> the loop.
>
> While we're at it, change the second break to a return as well; we
> already know that we won't enter the prompting-loop, beacuse
> is_file_in_use_error(GetLastError()) already evaluated to false.
I usually prefer to break from the loop, to be able to add whatever
cleanup code we might need in the future after the loop.
So does this fix the problem for you?
-- snipsnap --
diff --git a/compat/mingw.c b/compat/mingw.c
index 04af3dc..504495a 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -259,7 +259,8 @@ int mingw_rmdir(const char *pathname)
return -1;
while ((ret = _wrmdir(wpathname)) == -1 && tries < ARRAY_SIZE(delay)) {
- if (!is_file_in_use_error(GetLastError()))
+ errno = err_win_to_posix(GetLastError());
+ if (errno != EACCESS)
break;
if (!is_dir_empty(wpathname)) {
errno = ENOTEMPTY;
@@ -275,7 +276,7 @@ int mingw_rmdir(const char *pathname)
Sleep(delay[tries]);
tries++;
}
- while (ret == -1 && is_file_in_use_error(GetLastError()) &&
+ while (ret == -1 && errno == EACCESS &&
ask_yes_no_if_possible("Deletion of directory '%s' failed. "
"Should I try again?", pathname))
ret = _wrmdir(wpathname);
--
*** Please reply-to-all at all times ***
*** (do not pretend to know who is subscribed and who is not) ***
*** Please avoid top-posting. ***
The msysGit Wiki is here: https://github.com/msysgit/msysgit/wiki - Github accounts are free.
You received this message because you are subscribed to the Google
Groups "msysGit" group.
To post to this group, send email to msysgit@googlegroups.com
To unsubscribe from this group, send email to
msysgit+unsubscribe@googlegroups.com
For more options, and view previous threads, visit this group at
http://groups.google.com/group/msysgit?hl=en_US?hl=en
^ permalink raw reply related
* Re: Python extension commands in git - request for policy change
From: Martin Langhoff @ 2012-12-04 15:51 UTC (permalink / raw)
To: Eric S. Raymond; +Cc: Git Mailing List
In-Reply-To: <20121125024451.1ADD14065F@snark.thyrsus.com>
On Sat, Nov 24, 2012 at 9:44 PM, Eric S. Raymond <esr@thyrsus.com> wrote:
> git presently contains one Python extension command, Pete Wycoff's p4
> importer. If my git-weave code is merged it will acquire another.
Write a really compelling tool. Don't argue languages. Make it
wonderful. The git maintainers, tool maintainers (you!) and overall
development community have shown flexibility and smarts in the past.
cheers,
m
--
martin.langhoff@gmail.com
martin@laptop.org -- Software Architect - OLPC
- ask interesting questions
- don't get distracted with shiny stuff - working code first
- http://wiki.laptop.org/go/User:Martinlanghoff
^ permalink raw reply
* Re: Python extension commands in git - request for policy change
From: Stephen Bash @ 2012-12-04 14:40 UTC (permalink / raw)
To: Felipe Contreras
Cc: esr, Magnus Bäck, Michael Haggerty, git, Philippe Vaucher
In-Reply-To: <CAMP44s0rcy6OfMPM+8BhQy0DbxRLBHEsraHw0u4oAZzh5euTzg@mail.gmail.com>
----- Original Message -----
> From: "Felipe Contreras" <felipe.contreras@gmail.com>
> Sent: Tuesday, December 4, 2012 9:19:18 AM
> Subject: Re: Python extension commands in git - request for policy change
>
> > > Also, you are ignoring all the advantages that shell has and
> > > python does not.
> >
> > Out of curiosity, can you list the advantages? From what I
> > gathered:
> >
> > - no need to install bash
>
> Unless you are in Windows or OS X. OS X has a shell, but not bash.
>From http://support.apple.com/kb/TA27005:
"The default shell (or command-line interface) used in Mac OS X 10.0 through 10.2.8 is tcsh (with 10.3 and 10.4 it's bash). With Mac OS X 10.2 or later, other interactive shells are included, such as bash and zsh."
Stephen
^ permalink raw reply
* Re: Python extension commands in git - request for policy change
From: Felipe Contreras @ 2012-12-04 14:19 UTC (permalink / raw)
To: Philippe Vaucher
Cc: esr, Magnus Bäck, Michael Haggerty, git@vger.kernel.org
In-Reply-To: <CAGK7Mr4HkCkbw-SV-d=JAmQieV0ZQOE7YqR-g7rTWzHGPYqzHA@mail.gmail.com>
On Mon, Dec 3, 2012 at 3:45 PM, Philippe Vaucher
<philippe.vaucher@gmail.com> wrote:
>> Also, you are ignoring all the advantages that shell has and python does not.
>
> Out of curiosity, can you list the advantages? From what I gathered:
>
> - no need to install bash
Unless you are in Windows or OS X. OS X has a shell, but not bash.
> - git contributors are more used to bash
I don't see this as a big advantage.
> - there's only one "version" of bash (no real need to handle different
> versions compared to py26, py27, etc)
This one is.
The language doesn't change much from different versions of bash either way.
- the language is part of POSIX
Which means you don't need bash, you can use dash, or zsh, or many other shells.
- the language is simple
It's so simple it's used in shells.
- no need for extensions
All you need is the shell binary, that's it.
Cheers.
--
Felipe Contreras
^ permalink raw reply
* Re: [ANNOUNCE] Git v1.8.1-rc0
From: Michael J Gruber @ 2012-12-04 14:12 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
In-Reply-To: <7vip8iq1vs.fsf@alter.siamese.dyndns.org>
While not being a huge problem, you may or may not want to correct one
commit message:
* aaf5ad5 (origin/next, gitster/next) Sync with 1.8.0-rc0
|\
| * ee26a6e (tag: v1.8.1-rc0, origin/master, origin/HEAD,
gitster/master) Git 1.8.1-rc0
Cheers,
Michael
^ permalink raw reply
* Re: [PATCH v7 p1 07/13] remote-testgit: remove irrelevant test
From: Felipe Contreras @ 2012-12-04 14:03 UTC (permalink / raw)
To: Pete Wyckoff; +Cc: git, Junio C Hamano, Jeff King
In-Reply-To: <20121203231321.GA5098@padd.com>
On Mon, Dec 3, 2012 at 5:13 PM, Pete Wyckoff <pw@padd.com> wrote:
>> --- a/t/t5801-remote-helpers.sh
>> +++ b/t/t5801-remote-helpers.sh
>> @@ -53,19 +53,6 @@ test_expect_success 'pushing to local repo' '
>> compare_refs localclone HEAD server HEAD
>> '
>>
>> -# Generally, skip this test. It demonstrates a now-fixed race in
>> -# git-remote-testgit, but is too slow to leave in for general use.
>> -: test_expect_success 'racily pushing to local repo' '
>> - test_when_finished "rm -rf server2 localclone2" &&
>> - cp -R server server2 &&
>> - git clone "testgit::${PWD}/server2" localclone2 &&
>> - (cd localclone2 &&
>> - echo content >>file &&
>> - git commit -a -m three &&
>> - GIT_REMOTE_TESTGIT_SLEEPY=2 git push) &&
>> - compare_refs localclone2 HEAD server2 HEAD
>> -'
>> -
>
> Why does this cause problems?
It doesn't.
> If you're going to rip it out, please finish the job, and take
> out the other two hunks that are needed to trigger this test. See
> 7fb8e16 (git-remote-testgit: fix race when spawning fast-import,
> 2012-04-22).
That commit has absolutely nothing to do with the new remote-testgit,
the old remote-testgit is called now remote-testpy, and its test has
this chunk still there.
For the new remote-testgit this is irrelevant.
--
Felipe Contreras
^ permalink raw reply
* Re: [PATCH v2 0/4] git-svn: More docs for branch handling in
From: Eric Wong @ 2012-12-04 11:39 UTC (permalink / raw)
To: Sebastian Leske; +Cc: git, Junio C Hamano, Michael J Gruber
In-Reply-To: <7vvccjorsf.fsf@alter.siamese.dyndns.org>
Junio C Hamano <gitster@pobox.com> wrote:
> I've sent comments on small nits I found but overall they looked
> quite well researched. Will tentatively queue on the 'pu' branch,
> expecting further updates and Acks from people involved polishing
> these patches.
>
> Thanks for writing it up.
Thanks all. I think the patches are good, but also look forward
to improvements following Junio's comments.
^ permalink raw reply
* [PATCH] mingw_rmdir: do not prompt for retry when non-empty
From: Erik Faye-Lund @ 2012-12-04 10:41 UTC (permalink / raw)
To: git; +Cc: msysgit, johannes.schindelin
in ab1a11be ("mingw_rmdir: set errno=ENOTEMPTY when appropriate"),
a check was added to prevent us from retrying to delete a directory
that is both in use and non-empty.
However, this logic was slightly flawed; since we didn't return
immediately, we end up falling out of the retry-loop, but right into
the prompting loop.
Fix this by simply returning from the function instead of breaking
the loop.
While we're at it, change the second break to a return as well; we
already know that we won't enter the prompting-loop, beacuse
is_file_in_use_error(GetLastError()) already evaluated to false.
Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
---
Here's a quick patch for a small issue I recently encountered; when
deleting a file from inside a directory, we currently end up
prompting the user if (s)he want us to retry deleting the directory
they are in.
compat/mingw.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/compat/mingw.c b/compat/mingw.c
index 1eb974f..2c29667 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -260,10 +260,10 @@ int mingw_rmdir(const char *pathname)
while ((ret = _wrmdir(wpathname)) == -1 && tries < ARRAY_SIZE(delay)) {
if (!is_file_in_use_error(GetLastError()))
- break;
+ return ret;
if (!is_dir_empty(wpathname)) {
errno = ENOTEMPTY;
- break;
+ return ret;
}
/*
* We assume that some other process had the source or
--
1.8.0.msysgit.0.3.g0262b9f.dirty
--
*** Please reply-to-all at all times ***
*** (do not pretend to know who is subscribed and who is not) ***
*** Please avoid top-posting. ***
The msysGit Wiki is here: https://github.com/msysgit/msysgit/wiki - Github accounts are free.
You received this message because you are subscribed to the Google
Groups "msysGit" group.
To post to this group, send email to msysgit@googlegroups.com
To unsubscribe from this group, send email to
msysgit+unsubscribe@googlegroups.com
For more options, and view previous threads, visit this group at
http://groups.google.com/group/msysgit?hl=en_US?hl=en
^ permalink raw reply related
* Re: [PATCH] fsck: warn about ".git" in trees
From: Andreas Ericsson @ 2012-12-04 10:40 UTC (permalink / raw)
To: Torsten Bögershausen; +Cc: Jeff King, Junio C Hamano, git
In-Reply-To: <50B90E11.8090501@web.de>
On 11/30/2012 08:50 PM, Torsten Bögershausen wrote:
>> Having a ".git" entry inside a tree can cause confusing
>> results on checkout. At the top-level, you could not
>> checkout such a tree, as it would complain about overwriting
>> the real ".git" directory. In a subdirectory, you might
>> check it out, but performing operations in the subdirectory
>> would confusingly consider the in-tree ".git" directory as
>> the repository.
> [snip]
>> + int has_dotgit = 0;
>
> Name like "." or ".." are handled as directories by the OS.
>
The patch is for the index, where they're handled as whatever the mode
claims it is. The patch doesn't touch those parts though.
> ".git" could be a file or a directory, at least in theory,
> and from the OS point of view,
> but we want to have this as a reserved name.
>
> Looking at bad directory names, which gives trouble when checking out:
>
> Should we check for "/" or "../blabla" as well?
>
Apart from the checks already in place, checking for git's internal
directory separator marker (which is '/') is enough to catch both,
and that check is done.
--
Andreas Ericsson andreas.ericsson@op5.se
OP5 AB www.op5.se
Tel: +46 8-230225 Fax: +46 8-230231
Considering the successes of the wars on alcohol, poverty, drugs and
terror, I think we should give some serious thought to declaring war
on peace.
^ permalink raw reply
* Re: [PATCH] status: respect advice.statusHints for ahead/behind advice
From: Matthieu Moy @ 2012-12-04 9:17 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Jeff King, git
In-Reply-To: <7vr4n7rrgb.fsf@alter.siamese.dyndns.org>
Junio C Hamano <gitster@pobox.com> writes:
> So let's do a lot simpler patch instead.
>
> -- >8 --
> From: Jeff King <peff@peff.net>
> Date: Mon, 3 Dec 2012 01:16:57 -0500
>
> If the user has unset advice.statusHints, we already
> suppress the "use git reset to..." hints in each stanza. The
> new "use git push to publish..." hint is the same type of
> hint. Let's respect statusHints for it, rather than making
> the user set yet another advice flag.
You may want to squash this on top:
-- >8 --
>From 87a438bd06dd689bd37949e762690ab5dbfc5ff8 Mon Sep 17 00:00:00 2001
From: Matthieu Moy <Matthieu.Moy@imag.fr>
Date: Tue, 4 Dec 2012 10:15:03 +0100
Subject: [PATCH] document that statusHints affects git checkout
---
Documentation/config.txt | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index e70216d..bf8f911 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -160,9 +160,10 @@ advice.*::
it resulted in a non-fast-forward error.
statusHints::
Show directions on how to proceed from the current
- state in the output of linkgit:git-status[1] and in
+ state in the output of linkgit:git-status[1], in
the template shown when writing commit messages in
- linkgit:git-commit[1].
+ linkgit:git-commit[1], and in the help message shown
+ by linkgit:git-checkout[1] when switching branch.
commitBeforeMerge::
Advice shown when linkgit:git-merge[1] refuses to
merge to avoid overwriting local changes.
--
1.8.0.319.g8abfee4
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
^ permalink raw reply related
* [PATCH v2 6/6] mingw: get rid of getpass implementation
From: Erik Faye-Lund @ 2012-12-04 8:10 UTC (permalink / raw)
To: git; +Cc: msysgit, johannes.schindelin, gitster, peff
In-Reply-To: <1354608642-5316-1-git-send-email-kusmabite@gmail.com>
There's no remaining call-sites, and as pointed out in the
previous commit message, it's not quite ideal. So let's just
lose it.
Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
---
compat/mingw.c | 15 ---------------
compat/mingw.h | 2 --
2 files changed, 17 deletions(-)
diff --git a/compat/mingw.c b/compat/mingw.c
index 33ddfdf..5fc14b7 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -1758,21 +1758,6 @@ int link(const char *oldpath, const char *newpath)
return 0;
}
-char *getpass(const char *prompt)
-{
- struct strbuf buf = STRBUF_INIT;
-
- fputs(prompt, stderr);
- for (;;) {
- char c = _getch();
- if (c == '\r' || c == '\n')
- break;
- strbuf_addch(&buf, c);
- }
- fputs("\n", stderr);
- return strbuf_detach(&buf, NULL);
-}
-
pid_t waitpid(pid_t pid, int *status, int options)
{
HANDLE h = OpenProcess(SYNCHRONIZE | PROCESS_QUERY_INFORMATION,
diff --git a/compat/mingw.h b/compat/mingw.h
index 6b9e69a..f494ecb 100644
--- a/compat/mingw.h
+++ b/compat/mingw.h
@@ -55,8 +55,6 @@ struct passwd {
char *pw_dir;
};
-extern char *getpass(const char *prompt);
-
typedef void (__cdecl *sig_handler_t)(int);
struct sigaction {
sig_handler_t sa_handler;
--
1.8.0.4.g3c6fb4f.dirty
--
*** Please reply-to-all at all times ***
*** (do not pretend to know who is subscribed and who is not) ***
*** Please avoid top-posting. ***
The msysGit Wiki is here: https://github.com/msysgit/msysgit/wiki - Github accounts are free.
You received this message because you are subscribed to the Google
Groups "msysGit" group.
To post to this group, send email to msysgit@googlegroups.com
To unsubscribe from this group, send email to
msysgit+unsubscribe@googlegroups.com
For more options, and view previous threads, visit this group at
http://groups.google.com/group/msysgit?hl=en_US?hl=en
^ permalink raw reply related
* [PATCH v2 5/6] mingw: reuse tty-version of git_terminal_prompt
From: Erik Faye-Lund @ 2012-12-04 8:10 UTC (permalink / raw)
To: git; +Cc: msysgit, johannes.schindelin, gitster, peff
In-Reply-To: <1354608642-5316-1-git-send-email-kusmabite@gmail.com>
The getpass-implementation we use on Windows isn't at all ideal;
it works in raw-mode (as opposed to cooked mode), and as a result
does not deal correcly with deletion, arrow-keys etc.
Instead, use cooked mode to read a line at the time, allowing the
C run-time to process the input properly.
Since we set files to be opened in binary-mode by default on
Windows, introduce a FORCE_TEXT macro that expands to the "t"
modifier that forces the terminal to be opened in text-mode so we
do not have to deal with CRLF issues.
Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
---
compat/terminal.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++--------
1 file changed, 60 insertions(+), 9 deletions(-)
diff --git a/compat/terminal.c b/compat/terminal.c
index 9aecad6..9b5e3d1 100644
--- a/compat/terminal.c
+++ b/compat/terminal.c
@@ -3,8 +3,22 @@
#include "sigchain.h"
#include "strbuf.h"
+#if defined(HAVE_DEV_TTY) || defined(WIN32)
+
+static void restore_term(void);
+
+static void restore_term_on_signal(int sig)
+{
+ restore_term();
+ sigchain_pop(sig);
+ raise(sig);
+}
+
#ifdef HAVE_DEV_TTY
+#define INPUT_PATH "/dev/tty"
+#define OUTPUT_PATH "/dev/tty"
+
static int term_fd = -1;
static struct termios old_term;
@@ -18,13 +32,6 @@ static void restore_term(void)
term_fd = -1;
}
-static void restore_term_on_signal(int sig)
-{
- restore_term();
- sigchain_pop(sig);
- raise(sig);
-}
-
static int disable_echo(void)
{
struct termios t;
@@ -46,17 +53,61 @@ error:
return -1;
}
+#elif defined(WIN32)
+
+#define INPUT_PATH "CONIN$"
+#define OUTPUT_PATH "CONOUT$"
+#define FORCE_TEXT "t"
+
+static HANDLE hconin = INVALID_HANDLE_VALUE;
+static DWORD cmode;
+
+static void restore_term(void)
+{
+ if (hconin == INVALID_HANDLE_VALUE)
+ return;
+
+ SetConsoleMode(hconin, cmode);
+ CloseHandle(hconin);
+ hconin = INVALID_HANDLE_VALUE;
+}
+
+static int disable_echo(void)
+{
+ hconin = CreateFile("CONIN$", GENERIC_READ | GENERIC_WRITE,
+ FILE_SHARE_READ, NULL, OPEN_EXISTING,
+ FILE_ATTRIBUTE_NORMAL, NULL);
+ if (hconin == INVALID_HANDLE_VALUE)
+ return -1;
+
+ GetConsoleMode(hconin, &cmode);
+ sigchain_push_common(restore_term_on_signal);
+ if (!SetConsoleMode(hconin, cmode & (~ENABLE_ECHO_INPUT))) {
+ CloseHandle(hconin);
+ hconin = INVALID_HANDLE_VALUE;
+ return -1;
+ }
+
+ return 0;
+}
+
+#endif
+
+#ifndef FORCE_TEXT
+#define FORCE_TEXT
+#endif
+
char *git_terminal_prompt(const char *prompt, int echo)
{
static struct strbuf buf = STRBUF_INIT;
int r;
FILE *input_fh, *output_fh;
- input_fh = fopen("/dev/tty", "r");
+ input_fh = fopen(INPUT_PATH, "r" FORCE_TEXT);
if (!input_fh)
return NULL;
- output_fh = fopen("/dev/tty", "w");
+ output_fh = fopen(OUTPUT_PATH, "w" FORCE_TEXT);
if (!output_fh) {
fclose(input_fh);
return NULL;
--
1.8.0.4.g3c6fb4f.dirty
--
*** Please reply-to-all at all times ***
*** (do not pretend to know who is subscribed and who is not) ***
*** Please avoid top-posting. ***
The msysGit Wiki is here: https://github.com/msysgit/msysgit/wiki - Github accounts are free.
You received this message because you are subscribed to the Google
Groups "msysGit" group.
To post to this group, send email to msysgit@googlegroups.com
To unsubscribe from this group, send email to
msysgit+unsubscribe@googlegroups.com
For more options, and view previous threads, visit this group at
http://groups.google.com/group/msysgit?hl=en_US?hl=en
^ permalink raw reply related
* [PATCH v2 4/6] compat/terminal: separate input and output handles
From: Erik Faye-Lund @ 2012-12-04 8:10 UTC (permalink / raw)
To: git; +Cc: msysgit, johannes.schindelin, gitster, peff
In-Reply-To: <1354608642-5316-1-git-send-email-kusmabite@gmail.com>
On Windows, the terminal cannot be opened in read-write mode, so
we need distinct pairs for reading and writing. Since this works
fine on other platforms as well, always open them in pairs.
Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
---
compat/terminal.c | 29 ++++++++++++++++++-----------
1 file changed, 18 insertions(+), 11 deletions(-)
diff --git a/compat/terminal.c b/compat/terminal.c
index a6212ca..9aecad6 100644
--- a/compat/terminal.c
+++ b/compat/terminal.c
@@ -50,29 +50,36 @@ char *git_terminal_prompt(const char *prompt, int echo)
{
static struct strbuf buf = STRBUF_INIT;
int r;
- FILE *fh;
+ FILE *input_fh, *output_fh;
- fh = fopen("/dev/tty", "w+");
- if (!fh)
+ input_fh = fopen("/dev/tty", "r");
+ if (!input_fh)
return NULL;
+ output_fh = fopen("/dev/tty", "w");
+ if (!output_fh) {
+ fclose(input_fh);
+ return NULL;
+ }
+
if (!echo && disable_echo()) {
- fclose(fh);
+ fclose(input_fh);
+ fclose(output_fh);
return NULL;
}
- fputs(prompt, fh);
- fflush(fh);
+ fputs(prompt, output_fh);
+ fflush(output_fh);
- r = strbuf_getline(&buf, fh, '\n');
+ r = strbuf_getline(&buf, input_fh, '\n');
if (!echo) {
- fseek(fh, SEEK_CUR, 0);
- putc('\n', fh);
- fflush(fh);
+ putc('\n', output_fh);
+ fflush(output_fh);
}
restore_term();
- fclose(fh);
+ fclose(input_fh);
+ fclose(output_fh);
if (r == EOF)
return NULL;
--
1.8.0.4.g3c6fb4f.dirty
--
*** Please reply-to-all at all times ***
*** (do not pretend to know who is subscribed and who is not) ***
*** Please avoid top-posting. ***
The msysGit Wiki is here: https://github.com/msysgit/msysgit/wiki - Github accounts are free.
You received this message because you are subscribed to the Google
Groups "msysGit" group.
To post to this group, send email to msysgit@googlegroups.com
To unsubscribe from this group, send email to
msysgit+unsubscribe@googlegroups.com
For more options, and view previous threads, visit this group at
http://groups.google.com/group/msysgit?hl=en_US?hl=en
^ permalink raw reply related
* [PATCH v2 3/6] compat/terminal: factor out echo-disabling
From: Erik Faye-Lund @ 2012-12-04 8:10 UTC (permalink / raw)
To: git; +Cc: msysgit, johannes.schindelin, gitster, peff
In-Reply-To: <1354608642-5316-1-git-send-email-kusmabite@gmail.com>
By moving the echo-disabling code to a separate function, we can
implement OS-specific versions of it for non-POSIX platforms.
Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
---
compat/terminal.c | 43 +++++++++++++++++++++++++------------------
1 file changed, 25 insertions(+), 18 deletions(-)
diff --git a/compat/terminal.c b/compat/terminal.c
index bbb038d..a6212ca 100644
--- a/compat/terminal.c
+++ b/compat/terminal.c
@@ -14,6 +14,7 @@ static void restore_term(void)
return;
tcsetattr(term_fd, TCSAFLUSH, &old_term);
+ close(term_fd);
term_fd = -1;
}
@@ -24,6 +25,27 @@ static void restore_term_on_signal(int sig)
raise(sig);
}
+static int disable_echo(void)
+{
+ struct termios t;
+
+ term_fd = open("/dev/tty", O_RDWR);
+ if (tcgetattr(term_fd, &t) < 0)
+ goto error;
+
+ old_term = t;
+ sigchain_push_common(restore_term_on_signal);
+
+ t.c_lflag &= ~ECHO;
+ if (!tcsetattr(term_fd, TCSAFLUSH, &t))
+ return 0;
+
+error:
+ close(term_fd);
+ term_fd = -1;
+ return -1;
+}
+
char *git_terminal_prompt(const char *prompt, int echo)
{
static struct strbuf buf = STRBUF_INIT;
@@ -34,24 +56,9 @@ char *git_terminal_prompt(const char *prompt, int echo)
if (!fh)
return NULL;
- if (!echo) {
- struct termios t;
-
- if (tcgetattr(fileno(fh), &t) < 0) {
- fclose(fh);
- return NULL;
- }
-
- old_term = t;
- term_fd = fileno(fh);
- sigchain_push_common(restore_term_on_signal);
-
- t.c_lflag &= ~ECHO;
- if (tcsetattr(fileno(fh), TCSAFLUSH, &t) < 0) {
- term_fd = -1;
- fclose(fh);
- return NULL;
- }
+ if (!echo && disable_echo()) {
+ fclose(fh);
+ return NULL;
}
fputs(prompt, fh);
--
1.8.0.4.g3c6fb4f.dirty
--
*** Please reply-to-all at all times ***
*** (do not pretend to know who is subscribed and who is not) ***
*** Please avoid top-posting. ***
The msysGit Wiki is here: https://github.com/msysgit/msysgit/wiki - Github accounts are free.
You received this message because you are subscribed to the Google
Groups "msysGit" group.
To post to this group, send email to msysgit@googlegroups.com
To unsubscribe from this group, send email to
msysgit+unsubscribe@googlegroups.com
For more options, and view previous threads, visit this group at
http://groups.google.com/group/msysgit?hl=en_US?hl=en
^ permalink raw reply related
* [PATCH v2 2/6] mingw: make fgetc raise SIGINT if apropriate
From: Erik Faye-Lund @ 2012-12-04 8:10 UTC (permalink / raw)
To: git; +Cc: msysgit, johannes.schindelin, gitster, peff
In-Reply-To: <1354608642-5316-1-git-send-email-kusmabite@gmail.com>
Set a control-handler to prevent the process from terminating, and
simulate SIGINT so it can be handled by a signal-handler as usual.
Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
---
compat/mingw.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++--------
compat/mingw.h | 6 +++++
2 files changed, 72 insertions(+), 10 deletions(-)
diff --git a/compat/mingw.c b/compat/mingw.c
index 78e8f54..33ddfdf 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -319,6 +319,31 @@ ssize_t mingw_write(int fd, const void *buf, size_t count)
return write(fd, buf, min(count, 31 * 1024 * 1024));
}
+static BOOL WINAPI ctrl_ignore(DWORD type)
+{
+ return TRUE;
+}
+
+#undef fgetc
+int mingw_fgetc(FILE *stream)
+{
+ int ch;
+ if (!isatty(_fileno(stream)))
+ return fgetc(stream);
+
+ SetConsoleCtrlHandler(ctrl_ignore, TRUE);
+ while (1) {
+ ch = fgetc(stream);
+ if (ch != EOF || GetLastError() != ERROR_OPERATION_ABORTED)
+ break;
+
+ /* Ctrl+C was pressed, simulate SIGINT and retry */
+ mingw_raise(SIGINT);
+ }
+ SetConsoleCtrlHandler(ctrl_ignore, FALSE);
+ return ch;
+}
+
#undef fopen
FILE *mingw_fopen (const char *filename, const char *otype)
{
@@ -1524,7 +1549,7 @@ static HANDLE timer_event;
static HANDLE timer_thread;
static int timer_interval;
static int one_shot;
-static sig_handler_t timer_fn = SIG_DFL;
+static sig_handler_t timer_fn = SIG_DFL, sigint_fn = SIG_DFL;
/* The timer works like this:
* The thread, ticktack(), is a trivial routine that most of the time
@@ -1538,13 +1563,7 @@ static sig_handler_t timer_fn = SIG_DFL;
static unsigned __stdcall ticktack(void *dummy)
{
while (WaitForSingleObject(timer_event, timer_interval) == WAIT_TIMEOUT) {
- if (timer_fn == SIG_DFL) {
- if (isatty(STDERR_FILENO))
- fputs("Alarm clock\n", stderr);
- exit(128 + SIGALRM);
- }
- if (timer_fn != SIG_IGN)
- timer_fn(SIGALRM);
+ mingw_raise(SIGALRM);
if (one_shot)
break;
}
@@ -1635,12 +1654,49 @@ int sigaction(int sig, struct sigaction *in, struct sigaction *out)
sig_handler_t mingw_signal(int sig, sig_handler_t handler)
{
sig_handler_t old = timer_fn;
- if (sig != SIGALRM)
+
+ switch (sig) {
+ case SIGALRM:
+ timer_fn = handler;
+ break;
+
+ case SIGINT:
+ sigint_fn = handler;
+ break;
+
+ default:
return signal(sig, handler);
- timer_fn = handler;
+ }
+
return old;
}
+#undef raise
+int mingw_raise(int sig)
+{
+ switch (sig) {
+ case SIGALRM:
+ if (timer_fn == SIG_DFL) {
+ if (isatty(STDERR_FILENO))
+ fputs("Alarm clock\n", stderr);
+ exit(128 + SIGALRM);
+ } else if (timer_fn != SIG_IGN)
+ timer_fn(SIGALRM);
+ return 0;
+
+ case SIGINT:
+ if (sigint_fn == SIG_DFL)
+ exit(128 + SIGINT);
+ else if (sigint_fn != SIG_IGN)
+ sigint_fn(SIGINT);
+ return 0;
+
+ default:
+ return raise(sig);
+ }
+}
+
+
static const char *make_backslash_path(const char *path)
{
static char buf[PATH_MAX + 1];
diff --git a/compat/mingw.h b/compat/mingw.h
index 61a6521..6b9e69a 100644
--- a/compat/mingw.h
+++ b/compat/mingw.h
@@ -179,6 +179,9 @@ int mingw_open (const char *filename, int oflags, ...);
ssize_t mingw_write(int fd, const void *buf, size_t count);
#define write mingw_write
+int mingw_fgetc(FILE *stream);
+#define fgetc mingw_fgetc
+
FILE *mingw_fopen (const char *filename, const char *otype);
#define fopen mingw_fopen
@@ -287,6 +290,9 @@ static inline unsigned int git_ntohl(unsigned int x)
sig_handler_t mingw_signal(int sig, sig_handler_t handler);
#define signal mingw_signal
+int mingw_raise(int sig);
+#define raise mingw_raise
+
/*
* ANSI emulation wrappers
*/
--
1.8.0.4.g3c6fb4f.dirty
--
*** Please reply-to-all at all times ***
*** (do not pretend to know who is subscribed and who is not) ***
*** Please avoid top-posting. ***
The msysGit Wiki is here: https://github.com/msysgit/msysgit/wiki - Github accounts are free.
You received this message because you are subscribed to the Google
Groups "msysGit" group.
To post to this group, send email to msysgit@googlegroups.com
To unsubscribe from this group, send email to
msysgit+unsubscribe@googlegroups.com
For more options, and view previous threads, visit this group at
http://groups.google.com/group/msysgit?hl=en_US?hl=en
^ permalink raw reply related
* [PATCH v2 1/6] mingw: correct exit-code for SIGALRM's SIG_DFL
From: Erik Faye-Lund @ 2012-12-04 8:10 UTC (permalink / raw)
To: git; +Cc: msysgit, johannes.schindelin, gitster, peff
In-Reply-To: <1354608642-5316-1-git-send-email-kusmabite@gmail.com>
Make sure SIG_DFL for SIGALRM exits with 128 + SIGALRM so other
processes can diagnose why it exits.
While we're at it, make sure we only write to stderr if it's a
terminal, and change the output to match that of Linux.
Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
---
compat/mingw.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/compat/mingw.c b/compat/mingw.c
index afc892d..78e8f54 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -1538,8 +1538,11 @@ static sig_handler_t timer_fn = SIG_DFL;
static unsigned __stdcall ticktack(void *dummy)
{
while (WaitForSingleObject(timer_event, timer_interval) == WAIT_TIMEOUT) {
- if (timer_fn == SIG_DFL)
- die("Alarm");
+ if (timer_fn == SIG_DFL) {
+ if (isatty(STDERR_FILENO))
+ fputs("Alarm clock\n", stderr);
+ exit(128 + SIGALRM);
+ }
if (timer_fn != SIG_IGN)
timer_fn(SIGALRM);
if (one_shot)
--
1.8.0.4.g3c6fb4f.dirty
--
*** Please reply-to-all at all times ***
*** (do not pretend to know who is subscribed and who is not) ***
*** Please avoid top-posting. ***
The msysGit Wiki is here: https://github.com/msysgit/msysgit/wiki - Github accounts are free.
You received this message because you are subscribed to the Google
Groups "msysGit" group.
To post to this group, send email to msysgit@googlegroups.com
To unsubscribe from this group, send email to
msysgit+unsubscribe@googlegroups.com
For more options, and view previous threads, visit this group at
http://groups.google.com/group/msysgit?hl=en_US?hl=en
^ permalink raw reply related
* [PATCH v2 0/6] win32: support echo for terminal-prompt
From: Erik Faye-Lund @ 2012-12-04 8:10 UTC (permalink / raw)
To: git; +Cc: msysgit, johannes.schindelin, gitster, peff
So here's v2 of this series. For reference, you can find v1 and
it's discussions here:
http://mid.gmane.org/1352815288-3996-1-git-send-email-kusmabite@gmail.com
The changes since the last round:
* 1/6: This patch has been added. It was missing in the last round,
due to stupidity on my behalf. I'm sorry about that.
* 3/6: This patch got a fixup for the disable_echo function signature
squashed in. I forgot "void" for the empty parameter list.
Thanks to Junio for noticing.
Otherwise, things are unchanged.
Erik Faye-Lund (6):
mingw: correct exit-code for SIGALRM's SIG_DFL
mingw: make fgetc raise SIGINT if apropriate
compat/terminal: factor out echo-disabling
compat/terminal: separate input and output handles
mingw: reuse tty-version of git_terminal_prompt
mingw: get rid of getpass implementation
compat/mingw.c | 88 +++++++++++++++++++++++++++----------
compat/mingw.h | 8 +++-
compat/terminal.c | 129 ++++++++++++++++++++++++++++++++++++++++--------------
3 files changed, 169 insertions(+), 56 deletions(-)
--
1.8.0.4.g3c6fb4f.dirty
--
*** Please reply-to-all at all times ***
*** (do not pretend to know who is subscribed and who is not) ***
*** Please avoid top-posting. ***
The msysGit Wiki is here: https://github.com/msysgit/msysgit/wiki - Github accounts are free.
You received this message because you are subscribed to the Google
Groups "msysGit" group.
To post to this group, send email to msysgit@googlegroups.com
To unsubscribe from this group, send email to
msysgit+unsubscribe@googlegroups.com
For more options, and view previous threads, visit this group at
http://groups.google.com/group/msysgit?hl=en_US?hl=en
^ permalink raw reply
* Re: [RFC] Add basic syntax check on shell scripts
From: Nguyen Thai Ngoc Duy @ 2012-12-04 7:20 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Torsten Bögershausen, git
In-Reply-To: <7vzk1vrs63.fsf@alter.siamese.dyndns.org>
On Mon, Dec 3, 2012 at 11:56 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Torsten Bögershausen <tboegi@web.de> writes:
>
>> The test suite needs to be run on different platforms.
>> As it may be difficult for contributors to catch syntax
>> which work on GNU/linux, but is unportable, make a quick check
>> for the most common problems.
>> "sed -i", "echo -n" or "array in shell scripts"
>> This list is not complete, and may need to be extended
>>
>> Signed-off-by: Torsten Bögershausen <tboegi@web.de>
>> ---
>> We add 1 second test execution time
>> Is this a useful idea at all?
>
> Please do not name it after t/t[0-9]*.sh pattern, which are about
> testing git.
>
> This (once it gets cleaned up to reduce false positives) belongs to
> "cd t && make test-lint".
Or a project commit hook? We can see how it goes and whether we can
improve anything for projects that rely on hooks.
--
Duy
^ permalink raw reply
* [PATCHv2] l10n: de.po: translate 22 new messages
From: Ralf Thielow @ 2012-12-04 6:19 UTC (permalink / raw)
To: git; +Cc: trast, jk, stimming, git, Ralf Thielow
In-Reply-To: <50BCC0A3.4050203@drmicha.warpmail.net>
Translate 22 new messages came from git.pot
updates in 9306b5b (l10n: Update git.pot (3 new,
6 removed messages)), fe52cd6 (l10n: Update git.pot
(14 new, 3 removed messages)) and f9472e3
(l10n: Update git.pot (5 new, 1 removed messages)).
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Reviewed-by: Michael J Gruber <git@drmicha.warpmail.net>
---
Thanks for review!
>> -" (benutze \"git am --abort\" um den ursprünglichen Zweig wiederherzustellen)"
>> +" (benutze \"git pull\" um den externen Zweig mit Deinem zusammenzuführen)\n"
[...]
> BTW: Is there a standard about capitalising or not "Deine/Du" in de.pot?
> I think I've seen both here. (New spelling after the reform(s)
> recommends du/deine but Sie/Ihr, me thinks.)
Usually it's written in lower case. But there are some original messages
starting with capital letters, in which case the translation does simply the
same. In this special case, "Deinem" was meant as a short for "dein Zweig".
Switching to formal addressing is a point on my TODO list.
Thanks,
Ralf
po/de.po | 68 ++++++++++++++++++++++++++++++++++------------------------------
1 file changed, 36 insertions(+), 32 deletions(-)
diff --git a/po/de.po b/po/de.po
index a0bf3da..0e8ed54 100644
--- a/po/de.po
+++ b/po/de.po
@@ -5,7 +5,7 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: git 1.8.0\n"
+"Project-Id-Version: git 1.8.1\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
"POT-Creation-Date: 2012-11-30 12:40+0800\n"
"PO-Revision-Date: 2012-10-02 19:35+0200\n"
@@ -130,6 +130,8 @@ msgid ""
"Negative patterns are forbidden in git attributes\n"
"Use '\\!' for literal leading exclamation."
msgstr ""
+"Verneinende Muster sind in Git-Attributen verboten.\n"
+"Benutze '\\!' für führende Ausrufezeichen."
#: bundle.c:36
#, c-format
@@ -305,22 +307,21 @@ msgstr[0] "vor %lu Jahr"
msgstr[1] "vor %lu Jahren"
#: diff.c:111
-#, fuzzy, c-format
+#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr ""
-" Fehler beim Parsen des abgeschnittenen \"dirstat\" Prozentsatzes '%.*s'\n"
+" Fehler beim Parsen des abgeschnittenen \"dirstat\" Prozentsatzes '%s'\n"
#: diff.c:116
-#, fuzzy, c-format
+#, c-format
msgid " Unknown dirstat parameter '%s'\n"
-msgstr " Unbekannter \"dirstat\" Parameter '%.*s'\n"
+msgstr " Unbekannter \"dirstat\" Parameter '%s'\n"
#: diff.c:194
-#, fuzzy, c-format
+#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr ""
-"Fehler in 'diff.dirstat' Konfigurationsvariable gefunden:\n"
-"%s"
+"Unbekannter Wert in Konfigurationsvariable 'diff.dirstat': '%s'"
#: diff.c:237
#, c-format
@@ -341,11 +342,10 @@ msgstr ""
"%s"
#: diff.c:3508
-#, fuzzy, c-format
+#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr ""
-"Fehler beim Parsen des --dirstat/-X Optionsparameters:\n"
-"%s"
+"Fehler beim Parsen des --submodule Optionsparameters: '%s'"
#: gpg-interface.c:59
msgid "could not run gpg."
@@ -726,7 +726,7 @@ msgstr[1] "Dein Zweig ist vor '%s' um %d Versionen.\n"
#: remote.c:1637
msgid " (use \"git push\" to publish your local commits)\n"
-msgstr ""
+msgstr " (benutze \"git push\" um deine lokalen Versionen herauszubringen)\n"
#: remote.c:1640
#, c-format
@@ -740,10 +740,9 @@ msgstr[1] ""
"werden.\n"
#: remote.c:1647
-#, fuzzy
msgid " (use \"git pull\" to update your local branch)\n"
msgstr ""
-" (benutze \"git am --abort\" um den ursprünglichen Zweig wiederherzustellen)"
+" (benutze \"git pull\" um deinen lokalen Zweig zu aktualisieren)\n"
#: remote.c:1650
#, c-format
@@ -761,10 +760,9 @@ msgstr[1] ""
"und haben jeweils %d und %d unterschiedliche Versionen.\n"
#: remote.c:1659
-#, fuzzy
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr ""
-" (benutze \"git am --abort\" um den ursprünglichen Zweig wiederherzustellen)"
+" (benutze \"git pull\" um deinen Zweig mit dem externen zusammenzuführen)\n"
#: sequencer.c:123 builtin/merge.c:761 builtin/merge.c:874 builtin/merge.c:984
#: builtin/merge.c:994
@@ -2614,9 +2612,8 @@ msgid "git check-attr [-a | --all | attr...] [--] pathname..."
msgstr "git check-attr [-a | --all | Attribut...] [--] Pfadname..."
#: builtin/check-attr.c:12
-#, fuzzy
msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>"
-msgstr "git check-attr --stdin [-a | --all | Attribut...] < <Liste-von-Pfaden>"
+msgstr "git check-attr --stdin [-z] [-a | --all | Attribut...] < <Liste-von-Pfaden>"
#: builtin/check-attr.c:19
msgid "report all attributes set on file"
@@ -3596,9 +3593,8 @@ msgid "Paths with -a does not make sense."
msgstr "Pfade mit -a machen keinen Sinn."
#: builtin/commit.c:1067 builtin/commit.c:1202
-#, fuzzy
msgid "--long and -z are incompatible"
-msgstr "--column und -n sind inkompatibel"
+msgstr "--long und -z sind inkompatibel"
#: builtin/commit.c:1162 builtin/commit.c:1398
msgid "show status concisely"
@@ -3613,9 +3609,8 @@ msgid "machine-readable output"
msgstr "maschinenlesbare Ausgabe"
#: builtin/commit.c:1169 builtin/commit.c:1404
-#, fuzzy
msgid "show status in long format (default)"
-msgstr "zeigt zwischengespeicherten Dateien in der Ausgabe an (Standard)"
+msgstr "zeigt Status im Langformat (Standard)"
#: builtin/commit.c:1172 builtin/commit.c:1407
msgid "terminate entries with NUL"
@@ -4789,7 +4784,7 @@ msgstr "zeigt nur Übereinstimmungen von Dateien, die allen Mustern entsprechen"
#: builtin/grep.c:736
msgid "show parse tree for grep expression"
-msgstr ""
+msgstr "zeigt geparsten Baum für \"grep\"-Ausdruck"
#: builtin/grep.c:740
msgid "pager"
@@ -8029,6 +8024,9 @@ msgid ""
"submodule '%s' (or one of its nested submodules) uses a .git directory\n"
"(use 'rm -rf' if you really want to remove it including all of its history)"
msgstr ""
+"Unterprojekt '%s' (oder ein geschachteltes Unterprojekt hiervon) verwendet\n"
+"ein .git-Verzeichnis (benutze 'rm -rf' wenn du dieses wirklich mitsamt\n"
+"seiner Historie löschen möchtest)"
#: builtin/rm.c:174
#, c-format
@@ -8254,9 +8252,8 @@ msgid "git symbolic-ref [options] name [ref]"
msgstr "git symbolic-ref [Optionen] name [ref]"
#: builtin/symbolic-ref.c:8
-#, fuzzy
msgid "git symbolic-ref -d [-q] name"
-msgstr "git symbolic-ref [Optionen] name [ref]"
+msgstr "git symbolic-ref -d [-q] name"
#: builtin/symbolic-ref.c:40
msgid "suppress error message for non-symbolic (detached) refs"
@@ -8264,9 +8261,8 @@ msgstr ""
"unterdrückt Fehlermeldungen für nicht-symbolische (losgelöste) Referenzen"
#: builtin/symbolic-ref.c:41
-#, fuzzy
msgid "delete symbolic ref"
-msgstr "löscht ersetzende Referenzen"
+msgstr "löscht symbolische Referenzen"
#: builtin/symbolic-ref.c:42
msgid "shorten ref output"
@@ -9207,7 +9203,8 @@ msgstr "Kein Neuaufbau im Gange?"
#: git-rebase.sh:312
msgid "The --edit-todo action can only be used during interactive rebase."
-msgstr ""
+msgstr "Die --edit-todo Aktion kann nur während eines interaktiven "
+"Neuaufbaus benutzt werden."
#: git-rebase.sh:319
msgid "Cannot read HEAD"
@@ -9492,19 +9489,24 @@ msgstr "'$sm_path' existiert bereits und ist kein gültiges Git-Projektarchiv"
#: git-submodule.sh:365
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
-msgstr ""
+msgstr "Ein Git-Verzeichnis für '$sm_name' wurde lokal gefunden mit den "
+"Fernarchiv(en):"
#: git-submodule.sh:367
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from"
msgstr ""
+"Wenn du dieses lokale Git-Verzeichnis wiederverwenden möchtest, anstatt "
+"erneut zu klonen"
#: git-submodule.sh:369
#, sh-format
msgid ""
"use the '--force' option. If the local git directory is not the correct repo"
msgstr ""
+"benutze die Option '--force'. Wenn das lokale Git-Verzeichnis nicht das "
+"korrekte Projektarchiv ist"
#: git-submodule.sh:370
#, sh-format
@@ -9512,11 +9514,13 @@ msgid ""
"or you are unsure what this means choose another name with the '--name' "
"option."
msgstr ""
+"oder du dir unsicher bist, was das bedeutet, wähle einen anderen Namen mit "
+"der Option '--name'."
#: git-submodule.sh:372
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
-msgstr ""
+msgstr "Reaktiviere lokales Git-Verzeichnis für Unterprojekt '$sm_name'."
#: git-submodule.sh:384
#, sh-format
@@ -9659,9 +9663,9 @@ msgid "# Submodule changes to be committed:"
msgstr "# Änderungen in Unterprojekt zum Eintragen:"
#: git-submodule.sh:1080
-#, fuzzy, sh-format
+#, sh-format
msgid "Synchronizing submodule url for '$prefix$sm_path'"
-msgstr "Synchronisiere Unterprojekt-URL für '$name'"
+msgstr "Synchronisiere Unterprojekt-URL für '$prefix$sm_path'"
#~ msgid " 0 files changed"
#~ msgstr " 0 Dateien geändert"
--
1.8.0.1
^ permalink raw reply related
* Re: [RFC/PATCH] l10n: de.po: translate 825 new messages
From: Ralf Thielow @ 2012-12-04 6:19 UTC (permalink / raw)
To: Michael J Gruber; +Cc: trast, git, jk, stimming
In-Reply-To: <50BCBE58.30805@drmicha.warpmail.net>
2012/12/3 Michael J Gruber <git@drmicha.warpmail.net>:
>> 1 file changed, 61 insertions(+), 62 deletions(-)
> ...
>> #: builtin/fsck.c:620
>> msgid "also consider packs and alternate objects"
>> -msgstr "betrachtet auch Pakete und wechselnde Objekte"
>> +msgstr ""
>
> Oops ;)
>
>> #: builtin/push.c:391
>> msgid "check"
>> -msgstr "Überprüfung"
>> +msgstr ""
>
> Is this meant to omit the text? (I may have missed the pertaining
> discussion.)
>
For now, we let these two messages untranslated.
Ralf
^ permalink raw reply
* Re: [PATCH/RFC 1/5] mingw: make fgetc raise SIGINT if apropriate
From: Junio C Hamano @ 2012-12-04 0:23 UTC (permalink / raw)
To: kusmabite; +Cc: git, msysgit, peff
In-Reply-To: <CABPQNSb2NQesbjKc8LUT0TL4=xrnw2A_sJyjX72j9Je_zX1sQw@mail.gmail.com>
Erik Faye-Lund <kusmabite@gmail.com> writes:
> That patch corrected the exit-code for our SIGALRM's SIG_DFL routine;
> the old code did "die("Alarm");", but the new one does "fputs("Alarm
> clock\n", stderr); exit(128 + SIGALRM)"
>
>> Please double check the result when I push out the 'pu'
>> branch.
>
> The resolution is fine; you effectively got the two commits squashed.
> I'll send out a new version with the extra patch added, and your
> signature-fixup squashed in, OK?
Sure; thanks for a prompt response.
--
*** Please reply-to-all at all times ***
*** (do not pretend to know who is subscribed and who is not) ***
*** Please avoid top-posting. ***
The msysGit Wiki is here: https://github.com/msysgit/msysgit/wiki - Github accounts are free.
You received this message because you are subscribed to the Google
Groups "msysGit" group.
To post to this group, send email to msysgit@googlegroups.com
To unsubscribe from this group, send email to
msysgit+unsubscribe@googlegroups.com
For more options, and view previous threads, visit this group at
http://groups.google.com/group/msysgit?hl=en_US?hl=en
^ permalink raw reply
* Re: [PATCH v6 1/4] submodule: add get_submodule_config helper funtion
From: W. Trevor King @ 2012-12-04 0:17 UTC (permalink / raw)
To: Junio C Hamano, Phil Hord
Cc: Git, Heiko Voigt, Jeff King, Shawn Pearce, Jens Lehmann, Nahor
In-Reply-To: <7vehj7q6gr.fsf@alter.siamese.dyndns.org>
[-- Attachment #1: Type: text/plain, Size: 4793 bytes --]
On Mon, Dec 03, 2012 at 11:30:12AM -0800, Junio C Hamano wrote:
> > +get_submodule_config()
> > +{
>
> style (see CodingGuidelines):
>
> get_submodule_config () {
Will fix. I was generally just copying the surrounding code.
> > + name="$1"
> > + option="$2"
> > + default="$3"
> > + value=$(git config submodule."$name"."$option")
>
> This will get unwieldy quickly once we have submodule.$name.$var
> that takes a boolean option, as there are different ways to spell
> boolean and "git config --bool" is the way to ask for canonicalized
> "true" or "false".
>
> If we never query any boolean via this helper function, it is
> obviously not an issue, though.
We do in my submodule.<name>.active branch, and I adjusted the
function in
submodule: add submodule.<name>.active [1]
to add additional options passed through to `git config`. You do have
to pick a default to use the extra options though. If that becomes a
problem, I'd suggest extending git config itself to add a file above
or below the usual series of files. Then get_submodule_config could
be
git config --bottom-file .gitmodules submodule."$name"."$option"
or something, without needing a separate shell function.
On Mon, Dec 03, 2012 at 12:29:05PM -0800, Junio C Hamano wrote:
> "W. Trevor King" <wking@tremily.us> writes:
>
> > As an example to make this clearer:
> >
> > $ cat .gitmodules
> > [submodule "sub1"]
> > path = sub1
> > url = git://example.com/sub1.git
> > remote = remote1
> > branch = branch1
> > update-source = submodule-upstream
> > update = rebase
> > [submodule "sub2"]
> > ...
>
> Maybe it is just me but that "remote = remote1" sticks out like a
> sore thumb.
>
> If you are showing the .gitmodules file to be shared as hints to
> project participants, why does it even need to have both URL and
> remote1?
The remote name will probably only ever get configured locally in
.git/config. I put it in (as a separate patch) mostly because Phil
suggested something like it:
On Thu, Nov 29, 2012 at 10:27:19PM -0500, W. Trevor King wrote:
> On Thu, Nov 29, 2012 at 08:11:20PM -0500, Phil Hord wrote:
> > I've always felt that the "origin" defaults are broken and are simply
> > being ignored because most users do not trip over them. But ISTR that
> > submodule commands use the remote indicated by the superproject's
> > current remote-tracking configuration, with a fallback to 'origin' if
> > there is none. Sort of a "best effort" algorithm, I think. Am I
> > remembering that wrong?
>
> The current code uses a bare "git-fetch". I'm not sure what that
> defaults to if you're on a detached head. If it bothers you, I'm fine
> adding the submodule.<name>.remote option in v6.
and I hadn't heard any comments against it. I'm not really attached
to that patch though, so feel free to leave it out (unless Phil chimes
in with stronger motivation?).
On Mon, Dec 03, 2012 at 12:29:05PM -0800, Junio C Hamano wrote:
> But I do not see any reason to require or even suggest any local
> nickname that is to be used to call the remote. It really is a
> local matter. Why should .gitmodules have "remote = ..." line?
The idea for configuring it at all probably goes something like “I
don't like where upstream (origin) is taking this submodule. I want
to follow *my* upstream, but I've called it something besides origin.
Look, a submodule.<name>.remote option! Now I don't have to rename
my-remote→origin→original-remote.” I don't think this will come up
all that often.
> On the other hand, if you meant the above as an excerpt from
> $GIT_DIR/config, it also does not make sense. At that point, the
> participant own the file and updating url to point at whatever
> different repository without changing the remote name is sufficient.
Unless they still want to keep an the origin remote to track the
original submodule upstream. Maybe they'll want to switch back to
following that remote later. As I hinted at above, if they have
remotes `alice`, `bob`, etc., it's easier to flip between them by
configuring submodule.<name>.remote
$ git config submodule.submod.remote alice
than it is to reconfigure the submodule's origin:
$ cd submod
$ git remote rename origin charlie
$ git remote rename alice origin
> It looks way over-engineered for unclear/dubious benefit.
I'm not going to push for submodule.<name>.remote. Drop at will.
Cheers,
Trevor
[1]: https://github.com/wking/git/commit/fbe2d8419902700a6b0b40defaa5801811b887f7#L0R288
--
This email may be signed or encrypted with GnuPG (http://www.gnupg.org).
For more information, see http://en.wikipedia.org/wiki/Pretty_Good_Privacy
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: [PATCH/RFC 1/5] mingw: make fgetc raise SIGINT if apropriate
From: Erik Faye-Lund @ 2012-12-03 23:29 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git, msysgit, peff
In-Reply-To: <7vfw3oka68.fsf@alter.siamese.dyndns.org>
On Sun, Dec 2, 2012 at 11:42 AM, Junio C Hamano <gitster@pobox.com> wrote:
> Erik Faye-Lund <kusmabite@gmail.com> writes:
>
>> @@ -1538,13 +1563,7 @@ static sig_handler_t timer_fn = SIG_DFL;
>> static unsigned __stdcall ticktack(void *dummy)
>> {
>> while (WaitForSingleObject(timer_event, timer_interval) == WAIT_TIMEOUT) {
>> - if (timer_fn == SIG_DFL) {
>> - if (isatty(STDERR_FILENO))
>> - fputs("Alarm clock\n", stderr);
>> - exit(128 + SIGALRM);
>> - }
>> - if (timer_fn != SIG_IGN)
>> - timer_fn(SIGALRM);
>> + mingw_raise(SIGALRM);
>> if (one_shot)
>> break;
>> }
>
> This hunk seems to have been based on a slightly newer codebase than
> what I have, and I had to wiggle the patch a bit to make the series
> apply.
Huh, no, it shouldn't be; it's based on 8c7a786 ("Git 1.8.0").
OH! I see now what the problem is... I *missed* a patch in the series! :P
That patch corrected the exit-code for our SIGALRM's SIG_DFL routine;
the old code did "die("Alarm");", but the new one does "fputs("Alarm
clock\n", stderr); exit(128 + SIGALRM)"
> Please double check the result when I push out the 'pu'
> branch.
The resolution is fine; you effectively got the two commits squashed.
I'll send out a new version with the extra patch added, and your
signature-fixup squashed in, OK?
^ permalink raw reply
* Re: [PATCH v7 p1 07/13] remote-testgit: remove irrelevant test
From: Pete Wyckoff @ 2012-12-03 23:13 UTC (permalink / raw)
To: Felipe Contreras; +Cc: git, Junio C Hamano, Jeff King
In-Reply-To: <1354140669-23533-8-git-send-email-felipe.contreras@gmail.com>
felipe.contreras@gmail.com wrote on Wed, 28 Nov 2012 23:11 +0100:
> This was only to cover a bug that was fixed in remote-testpy not to
> resurface.
>
> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
> Signed-off-by: Junio C Hamano <gitster@pobox.com>
> ---
> t/t5801-remote-helpers.sh | 13 -------------
> 1 file changed, 13 deletions(-)
>
> diff --git a/t/t5801-remote-helpers.sh b/t/t5801-remote-helpers.sh
> index 2f7fc10..6801529 100755
> --- a/t/t5801-remote-helpers.sh
> +++ b/t/t5801-remote-helpers.sh
> @@ -53,19 +53,6 @@ test_expect_success 'pushing to local repo' '
> compare_refs localclone HEAD server HEAD
> '
>
> -# Generally, skip this test. It demonstrates a now-fixed race in
> -# git-remote-testgit, but is too slow to leave in for general use.
> -: test_expect_success 'racily pushing to local repo' '
> - test_when_finished "rm -rf server2 localclone2" &&
> - cp -R server server2 &&
> - git clone "testgit::${PWD}/server2" localclone2 &&
> - (cd localclone2 &&
> - echo content >>file &&
> - git commit -a -m three &&
> - GIT_REMOTE_TESTGIT_SLEEPY=2 git push) &&
> - compare_refs localclone2 HEAD server2 HEAD
> -'
> -
Why does this cause problems?
If you're going to rip it out, please finish the job, and take
out the other two hunks that are needed to trigger this test. See
7fb8e16 (git-remote-testgit: fix race when spawning fast-import,
2012-04-22).
-- Pete
^ permalink raw reply
* Re: Python extension commands in git - request for policy change
From: Philippe Vaucher @ 2012-12-03 21:45 UTC (permalink / raw)
To: Felipe Contreras
Cc: esr, Magnus Bäck, Michael Haggerty, git@vger.kernel.org
In-Reply-To: <CAMP44s27gdDJGNx-UTe1rdQZFpn3M60L=nMyd69gAFo15VnMAA@mail.gmail.com>
> Also, you are ignoring all the advantages that shell has and python does not.
Out of curiosity, can you list the advantages? From what I gathered:
- no need to install bash
- git contributors are more used to bash
- there's only one "version" of bash (no real need to handle different
versions compared to py26, py27, etc)
Are there any "language" advantage or are all the advantages in the
"pragmatic" section?
I don't really have an opinion on this topic. A "real language" seems
better, but bash's pragmaticity seems to outweight the cons,
especially the "contributors want bash" argument.
Thanks,
Philippe
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox