threads / announce / 23418

[ANNOUNCE] Git 1.7.1.rc1

Subject: [ANNOUNCE] Git 1.7.1.rc1

## tl;dr

8 messages between Apr 11, 2010 and Apr 11, 2010.

replies: 7people: 6as markdown or json

Junio C Hamano· Apr 11, 2010, 04:13 UTC · lore

A release candidate Git 1.7.1.rc1 is available at the usual places for testing:

  http://www.kernel.org/pub/software/scm/git/
  git-1.7.1.rc1.tar.{gz,bz2}			(source tarball)
  git-htmldocs-1.7.1.rc1.tar.{gz,bz2}		(preformatted docs)
  git-manpages-1.7.1.rc1.tar.{gz,bz2}		(preformatted docs)
The RPM binary packages for a few architectures are found in:
  testing/git-*-1.7.1.rc1-1.fc11.$arch.rpm	(RPM)

Please test 'master', report & fix regressions. Hopefully we can do another rc during the next week and release the final one next weekend.

----------------------------------------------------------------
Changes since v1.7.1-rc0 are as follows:
Brandon Casey (1):
      notes.h: declare bit field as unsigned to silence compiler complaints
Jeff King (4):
      fix const-correctness of write_sha1_file
      fix textconv leak in emit_rewrite_diff
      fix typos and grammar in 1.7.1 draft release notes
      docs: clarify "branch -l"
Jens Lehmann (2):
      Let check_preimage() use memset() to initialize "struct checkout"
      Teach diff --submodule and status to handle .git files in submodules
Jonathan Nieder (1):
      Teach mailinfo %< as an alternative scissors mark
Junio C Hamano (2):
      diff.c: work around pointer constness warnings
      Git 1.7.1-rc1
Mark Rada (6):
      Gitweb: add ignore and clean rules for minified files
      Gitweb: add support for minifying gitweb.css
      Gitweb: add autoconfigure support for minifiers
      instaweb: add minification awareness
      gitweb: add documentation to INSTALL regarding gitweb.js
      gitweb: update INSTALL to use shorter make target
Michael J Gruber (2):
      t3301-notes: Test the creation of reflog entries
      refs.c: Write reflogs for notes just like for branch heads
Tay Ray Chuan (2):
      branch: say "Reset to" in reflog entries for 'git branch -f' operations
      fetch/push: fix usage strings
ZoltánFüzesi· Apr 11, 2010, 15:57 UTC · re: Junio C Hamano · lore

Re: [ANNOUNCE] Git 1.7.1.rc1

Hi,
Junio C Hamano <gitster <at> pobox.com> writes:
Show 5 quoted lines
> 
> Jens Lehmann (2):
>       Let check_preimage() use memset() to initialize "struct checkout"
>       Teach diff --submodule and status to handle .git files in submodules
>

This breaks git-status on Windows, if repository has submodule(s). "fatal: chdir in start_command() not implemented"

It comes from run-command.c line 345:
if (cmd->dir)
  die("chdir in start_command() not implemented");

Commit (eee49b6ce4b7b3fed28794676c67ad3609f658ac) message says: "While at it, is_submodule_modified() was cleaned up to use the "dir" member of "struct child_process" instead of setting the GIT_WORK_TREE and GIT_DIR environment variables."

Z.
Johannes Sixt· Apr 11, 2010, 20:40 UTC · re: ZoltánFüzesi · lore

[PATCH jl/maint-submodule-gitfile-awareness] Windows: start_command: Support non-NULL dir in struct child_process

A caller of start_command can set the member 'dir' to a directory to request that the child process starts with that directory as CWD. The first user of this feature was added recently in eee49b6 (Teach diff --submodule and status to handle .git files in submodules).

On Windows, we have been lazy and had not implemented support for this feature, yet. This fixes the shortcoming.

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
---
Am 11.04.2010 17:57, schrieb ZoltánFüzesi:
Show 7 quoted lines
> Junio C Hamano<gitster<at>  pobox.com>  writes:
>> Jens Lehmann (2):
>>        Let check_preimage() use memset() to initialize "struct checkout"
>>        Teach diff --submodule and status to handle .git files in submodules
> 
> This breaks git-status on Windows, if repository has submodule(s).
> "fatal: chdir in start_command() not implemented"
This fixes it. Hope this gets through without whitespace damage.
-- Hannes
 compat/mingw.c |   10 ++++++----
 compat/mingw.h |    1 +
 run-command.c  |    4 +---
 3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/compat/mingw.c b/compat/mingw.c
