All of lore.kernel.org
 help / color / mirror / Atom feed
* git version 1.9.0 missing git-http-push?
@ 2014-04-28  6:19 Silvola Tuomas
  2014-04-28  7:36 ` Marat Radchenko
  0 siblings, 1 reply; 15+ messages in thread
From: Silvola Tuomas @ 2014-04-28  6:19 UTC (permalink / raw)
  To: git

Hello,

I installed git for windows 1.9.0 but any push operation I tried with it produced an error message saying "git: 'http-push' is not a git command". Other commands like pull, add, and commit worked just fine.
At the end of this day I noticed that C:\Program Files (x86)\Git\libexec\git-core just didn't have the file git-http-push. There were git-http-backend, git-http-fetch and git-imap-send and such but no git-http-push.

I resolved my issue by uninstalling 1.9.0, installing an older version instead (1.8.1.2; this is when push started working) and 1.9.0 right on top of the older version. Now git push command works as expected.

Br,
Tuomas Silvola

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: git version 1.9.0 missing git-http-push?
  2014-04-28  6:19 git version 1.9.0 missing git-http-push? Silvola Tuomas
@ 2014-04-28  7:36 ` Marat Radchenko
  2014-04-28  8:48   ` Erik Faye-Lund
  0 siblings, 1 reply; 15+ messages in thread
From: Marat Radchenko @ 2014-04-28  7:36 UTC (permalink / raw)
  To: git

Silvola Tuomas wrote
> Hello,
> 
> I installed git for windows 1.9.0 but any push operation I tried with it
> produced an error message saying "git: 'http-push' is not a git command".
> Other commands like pull, add, and commit worked just fine.
> At the end of this day I noticed that C:\Program Files
> (x86)\Git\libexec\git-core just didn't have the file git-http-push. There
> were git-http-backend, git-http-fetch and git-imap-send and such but no
> git-http-push.
> 
> I resolved my issue by uninstalling 1.9.0, installing an older version
> instead (1.8.1.2; this is when push started working) and 1.9.0 right on
> top of the older version. Now git push command works as expected.
> 
> Br,
> Tuomas Silvola

>From Makefile:

	curl_check := $(shell (echo 070908; curl-config --vernum) 2>/dev/null |
sort -r | sed -ne 2p)
	ifeq "$(curl_check)" "070908"
		ifndef NO_EXPAT
			PROGRAM_OBJS += http-push.o
		endif
	endif

if there's no curl-config, http-push.c is silently skipped. This check also
doesn't play with cross-compiling when you cannot call curl-config because
it is for other arch.

There's also a mystic git-http-push$X that is not referenced from anywhere.



--
View this message in context: http://git.661346.n2.nabble.com/git-version-1-9-0-missing-git-http-push-tp7608787p7608792.html
Sent from the git mailing list archive at Nabble.com.

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: git version 1.9.0 missing git-http-push?
  2014-04-28  7:36 ` Marat Radchenko
