Nguyen Thai Ngoc Duy | 1 Jan 04:46 2011
Picon

Re: [PATCH] Fix expected values of setup tests on Windows

On Fri, Dec 31, 2010 at 11:11 PM, Johannes Sixt <j6t <at> kdbg.org> wrote:
>> in your patch does not. Does bash auto convert value in
>> TRASH_DIRECTORY="$TE..." line?
>
> No. When this line is executed:
>
> TEST_DIRECTORY=$(pwd)
>
> $(pwd) still has its default behavior to return the POSIX style path. pwd is
> redefined to pwd -W only later.
>
> I'm hesitant to redefine pwd earlier in test-lib.sh, though, because we would
> have to audit all uses of TEST_DIRECTORY for whether POSIX style paths or
> drive-letter paths are needed.

Ah I missed that. Thanks. Ack from me.
--

-- 
Duy
Jonathan Nieder | 1 Jan 11:41 2011
Picon

Re: [PATCH 0/4 v4] minor gitweb modifications

(adding back cc: jakub)

Hi,

Sylvain Rabot wrote:

>   gitweb: add extensions to highlight feature map
>   gitweb: remove unnecessary test when closing file descriptor

I like the above two.

>   gitweb: add css class to remote url titles

I had a question (why make the remote url table inconsistent with the
older projects_list table) and suggested a more generic approach in
reply to v2[1]:

	<table class="projects_list">
	<tr id="metadata_desc">
		<td class="metadata_tag">description</td>
		<td>Unnamed repository; edit this file to name it for gitweb.</td>
	</tr>
	<tr id="metadata_owner">
		<td class="metadata_tag">owner</td>
		<td>UNKNOWN</td>
	</tr>
	...

The idea was that the rows are already labelled for use by css, so to
make this stylable all we need to do is use a class for the first
(Continue reading)

Ramsay Jones | 1 Jan 21:26 2011
Picon
Picon

Re: [PATCH] msvc: Fix compilation error due to missing mktemp() declaration

Erik Faye-Lund wrote:
> Actually, I suspect that you know exactly what my concern is (based on
> the above), and that it's not with your patch.

Actually no, which is why I asked! :-D

> I have a patch in my MSVC-tree that includes io.h in mingw.h, because
> mingw.h already depends on facilities from io.h on MSVC. My point was
> simply that this dependency was already present, and as such I think
> mingw.h is the appropriate place to include it.

OK, v2 of patch on the way...

ATB,
Ramsay Jones

Ramsay Jones | 1 Jan 21:31 2011
Picon
Picon

[PATCH v2] msvc: Fix compilation error due to missing mktemp() declaration


Commit d1b6e6e (win32: use our own dirent.h, 2010-11-23) removed
the compat/vcbuild/include/dirent.h compatibility header file.
This file, among other things, included the <io.h> system header
file which provides the declaration of the mktemp() function.

In order to fix the compilation error, we add an include directive
for <io.h> to the compat/mingw.h header.

Signed-off-by: Ramsay Jones <ramsay <at> ramsay1.demon.co.uk>
---

Change from v1:
    - add #include to compat/mingw.h rather than compat/vcbuild/include/unistd.h

ATB,
Ramsay Jones

 compat/mingw.h |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/compat/mingw.h b/compat/mingw.h
index cafc1eb..1c6bc02 100644
--- a/compat/mingw.h
+++ b/compat/mingw.h
 <at>  <at>  -1,5 +1,6  <at>  <at> 
 #include <winsock2.h>
 #include <ws2tcpip.h>
+#include <io.h>

(Continue reading)

Oliver Kullmann | 1 Jan 21:39 2011
Picon
Picon

Re: how to update a submodule?

