Re: [RFC] Rebasing merges: a jorney to the ultimate solution(RoadClear)

Hi Johannes, Johannes Schindelin writes: > Hi Sergey, > [...] >> >> Reusing existing concepts where possible doesn`t have this problem. >> > >> > Existing concepts are great. As long as they fit the requirements of >> > the new scenarios. In this case, `pick` does

Re: [RFC] Rebasing merges: a jorney to the ultimate solution(RoadClear)

Hi Johannes, Johannes Schindelin writes: > Hi Sergey, [...] > But I'll stop here. Even my account how there are conceptual differences > between the changes in merge vs non-merge commits (the non-merge commit > *introduces* changes, the merge commit *reconciles

[PATCH] l10n: de.po: translate 132 new messages

Translate 132 new message came from git.pot update in abc8de64d (l10n: git.pot: v2.17.0 round 1 (132 new, 44 removed)). Signed-off-by: Ralf Thielow --- po/de.po | 455 +-- 1 file changed, 209 insertions(+), 246

Re: [PATCH v2] test_must_be_empty: simplify file existence check

Junio C Hamano writes: >> test_must_be_empty () { >> -if ! test -f "$1" >> -then >> -echo "'$1' is missing" >> -return 1 >> -elif test -s "$1" >> +test_path_is_file "$1" && >> +if test -s "$1" >> then >> echo "'$1'

Re: [PATCH] submodule deinit: handle non existing pathspecs gracefully

Stefan Beller writes: > This fixes a regression introduced in 22e612731b5 (submodule: port s/22e/2e/, I think. > submodule subcommand 'deinit' from shell to C, 2018-01-15), when handling > pathspecs that do not exist gracefully. This restores the historic behavior > of

Re: [RFC] Rebasing merges: a jorney to the ultimate solution (Road Clear)

Hi Johannes, Johannes Schindelin writes: > Hi Sergey, > > On Tue, 27 Mar 2018, Sergey Organov wrote: > >> Johannes Schindelin writes: >> >> > On Mon, 12 Mar 2018, Sergey Organov wrote: >> > >> >> Johannes Schindelin

Re: [PATCH] submodule deinit: handle non existing pathspecs gracefully

On 28 March 2018 at 01:28, Stefan Beller wrote: > This fixes a regression introduced in 22e612731b5 (submodule: port s/22/2/ > submodule subcommand 'deinit' from shell to C, 2018-01-15), when handling > pathspecs that do not exist gracefully. This restores the historic

Re: [PATCH v2 3/6] stash: convert apply to builtin

On Mon, Mar 26, 2018 at 12:05 AM, Christian Couder wrote: > On Mon, Mar 26, 2018 at 3:14 AM, Joel Teichroeb wrote: >> Signed-off-by: Joel Teichroeb > > The commit message in this patch and the following ones could be a bit >

Re: [PATCH 1/4] stash: convert apply to builtin

On Sun, Mar 25, 2018 at 9:43 AM, Thomas Gummerer wrote: > On 03/24, Joel Teichroeb wrote: >> --- > > Missing sign-off? I saw it's missing in the other patches as well. > Thanks! I always forget to add a sign-off. >> [...] >> + >> + if (info->has_u) { >> +

Re: [PATCH 2/2] send-email: supply a --send-delay=1 by default

Ævar Arnfjörð Bjarmason wrote: > Good point. I also see that (via git log --author=Ævar --grep='^\[PATCH > ') that this series itself arrived out of order (0 -> 2 -> 1), but I > don't know to what extent public-inbox itself might be batching things. public-inbox doesn't batch,

Re: [PATCH v4] json_writer: new routines to create data in JSON format

Ramsay Jones writes: > BTW, I forgot to mention that you had some whitespace problems > with this patch, viz: > > $ git log --oneline -1 --check master-json > ab643d838 (master-json) json_writer: new routines to create data in JSON > format >

Re: [PATCH 5/5] submodule: fixup nested submodules after moving the submodule

On Tue, Mar 27, 2018 at 5:07 PM, Jonathan Tan wrote: > s/submoduled/submodules > s/superprojects/superproject's/ > s/and // > > s/force/forcing/ All wording fixed. >> + sub_path = sub_worktree + strlen(super_worktree) + 1; >> + >> + if (repo_submodule_init(,

Re: [PATCH] grep: remove "repo" arg from non-supporting funcs

On Tue, Mar 27, 2018 at 5:24 PM, Jonathan Tan wrote: > On Tue, 27 Mar 2018 16:20:25 -0700 > Stefan Beller wrote: > >> On Tue, Mar 27, 2018 at 3:58 PM, Jonathan Tan >> wrote: >> > As part of commit f9ee2fcdfa ("grep:

Re: [PATCH] grep: remove "repo" arg from non-supporting funcs

On Tue, 27 Mar 2018 16:20:25 -0700 Stefan Beller wrote: > On Tue, Mar 27, 2018 at 3:58 PM, Jonathan Tan > wrote: > > As part of commit f9ee2fcdfa ("grep: recurse in-process using 'struct > > repository'", 2017-08-02), many functions in

[RFC PATCH 0/1] bdl-lib.sh: add bash debug logger

Add bdl-lib.sh which provides functions to assit in debugging git shell scripts and tests. The primary public interace are two routines, bdl and bdl_nsl which print strings. The difference between the two is that bdl outputs location of the statement optionally followed by a string to print. For

[RFC PATCH 1/1] bdl-lib.sh: add bash debug logger

Add bdl-lib to assist the programmer in debugging scripts and tests. --- bdl-exmpl.sh | 46 bdl-lib.sh | 215 + t/t0014-bdl-lib.sh | 115 t/test-lib.sh | 4 + 4 files changed, 380

Re: [PATCH v2] test_must_be_empty: simplify file existence check

SZEDER Gábor writes: > Commit 11395a3b4b (test_must_be_empty: make sure the file exists, not > just empty, 2018-02-27) basically duplicated the 'test_path_is_file' > helper function in 'test_must_be_empty'. > > Just call 'test_path_is_file' to avoid this code duplication. >

Re: [PATCH 5/5] submodule: fixup nested submodules after moving the submodule

On Tue, 27 Mar 2018 14:39:18 -0700 Stefan Beller wrote: > connect_work_tree_and_git_dir is used to connect a submodule worktree with > its git directory and vice versa after events that require a reconnection > such as moving around the working tree. As submodules can have

Re: [PATCH 3/5] submodule-config: add repository argument to submodule_from_{name, path}

On Tue, Mar 27, 2018 at 4:04 PM, Jonathan Tan wrote: > On Tue, 27 Mar 2018 14:39:16 -0700 > Stefan Beller wrote: > >> -extern const struct submodule *submodule_from_name( >> +extern const struct submodule *submodule_from_name(struct repository *r, >>

Re: Null pointer dereference in git-submodule

On Sun, Mar 25, 2018 at 3:58 AM René Scharfe wrote: > Am 25.03.2018 um 11:50 schrieb Jeremy Feusi: > > > > Hmm... That's weird. I can reproduce it on 3 independant systems with > > versions 2.16.2 up, although it does not work with version 2.11.0. > > Anyway, I figured out how to

[PATCH] submodule deinit: handle non existing pathspecs gracefully

This fixes a regression introduced in 22e612731b5 (submodule: port submodule subcommand 'deinit' from shell to C, 2018-01-15), when handling pathspecs that do not exist gracefully. This restores the historic behavior of reporting the pathspec as unknown and returning instead of reporting a bug.

Re: [PATCH 5/5] submodule: fixup nested submodules after moving the submodule

On 03/27, Stefan Beller wrote: > connect_work_tree_and_git_dir is used to connect a submodule worktree with > its git directory and vice versa after events that require a reconnection > such as moving around the working tree. As submodules can have nested > submoduled themselves, we'd also want to

Re: [PATCH] grep: remove "repo" arg from non-supporting funcs

On Tue, Mar 27, 2018 at 3:58 PM, Jonathan Tan wrote: > As part of commit f9ee2fcdfa ("grep: recurse in-process using 'struct > repository'", 2017-08-02), many functions in builtin/grep.c were > converted to also take "struct repository *" arguments. Among them were >

Re: [PATCH 4/5] submodule-config: remove submodule_from_cache

On Tue, 27 Mar 2018 14:39:17 -0700 Stefan Beller wrote: > This continues the story of bf12fcdf5e (submodule-config: store > the_submodule_cache in the_repository, 2017-06-22). > > The previous patch taught submodule_from_path to take a repository into > account, such that

[no subject]

发自我的手机

[PATCH] grep: remove "repo" arg from non-supporting funcs

As part of commit f9ee2fcdfa ("grep: recurse in-process using 'struct repository'", 2017-08-02), many functions in builtin/grep.c were converted to also take "struct repository *" arguments. Among them were grep_object() and grep_objects(). However, at least grep_objects() was converted

Re: git submodule deinit resulting in BUG: builtin/submodule--helper.c:1045: module_list_compute should not choke on empty pathspec

On Tue, Mar 27, 2018 at 12:55 PM Peter Oberndorfer wrote: > Hi, > i tried to run "git submodule deinit xxx" > on a submodule that was recently removed from the Rust project. > But git responded with a BUG/Core dump (and also did not remove the submodule directory from the

Re: [PATCH] Support long format for log-based submodule diff

> >> $ git diff --submodule=log --submodule-log-detail=(long|short) > >> > >> I'm not sure what makes sense here. I welcome thoughts/discussion and > >> will provide follow-up patches. > > > > The case of merges is usually configured with --[no-]merges, or > > --min-parents=. > But that is a knob

Re: [PATCH v5] json_writer: new routines to create data in JSON format

On Tue, Mar 27, 2018 at 2:02 PM wrote: > > From: Jeff Hostetler > > Add a series of jw_ routines and "struct json_writer" structure to compose > JSON data. The resulting string data can then be output by commands wanting > to support a JSON output

Re: Bug: duplicate sections in .git/config after remote removal

On Tue, Mar 27 2018, Jason Frey wrote: > While the impact of this bug is minimal, and git itself is not > affected, it can affect external tools that want to read the > .git/config file, expecting unique section names. > > To reproduce: > > Given the following example .git/config file (I am

Re: Bug: duplicate sections in .git/config after remote removal

On Tue, Mar 27, 2018 at 1:41 PM Jason Frey wrote: > at which point you can see the duplicate sections (even though one is > empty). Also note that if you do the steps again, you will be left > with 3 sections, 2 of which are empty. This process can be repeated > over and

[PATCH 1/5] submodule.h: drop declaration of connect_work_tree_and_git_dir

The function connect_work_tree_and_git_dir is declared in both submodule.h and dir.h, such that one of them is redundant. As the function is implemented in dir.c, drop the declaration from submodule.h Signed-off-by: Stefan Beller --- submodule.h | 1 - 1 file changed, 1

[PATCH 4/5] submodule-config: remove submodule_from_cache

This continues the story of bf12fcdf5e (submodule-config: store the_submodule_cache in the_repository, 2017-06-22). The previous patch taught submodule_from_path to take a repository into account, such that submodule_from_{path, cache} are the same now. Remove submodule_from_cache, migrating all

[PATCH 5/5] submodule: fixup nested submodules after moving the submodule

connect_work_tree_and_git_dir is used to connect a submodule worktree with its git directory and vice versa after events that require a reconnection such as moving around the working tree. As submodules can have nested submoduled themselves, we'd also want to fix the nested submodules when asked

[PATCH 2/5] submodule-config: allow submodule_free to handle arbitrary repositories

Signed-off-by: Stefan Beller --- Documentation/technical/api-submodule-config.txt | 2 +- builtin/grep.c | 2 +- submodule-config.c | 6 +++--- submodule-config.h | 2 +-

[PATCH 3/5] submodule-config: add repository argument to submodule_from_{name, path}

This enables submodule_from_{name, path} to handle arbitrary repositories. All callers just pass in the_repository, a later patch will pass in other repos. Signed-off-by: Stefan Beller --- builtin/submodule--helper.c | 14 +++--- submodule-config.c

[PATCH 0/5] Moving submodules with nested submodules

This fixes the bug reported in [1] ("Bug: moving submodules that have submodules inside them causes a fatal error in git status") [1] https://public-inbox.org/git/20180306192017.ga5...@riseup.net/ Thanks, Stefan Stefan Beller (5): submodule.h: drop declaration of connect_work_tree_and_git_dir

[PATCH v5] json_writer: new routines to create data in JSON format

From: Jeff Hostetler Add a series of jw_ routines and "struct json_writer" structure to compose JSON data. The resulting string data can then be output by commands wanting to support a JSON output format. The json-writer routines can be used to generate structured data

[PATCH v5] routines to generate JSON data

From: Jeff Hostetler This is version 5 of my JSON data format routines. This version address the uint64_t vs intmax_t formatting issues that were discussed on the mailing list. I removed the jw_*_int() and jw_*_uint64() routines and replaced them with a single

Bug: duplicate sections in .git/config after remote removal

While the impact of this bug is minimal, and git itself is not affected, it can affect external tools that want to read the .git/config file, expecting unique section names. To reproduce: Given the following example .git/config file (I am leaving out the [core] section for brevity): [remote

git submodule deinit resulting in BUG: builtin/submodule--helper.c:1045: module_list_compute should not choke on empty pathspec

Hi, i tried to run "git submodule deinit xxx" on a submodule that was recently removed from the Rust project. But git responded with a BUG/Core dump (and also did not remove the submodule directory from the checkout). ~/src/rust/rust$ git submodule deinit src/rt/hoedown/ error: pathspec

Re: [PATCH] branch: implement shortcut to delete last branch

On Tue, Mar 27 2018, Ævar Arnfjörð Bjarmason wrote: > [...]With that, some comments on the change below: Also, didn't mean to gang up on you. I only saw Jonathan's E-Mail after I sent mine, and it covered some of the same stuff.

Re: [PATCH] branch: implement shortcut to delete last branch

On Tue, Mar 27 2018, Aaron Greenberg wrote: > This patch gives git-branch the ability to delete the previous > checked-out branch using the "-" shortcut. This shortcut already exists > for git-checkout, git-merge, and git-revert. A common workflow is > > 1. Do some work on a local topic-branch

Re: [PATCH] branch: implement shortcut to delete last branch

Hi, Aaron Greenberg wrote: > This patch gives git-branch the ability to delete the previous > checked-out branch using the "-" shortcut. This shortcut already exists > for git-checkout, git-merge, and git-revert. A common workflow is > > 1. Do some work on a local topic-branch and push it to a

[PATCH] branch: implement shortcut to delete last branch

This patch gives git-branch the ability to delete the previous checked-out branch using the "-" shortcut. This shortcut already exists for git-checkout, git-merge, and git-revert. A common workflow is 1. Do some work on a local topic-branch and push it to a remote. 2. 'remote/topic-branch' gets

[PATCH] branch: implement shortcut to delete last branch

With the approvals listed in [*1*] and in accordance with the guidelines set out in Documentation/SubmittingPatches, I am submitting this patch to be applied upstream. After work on this patch is done, I'll look into picking up where the prior work done in [*2*] left off. Is there anything else

Re: [PATCH 0/2] Add Windows support to the new RUNTIME_PREFIX design

Hi Dan, On Tue, 27 Mar 2018, Daniel Jacques wrote: > On Tue, Mar 27, 2018 at 11:54 AM Johannes Schindelin < > johannes.schinde...@gmx.de> wrote: > > > I guess we should add a test where we copy the `git` executable into a > > subdirectory with the name "git" and call `git/git --exec-path` and >

Re: [PATCH v4] json_writer: new routines to create data in JSON format

On 27/03/18 18:14, Jeff Hostetler wrote: > > > On 3/27/2018 11:45 AM, Ramsay Jones wrote: >> >> >> On 27/03/18 04:18, Ramsay Jones wrote: >>> On 26/03/18 15:31, g...@jeffhostetler.com wrote: From: Jeff Hostetler >>> [snip] >>> >>> Thanks, this version fixes

RE: [PATCH v4] json_writer: new routines to create data in JSON format

On March 27, 2018 1:43 PM, Wink Saville wrote: > > the leading spaces are required in this case. > > the pretty json output contains 8 spaces for that sub-structure not a tab. > > is there a preferred way to denote this in the test script? > > > > Jeff > > I've used "git diff --check" which I got

Re: [PATCH v4] json_writer: new routines to create data in JSON format

> the leading spaces are required in this case. > the pretty json output contains 8 spaces for that sub-structure not a tab. > is there a preferred way to denote this in the test script? > > Jeff I've used "git diff --check" which I got from Documentation/SubmittingPatches. -- Wink

[GSoC][PATCH v5] test: avoid pipes in git related commands for test

Thank you Eric, I made changes according to your review. Cheers, Pratik -- >8 -- Avoid using pipes downstream of Git commands since the exit codes of commands upstream of pipes get swallowed, thus potentially hiding failure of those commands. Instead, capture Git command output to a file and

Re: git complains packed-refs is not a directory when used with GIT_DIR and GIT_WORK_TREE envvars.

On Tue, Mar 27, 2018 at 07:09:36PM +0200, Duy Nguyen wrote: > I would rather have something like ref_store_reinit() in the same > spirit as the second call of set_git_dir() in setup_work_tree. It is > hacky, but it works and keeps changes to minimal (so that it could be > easily replaced later).

Re: [PATCH v4] json_writer: new routines to create data in JSON format

On 3/27/2018 11:45 AM, Ramsay Jones wrote: On 27/03/18 04:18, Ramsay Jones wrote: On 26/03/18 15:31, g...@jeffhostetler.com wrote: From: Jeff Hostetler [snip] Thanks, this version fixes all issues I had (with the compilation and sparse warnings). [Was using

Re: git complains packed-refs is not a directory when used with GIT_DIR and GIT_WORK_TREE envvars.

On Tue, Mar 27, 2018 at 6:47 PM, Jeff King wrote: >> So I would not mind papering over it right now (with an understanding >> that absolute path pays some more overhead in path walking, which was >> th reason we tried to avoid it in setup code). A slightly better patch >> is

Re: [PATCH v6 07/35] connect: convert get_remote_heads to use struct packet_reader

On Tue, Mar 27, 2018 at 6:25 PM, Duy Nguyen wrote: > On Tue, Mar 27, 2018 at 6:11 PM, Jeff King wrote: >> On Tue, Mar 27, 2018 at 05:27:14PM +0200, Duy Nguyen wrote: >> >>> On Thu, Mar 15, 2018 at 10:31:14AM -0700, Brandon Williams wrote: >>> > In order to allow

Re: [PATCH v6 07/35] connect: convert get_remote_heads to use struct packet_reader

On 03/27, Duy Nguyen wrote: > On Tue, Mar 27, 2018 at 6:25 PM, Duy Nguyen wrote: > > On Tue, Mar 27, 2018 at 6:11 PM, Jeff King wrote: > >> On Tue, Mar 27, 2018 at 05:27:14PM +0200, Duy Nguyen wrote: > >> > >>> On Thu, Mar 15, 2018 at 10:31:14AM -0700, Brandon

Re: [PATCH v3] git{,-blame}.el: remove old bitrotting Emacs code

Hi, Ævar Arnfjörð Bjarmason wrote[1]: > The git-blame.el mode has been superseded by Emacs's own > vc-annotate (invoked by C-x v g). Users of the git.el mode are now > much better off using either Magit or the Git backend for Emacs's own > VC mode. > > These modes were added over 10 years ago

Re: [PATCH v7 00/13] nd/pack-objects-pack-struct updates

On Mon, Mar 26, 2018 at 07:04:54PM +0200, Duy Nguyen wrote: > >> +unsigned long oe_get_size_slow(struct packing_data *pack, > >> +const struct object_entry *e) > [...] > > But short of that, it's probably worth a comment explaining what's going > > on. > > I thought

Re: [PATCH v2] Makefile: detect compiler and enable more warnings in DEVELOPER=1

Duy Nguyen writes: On Tue, Mar 27, 2018 at 12:02 AM, Junio C Hamano wrote: >> >> - connect.c -Werror=implicit-fallthough around die_initial_contact(). > > This I did not expect. But I just looked again and I had this option > explicitly turned off in

Re: git complains packed-refs is not a directory when used with GIT_DIR and GIT_WORK_TREE envvars.

On Tue, Mar 27, 2018 at 04:56:00PM +0200, Duy Nguyen wrote: > The way setup_work_tree() does it is just bad to me. When it calls > set_git_dir() again, the assumption is the new path is exactly the > same as the old one. The only difference is relative vs absolute. But > this is super hard to see

Re: [PATCH v3 3/3] Move reusable parts of memory pool into its own file

Jameson Miller writes: > This moves the reusable parts of the memory pool logic used by > fast-import.c into its own file for use by other components. > > Signed-off-by: Jameson Miller > --- > Makefile | 1 + > fast-import.c | 70 >

Re: [PATCH v6 07/35] connect: convert get_remote_heads to use struct packet_reader

On Tue, Mar 27, 2018 at 6:11 PM, Jeff King wrote: > On Tue, Mar 27, 2018 at 05:27:14PM +0200, Duy Nguyen wrote: > >> On Thu, Mar 15, 2018 at 10:31:14AM -0700, Brandon Williams wrote: >> > In order to allow for better control flow when protocol_v2 is introduced >> > +static enum

Re: [PATCH v3 2/5] stash: convert apply to builtin

On Tue, Mar 27, 2018 at 9:02 AM, Johannes Schindelin wrote: > Hi Joel, > > [...] >> + >> +static int do_apply_stash(const char *prefix, struct stash_info *info, int >> index) >> +{ >> + struct merge_options o; >> + struct object_id c_tree; >> + struct

Re: [PATCH v2 00/36] Combine t/helper binaries into a single one

Hi Junio, On Tue, 27 Mar 2018, Junio C Hamano wrote: > Johannes Schindelin writes: > > > This iteration, with the SQUASH??? I proposed (and that Junio will > > hopefully pick up soon), works well on Windows. > > Thanks; is that the "call it fn, as main is macro-ed

Re: [PATCH v6 07/35] connect: convert get_remote_heads to use struct packet_reader

On Tue, Mar 27, 2018 at 05:27:14PM +0200, Duy Nguyen wrote: > On Thu, Mar 15, 2018 at 10:31:14AM -0700, Brandon Williams wrote: > > In order to allow for better control flow when protocol_v2 is introduced > > +static enum protocol_version discover_version(struct packet_reader *reader) > > +{ > >

Re: [PATCH v3 2/3] fast-import: introduce mem_pool type

Jameson Miller writes: > Introduce the mem_pool type which encapsulates all the information > necessary to manage a pool of memory.This change moves the existing > variables in fast-import used to support the global memory pool to use > this structure. > > These changes

Re: [PATCH 0/2] Add Windows support to the new RUNTIME_PREFIX design

On Tue, Mar 27, 2018 at 11:54 AM Johannes Schindelin < johannes.schinde...@gmx.de> wrote: > Yes, I performed manual testing. Alright! Just manually tested your "git" scenario myself on the Linux build and all seems to be in order. > I guess we should add a test where we copy the `git`

Re: [PATCH v3 2/5] stash: convert apply to builtin

Hi Joel, On Mon, 26 Mar 2018, Joel Teichroeb wrote: > Add a bulitin helper for performing stash commands. Converting > all at once proved hard to review, so starting with just apply > let conversion get started without the other command being > finished. > > The helper is being implemented as a

Re: Windows build on Travis CI (was: Re: [PATCH v2 01/36] t/helper: add an empty test-tool program)

Hi Gábor, On Tue, 27 Mar 2018, SZEDER Gábor wrote: > On Tue, Mar 27, 2018 at 3:57 PM, Johannes Schindelin > wrote: > > > > On Tue, 27 Mar 2018, SZEDER Gábor wrote: > > > >> On Tue, Mar 27, 2018 at 12:14 AM, Johannes Schindelin > >> wrote:

Re: [PATCH 0/2] Add Windows support to the new RUNTIME_PREFIX design

Hi Dan, On Tue, 27 Mar 2018, Daniel Jacques wrote: > On Mon, Mar 26, 2018 at 5:31 PM Johannes Schindelin < > johannes.schinde...@gmx.de> wrote: > > > Even if the RUNTIME_PREFIX feature originates from Git for Windows, the > > current patch series is different enough in its design that it leaves

Re: [PATCH v4] json_writer: new routines to create data in JSON format

On 27/03/18 04:18, Ramsay Jones wrote: > On 26/03/18 15:31, g...@jeffhostetler.com wrote: >> From: Jeff Hostetler >> > [snip] > > Thanks, this version fixes all issues I had (with the compilation > and sparse warnings). > > [Was using UINT64_C(0x) a

Re: [PATCH v2 00/36] Combine t/helper binaries into a single one

Johannes Schindelin writes: > This iteration, with the SQUASH??? I proposed (and that Junio will > hopefully pick up soon), works well on Windows. Thanks; is that the "call it fn, as main is macro-ed away by us?" change?

Re: [PATCH v6 07/35] connect: convert get_remote_heads to use struct packet_reader

On Thu, Mar 15, 2018 at 10:31:14AM -0700, Brandon Williams wrote: > In order to allow for better control flow when protocol_v2 is introduced > +static enum protocol_version discover_version(struct packet_reader *reader) > +{ > + enum protocol_version version = protocol_unknown_version; > + > +

Re: [PATCH v3 2/5] stash: convert apply to builtin

Hi Joel, On Mon, 26 Mar 2018, Joel Teichroeb wrote: > Add a bulitin helper for performing stash commands. Converting > all at once proved hard to review, so starting with just apply > let conversion get started without the other command being > finished. > > The helper is being implemented as a

Re: [PATCH v2] Makefile: detect compiler and enable more warnings in DEVELOPER=1

On Tue, Mar 27, 2018 at 12:02 AM, Junio C Hamano wrote: > Nguyễn Thái Ngọc Duy writes: > >> The set of extra warnings we enable when DEVELOPER has to be >> conservative because we can't assume any compiler version the >> developer may use. Detect the

Windows build on Travis CI (was: Re: [PATCH v2 01/36] t/helper: add an empty test-tool program)

On Tue, Mar 27, 2018 at 3:57 PM, Johannes Schindelin wrote: > Hi Gábor, > > On Tue, 27 Mar 2018, SZEDER Gábor wrote: > >> On Tue, Mar 27, 2018 at 12:14 AM, Johannes Schindelin >> wrote: >> > However, it seems that something is off, as >> >

Re: git complains packed-refs is not a directory when used with GIT_DIR and GIT_WORK_TREE envvars.

On Tue, Mar 27, 2018 at 8:31 AM, Jeff King wrote: >... > > But that really feels like we're papering over the problem. It is papering over the problem in my opinion. setup_work_tree() is involved here and when it moves cwd around, it re-init git-dir (and all other paths). Before

Re: [PATCH v3 0/5] Convert some stash functionality to a builtin

Hi Joel, On Mon, 26 Mar 2018, Joel Teichroeb wrote: > I've been working on converting all of git stash to be a > builtin, however it's hard to get it all working at once with > limited time, so I've moved around half of it to a new > stash--helper builtin and called these functions from the

Re: [PATCH 00/10] Hash-independent tests (part 1)

Hi Junio, On Sun, 25 Mar 2018, Junio C Hamano wrote: > Eric Sunshine writes: > > > What's the plan for oddball cases such as 66ae9a57b8 (t3404: rebase > > -i: demonstrate short SHA-1 collision, 2013-08-23) which depend > > implicitly upon SHA-1 without actually

Re: [PATCH 0/2] Add Windows support to the new RUNTIME_PREFIX design

On Mon, Mar 26, 2018 at 5:31 PM Johannes Schindelin < johannes.schinde...@gmx.de> wrote: > Even if the RUNTIME_PREFIX feature originates from Git for Windows, the > current patch series is different enough in its design that it leaves the > Windows-specific RUNTIME_PREFIX handling in place: On

Re: [PATCH 00/10] Hash-independent tests (part 1)

Hi Brian, On Sun, 25 Mar 2018, brian m. carlson wrote: > This is a series to make our tests hash-independent. Many tests have > hard-coded SHA-1 values in them, and it would be valuable to express > these items in a hash-independent way for our hash transitions. > > The approach in this series

Re: [PATCH v2 00/36] Combine t/helper binaries into a single one

Hi Duy, On Sat, 24 Mar 2018, Nguyễn Thái Ngọc Duy wrote: > v2 fixes a couple of typos in commit messages and use the cmd__ prefix > for test commands instead of test_, which avoids a naming conflict > with the existing function test_lazy_init_name_hash > > [the previous v2 send out was aborted

Re: [PATCH v2 01/36] t/helper: add an empty test-tool program

Hi Gábor, On Tue, 27 Mar 2018, SZEDER Gábor wrote: > On Tue, Mar 27, 2018 at 12:14 AM, Johannes Schindelin > wrote: > > However, it seems that something is off, as > > ba5bec9589e9eefe2446044657963e25b7c8d88e is reported as fine on Windows: > >

Re: [RFC] Rebasing merges: a jorney to the ultimate solution(RoadClear)

Hi Sergey, On Tue, 27 Mar 2018, Sergey Organov wrote: > Johannes Schindelin writes: > > > On Tue, 13 Mar 2018, Igor Djordjevic wrote: > > > >> On 12/03/2018 11:46, Johannes Schindelin wrote: > >> > > >> > > Sometimes one just needs to read the manual, and I don`t