index ab65f77..754b534 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -618,6 +618,7 @@ static int env_compare(const void *a, const void *b)
 }
 
 static pid_t mingw_spawnve_fd(const char *cmd, const char **argv, char **env,
+			      const char *dir,
 			      int prepend_cmd, int fhin, int fhout, int fherr)
 {
 	STARTUPINFO si;
@@ -697,7 +698,7 @@ static pid_t mingw_spawnve_fd(const char *cmd, const char **argv, char **env,
 
 	memset(&pi, 0, sizeof(pi));
 	ret = CreateProcess(cmd, args.buf, NULL, NULL, TRUE, flags,
-		env ? envblk.buf : NULL, NULL, &si, &pi);
+		env ? envblk.buf : NULL, dir, &si, &pi);
 
 	if (env)
 		strbuf_release(&envblk);
@@ -714,10 +715,11 @@ static pid_t mingw_spawnve_fd(const char *cmd, const char **argv, char **env,
 static pid_t mingw_spawnve(const char *cmd, const char **argv, char **env,
 			   int prepend_cmd)
 {
-	return mingw_spawnve_fd(cmd, argv, env, prepend_cmd, 0, 1, 2);
+	return mingw_spawnve_fd(cmd, argv, env, NULL, prepend_cmd, 0, 1, 2);
 }
 
 pid_t mingw_spawnvpe(const char *cmd, const char **argv, char **env,
+		     const char *dir,
 		     int fhin, int fhout, int fherr)
 {
 	pid_t pid;
@@ -740,14 +742,14 @@ pid_t mingw_spawnvpe(const char *cmd, const char **argv, char **env,
 				pid = -1;
 			}
 			else {
-				pid = mingw_spawnve_fd(iprog, argv, env, 1,
+				pid = mingw_spawnve_fd(iprog, argv, env, dir, 1,
 						       fhin, fhout, fherr);
 				free(iprog);
 			}
 			argv[0] = argv0;
 		}
 		else
-			pid = mingw_spawnve_fd(prog, argv, env, 0,
+			pid = mingw_spawnve_fd(prog, argv, env, dir, 0,
 					       fhin, fhout, fherr);
 		free(prog);
 	}
diff --git a/compat/mingw.h b/compat/mingw.h
index e254fb4..e0a6aba 100644
--- a/compat/mingw.h
+++ b/compat/mingw.h
@@ -223,6 +223,7 @@ int mingw_utime(const char *file_name, const struct utimbuf *times);
 #define utime mingw_utime
 
 pid_t mingw_spawnvpe(const char *cmd, const char **argv, char **env,
+		     const char *dir,
 		     int fhin, int fhout, int fherr);
 void mingw_execvp(const char *cmd, char *const *argv);
 #define execvp mingw_execvp
diff --git a/run-command.c b/run-command.c
index 2feb493..db30cd5 100644
--- a/run-command.c
+++ b/run-command.c
@@ -335,8 +335,6 @@ fail_pipe:
 	else if (cmd->out > 1)
 		fhout = dup(cmd->out);
 
-	if (cmd->dir)
-		die("chdir in start_command() not implemented");
 	if (cmd->env)
 		env = make_augmented_environ(cmd->env);
 
@@ -346,7 +344,7 @@ fail_pipe:
 		cmd->argv = prepare_shell_cmd(cmd->argv);
 	}
 
-	cmd->pid = mingw_spawnvpe(cmd->argv[0], cmd->argv, env,
+	cmd->pid = mingw_spawnvpe(cmd->argv[0], cmd->argv, env, cmd->dir,
 				  fhin, fhout, fherr);
 	failed_errno = errno;
 	if (cmd->pid < 0 && (!cmd->silent_exec_failure || errno != ENOENT))

-- 
1.7.0.12.ga3b9
Jens Lehmann· Apr 11, 2010, 21:51 UTC · re: Johannes Sixt · lore

Re: [PATCH jl/maint-submodule-gitfile-awareness] Windows: start_command: Support non-NULL dir in struct child_process

Am 11.04.2010 22:40, schrieb Johannes Sixt:
Show 7 quoted lines
> A caller of start_command can set the member 'dir' to a directory to
> request that the child process starts with that directory as CWD. The first
> user of this feature was added recently in eee49b6 (Teach diff --submodule
> and status to handle .git files in submodules).
> 
> On Windows, we have been lazy and had not implemented support for this
> feature, yet. This fixes the shortcoming.
Thanks, I didn't know this was missing from the Windows port.
Ævar Arnfjörð Bjarmason· Apr 11, 2010, 16:08 UTC · re: Junio C Hamano · lore

Re: [ANNOUNCE] Git 1.7.1.rc1

On Sun, Apr 11, 2010 at 04:13, Junio C Hamano <gitster@pobox.com> wrote:
> A release candidate Git 1.7.1.rc1 is available at the usual places
> for testing:

This is a minor nit but when I generate the info docs from master I get this at the top of user-manual.texi:

    @menu
    * : id2860714.
    * Repositories and Branches::
    * Exploring git history::
    * Developing with git::
I can't find what produces that token but here are all occurrences of it:
  4 matches for "id2860714" in buffer: user-manual.texi
     10:@node Top, id2860714, , (dir)
     15:* : id2860714.
    130:@node id2860714, Repositories and Branches, Top, Top
    171:@node Repositories and Branches, Exploring git history, id2860714, Top

This bug results in an empty list item when viewing the Git User’s Manual with info.

Andreas Schwab· Apr 11, 2010, 16:55 UTC · re: Ævar Arnfjörð Bjarmason · lore

Re: [ANNOUNCE] Git 1.7.1.rc1

Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:
Show 14 quoted lines
> On Sun, Apr 11, 2010 at 04:13, Junio C Hamano <gitster@pobox.com> wrote:
>> A release candidate Git 1.7.1.rc1 is available at the usual places
>> for testing:
>
> This is a minor nit but when I generate the info docs from master I
> get this at the top of user-manual.texi:
>
>     @menu
>     * : id2860714.
>     * Repositories and Branches::
>     * Exploring git history::
>     * Developing with git::
>
> I can't find what produces that token but here are all occurrences of it:
That appears to be because the first title is empty:

$ head -n 9 user-manual.xml <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">

<book lang="en">
<bookinfo>
    <title>Git User&#8217;s Manual (for version 1.5.3 or newer)</title>
</bookinfo>
<preface>
<title></title>
Andreas.
-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."
Ævar Arnfjörð Bjarmason· Apr 11, 2010, 17:14 UTC · re: Andreas Schwab · lore

Re: [ANNOUNCE] Git 1.7.1.rc1

On Sun, Apr 11, 2010 at 16:55, Andreas Schwab <schwab@linux-m68k.org> wrote:
Show 29 quoted lines
> Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:
>
>> On Sun, Apr 11, 2010 at 04:13, Junio C Hamano <gitster@pobox.com> wrote:
>>> A release candidate Git 1.7.1.rc1 is available at the usual places
>>> for testing:
>>
>> This is a minor nit but when I generate the info docs from master I
>> get this at the top of user-manual.texi:
>>
>>     @menu
>>     * : id2860714.
>>     * Repositories and Branches::
>>     * Exploring git history::
>>     * Developing with git::
>>
>> I can't find what produces that token but here are all occurrences of it:
>
> That appears to be because the first title is empty:
>
> $ head -n 9 user-manual.xml
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
>
> <book lang="en">
> <bookinfo>
>    <title>Git User&#8217;s Manual (for version 1.5.3 or newer)</title>
> </bookinfo>
> <preface>
> <title></title>

The original error is going to be in user-manual.txt. That's where I couldn't track down the error. The XML and TexInfo files are automatically generated from the .txt source.

Andreas Schwab· Apr 11, 2010, 21:49 UTC · re: Ævar Arnfjörð Bjarmason · lore

Re: [ANNOUNCE] Git 1.7.1.rc1

Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:
> The original error is going to be in user-manual.txt.
Or the way asciidoc works.
Andreas.
-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

← back to recent threads