On Fri, Dec 31, 2010 at 06:42:01PM -0500, Seth Robertson wrote:
> 
> In message <20101231222438.GA28199 <at> cs-wsok.swansea.ac.uk>, Oliver Kullmann writ
> es:
> 
>     it would be very helpful if somebody could tell me the
>     supposed workflow how to update a submodule (I'm using version
>     1.7.3.2; the man-page doesn't say much about it).
> 
> https://git.wiki.kernel.org/index.php/GitSubmoduleTutorial
>

thanks, that's definitely something.

> --------------------------------------------------
> cd submodule_path
> git checkout <branchname>
> git pull
> cd .. # or otherwise get to the superproject
> 
> git add submodule_path
> git commit -m "Updated submodule to latest <branchname>"
> git submodule update
> --------------------------------------------------
> 
> This (untested) code obviously only works for a single repository.  If
> you want to do it for all repositories, you need something more like
> the untested:
> 
> --------------------------------------------------
(Continue reading)

Jonathan Nieder | 2 Jan 00:02 2011
Picon

Re: [PATCH 0/4 v4] minor gitweb modifications

Jonathan Nieder wrote:
> Sylvain Rabot wrote:

>>   gitweb: add css class to remote url titles
>
> I had a question (why make the remote url table inconsistent with the
> older projects_list table) and suggested a more generic approach in
> reply to v2[1]:

Sorry, forgot the link before.

[1] http://thread.gmane.org/gmane.comp.version-control.git/164004/focus=164010
Junio C Hamano | 2 Jan 02:31 2011
Picon
Picon

Re: [PATCH] Fix expected values of setup tests on Windows

Johannes Sixt <j6t <at> kdbg.org> writes:

> On Freitag, 31. Dezember 2010, Jonathan Nieder wrote:
>> Johannes Sixt wrote:
>> > On Freitag, 31. Dezember 2010, Nguyen Thai Ngoc Duy wrote:
>> >> in your patch does not. Does bash auto convert value in
>> >> TRASH_DIRECTORY="$TE..." line?
>> >
>> > No. When this line is executed:
>> >
>> > TEST_DIRECTORY=$(pwd)
>> >
>> > $(pwd) still has its default behavior to return the POSIX style path. pwd
>> > is redefined to pwd -W only later.
>>
>> Would it make sense to change it to
>>
>>  TEST_DIRECTORY=$PWD
>>
>> for clarity and robustness against code movement, then?
>
> Yes, that would make sense.

It will be very much appreciated to add a few sentences to clarify this to
"Do's and don'ts" section of t/README if you are re-rolling this.  Thanks.
David D. Kilzer | 2 Jan 02:20 2011
Picon

[RFC PATCH] Why doesn't git rebase --interactive --preserve-merges continue past known conflicts?

On 2010-12-31, David Kilzer wrote:
> When I run "git rebase --interactive --preserve-merges" on a sequence of 
> commits, edit an earlier commit, then run "git rebase --continue", the rebase 
> operation always stops on a merge commit with a known conflict (in the rr-cache) 
> instead of resolving it and continuing.
> 
> As long as I'm not rearranging commits, I expect git-rebase to resolve the known 
> merge commit conflict and continue.  Why does it always stop?

Here's a very rough patch that fixes my original test case so that an interactive
rebase won't stop when git-rerere knows how to resolve all conflicts during a
merge.

However, if there are any changes to a non-conflicted file during the original
merge commit, they will be lost when rebasing, even with --preserve-merges.
Note that this occurs even without this patch applied.  You must compare the
current commit with original being rebased to make sure they're not lost.

Why doesn't an interactive rebase serialize to disk all of the changes in a merge
commit like it does for non-merge commits?

Dave
---
 git-rebase--interactive.sh                    |   11 ++++-
 t/t3404-rebase-interactive-preserve-merges.sh |   64 +++++++++++++++++++++++++
 2 files changed, 73 insertions(+), 2 deletions(-)
 create mode 100755 t/t3404-rebase-interactive-preserve-merges.sh

diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index a5ffd9a..32375bc 100755
(Continue reading)

Drew Northup | 2 Jan 05:16 2011
Picon

Web browser and Git wiki (kernel.org) not getting along....

Are any other Opera users getting this error when attempting to go to
https://git.wiki.kernel.org ?

"Unable to complete secure transaction

You tried to access the address
https://git.wiki.kernel.org/index.php/Interfaces,_frontends,_and_tools,
which is currently unavailable. Please make sure that the web address
(URL) is correctly spelled and punctuated, then try reloading the page.

Secure connection: fatal error (112) from server.

https://git.wiki.kernel.org/index.php/Interfaces,_frontends,_and_tools

Transmission failure.
....."

I'm trying to figure out of this is a pure Opera problem or just a
RedHat problem (ugh). (I'm also pretty darn sure that the server is up,
as it loads up just fine in Firefox.....)

Unless lots of other people on the list are interested I don't see the
point in splattering replies back to it until (unless?) something
interesting comes up, so this may be a case when culling the CC list is
ok...

--

-- 
-Drew Northup N1XIM
   AKA RvnPhnx on OPN
________________________________________________
(Continue reading)

Ralf Wildenhues | 2 Jan 07:00 2011
Picon
Picon

[PATCH] Consistent use of AC_LANG_PROGRAM in configure.ac and aclocal.m4.

This avoids warnings from Autoconf 2.68 about missing use of
AC_LANG_PROGRAM and friends.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues <at> gmx.de>
---

The patch should not cause any semantic changes in the generated
configure script.

Thanks,
Ralf

 aclocal.m4   |    4 ++--
 configure.ac |   56 +++++++++++++++++++-------------------------------------
 2 files changed, 21 insertions(+), 39 deletions(-)

diff --git a/aclocal.m4 b/aclocal.m4
index d399de2..f11bc7e 100644
--- a/aclocal.m4
+++ b/aclocal.m4
 <at>  <at>  -13,7 +13,7  <at>  <at>  AC_DEFUN([TYPE_SOCKLEN_T],
          git_cv_socklen_t_equiv=
          for arg2 in "struct sockaddr" void; do
             for t in int size_t unsigned long "unsigned long"; do
-               AC_TRY_COMPILE([
+               AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
                   #include <sys/types.h>
                   #include <sys/socket.h>

 <at>  <at>  -21,7 +21,7  <at>  <at>  AC_DEFUN([TYPE_SOCKLEN_T],
(Continue reading)


Gmane