Re: [RFC] Rebasing merges: a jorney to the ultimate solution(RoadClear)

Hi Sergey, On Tue, 27 Mar 2018, Sergey Organov wrote: > Johannes Schindelin writes: > > > > On Tue, 13 Mar 2018, Igor Djordjevic wrote: > > > >> On 12/03/2018 13:56, Sergey Organov wrote: > >> > > >> > > > I agree with both of you that `pick ` is inflexible > >> > >

Re: [RFC] Rebasing merges: a jorney to the ultimate solution (Road Clear)

Hi Sergey, On Tue, 27 Mar 2018, Sergey Organov wrote: > Johannes Schindelin writes: > > > On Mon, 12 Mar 2018, Sergey Organov wrote: > > > >> Johannes Schindelin writes: > >> > > >> > On Wed, 7 Mar 2018, Sergey Organov wrote: > >> > > >>

Re: A bug in git merge

On Tue, Mar 27, 2018 at 12:53:52PM +0300, Orgad Shaneh wrote: > If I cherry-pick a commit that added a line, then merge another commit > which removes this line, the line remains in the file instead of being > removed. > > The following script demonstrates the bug. > > file should be equivalent

I NEED YOUR URGENT ASSISTANT

-- Hi friend I am a banker in ADB BANK. I want to transfer an abandoned sum of USD15.6Million to your Bank account. 40/percent will be your share. No risk involved but keeps it as secret. Contact me for more details. Please reply me through my alternative email id only (salif.musa...@gmail.com)