@ 2014-04-28  8:48   ` Erik Faye-Lund
  2014-04-28  9:01     ` Erik Faye-Lund
  2014-04-28 18:31     ` Junio C Hamano
  0 siblings, 2 replies; 15+ messages in thread
From: Erik Faye-Lund @ 2014-04-28  8:48 UTC (permalink / raw)
  To: Marat Radchenko, msysGit, Pat Thoyts, Nick Hengeveld; +Cc: GIT Mailing-list

On Mon, Apr 28, 2014 at 9:36 AM, Marat Radchenko <marat@slonopotamus.org> wrote:
> Silvola Tuomas wrote
>> Hello,
>>
>> I installed git for windows 1.9.0 but any push operation I tried with it
>> produced an error message saying "git: 'http-push' is not a git command".
>> Other commands like pull, add, and commit worked just fine.
>> At the end of this day I noticed that C:\Program Files
>> (x86)\Git\libexec\git-core just didn't have the file git-http-push. There
>> were git-http-backend, git-http-fetch and git-imap-send and such but no
>> git-http-push.
>>
>> I resolved my issue by uninstalling 1.9.0, installing an older version
>> instead (1.8.1.2; this is when push started working) and 1.9.0 right on
>> top of the older version. Now git push command works as expected.
>>
>> Br,
>> Tuomas Silvola
>
> From Makefile:
>
>         curl_check := $(shell (echo 070908; curl-config --vernum) 2>/dev/null |
> sort -r | sed -ne 2p)
>         ifeq "$(curl_check)" "070908"
>                 ifndef NO_EXPAT
>                         PROGRAM_OBJS += http-push.o
>                 endif
>         endif
>
> if there's no curl-config, http-push.c is silently skipped. This check also
> doesn't play with cross-compiling when you cannot call curl-config because
> it is for other arch.
>
> There's also a mystic git-http-push$X that is not referenced from anywhere.

We're using Curl 7.30.0 in msysGit (and thus also Git for Windows), so
we should be able to include it. However, we do not have curl-config
installed.

Looking at 08900987 ("Decide whether to build http-push in the
Makefile"), that commit is from 2005, so it seems we've broken
something.

Further, looking a bit at our curl build-script, we don't seem to to
install curl-config. HOWEVER, 37e42ab ("curl: update to 7.28.1 and
enable ipv6"), dated 1. Feb 2013 adds a function to remove
curl-config. Pat, why is this?

My knee-jerk suspicion would be that it's because it's a stale
curl-config from a previous install (that *did* install it). However,
it doesn't seem like the mingw32 Makefile (the one you get without
running configure, it seems) even tries to build curl-config. In fact,
it seems this is simply built by configure itself. Which we don't run,
again since 37e42ab ("curl: update to 7.28.1 and enable ipv6").

So it seems that 08900987 ("Decide whether to build http-push in the
Makefile") makes a bad assumption about the availability of
curl-config on new libcurl installations; it's not present on "stock"
Windows builds.

-- 
-- 
*** 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

--- 
You received this message because you are subscribed to the Google Groups "msysGit" group.
To unsubscribe from this group and stop receiving emails from it, send an email to msysgit+unsubscribe@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: git version 1.9.0 missing git-http-push?
  2014-04-28  8:48   ` Erik Faye-Lund
@ 2014-04-28  9:01     ` Erik Faye-Lund
  2014-04-28  9:43       ` Erik Faye-Lund
                         ` (2 more replies)
  2014-04-28 18:31     ` Junio C Hamano
  1 sibling, 3 replies; 15+ messages in thread
From: Erik Faye-Lund @ 2014-04-28  9:01 UTC (permalink / raw)
  To: Marat Radchenko, msysGit, Pat Thoyts; +Cc: GIT Mailing-list

