Re: [PATCH] git-svn: clone: Fail on missing url argument

2016-07-02 Thread Christopher Layne
> On Jul 2, 2016, at 2315 PT, Eric Wong wrote: >> sub cmd_clone { >> my ($url, $path) = @_; >> -if (!defined $path && >> +if (!$url) { >> +die "SVN repository location required ", >> +"as a command-line argument\n"; > > "as a command-line argument" seems

Re: [PATCH] git-svn: clone: Fail on missing url argument

2016-07-02 Thread Eric Wong
Christopher Layne wrote: > * cmd_clone should detect a missing $url arg before using it otherwise > an uninitialized value error is emitted in even the simplest case of > 'git svn clone' without arguments. Thanks, this patch looks obviously correct. I've eliminated the '* ' and space prefix

[PATCH] git-svn: clone: Fail on missing url argument

2016-07-02 Thread Christopher Layne
* cmd_clone should detect a missing $url arg before using it otherwise an uninitialized value error is emitted in even the simplest case of 'git svn clone' without arguments. Signed-off-by: Christopher Layne --- git-svn.perl | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --g

[PATCH] t7610 test for mktemp existence

2016-07-02 Thread Armin Kunaschik
Subject: t7610: test for mktemp before test execution mktemp is not available on all platforms, so the test 'temporary filenames are used with mergetool.writeToTemp' fails there. This patch does not replace mktemp but just disables the test that otherwise would fail. mergetool checks itself before

Re: [PATCH v3 3/3] correct ce_compare_data() in a middle of a merge

2016-07-02 Thread Torsten Bögershausen
On 2016-07-02 00.11, Junio C Hamano wrote: [snip] diff --git a/read-cache.c b/read-cache.c index a3ef967..c109b6d 100644 --- a/read-cache.c +++ b/read-cache.c @@ -163,7 +163,9 @@ static int ce_compare_data(const struct cache_entry *ce, struct stat *st) if (fd >= 0) { uns

Re: [bug] Reliably Reproducible Bad Packing of Objects

2016-07-02 Thread Duy Nguyen
On Sat, Jul 2, 2016 at 11:10 AM, Duy Nguyen wrote: > On Sat, Jun 25, 2016 at 12:38:22AM +0200, Christoph Michelbach wrote: >> Hi, >> >> when run on a 32 bit system (Linux system, don't know about other >> systems), >> >> mkdir test && cd test && git init && touch someFile && git add someFile >> &&

[PATCH] config.c: fix potential number truncation in git_parse_signed()

2016-07-02 Thread Nguyễn Thái Ngọc Duy
clang -Wabsolute-value on IA-32 architecture complains that "absolute value function 'labs' given an argument of type 'intmax_t' (aka 'long long') but has parameter of type 'long' which may cause truncation of value". Very unlikely for this code though. Nevertheless, add an explicit check for trunc

Re: [PATCH v13 04/20] index-helper: new daemon for caching index and related stuff

2016-07-02 Thread Duy Nguyen
On Sat, Jul 2, 2016 at 1:20 PM, Johannes Schindelin wrote: >> > -test -n "$NO_MMAP" && { >> > - skip_all='skipping index-helper tests: no mmap' >> > +git index-helper -h 2>/dev/null >> > +test $? = 129 || >> >> So when NO_MMAP is set, "git index-helper -h" will set $? to 1. > > Not quite. >

Re: [PATCH 4/9] merge_recursive: abort properly upon errors

2016-07-02 Thread Johannes Schindelin
Hi Junio, On Fri, 1 Jul 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > >> > saved_b2 = o->branch2; > >> > o->branch1 = "Temporary merge branch 1"; > >> > o->branch2 = "Temporary merge branch 2"; > >> > -merge_recu

Re: [PATCH v13 04/20] index-helper: new daemon for caching index and related stuff

2016-07-02 Thread Johannes Schindelin
Hi Duy, On Thu, 30 Jun 2016, Duy Nguyen wrote: > On Thu, Jun 30, 2016 at 3:06 PM, Johannes Schindelin > wrote: > > Even when NO_MMAP is empty, there might be no Unix sockets available (such > > as is the case on Windows). In any case, you really only want to skip > > these tests when index-helpe

Re: What's cooking in git.git (Jul 2016, #01; Fri, 1)

2016-07-02 Thread Johannes Schindelin
Hi Junio, On Fri, 1 Jul 2016, Junio C Hamano wrote: > * jc/t2300-setup (2016-06-22) 1 commit > (merged to 'next' on 2016-06-28 at 62b902a) > + t2300: "git --exec-path" is not usable in $PATH on Windows as-is > > Portability fix for Windows. > > Will merge to 'master'. Would you mind cherr

[PATCH] git-svn: warn instead of dying when commit data is missing

2016-07-02 Thread Eric Wong
Christian Couder wrote: > On Fri, Jun 24, 2016 at 10:06 PM, Eric Wong wrote: > > Jacob Godserv wrote: > >> > Christian (Cc-ed) also noticed the problem a few weeks ago > >> > and took a more drastic approach by having git-svn die > >> > instead of warning: > >> > http://mid.gmane.org/1462604323-

Re: [PATCHv2 3/4] push: accept push options

2016-07-02 Thread Eric Wong
Stefan Beller wrote: > @@ -513,6 +531,17 @@ int send_pack(struct send_pack_args *args, > strbuf_release(&req_buf); > strbuf_release(&cap_buf); > > + if (use_push_options) { > + struct string_list_item *item; > + struct strbuf sb = STRBUF_INIT; > + > +

Re: [bug] Reliably Reproducible Bad Packing of Objects

2016-07-02 Thread Duy Nguyen
On Sat, Jun 25, 2016 at 12:38:22AM +0200, Christoph Michelbach wrote: > Hi, > > when run on a 32 bit system (Linux system, don't know about other > systems), > > mkdir test && cd test && git init && touch someFile && git add someFile > && git commit -m "Initial commit." && dd if=/dev/urandom > of

Re: [PATCH 1/9] Report bugs consistently

2016-07-02 Thread Duy Nguyen
On Sat, Jul 2, 2016 at 9:25 AM, Johannes Schindelin wrote: > Hi Duy, > > On Sat, 2 Jul 2016, Duy Nguyen wrote: > >> On Wed, Jun 29, 2016 at 1:36 PM, Johannes Schindelin >> wrote: >> > @@ -955,9 +955,8 @@ static struct merge_file_info merge_file_1(struct >> > merge_options *o, >> > >> >

Re: What's cooking in git.git (Jul 2016, #01; Fri, 1)

2016-07-02 Thread Johannes Schindelin
Hi, On Fri, 1 Jul 2016, Junio C Hamano wrote: > * jk/common-main-2.8 (2016-07-01) 5 commits > - common-main: call git_setup_gettext() > - common-main: call restore_sigpipe_to_default() > - common-main: call sanitize_stdfds() > - common-main: call git_extract_argv0_path() > - add an extra lev

Re: [PATCH 2/2] t3404: add a test for the --gpg-sign option

2016-07-02 Thread Johannes Schindelin
Hi Junio, On Fri, 1 Jul 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > >> that has a substring '-S"' in it to ensure that the codepath to > >> parse --gpg-sign= on the command line of "rebase", and to the > >> message we see here are working correctly, without actually checking >

Re: [PATCH 1/9] Report bugs consistently

2016-07-02 Thread Johannes Schindelin
Hi Duy, On Sat, 2 Jul 2016, Duy Nguyen wrote: > On Wed, Jun 29, 2016 at 1:36 PM, Johannes Schindelin > wrote: > > @@ -955,9 +955,8 @@ static struct merge_file_info merge_file_1(struct > > merge_options *o, > > > > if (!sha_eq(a->sha1, b->sha1)) > >

Re: preview: What's cooking in git.git (Jun 2016, #10; Tue, 28)

2016-07-02 Thread Johannes Schindelin
Hi Junio, On Wed, 29 Jun 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > > On Tue, 28 Jun 2016, Junio C Hamano wrote: > > > >> * jk/ansi-color (2016-06-23) 7 commits > >> (merged to 'next' on 2016-06-28 at 354989c) > >> + color: support strike-through attribute > >> + color: s

Re: [PATCH 3/9] Prepare the builtins for a libified merge_recursive()

2016-07-02 Thread Johannes Schindelin
Hi Junio, On Fri, 1 Jul 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > >> > A truly libified function does not die() just for fun. > >> > >> The sentence is wasting bits. After all, a helper function in > >> run-once-and-exit program does not die() just for fun, either. > > > >

Re: [PATCH 2/9] merge-recursive: clarify code in was_tracked()

2016-07-02 Thread Johannes Schindelin
Hi Junio, On Fri, 1 Jul 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > > I would like to propose this diff instead (it is larger, but with a net > > savings of one line): > > > > -- snipsnap -- > > diff --git a/merge-recursive.c b/merge-recursive.c > > index d5a593c..0eda51a 1006