Re: Fwd: New Defects reported by Coverity Scan for git

On 3/26/2018 7:39 PM, Stefan Beller wrote: coverity scan failed for the last couple month (since Nov 20th) without me noticing, I plan on running it again nightly for the Git project. Anyway, here are issues that piled up (in origin/pu) since then. Stefan -- Forwarded message

Business-Vorschlag für Sie zu behandeln!

Ich bin Sgt.Monica Lin Brown, ursprünglich aus Lake Jackson Texas USA. Ich habe persönlich eine spezielle Recherche zum Internet-Adressbuch durchgeführt und bin auf Ihre Informationen gestoßen. Ich schreibe Ihnen gerade diese Mail von der US-Militärbasis Kabul Afghanistan. Ich habe einen

Business-Vorschlag für Sie zu behandeln!

Ich bin Sgt.Monica Lin Brown, ursprünglich aus Lake Jackson Texas USA. Ich habe persönlich eine spezielle Recherche zum Internet-Adressbuch durchgeführt und bin auf Ihre Informationen gestoßen. Ich schreibe Ihnen gerade diese Mail von der US-Militärbasis Kabul Afghanistan. Ich habe einen

Re: [PATCH v4] json_writer: new routines to create data in JSON format

On 3/26/2018 11:18 PM, Ramsay Jones wrote: On 26/03/18 15:31, g...@jeffhostetler.com wrote: From: Jeff Hostetler [snip] Thanks, this version fixes all issues I had (with the compilation and sparse warnings). [Was using UINT64_C(0x) a problem on

Re: [RFC PATCH 1/1] json-writer: incorrect format specifier

On 3/26/2018 11:26 PM, Ramsay Jones wrote: On 26/03/18 18:04, Junio C Hamano wrote: Ramsay Jones writes: [...] I must confess to not having given any thought to the wider implications of the code. I don't really know what this code is going to be used for.

Business-Vorschlag für Sie zu behandeln!

Ich bin Sgt.Monica Lin Brown, ursprünglich aus Lake Jackson Texas USA. Ich habe persönlich eine spezielle Recherche zum Internet-Adressbuch durchgeführt und bin auf Ihre Informationen gestoßen. Ich schreibe Ihnen gerade diese Mail von der US-Militärbasis Kabul Afghanistan. Ich habe einen

Business-Vorschlag für Sie zu behandeln!

Ich bin Sgt.Monica Lin Brown, ursprünglich aus Lake Jackson Texas USA. Ich habe persönlich eine spezielle Recherche zum Internet-Adressbuch durchgeführt und bin auf Ihre Informationen gestoßen. Ich schreibe Ihnen gerade diese Mail von der US-Militärbasis Kabul Afghanistan. Ich habe einen

Re: [RFC PATCH v5 0/8] rebase-interactive

On 3/27/2018 1:07 AM, Junio C Hamano wrote: Jeff Hostetler writes: [...] So I would think it is most sensible to have double, uintmax_t and intmax_t variants. If you do not care about the extra value range that unsigned integral types afford, a single intmax_t

A bug in git merge

Hi, If I cherry-pick a commit that added a line, then merge another commit which removes this line, the line remains in the file instead of being removed. The following script demonstrates the bug. file should be equivalent on both branches git init seq 1 20 > file git add file git commit -m

Re: [PATCH v5 5/6] worktree: teach "add" to check out existing branches

On Sun, Mar 25, 2018 at 9:49 AM, Thomas Gummerer wrote: > Currently 'git worktree add ' creates a new branch named after the > basename of the path by default. If a branch with that name already > exists, the command refuses to do anything, unless the '--force' option > is

Re: [PATCH v5 4/6] worktree: factor out dwim_branch function

On Sun, Mar 25, 2018 at 9:49 AM, Thomas Gummerer wrote: > Factor out a dwim_branch function, which takes care of the dwim'ery in > 'git worktree add '. It's not too much code currently, but we're > adding a new kind of dwim in a subsequent patch, at which point it makes >

Re: [PATCH v5 3/6] worktree: remove force_new_branch from struct add_opts

On Sun, Mar 25, 2018 at 9:49 AM, Thomas Gummerer wrote: > The 'force_new_branch' flag in 'struct add_opts' is only used inside the > add function, where we already have the same information stored in the > 'new_branch_force' variable. Avoid that unnecessary duplication.

  1   2   >