On Mon, Apr 28, 2014 at 10:48 AM, Erik Faye-Lund <kusmabite@gmail.com> wrote:
> So it seems that 08900987 ("Decide whether to build http-push in the
> Makefile") makes a bad assumption about the availability of
> curl-config on new libcurl installations; it's not present on "stock"
> Windows builds.

I wonder, though. That check is over 8 years old. Are that old systems
(that haven't been upgraded) still able to build Git? Even my old
RedHat 5 setup has curl 7.15.5...

Perhaps the following is the right thing to do? If not, perhaps we
could move this complication to configure.ac, which could get the
version number from the header-file instead? That way, quirks only
affect quirky systems...

(white-space damaged, I'll post a proper patch if there's some agreement)
---

diff --git a/Makefile b/Makefile
index 29a555d..6da72e7 100644
--- a/Makefile
+++ b/Makefile
@@ -1133,13 +1133,8 @@ else
     REMOTE_CURL_NAMES = $(REMOTE_CURL_PRIMARY) $(REMOTE_CURL_ALIASES)
     PROGRAM_OBJS += http-fetch.o
     PROGRAMS += $(REMOTE_CURL_NAMES)
-    curl_check := $(shell (echo 070908; curl-config --vernum)
2>/dev/null | sort -r | sed -ne 2p)
-    ifeq "$(curl_check)" "070908"
-        ifndef NO_EXPAT
-            PROGRAM_OBJS += http-push.o
-        endif
-    endif
     ifndef NO_EXPAT
+        PROGRAM_OBJS += http-push.o
         ifdef EXPATDIR
             BASIC_CFLAGS += -I$(EXPATDIR)/include
             EXPAT_LIBEXPAT = -L$(EXPATDIR)/$(lib)
$(CC_LD_DYNPATH)$(EXPATDIR)/$(lib) -lexpat

-- 
-- 
*** 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

--- 
You received this message because you are subscribed to the Google Groups "msysGit" group.
To unsubscribe from this group and stop receiving emails from it, send an email to msysgit+unsubscribe@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

^ permalink raw reply related	[flat|nested] 15+ messages in thread

* Re: git version 1.9.0 missing git-http-push?
  2014-04-28  9:01     ` Erik Faye-Lund
@ 2014-04-28  9:43       ` Erik Faye-Lund
  2014-04-28 13:12       ` Erik Faye-Lund
  2014-04-28 13:20       ` Johannes Schindelin
  2 siblings, 0 replies; 15+ messages in thread
From: Erik Faye-Lund @ 2014-04-28  9:43 UTC (permalink / raw)
  To: Marat Radchenko, msysGit, Pat Thoyts; +Cc: GIT Mailing-list

On Mon, Apr 28, 2014 at 11:01 AM, Erik Faye-Lund <kusmabite@gmail.com> wrote:
> On Mon, Apr 28, 2014 at 10:48 AM, Erik Faye-Lund <kusmabite@gmail.com> wrote:
>> So it seems that 08900987 ("Decide whether to build http-push in the
>> Makefile") makes a bad assumption about the availability of
>> curl-config on new libcurl installations; it's not present on "stock"
>> Windows builds.
>
> I wonder, though. That check is over 8 years old. Are that old systems
> (that haven't been upgraded) still able to build Git? Even my old
> RedHat 5 setup has curl 7.15.5...
>
> Perhaps the following is the right thing to do? If not, perhaps we
> could move this complication to configure.ac, which could get the
> version number from the header-file instead? That way, quirks only
> affect quirky systems...

And here's a stab at that. Not really tested, as I don't have an
affected system, so it's probably broken somehow ;)

But if someone want's to pick it up, at least there's a starting-point.

---

diff --git a/Makefile b/Makefile
index 29a555d..b94f830 100644
--- a/Makefile
+++ b/Makefile
@@ -1133,11 +1133,8 @@ else
  REMOTE_CURL_NAMES = $(REMOTE_CURL_PRIMARY) $(REMOTE_CURL_ALIASES)
  PROGRAM_OBJS += http-fetch.o
  PROGRAMS += $(REMOTE_CURL_NAMES)
- curl_check := $(shell (echo 070908; curl-config --vernum)
2>/dev/null | sort -r | sed -ne 2p)
- ifeq "$(curl_check)" "070908"
- ifndef NO_EXPAT
- PROGRAM_OBJS += http-push.o
- endif
+ ifndef NO_CAPABLE_CURL
+ PROGRAM_OBJS += http-push.o
  endif
  ifndef NO_EXPAT
  ifdef EXPATDIR
diff --git a/configure.ac b/configure.ac
index 2f43393..47991c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -513,6 +513,16 @@ AC_CHECK_LIB([curl], [curl_global_init],
 [NO_CURL=],
 [NO_CURL=YesPlease])

+AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM([#include <curlver.h>],
+ [#if LIBCURL_VERSION_NUM < 0x070908
+#error version too old
+#endif
+ ])],
+ [NO_CAPABLE_CURL=YesPlease],
+ [NO_CAPABLE_CURL=])
+GIT_CONF_SUBST([NO_CAPABLE_CURL])
+
 GIT_UNSTASH_FLAGS($CURLDIR)

 GIT_CONF_SUBST([NO_CURL])

-- 
-- 
*** 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

--- 
You received this message because you are subscribed to the Google Groups "msysGit" group.
To unsubscribe from this group and stop receiving emails from it, send an email to msysgit+unsubscribe@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

^ permalink raw reply related	[flat|nested] 15+ messages in thread

* Re: git version 1.9.0 missing git-http-push?
  2014-04-28  9:01     ` Erik Faye-Lund
  2014-04-28  9:43       ` Erik Faye-Lund
@ 2014-04-28 13:12       ` Erik Faye-Lund
  2014-04-28 13:20       ` Johannes Schindelin
  2 siblings, 0 replies; 15+ messages in thread
From: Erik Faye-Lund @ 2014-04-28 13:12 UTC (permalink / raw)
  To: Marat Radchenko, msysGit, Pat Thoyts; +Cc: GIT Mailing-list

On Mon, Apr 28, 2014 at 11:01 AM, Erik Faye-Lund <kusmabite@gmail.com> wrote:
> On Mon, Apr 28, 2014 at 10:48 AM, Erik Faye-Lund <kusmabite@gmail.com> wrote:
>> So it seems that 08900987 ("Decide whether to build http-push in the
>> Makefile") makes a bad assumption about the availability of
>> curl-config on new libcurl installations; it's not present on "stock"
>> Windows builds.
>
> I wonder, though. That check is over 8 years old. Are that old systems
> (that haven't been upgraded) still able to build Git? Even my old
> RedHat 5 setup has curl 7.15.5...
>
> Perhaps the following is the right thing to do? If not, perhaps we
> could move this complication to configure.ac, which could get the
> version number from the header-file instead? That way, quirks only
> affect quirky systems...
>
> (white-space damaged, I'll post a proper patch if there's some agreement)
> ---
>
> diff --git a/Makefile b/Makefile
> index 29a555d..6da72e7 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -1133,13 +1133,8 @@ else
>      REMOTE_CURL_NAMES = $(REMOTE_CURL_PRIMARY) $(REMOTE_CURL_ALIASES)
>      PROGRAM_OBJS += http-fetch.o
>      PROGRAMS += $(REMOTE_CURL_NAMES)
> -    curl_check := $(shell (echo 070908; curl-config --vernum)
> 2>/dev/null | sort -r | sed -ne 2p)
> -    ifeq "$(curl_check)" "070908"
> -        ifndef NO_EXPAT
> -            PROGRAM_OBJS += http-push.o
> -        endif
> -    endif
>      ifndef NO_EXPAT
> +        PROGRAM_OBJS += http-push.o
>          ifdef EXPATDIR
>              BASIC_CFLAGS += -I$(EXPATDIR)/include
>              EXPAT_LIBEXPAT = -L$(EXPATDIR)/$(lib)
> $(CC_LD_DYNPATH)$(EXPATDIR)/$(lib) -lexpat

I've built an installer with this patch applied, and it seems to do the trick:

https://dl.dropboxusercontent.com/u/1737924/Git-1.9.2-http-push.exe

-- 
-- 
*** 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

--- 
You received this message because you are subscribed to the Google Groups "msysGit" group.
To unsubscribe from this group and stop receiving emails from it, send an email to msysgit+unsubscribe@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: Re: git version 1.9.0 missing git-http-push?
  2014-04-28  9:01     ` Erik Faye-Lund
  2014-04-28  9:43       ` Erik Faye-Lund
  2014-04-28 13:12       ` Erik Faye-Lund
@ 2014-04-28 13:20       ` Johannes Schindelin
  2014-04-28 13:24         ` Erik Faye-Lund
  2014-04-28 13:47         ` Marat Radchenko
  2 siblings, 2 replies; 15+ messages in thread
From: Johannes Schindelin @ 2014-04-28 13:20 UTC (permalink / raw)
  To: Erik Faye-Lund; +Cc: Marat Radchenko, msysGit, Pat Thoyts, GIT Mailing-list

Hi kusma,

On Mon, 28 Apr 2014, Erik Faye-Lund wrote:

> On Mon, Apr 28, 2014 at 10:48 AM, Erik Faye-Lund <kusmabite@gmail.com> wrote:
> > So it seems that 08900987 ("Decide whether to build http-push in the
> > Makefile") makes a bad assumption about the availability of
> > curl-config on new libcurl installations; it's not present on "stock"
> > Windows builds.
> 
> I wonder, though. That check is over 8 years old. Are that old systems
> (that haven't been upgraded) still able to build Git? Even my old
> RedHat 5 setup has curl 7.15.5...

The easiest way in my humble opinion would be to install a script like
this into /mingw/bin/:

-- snip --
#!/bin/sh

case "$1" in
--vernum)
	version="$(curl -V)" || exit
	version="$(echo "${version%% (*)*}" | tr . \ )"
	eval printf "%02d%02d%02d" ${version#curl }
	;;
--cflags)
	;;
--libs)
	echo -lcurl
	;;
esac
-- snap --

That way, upstream Git does not have anything to change (and we avoid
discussing five versions of essentially the same patch :-P).

Hmm?

Ciao,
Dscho

-- 
-- 
*** 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

--- 
You received this message because you are subscribed to the Google Groups "msysGit" group.
To unsubscribe from this group and stop receiving emails from it, send an email to msysgit+unsubscribe@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: Re: git version 1.9.0 missing git-http-push?
  2014-04-28 13:20       ` Johannes Schindelin
@ 2014-04-28 13:24         ` Erik Faye-Lund
  2014-04-28 13:47         ` Marat Radchenko
  1 sibling, 0 replies; 15+ messages in thread
From: Erik Faye-Lund @ 2014-04-28 13:24 UTC (permalink / raw)
  To: Johannes Schindelin
  Cc: Marat Radchenko, msysGit, Pat Thoyts, GIT Mailing-list

On Mon, Apr 28, 2014 at 3:20 PM, Johannes Schindelin
<Johannes.Schindelin@gmx.de> wrote:
> Hi kusma,
>
> On Mon, 28 Apr 2014, Erik Faye-Lund wrote:
>
>> On Mon, Apr 28, 2014 at 10:48 AM, Erik Faye-Lund <kusmabite@gmail.com> wrote:
>> > So it seems that 08900987 ("Decide whether to build http-push in the
>> > Makefile") makes a bad assumption about the availability of
>> > curl-config on new libcurl installations; it's not present on "stock"
>> > Windows builds.
>>
>> I wonder, though. That check is over 8 years old. Are that old systems
>> (that haven't been upgraded) still able to build Git? Even my old
>> RedHat 5 setup has curl 7.15.5...
>
> The easiest way in my humble opinion would be to install a script like
> this into /mingw/bin/:
>
> -- snip --
> #!/bin/sh
>
> case "$1" in
> --vernum)
>         version="$(curl -V)" || exit
>         version="$(echo "${version%% (*)*}" | tr . \ )"
>         eval printf "%02d%02d%02d" ${version#curl }
>         ;;
> --cflags)
>         ;;
> --libs)
>         echo -lcurl
>         ;;
> esac
> -- snap --
>
> That way, upstream Git does not have anything to change (and we avoid
> discussing five versions of essentially the same patch :-P).

Huh? I think I only really proposed one patch...?

-- 
-- 
*** 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

--- 
You received this message because you are subscribed to the Google Groups "msysGit" group.
To unsubscribe from this group and stop receiving emails from it, send an email to msysgit+unsubscribe@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: Re: git version 1.9.0 missing git-http-push?
  2014-04-28 13:20       ` Johannes Schindelin
  2014-04-28 13:24         ` Erik Faye-Lund
@ 2014-04-28 13:47         ` Marat Radchenko
  2014-04-28 13:53           ` Erik Faye-Lund
  1 sibling, 1 reply; 15+ messages in thread
From: Marat Radchenko @ 2014-04-28 13:47 UTC (permalink / raw)
  To: Johannes Schindelin; +Cc: Erik Faye-Lund, msysGit, Pat Thoyts, GIT Mailing-list

On Mon, Apr 28, 2014 at 03:20:46PM +0200, Johannes Schindelin wrote:
> That way, upstream Git does not have anything to change (and we avoid
> discussing five versions of essentially the same patch :-P).

This bug isn't specific to msysGit but also affects all environments
where curl-config is not available or cannot be run for some reason,
for example during cross-compilation.

-- 
-- 
*** 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

--- 
You received this message because you are subscribed to the Google Groups "msysGit" group.
To unsubscribe from this group and stop receiving emails from it, send an email to msysgit+unsubscribe@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: Re: git version 1.9.0 missing git-http-push?
  2014-04-28 13:47         ` Marat Radchenko
@ 2014-04-28 13:53           ` Erik Faye-Lund
  0 siblings, 0 replies; 15+ messages in thread
From: Erik Faye-Lund @ 2014-04-28 13:53 UTC (permalink / raw)
  To: Marat Radchenko
  Cc: Johannes Schindelin, msysGit, Pat Thoyts, GIT Mailing-list

On Mon, Apr 28, 2014 at 3:47 PM, Marat Radchenko <marat@slonopotamus.org> wrote:
> On Mon, Apr 28, 2014 at 03:20:46PM +0200, Johannes Schindelin wrote:
>> That way, upstream Git does not have anything to change (and we avoid
>> discussing five versions of essentially the same patch :-P).
>
> This bug isn't specific to msysGit but also affects all environments
> where curl-config is not available or cannot be run for some reason,
> for example during cross-compilation.

True. I think the assumption simply was a bad one, and it has probably
gone unnoticed for a while because pushing over WebDAV is not all that
common.

If anyone turns up a system with an old enough libcurl, they should
probably consult curlver.h instead. And if so, they are probably on a
system so crippled they need to run automake anyway.

-- 
-- 
*** 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

--- 
You received this message because you are subscribed to the Google Groups "msysGit" group.
To unsubscribe from this group and stop receiving emails from it, send an email to msysgit+unsubscribe@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: git version 1.9.0 missing git-http-push?
  2014-04-28  8:48   ` Erik Faye-Lund
  2014-04-28  9:01     ` Erik Faye-Lund
@ 2014-04-28 18:31     ` Junio C Hamano
  2014-04-28 18:39       ` 'Dave Borowitz <dborowitz@google.com>' via msysGit
  1 sibling, 1 reply; 15+ messages in thread
From: Junio C Hamano @ 2014-04-28 18:31 UTC (permalink / raw)
  To: kusmabite, Dave Borowitz
  Cc: Marat Radchenko, msysGit, Pat Thoyts, Nick Hengeveld, GIT Mailing-list

Erik Faye-Lund <kusmabite@gmail.com> writes:

> We're using Curl 7.30.0 in msysGit (and thus also Git for Windows), so
> we should be able to include it. However, we do not have curl-config
> installed.

Hmmm, between 2.0-rc0 and 2.0-rc1 there is 61a64fff (Makefile: use
curl-config to determine curl flags, 2014-04-15) merged already,
which makes this assumption and a claim based on that assumption:

    curl-config should always be installed alongside a curl
    distribution, and its purpose is to provide flags for building
    against libcurl, so use it instead of guessing flags and
    dependent libraries.

which may make things worse for you guys, unless you are explicitly
setting CURLDIR and other Makefile variables.

-- 
-- 
*** 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

--- 
You received this message because you are subscribed to the Google Groups "msysGit" group.
To unsubscribe from this group and stop receiving emails from it, send an email to msysgit+unsubscribe@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: git version 1.9.0 missing git-http-push?
  2014-04-28 18:31     ` Junio C Hamano
@ 2014-04-28 18:39       ` 'Dave Borowitz <dborowitz@google.com>' via msysGit
  2014-04-28 19:02         ` Erik Faye-Lund
  2014-04-28 19:40         ` Junio C Hamano
  0 siblings, 2 replies; 15+ messages in thread
From: 'Dave Borowitz <dborowitz@google.com>' via msysGit @ 2014-04-28 18:39 UTC (permalink / raw)
  To: Junio C Hamano
  Cc: kusmabite, Marat Radchenko, msysGit, Pat Thoyts, Nick Hengeveld,
	GIT Mailing-list

On Mon, Apr 28, 2014 at 11:31 AM, Junio C Hamano <gitster@pobox.com> wrote:
> Erik Faye-Lund <kusmabite@gmail.com> writes:
>
>> We're using Curl 7.30.0 in msysGit (and thus also Git for Windows), so
>> we should be able to include it. However, we do not have curl-config
>> installed.
>
> Hmmm, between 2.0-rc0 and 2.0-rc1 there is 61a64fff (Makefile: use
> curl-config to determine curl flags, 2014-04-15) merged already,
> which makes this assumption and a claim based on that assumption:
>
>     curl-config should always be installed alongside a curl
>     distribution, and its purpose is to provide flags for building
>     against libcurl, so use it instead of guessing flags and
>     dependent libraries.
>
> which may make things worse for you guys, unless you are explicitly
> setting CURLDIR and other Makefile variables.

Yes, I can see that assumption may not always hold. But I'm slightly
surprised this worked in the first place; are you saying this is a
system where:
-curl-config is not installed
-but -lcurl still works
-without setting CURLDIR
?

I think I should probably re-roll the patch to default to the old
behavior (blind -lcurl) if curl-config returns the empty string, which
I believe is also the case when the binary is not found.

-- 
-- 
*** 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

--- 
You received this message because you are subscribed to the Google Groups "msysGit" group.
To unsubscribe from this group and stop receiving emails from it, send an email to msysgit+unsubscribe@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: git version 1.9.0 missing git-http-push?
  2014-04-28 18:39       ` 'Dave Borowitz <dborowitz@google.com>' via msysGit
@ 2014-04-28 19:02         ` Erik Faye-Lund
  2014-04-28 19:40         ` Junio C Hamano
  1 sibling, 0 replies; 15+ messages in thread
From: Erik Faye-Lund @ 2014-04-28 19:02 UTC (permalink / raw)
  To: Dave Borowitz
  Cc: Junio C Hamano, Marat Radchenko, msysGit, Pat Thoyts,
	Nick Hengeveld, GIT Mailing-list

On Mon, Apr 28, 2014 at 8:39 PM, Dave Borowitz <dborowitz@google.com> wrote:
> On Mon, Apr 28, 2014 at 11:31 AM, Junio C Hamano <gitster@pobox.com> wrote:
>> Erik Faye-Lund <kusmabite@gmail.com> writes:
>>
>>> We're using Curl 7.30.0 in msysGit (and thus also Git for Windows), so
>>> we should be able to include it. However, we do not have curl-config
>>> installed.
>>
>> Hmmm, between 2.0-rc0 and 2.0-rc1 there is 61a64fff (Makefile: use
>> curl-config to determine curl flags, 2014-04-15) merged already,
>> which makes this assumption and a claim based on that assumption:
>>
>>     curl-config should always be installed alongside a curl
>>     distribution, and its purpose is to provide flags for building
>>     against libcurl, so use it instead of guessing flags and
>>     dependent libraries.
>>
>> which may make things worse for you guys, unless you are explicitly
>> setting CURLDIR and other Makefile variables.
>
> Yes, I can see that assumption may not always hold. But I'm slightly
> surprised this worked in the first place; are you saying this is a
> system where:
> -curl-config is not installed
> -but -lcurl still works
> -without setting CURLDIR
> ?

Yes, our cURL is installed globally together with the system libraries.

> I think I should probably re-roll the patch to default to the old
> behavior (blind -lcurl) if curl-config returns the empty string, which
> I believe is also the case when the binary is not found.

That sounds like it would work for MsysGit, yeah.

-- 
-- 
*** 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

--- 
You received this message because you are subscribed to the Google Groups "msysGit" group.
To unsubscribe from this group and stop receiving emails from it, send an email to msysgit+unsubscribe@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: git version 1.9.0 missing git-http-push?
  2014-04-28 18:39       ` 'Dave Borowitz <dborowitz@google.com>' via msysGit
  2014-04-28 19:02         ` Erik Faye-Lund
@ 2014-04-28 19:40         ` Junio C Hamano
  2014-04-28 19:42           ` 'Dave Borowitz <dborowitz@google.com>' via msysGit
  1 sibling, 1 reply; 15+ messages in thread
From: Junio C Hamano @ 2014-04-28 19:40 UTC (permalink / raw)
  To: Dave Borowitz
  Cc: kusmabite, Marat Radchenko, msysGit, Pat Thoyts, Nick Hengeveld,
	GIT Mailing-list

"'Dave Borowitz <dborowitz@google.com>' via msysGit"
<msysgit@googlegroups.com> writes:

> I think I should probably re-roll the patch to default to the old
> behavior (blind -lcurl) if curl-config returns the empty string, which
> I believe is also the case when the binary is not found.

Thanks for a prompt response; as this may indicate a possible
regression on what is already in 2.0-rc1, I am tempted to say that
we should revert the merge in the meantime.

Unless such an update can be done in a fairly trivial way, that is.


-- 
-- 
*** 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

--- 
You received this message because you are subscribed to the Google Groups "msysGit" group.
To unsubscribe from this group and stop receiving emails from it, send an email to msysgit+unsubscribe@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: git version 1.9.0 missing git-http-push?
  2014-04-28 19:40         ` Junio C Hamano
@ 2014-04-28 19:42           ` 'Dave Borowitz <dborowitz@google.com>' via msysGit
  0 siblings, 0 replies; 15+ messages in thread
From: 'Dave Borowitz <dborowitz@google.com>' via msysGit @ 2014-04-28 19:42 UTC (permalink / raw)
  To: Junio C Hamano
  Cc: kusmabite, Marat Radchenko, msysGit, Pat Thoyts, Nick Hengeveld,
	GIT Mailing-list

On Mon, Apr 28, 2014 at 12:40 PM, Junio C Hamano <gitster@pobox.com> wrote:
> "'Dave Borowitz <dborowitz@google.com>' via msysGit"
> <msysgit@googlegroups.com> writes:
>
>> I think I should probably re-roll the patch to default to the old
>> behavior (blind -lcurl) if curl-config returns the empty string, which
>> I believe is also the case when the binary is not found.
>
> Thanks for a prompt response; as this may indicate a possible
> regression on what is already in 2.0-rc1, I am tempted to say that
> we should revert the merge in the meantime.
>
> Unless such an update can be done in a fairly trivial way, that is.

I already sent the update. There's a bit more (unavoidable) complexity
in the conditionals but it should still be fairly straightforward.

-- 
-- 
*** 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

--- 
You received this message because you are subscribed to the Google Groups "msysGit" group.
To unsubscribe from this group and stop receiving emails from it, send an email to msysgit+unsubscribe@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

^ permalink raw reply	[flat|nested] 15+ messages in thread

end of thread, other threads:[~2014-04-28 19:43 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-04-28  6:19 git version 1.9.0 missing git-http-push? Silvola Tuomas
2014-04-28  7:36 ` Marat Radchenko
2014-04-28  8:48   ` Erik Faye-Lund
2014-04-28  9:01     ` Erik Faye-Lund
2014-04-28  9:43       ` Erik Faye-Lund
2014-04-28 13:12       ` Erik Faye-Lund
2014-04-28 13:20       ` Johannes Schindelin
2014-04-28 13:24         ` Erik Faye-Lund
2014-04-28 13:47         ` Marat Radchenko
2014-04-28 13:53           ` Erik Faye-Lund
2014-04-28 18:31     ` Junio C Hamano
2014-04-28 18:39       ` 'Dave Borowitz <dborowitz@google.com>' via msysGit
2014-04-28 19:02         ` Erik Faye-Lund
2014-04-28 19:40         ` Junio C Hamano
2014-04-28 19:42           ` 'Dave Borowitz <dborowitz@google.com>' via msysGit

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.