bmodule from within
submodule' '
test_must_fail git -C sub add . 2>actual &&
+ test_i18ngrep "in unpopulated submodule" actual
'
test_done
$
Thanks!
ATB,
Ramsay Jones
g.txt b/Documentation/config.txt
> index 475e874d5..d5a453ed3 100644
> --- a/Documentation/config.txt
> +++ b/Documentation/config.txt
> @@ -79,14 +79,20 @@ escape sequences) are invalid.
> Includes
>
>
> +The `include` and `includeIf` sections allow you include config
s/you include/you to include/
ATB,
Ramsay Jones
05583. ;-P
So, sparse is, once again, complaining about the SIZE_MAX macro
redefinition. (Along with two other warnings, one of which is a
_very_ long standing warning and one of which is new - I have
yet to investigate).
ATB,
Ramsay Jones
igned-off-by: Jeff King
I have an identical patch, which I had intended to send at
the 'start of the next cycle'. :D (Well, you actually had
a commit message ...).
So, FWIW: ACK
ATB,
Ramsay Jones
> ---
> This goes on top of bw/forking-and-threading.
>
> git-compat-util.h |
Signed-off-by: Ramsay Jones
---
Hi Jeff,
If you need to re-roll your 'jk/bug-to-abort' branch, could you please
squash this into the relevant patch (commit d8193743e0 "usage.c: add
BUG() function", 12-05-2017).
[Just FYI, sparse complains thus:
usage.c:212:6: e
On 16/05/17 04:02, Jeff King wrote:
> On Tue, May 16, 2017 at 02:11:40AM +0100, Ramsay Jones wrote:
>
>>
>> If you need to re-roll your 'jk/bug-to-abort' branch, could you please
>> squash this into the relevant patch (commit d8193743e0 "usage.c: add
>&
not a major reduction in test coverage, but I
don't recall any discussion about it and I wondered if it was
by accident or design.
ATB,
Ramsay Jones
;
> +
> + # Maybe print SKIP message
> + test -z "$skip_all" || skip_all="# SKIP $skip_all"
> + case "$test_count" in
> + 0)
> + say "1..$test_count${skip_all:+ $skip_all}"
> + ;;
> + *)
> + test -z "$skip_all" ||
> + say_color warn "$skip_all"
> + say "1..$test_count"
> + ;;
> + esac
> fi
>
> test -d "$remove_trash" &&
... this looks good to me. (tested on Linux and cygwin).
Thanks!
ATB,
Ramsay Jones
nch 'jc/name-rev-lw-tag') and I spotted
the 'unsigned long' taggerdate parameter to the is_better_name()
function.
I was just about to try the patch above and retest, when I saw
your email! (so I can leave that for tonight).
Thanks!
ATB,
Ramsay Jones
Signed-off-by: Ramsay Jones
---
Hi Stefan,
If you need to re-roll your 'sb/diff-color-move' branch, could you
please squash this into to the relevant patches. (Each hunk would
be squashed into a separate commit, thus:
- commit 9b68d54c11, "diff: buffer all output if asked
s sparse to
complain thus:
SP usage.c
usage.c:220:6: error: symbol 'BUG_fl' redeclared with different type
(originally declared at git-compat-util.h:1074) - different modifiers
In order to suppress the sparse error, add the NORETURN to the function
definitions.
Signed-off-b
On 22/05/17 02:43, Junio C Hamano wrote:
> Ramsay Jones writes:
>
>> Commit d8193743e0 ("usage.c: add BUG() function", 12-05-2017) added the
>> BUG() functions and macros as a replacement for calls to die("BUG: ..").
>> The use of NORETURN on the
0a177
> SP compat/fopen.c
276a284
> builtin/worktree.c:539:38: warning: Using plain integer as NULL pointer
296a305
> SP t/helper/test-dir-iterator.c
$
ATB,
Ramsay Jones
CC common-main.o
...
CC pack-objects.o
CC pack-revindex.o
pack-revindex.c:64:23: error: memset with byte count of 262144
Makefile:2036: recipe for target 'pack-revindex.o' failed
make: *** [pack-revindex.o] Error 1
$
> Otherwise it would make a
> good addition to the "Static Analysis" task in .travis.yml file.
Unfortunately, some additional work required. :-P
ATB,
Ramsay Jones
mds, nr, cmd_category_cmp);
for (i = 0; i < nr; i++) {
@@ -343,6 +352,9 @@ void list_all_cmds_help(void)
int nr = ARRAY_SIZE(command_list);
struct cmdname_help *cmds = command_list;
+ if (nr == 0)
+ BUG("empty command_list");
+
for (i = 0; i < nr; i++) {
struct cmdname_help *cmd = cmds + i;
This had a very dramatic effect on the test-suite, since every single
test file failed while sourcing 'test-lib.sh'. [The test for having
built git ('"$GIT_BUILD_DIR/git" >/dev/null') tries to output help,
because you haven't given a command, and hits BUG - core dump!]
I haven't tried this patch series yet (I will hopefully find some
time tonight), but it looks like it will fix the problem.
ATB,
Ramsay Jones
On 22/04/18 16:22, Duy Nguyen wrote:
> On Sun, Apr 22, 2018 at 4:45 PM, Ramsay Jones
> wrote:
>>
>>
>> On 21/04/18 17:56, Duy Nguyen wrote:
>>> On Sat, Apr 21, 2018 at 06:54:08PM +0200, Nguyễn Thái Ngọc Duy wrote:
>>>> Changes:
>>>>
&g
On 22/04/18 17:12, Duy Nguyen wrote:
> On Sun, Apr 22, 2018 at 5:58 PM, Ramsay Jones
> wrote:
>>>> I think you need to try a little harder than this! ;-)
>>>
>>> Yeah. I did think about grepping the output but decided not to because
>>> of gettex
ed in 091a6eb0fe (submodule: drop the
> top-level requirement, 2013-06-16) the intent for $path seemed to be
> relative to $cwd to the submodule worktree, but that did not work for
> nested submodules, as the intermittent submodules were not included in
intermediate
ATB,
Ramsay Jones
const char *prefix);
> diff --git a/builtin/branch-diff.c b/builtin/branch-diff.c
> new file mode 100644
> index 000..97266cd326d
> --- /dev/null
> +++ b/builtin/branch-diff.c
> @@ -0,0 +1,40 @@
> +#include "cache.h"
> +#include "parse-options.h"
> +
> +static const char * const builtin_branch_diff_usage[] = {
> + N_("git rebase--helper [] ( A..B C..D | A...B | base A B )"),
s/rebase--helper/branch-diff/
ATB,
Ramsay Jones
..B C..D | A...B | base A B )"),
> NULL
> };
>
> -#define COLOR_DUAL_MODE 2
> -
This #define was introduced in the previous patch, without being
used in that patch, and is now deleted here.
ATB,
Ramsay Jones
On 03/05/18 21:25, Johannes Schindelin wrote:
> On Thu, 3 May 2018, Ramsay Jones wrote:
>> On 03/05/18 16:30, Johannes Schindelin wrote:
[snip]
>>> diff --git a/builtin/branch-diff.c b/builtin/branch-diff.c
>>> new file mode 100644
>>> index 00
his tool will be very useful (thanks
also go to Thomas, of course).
I noticed that there seemed to be an occasional 'whitespace error'
indicator (red background) directly after an +/- change character
which I suspect is an error (I haven't actually checked). However,
this indicator disappears if you add the --dual-color option.
Thanks!
ATB,
Ramsay Jones
lved in setting up a 'ppa repo' for
Ubuntu, which I suspect is the kind of thing you want, but it
would have helped me several times in the past (so that I could
have something to point people to) ... ;-)
ATB,
Ramsay Jones
Signed-off-by: Ramsay Jones
---
Hi Johannes,
If you need to re-roll your 'js/use-bug-macro' branch, could you
please squash this into the relevant patch (commit a86303cb5d,
"test-tool: help verifying BUG() code paths", 2018-05-02).
This will, obviously, not be req
Signed-off-by: Ramsay Jones
---
Hi Duy,
If you need to re-roll your 'nd/commit-util-to-slab' branch, could
you please squash this into the relevant patch (commit 37de2f0a93,
"merge: use commit-slab in merge remote desc instead of commit->util",
2018-05-13).
Also, my &
Signed-off-by: Ramsay Jones
---
Hi Brandon,
If you need to re-roll your 'bw/refspec-api' branch, could you please
squash this, or the equivalent change before the 'struct refname' to
'struct refname_item' name change, into the relevant patch. (which
would be patc
Signed-off-by: Ramsay Jones
---
Hi Stefan,
If you need to re-roll your 'sb/object-store-grafts' branch, could
you please squash this into the relevant patch (whichever one that
would be)! ;-)
I have not looked to see which patch needs to change (just being
lazy, sorry!), but this va
plain?
Indeed, it already did (see [1]). ;-)
Your fixup, commit dc2172daed, on the 'nd/commit-util-to-slab'
branch has indeed fixed it up.
Thanks!
[1]
https://public-inbox.org/git/e2c4276f-bcfd-faaa-f9ee-cb50e99da...@ramsayjones.plus.com/
ATB,
Ramsay Jones
:
provide `string_list_appendf()`", 2018-05-20) claiming that:
'The next commit will add a user'. ;-)
Have I missed something?
ATB,
Ramsay Jones
On 22/05/18 00:59, Junio C Hamano wrote:
> Ramsay Jones writes:
>
>> I strongly suspect that I haven't followed the discussion on
>> the list closely enough, but your 'ma/unpack-trees-free-msgs'
>> branch in 'pu', seems to define string_list_app
Signed-off-by: Ramsay Jones
---
Hi Derrick,
If you need to re-roll your 'ds/commit-graph-fsck' branch (pu@a84e06bc0f),
could you please squash this into the relevant patch (commit 80453b4529,
"commit-graph: add 'verify' subcommand", 2018-05-24).
[No, No, that wa
1
> then
> eval "$1"
>
Hmm, I'm not sure which documentation you are referring to, but if
$path != $sm_path then something is wrong. (unless their definition
has changed, of course). commit 091a6eb0fe may have muddied the water
a little by using $sm_path in the test in t7407, since (as far as I
know) $path is the user-facing variable (NOT $sm_path).
ATB,
Ramsay Jones
...
I tried provoking a failure on cygwin, and I couldn't get it to fail!
Since Johannes told me about Gfw fork of the msys-runtime, I didn't
even attempt to try and provoke a failure on MSYS2/MinGW.
So, maybe it's fixed (no I'm not convinced either) ...
ATB,
Ramsay Jones
On 26/05/17 18:07, Stefan Beller wrote:
> On Fri, May 26, 2017 at 9:31 AM, Ramsay Jones
> wrote:
>> Hmm, I'm not sure which documentation you are referring to,
>
> Quite likely our fine manual pages. ;)
>
>foreach [--recursive]
>Evaluat
On 27/05/17 02:20, Ramsay Jones wrote:
>
>
> On 26/05/17 22:54, Johannes Sixt wrote:
>> Am 26.05.2017 um 17:17 schrieb Prathamesh Chavan:
>>> +argv_array_pushf(&cp.env_array, "path=%s", list_item->name);
>>
>> Not good! On Win
e run. However, a plan with '1..n'
(for any n > 0) must not have any annotation. (Back in 2012, when I wrote
commit bf4b721932, I found much better documentation than the above!)
So, after commit c7018be509, you can now use the 'skip_all' facility
after having run some tests; it now converts that into an 'SKIP comment'
just before the test plan, effectively skipping the remainder of the
tests in the file. (since we are using a 'trailing plan', and have thus
not declared how many tests we had intended to run, we can output an
accurate plan).
ATB,
Ramsay Jones
On 30/05/17 01:03, Junio C Hamano wrote:
> Ramsay Jones writes:
>
>> See commit c7018be509 ("test: allow skipping the remainder", 18-05-2017)
>> which is currently merged to the 'next' branch (merge 03b8a61e47 of the
>> 'jc/skip-
On 30/05/17 22:53, Stefan Beller wrote:
> On Fri, May 26, 2017 at 6:10 PM, Ramsay Jones
> wrote:
>> On 26/05/17 18:07, Stefan Beller wrote:
>>> On Fri, May 26, 2017 at 9:31 AM, Ramsay Jones
>>> wrote:
>> Back in 2012, the submodule list was generated b
the C conversion:
> * export the sm_path as all other environment variables
> * for "$path" we do not export it into the environment, but
> prefix the command with it, i.e. we'd ask our shell to run
> "path=%s; %s", sm_path, argv[0]
> to preserve the historic behavior.
Yes, that would probably work.
ATB,
Ramsay Jones
On 31/05/17 01:13, Ramsay Jones wrote:
> On 31/05/17 00:29, Stefan Beller wrote:
>
>> In that test sm_path contains the relative path from $PWD to the
>> submodule. (It does NOT: "$[sm_]path is the name of the submodule
>> directory relative to the superproj
Signed-off-by: Ramsay Jones
---
Hi Stefan,
If you need to re-roll your 'sb/submodule-blanket-recursive' branch,
could you please squash this into the relevant patch (commit 0e5bca302a
"Introduce 'submodule.recurse' option for worktree manipulators",
26-05-2017
tation.
> It does not contain the topmost superproject as the author assumed,
> but the direct superproject, such that $toplevel/$sm_path is the
> actual absolute path of the submodule.
>
> * The variable '$displaypath' was accessible but undocumented.
> Re
On 03/06/17 15:07, Ramsay Jones wrote:
[snip]
>> diff --git a/Documentation/git-submodule.txt
>> b/Documentation/git-submodule.txt
>> index 74bc6200d5..52e3ef1325 100644
>> --- a/Documentation/git-submodule.txt
>> +++ b/Documentation/git-submodule.txt
>> @
ha1dc/sha1.c and see if that helps, alternatively comment out the
> ifdefs guarded by "#ifdef _MSC_VER" calls in sha1dc/sha1.c
This can't possibly make a difference! ;-)
However, rebuilding with:
$ make OPENSSL_SHA1=YesPlease >out2 2>&1
... make t-basic.sh pass just fine, so ...
ATB,
Ramsay Jones
On 06/06/17 00:20, Ramsay Jones wrote:
>
>
> On 05/06/17 22:05, Ævar Arnfjörð Bjarmason wrote:
>> On Mon, Jun 5, 2017 at 10:34 PM, Adam Dinwoodie wrote:
>>> I'm trying to compile Git v2.13.1 to release for Cygwin, but it appears
>>> a010391 ("sh
e-topology-linear.sh
3 224.854s t7610-mergetool.sh
4 211.230s t6030-bisect-porcelain.sh
...
175 10.389s t4300-merge-tree.sh
176 10.324s t4213-log-tabexpand.sh
177 10.143s t3034-merge-recursive-rename-options.sh
178 10.108s t1410-reflog.sh
$
[On linux a complete run is about 400s and on cygwin about 3hours!]
ATB,
Ramsay Jones
Signed-off-by: Ramsay Jones
---
Hi Sahil,
If you need to re-roll your 'sd/branch-copy' branch, could you please
squash this into the relevant patch (commit 37af9c71b6, "config: create
a function to format section headers", 13-06-2017).
Also, I note that another patch in
ge
> which adds support for copying branch sections in the config file.
>
> Signed-off-by: Ævar Arnfjörð Bjarmason
> Signed-off-by: Ramsay Jones
Adding my SOB isn't really appropriate here - I only made a very
very minor contribution. At _most_ you might consider 'Helped-by:'
ly on the renaming.
Err, except for the commit message! :-D
Both the commit message subject and the commit message body
refer to _move_bits() rather than _mode_bits() etc.
(So, three instances of s/move/mode/).
ATB,
Ramsay Jones
two reflogs have the same tip commit, we only map back
> to one of them.
>
> Instead, we should show each reflog individually, in
> the order the user gave us on the command line.
>
> 2. If the tip of the reflog and the ref tip disagree on
^^
It seems hard to get off the second point! ;-)
ATB,
Ramsay Jones
x27;signature' in the commit message,
including the subject, should be 'sign-off' (or Signed-off-by)
instead. Yes?
(when I hear 'signature', I think GPG signature).
ATB,
Ramsay Jones
Signed-off-by: Ramsay Jones
---
Hi Jeff,
When you re-roll your 'jk/reflog-walk' branch, could you please squash
this into the relevant patch (commit beafb2c629, "reflog-walk: stop using
fake parents", 05-07-2017).
Thanks!
ATB,
Ramsay Jones
reflog-walk.c | 2 +-
1 file
sense. ;-) The missing information being that 'another'
was the name of the string variable that we were potentially
'running over the end of'.
ATB,
Ramsay Jones
>
> Signed-off-by: Rene Scharfe
> ---
> apply.c | 3 +--
> 1 file changed, 1 insertion(+), 2
it commit" without any arguments. In that case manually
> add a new line after the first line to ensure it's consistent
> with the output of "-s" option.
>
Again, s/signature/sign-off/g, or similar (including subject line).
ATB,
Ramsay Jones
> Signed-off-by: Kaartic
/sha1.c b/sha1dc/sha1.c
index 25eded139..3baddc636 100644
--- a/sha1dc/sha1.c
+++ b/sha1dc/sha1.c
@@ -118,6 +118,10 @@
#define SHA1DC_ALLOW_UNALIGNED_ACCESS
#endif /*UNALIGNMENT DETECTION*/
+#if defined(SHA1DC_ALLOW_UNALIGNED_ACCESS) &&
defined(SHA1DC_FORCE_ALIGNED_ACCESS)
+#undef SHA1DC_ALLOW_UNALIGNED_ACCESS
+#endif
+
#define rotate_right(x,n) (((x)>>(n))|((x)<<(32-(n
#define rotate_left(x,n) (((x)<<(n))|((x)>>(32-(n
Hmm, hopefully that is not whitespace damaged.
ATB,
Ramsay Jones
0) << 24) | \
> + ((uint32_t)*((unsigned char *)(p) + 1) << 16) | \
> + ((uint32_t)*((unsigned char *)(p) + 2) << 8) | \
> + ((uint32_t)*((unsigned char *)(p) + 3) << 0) )
> #define put_be32(p, v) do { \
> unsigned int __v = (v); \
> *((unsigned char *)(p) + 0) = __v >> 24; \
>
Heh, I have a patch that is pretty much identical. I suspect
you can guess why. ;-)
ATB,
Ramsay Jones
like:
- if (!prefix)
+ if (!prefix || !istate->cache || istate->cache_nr == 0)
... which is probably a bit 'belt-n-braces'. ;-)
ATB,
Ramsay Jones
+ if (postimage->line && postimage->nr)
+ memcpy(img->line + applied_pos,
+ postimage->line,
+ postimage->nr * sizeof(*img->line));
... which I think I prefer (slightly).
ATB,
Ramsay Jones
> if (!state->allow_overlap)
> for (i = 0; i < postimage->nr; i++)
> img->line[applied_pos + i].flag |= LINE_PATCHED;
>
Signed-off-by: Ramsay Jones
---
Hi Phillip,
If you need to re-roll your 'pw/sequencer-in-process-commit' branch, could
you please squash this into the relevant patch (commit da96adcf5a,
"sequencer: run 'prepare-commit-msg' hook", 2018-01-19).
Thanks.
ATB,
Ramsay
the commit message to a
> different file and running the hook. Using a different file means that
> if the commit is cancelled the original message file is
> unchanged. Also move the checks for an empty commit so the order
> matches 'git commit'.
>
> Reported-by: Dm
en extract it elsewhere" is truly necessary.
> IOW, why isn't it sufficient to do this instead, for example?
>
> umask 022 && cp -r po/build/locale/. '$(DESTDIR_SQ)$(localedir_SQ)'
Given the above, I suspect that (for some unknown reason), a verbose
'listing' of the locale files is required ... :-D
ATB,
Ramsay Jones
OPTION_INTEGER, 'n', NULL, &filter.lines, N_("n"),
> @@ -386,6 +391,7 @@ int cmd_tag(int argc, const char **argv, const char
> *prefix)
> OPT_CALLBACK('m', "message", &msg, N_("message"),
>N_("tag message"), parse_msg_arg),
> OPT_FILENAME('F', "file", &msgfile, N_("read message from
> file")),
> + OPT_BOOL('e', "edit", &edit_flag, N_("force edit of commit")),
s/commit/tag message/ ?
ATB,
Ramsay Jones
r, I can rebuild these patches on top of 'next' and re-submit. Just
let me know.
Note that I replaced an 'test_i18ngrep -E' with 'grep -E' rather than egrep.
(the grep man page claims that egrep, fgrep and rgrep are deprecated, but I
think that has been the case for as l
content
being compared is not subject to i18n anyway.
Signed-off-by: Ramsay Jones
---
t/t4151-am-abort.sh | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/t/t4151-am-abort.sh b/t/t4151-am-abort.sh
index 9473c2779..16432781d 100755
--- a/t/t4151-am-abort.sh
+++ b/t/t4151-am
ng up unexpectedly' warning message. Use a regular 'grep -E' to
replace the call to test_i18ngrep in the filter pipeline.
Also, remove a useless invocation of 'sort' as the final element of the
pipeline.
Signed-off-by: Ramsay Jones
---
t/t5536-fetch-conflicts.sh | 2 +-
1 f
These patches are based on v2.16, but a test merge to master, next and
pu are all clean.
Ramsay Jones (2):
config.mak.uname: remove SPARSE_FLAGS setting for cygwin
Makefile: suppress a sparse warning for pack-revindex.c
Makefile | 2 ++
config.mak.uname | 1 -
2 files changed, 2
32 header files).
In addition, the '-Wno-one-bit-signed-bitfield' option can be removed,
since the warning suppressed by that option was only provoked by a WIN32
header file.
Signed-off-by: Ramsay Jones
---
config.mak.uname | 1 -
1 file changed, 1 deletion(-)
diff --git a/config.mak.
tual limit used (-fmemcpy-max-count=COUNT), rather than a hard-coded
limit of 10.
In order to suppress the warning, add a target for pack-revindex.sp that
adds the '-Wno-memcpy-max-count' option to the SPARSE_FLAGS variable.
Signed-off-by: Ramsay Jones
---
Makefile | 2 ++
1 file c
On 12/02/18 20:18, Junio C Hamano wrote:
> Ramsay Jones writes:
>
>> Attempting to grep the output of test_i18ngrep will not work under a
>> poison build, since the output is (almost) guaranteed not to have the
>> string you are looking for. In this case, the outpu
-
... and now this test passes on cygwin (and the SANITIZE build on Linux).
Of course, this is not a real fix, since this has probably only changed
the stack-overflow into an un-diagnosed heap-overflow bug! ;-)
However, the above should provide enough info for someone more familiar
with the code to implement a correct fix.
[BTW, the symbol that should be marked static is: cat_file_info, in file
ref-filter.c, line 103.]
ATB,
Ramsay Jones
On 18/02/18 22:55, Ramsay Jones wrote:
>
>
> On 16/02/18 14:55, Adam Dinwoodie wrote:
>> On 12 February 2018 at 08:08, Olga Telezhnaya wrote:
>>> Add some tests for new formatting atoms from ref-filter.
>>> Some of new atoms are supported automatically,
>>
s required. Thanks!]
[1]
https://public-inbox.org/git/%3c20180213100437.15685-1-szeder@gmail.com%3E/
Ramsay Jones (2):
t4151: consolidate multiple calls to test_i18ngrep
t5536: simplify checking of messages output to stderr
t/t4151-am-abort.sh| 5 ++---
t/t5536-fetch-conflic
content
being compared is not subject to i18n anyway.
Signed-off-by: Ramsay Jones
---
t/t4151-am-abort.sh | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/t/t4151-am-abort.sh b/t/t4151-am-abort.sh
index 9473c2779..16432781d 100755
--- a/t/t4151-am-abort.sh
+++ b/t/t4151-am
ctive invocation of sort at the end of a grep pipeline.
Instead of fixing these minor problems in verify_stderr(), we take
the simpler approach of directly searching the error file, using
test_i18ngrep, for the specific message(s) we expect. (The only
minor downside is that we would not notice a
Signed-off-by: Ramsay Jones
---
Hi Derrick,
If you need to re-roll your 'ds/commit-graph' branch, could you
please squash this into the relevant patches (corresponding to
commits 0fd2d95ee6 ["commit-graph: implement --set-latest"],
a33b9b79ff ["commit-graph: impleme
the cover letter, I wasn't too sure that
I had passed that patch along correctly. ;-)
> so I'll use that version. We still want sign-off from Szeder,
> though.
I would be happy with either version, or maybe Szeder would like
to tweak the commit message. In any event, it would be good to
get sign-off from Szeder.
Thanks!
ATB,
Ramsay Jones
On 28/02/18 00:42, SZEDER Gábor wrote:
> On Wed, Feb 28, 2018 at 12:47 AM, Ramsay Jones
> wrote:
>>
>>
>> On 27/02/18 22:05, Junio C Hamano wrote:
>>> Junio C Hamano writes:
>>>
>>>> OK, somehow I had the version from Ramsay on a topic
, it's a while since I looked at that code, but I don't think
you have a commit with two trees - the second 'tree ' line
is just part of the commit message, isn't it?
ATB,
Ramsay Jones
quite noisy with regard to sparse
and static-check.pl at the moment).
These patches were developed on top of 'next', however, I also tested
them on top of commit fcfba37337 directly. (Note, this is branch
'ps/contains-id-error-message' merged at commit 9623d6817b).
Ramsay Jo
, mark that function as static.
Signed-off-by: Ramsay Jones
---
ref-filter.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ref-filter.c b/ref-filter.c
index f375e7670..69bf7b587 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -2000,7 +2000,7 @@ static void do_merge_f
Commit fcfba37337 ('ref-filter: make "--contains " less chatty if
is invalid', 2018-02-23), removed the last use of the callback
function parse_opt_commits(). Remove this function declaration and
definition, since it is now dead code.
Signed-off-by: Ramsay Jones
---
par
On 02/03/18 03:59, Jonathan Nieder wrote:
> Hi,
>
> Ramsay Jones wrote:
>
>> Commit fcfba37337 ('ref-filter: make "--contains " less chatty if
>> is invalid', 2018-02-23) added the add_str_to_commit_list()
>> function, which causes sparse to
On 02/03/18 17:19, Junio C Hamano wrote:
> Ramsay Jones writes:
>
>> Junio, do you want me to re-roll, or would you mind tweaking the
>> commit message while queueing?
>
> Perfect timing ;-) I was about to get to these two patches. Here
> is what is queued.
d submodule_reset_index(const char *path)
I was just about to send a patch against the previous series
(in pu branch last night), but since you have sent another
version ...
In the last series this was called 'submodule_clean_index()'
and, since it is a file-local symbol, should be marked with
static. I haven't applied these patches to check, but the
interdiff in the cover letter leads me to believe that this
will also apply to the renamed function.
[The patch subject was also slightly different.]
ATB,
Ramsay Jones
const char * const checkout_usage[] = {
> N_("git checkout [] "),
> N_("git checkout [] [] -- ..."),
> NULL,
> };
>
> +int option_parse_recurse_submodules(const struct option *opt,
> + const char *arg, int unset)
Again, this function should be marked static.
[I also noted _two_ other local functions with the same name
in builtin/fetch.c and builtin/push.c]
ATB,
Ramsay Jones
path = ~/foo ; expand "foo" in your `$HOME` directory
>
> + ; include if $GIT_DIR is /path/to/foo/.git
> + [include-if "gitdir:/path/to/foo/.git"]
s/include-if/includeIf/
> + path = /path/to/foo.inc
> +
> + ; include for all repositories inside /path/to/group
> + [include-if "gitdir:/path/to/group/"]
ditto
> + path = /path/to/foo.inc
> +
> + ; include for all repositories inside $HOME/to/group
> + [include-if "gitdir:~/to/group/"]
ditto
ATB,
Ramsay Jones
I promised the first of these patches on 18th June last year! ;-)
(In response to Jeff's 'jk/gpg-interface-cleanup' branch).
Ramsay Jones (2):
wrapper.c: remove unused git_mkstemp() function
wrapper.c: remove unused gitmkstemps() function
Makefile | 5
The last caller of git_mkstemp() was removed in commit 6fec0a89
("verify_signed_buffer: use tempfile object", 16-06-2016). Since
the introduction of the 'tempfile' APIs, along with git_mkstemp_mode,
it is unlikely that new callers will materialize. Remove the dead
code.
S
itmkstemps()
function. Remove the dead code, along with the defunct build machinery.
Signed-off-by: Ramsay Jones
---
Makefile | 5 -
config.mak.uname | 17 -
configure.ac | 6 --
git-compat-util.h | 5 -
wrapper.c | 7 ---
5 files changed, 40
~~~
> +
> +You can include a config file from another conditionally by setting a
> +`includeIf..path` variable to the name of the file to be
> +included. The variable's value is treated the same way as
> +`include.path`. `includeIf.path` supports multiple key
^^
s/path/.path/
ATB,
Ramsay Jones
do
this. (They used different Ubuntu LTS releases).
[Mint 18.1 'prove --version' says: TAP::Harness v3.35 and Perl v5.22.1]
ATB,
Ramsay Jones
; const char *real_path(const char *path);
> diff --git a/config.c b/config.c
> index c6b874a7bf..c21c0ce433 100644
> --- a/config.c
> +++ b/config.c
> @@ -13,6 +13,7 @@
> #include "hashmap.h"
> #include "string-list.h"
> #include "utf8.h"
> +#include "dir.h"
Something is a bit odd here - nothing in this commit (that I can
see, anyway) would require the addition of this include. Also, this
include is already there in the 'pu' branch, brought in by your
conditional include changes. So, ...
ATB,
Ramsay Jones
round the "!=", but maybe
> that's just me.
It's probably just me (too), but I think it would read better
without having '!=true' in the message at all. ;-)
ATB,
Ramsay Jones
On 05/03/17 17:38, Lars Schneider wrote:
>> On 02 Mar 2017, at 16:17, Ramsay Jones wrote:
>> On 02/03/17 11:24, Johannes Schindelin wrote:
>>> On Thu, 2 Mar 2017, Lars Schneider wrote:
>>>
>> [snip]
>>>> One thing that still bugs me: In the Linu
Signed-off-by: Ramsay Jones
---
Hi Stefan,
If you need to re-roll your 'sb/checkout-recurse-submodules' branch,
could you please squash this into the relevant patch (commit 97aadb19f1,
"builtin/read-tree: add --recurse-submodules switch", 06-03-2017).
ATB,
Ramsay Jones
remember if it's allowed in C89/C90 (I think it is). I only
have immediate access to the C99 and C11 standards (and I can't be
bothered to search), so I can't say for sure.
ATB,
Ramsay Jones
On 14/03/17 23:46, brian m. carlson wrote:
> On Tue, Mar 14, 2017 at 11:42:20PM +0000, Ramsay Jones wrote:
>>
>>
>> On 14/03/17 20:44, Junio C Hamano wrote:
>>> OK, then I'll queue this. The selection still goes to BASIC_CFLAGS
>>> so the dependen
On 15/03/17 15:57, Junio C Hamano wrote:
> Ramsay Jones writes:
>
>> On 14/03/17 23:46, brian m. carlson wrote:
>>>>>
>>>>> Since the SHA1_HEADER include is not defined in such a case, developers
>>>>> see spurious errors when using th
me))
> - die(_("cannot store index file"));
> - } else
> - chmod(final_index_name, 0444);
Is from_stdin always true if final_index_name == curr_index_name?
Was the original asymmetry deliberate?
> + finalize_file(final_pack_name, curr_pack_name, sha1, "pack");
> + finalize_file(final_index_name, curr_index_name, sha1, "idx");
>
> if (!from_stdin) {
> printf("%s\n", sha1_to_hex(sha1));
>
ATB,
Ramsay Jones
Signed-off-by: Ramsay Jones
---
Hi Brandon,
If you need to re-roll your 'bw/submodule-is-active' branch, could
you please squash this into the relevant patch (commit 20d59ab335,
"submodule: decouple url and submodule existence", 13-03-2017).
Thanks!
ATB,
Ramsay Jones
s
501 - 600 of 1047 matches
Mail list logo
