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

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 hardcoding any hashes? The test > added by 66ae9a57b8, for instance,

core.fsmonitor always perform rescans

Hello, I'm facing issue with core.fsmonitor. I'm currently using the provided watchman hook, but it doesn't seem to record the fact that it has queried the fsmonitor backend, and as a result the timestamp passed to the hook doesn't seem to change. As it always pass a timestamp before watchman

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

Nguyễn Thái Ngọc Duy writes: > 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 because I

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

On Sun, Mar 25, 2018 at 3:20 PM, 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. >

Re: [PATCH v4 3/7] gc: add --keep-largest-pack option

Duy Nguyen writes: >> This conflicts with master because of your own 7e1eeaa431 ("completion: >> use __gitcomp_builtin in _git_gc", 2018-02-09). I pushed out a >> avar-pclouds/gc-auto-keep-base-pack branch to github.com/avar/git which >> resolves it as: >> >> @@ -365,6

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

Eric Sunshine writes: > A minor point: Are you sure that it's git-format-patch that's being > careful about arranging Date: to display in the desired order, and not > git-send-email? Looking at old patches I still have hanging around > which were created with

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

"brian m. carlson" writes: > I'm not sure that this is going to have the effect you want it to have. > Let me give an example to demonstrate why. > ... > In short, I don't think this is going to be especially helpful because > it won't change the status quo for a

[PATCH v2 4/6] stash: convert drop and clear to builtin

Signed-off-by: Joel Teichroeb --- builtin/stash--helper.c | 101 git-stash.sh| 4 +- 2 files changed, 103 insertions(+), 2 deletions(-) diff --git a/builtin/stash--helper.c b/builtin/stash--helper.c index

[PATCH v2 6/6] stash: convert pop to builtin

Signed-off-by: Joel Teichroeb --- builtin/stash--helper.c | 41 + git-stash.sh| 39 --- 2 files changed, 45 insertions(+), 35 deletions(-) diff --git a/builtin/stash--helper.c

[PATCH v2 1/6] stash: Add tests for passing in too many refs

Signed-off-by: Joel Teichroeb --- t/t3903-stash.sh | 22 ++ 1 file changed, 22 insertions(+) diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh index aefde7b172..7146e27bb5 100755 --- a/t/t3903-stash.sh +++ b/t/t3903-stash.sh @@ -45,6 +45,12 @@

[PATCH v2 0/6] Convert some stash functionality to a builtin

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 shell script. Once this is stabalized, it should be easier to

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

Signed-off-by: Joel Teichroeb --- .gitignore | 1 + Makefile| 1 + builtin.h | 1 + builtin/stash--helper.c | 431 git-stash.sh| 75 + git.c

[PATCH v2 5/6] stash: convert branch to builtin

Signed-off-by: Joel Teichroeb --- builtin/stash--helper.c | 47 +++ git-stash.sh| 17 ++--- 2 files changed, 49 insertions(+), 15 deletions(-) diff --git a/builtin/stash--helper.c b/builtin/stash--helper.c

[PATCH v2 2/6] stash: Add test for branch with no arguments

Signed-off-by: Joel Teichroeb --- t/t3903-stash.sh | 4 1 file changed, 4 insertions(+) diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh index 7146e27bb5..261571d02a 100755 --- a/t/t3903-stash.sh +++ b/t/t3903-stash.sh @@ -497,6 +497,10 @@ test_expect_success 'stash

Angebot Darlehen bei 1.3%

Dies ist ein Kreditangebot von PSA Finance UK Limited. Wir bieten alle Arten von Darlehen für Einzelpersonen und Unternehmen für jeden Zweck zu 1.3% Zinsen pro Jahr. Bewerben Sie sich jetzt und weitere Informationen über unser Kreditangebot, werden Ihnen zugesandt, sobald wir Ihr

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

On Sun, Mar 25, 2018 at 2:28 PM, Ævar Arnfjörð Bjarmason wrote: > The earlier change to add this option described the problem this > option is trying to solve. > > This turns it on by default with a value of 1 second, which'll > hopefully solve it, and if not user reports as

Re: Git Merge contributor summit notes

On Sat, Mar 10 2018, Alex Vandiver wrote: > New hash (Stefan, etc) > -- > - discussed on the mailing list > - actual plan checked in to > Documentation/technical/hash-function-transition.txt > - lots of work renaming > - any actual work with the transition plan? > -

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

On Sun, Mar 25 2018, brian m. carlson wrote: > On Sun, Mar 25, 2018 at 06:28:03PM +, Ævar Arnfjörð Bjarmason wrote: >> The earlier change to add this option described the problem this >> option is trying to solve. >> >> This turns it on by default with a value of 1 second, which'll >>

Re: [PATCH v2 4/8] completion: factor out _git_xxx calling code

S iPhone’umdan gönderildi

Re: [PATCH v7 0/3] RUNTIME_PREFIX relocatable Git

On Sun, Mar 25 2018, Dan Jacques wrote: > This patch set expands support for the RUNTIME_PREFIX configuration flag, > currently only used on Windows builds, to include Linux, Darwin, and > FreeBSD. When Git is built with RUNTIME_PREFIX enabled, it resolves its > ancillary paths relative to the

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

On Sun, Mar 25, 2018 at 06:28:03PM +, Ævar Arnfjörð Bjarmason wrote: > The earlier change to add this option described the problem this > option is trying to solve. > > This turns it on by default with a value of 1 second, which'll > hopefully solve it, and if not user reports as well as the

[PATCH] Remove contrib/examples/*

On Sun, Mar 25 2018, Ævar Arnfjörð Bjarmason wrote: > There were some side discussions at Git Merge this year about how we > should just update the README to tell users they can dig these up from > the history if the need them, do that. > > Looking at the "git log" for this directory we get

[PATCH v7 3/3] exec_cmd: RUNTIME_PREFIX on some POSIX systems

Enable Git to resolve its own binary location using a variety of OS-specific and generic methods, including: - procfs via "/proc/self/exe" (Linux) - _NSGetExecutablePath (Darwin) - KERN_PROC_PATHNAME sysctl on BSDs. - argv0, if absolute (all, including Windows). This is used to enable

[PATCH v7 1/3] Makefile: generate Perl header from template file

Currently, the generated Perl script headers are emitted by commands in the Makefile. This mechanism restricts options to introduce alternative header content, needed by Perl runtime prefix support, and obscures the origin of the Perl script header. Change the Makefile to generate a header by

[PATCH v7 2/3] Makefile: add Perl runtime prefix support

Broaden the RUNTIME_PREFIX flag to configure Git's Perl scripts to locate the Git installation's Perl support libraries by resolving against the script's path, rather than hard-coding that path at build-time. Hard-coding at build time worked on previous RUNTIME_PREFIX configurations (i.e.,

[PATCH v7 0/3] RUNTIME_PREFIX relocatable Git

This patch set expands support for the RUNTIME_PREFIX configuration flag, currently only used on Windows builds, to include Linux, Darwin, and FreeBSD. When Git is built with RUNTIME_PREFIX enabled, it resolves its ancillary paths relative to the runtime location of its executable rather than

Re: [PATCH v3] filter-branch: fix errors caused by refs that point at non-committish

Yuki Kokubun writes: > References: > > <5ab46520.0352650a.cc02b.a...@mx.google.com> > <20180323050913.5188-1-orga.chem@gmail.com> > Content-Type: text/plain >

Re: Should I try to fix rebase interactive preserve-merges bug

> AFAIK this breakage of preserve-merges is a design flaw which isn't > really fixable, which is why --recreate-merges is being added. > > I believe the plan is to deprecate preserve-merges once > recreate-merges has landed. > > Thanks, > Jake Txs for the info, hopefully others will respond.

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

On Sun, Mar 25, 2018 at 6:51 PM, Joel Teichroeb wrote: > On Sun, Mar 25, 2018 at 1:09 AM, Christian Couder > wrote: >> It seems to me that the apply_stash() shell function is also used in >> pop_stash() and in apply_to_branch(). Can the new helper

[PATCH 04/10] t1405: sort reflog entries in a hash-independent way

The test enumerates reflog entries in an arbitrary order and then sorts them. For SHA-1, this produces results that happen to sort in alphabetical order, but for other hash algorithms they sort differently. Ensure we sort the reflog entries in a hash-independent way by sorting on the ref name

[PATCH 01/10] t1011: abstract away SHA-1-specific constants

Adjust the test so that it computes the expected hash value dynamically instead of relying on a hard-coded hash. Hoist some code earlier in the test to make this possible. Signed-off-by: brian m. carlson --- t/t1011-read-tree-sparse-checkout.sh | 7 --- 1 file

[PATCH 03/10] t1300: abstract away SHA-1-specific constants

Adjust the test so that it uses the computed blob value instead of hard-coding a hash. Signed-off-by: brian m. carlson --- t/t1300-repo-config.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/t/t1300-repo-config.sh

[PATCH 10/10] t2107: abstract away SHA-1-specific constants

Use the $EMPTY_BLOB variable instead of hard-coding a hash. Signed-off-by: brian m. carlson --- t/t2107-update-index-basic.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/t/t2107-update-index-basic.sh b/t/t2107-update-index-basic.sh

[PATCH 05/10] t1411: abstract away SHA-1-specific constants

Adjust the test so that it uses a variable consisting of the current HEAD instead of a hard-coded hash. Signed-off-by: brian m. carlson --- t/t1411-reflog-show.sh | 21 +++-- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git

[PATCH 09/10] t2101: abstract away SHA-1-specific constants

Adjust the test so that it uses variables and command substitution for blobs instead of hard-coded hashes. Signed-off-by: brian m. carlson --- t/t2101-update-index-reupdate.sh | 41 1 file changed, 21 insertions(+), 20 deletions(-)

[PATCH 08/10] t2101: modernize test style

Most of our tests start with the opening quote of the test body on the same line as the test_expect_success call. Additionally, our tests are usually indented with a single tab. Update this test to be the same as most others, which will make it easier to use inline heredocs in the future.

[PATCH 06/10] t1507: abstract away SHA-1-specific constants

Adjust the test so that it uses a variable consisting of the current HEAD instead of a hard-coded hash. Signed-off-by: brian m. carlson --- t/t1507-rev-parse-upstream.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git

[PATCH 07/10] t2020: abstract away SHA-1 specific constants

Adjust the test so that it uses variables for the revisions we're checking out instead of hard-coded hashes. Signed-off-by: brian m. carlson --- t/t2020-checkout-detach.sh | 40 +++--- 1 file changed, 24 insertions(+), 16

[PATCH 02/10] t1304: abstract away SHA-1-specific constants

Adjust the test so that it uses the $EMPTY_BLOB value instead of hard-coding the hash. Signed-off-by: brian m. carlson --- t/t1304-default-acl.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t1304-default-acl.sh b/t/t1304-default-acl.sh

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

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 relies on only three components for hash independence: git

Re: [ANNOUNCE] Git v2.17.0-rc1

On 3/25/2018 2:42 PM, Ævar Arnfjörð Bjarmason wrote: On Sun, Mar 25 2018, Derrick Stolee wrote: On 3/23/2018 1:59 PM, Ævar Arnfjörð Bjarmason wrote: On Wed, Mar 21 2018, Junio C. Hamano wrote: A release candidate Git v2.17.0-rc1 is now available for testing at the usual places. It is

Re: [ANNOUNCE] Git v2.17.0-rc1

On Sun, Mar 25 2018, Derrick Stolee wrote: > On 3/23/2018 1:59 PM, Ævar Arnfjörð Bjarmason wrote: >> On Wed, Mar 21 2018, Junio C. Hamano wrote: >> >>> A release candidate Git v2.17.0-rc1 is now available for testing >>> at the usual places. It is comprised of 493 non-merge commits >>> since

Re: [RFC][PATCH] git-stash: convert git stash list to C builtin

On 03/24, Paul-Sebastian Ungureanu wrote: > Currently, because git stash is not fully converted to C, I > introduced a new helper that will hold the converted commands. Missing sign-off? I think it's a good idea to sign off your work even for RFC patches that you don't expect to be applied. If

Re: [PATCH] unpack-trees: release oid_array after use in check_updates()

On 3/25/2018 12:31 PM, René Scharfe wrote: Signed-off-by: Rene Scharfe --- That leak was introduced by c0c578b33c (unpack-trees: batch fetching of missing blobs). unpack-trees.c | 1 + 1 file changed, 1 insertion(+) diff --git a/unpack-trees.c b/unpack-trees.c index

[PATCH 1/2] send-email: add an option to impose delay sent E-Mails

Add a --send-delay option with a corresponding sendemail.smtpSendDelay configuration variable. When set to e.g. 2, this causes send-email to sleep 2 seconds before sending the next E-Mail. We'll only sleep between sends, not before the first send, or after the last. This option is useful because

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

The earlier change to add this option described the problem this option is trying to solve. This turns it on by default with a value of 1 second, which'll hopefully solve it, and if not user reports as well as the X-Mailer-Send-Delay header should help debug it. I think the trade-off of slowing

[PATCH 0/2] send-email: impose a delay while sending to appease GMail

GMail doesn't sort E-Mail by the "Date" header, but by when the E-Mail was received. As a result patches sent to the git ML and LKML (and friends) show up out of order in GMail. This series works around that issue by sleeping for 1 second between sending E-Mails. If you're on the LKML and

Re: [PATCH 4/3] sha1_name: use bsearch_pack() in unique_in_pack()

On 3/24/2018 12:41 PM, René Scharfe wrote: Replace the custom binary search in unique_in_pack() with a call to bsearch_pack(). This reduces code duplication and makes use of the fan-out table of packs. Signed-off-by: Rene Scharfe --- This is basically the same replacement as

Re: [ANNOUNCE] Git v2.17.0-rc1

On 3/23/2018 1:59 PM, Ævar Arnfjörð Bjarmason wrote: On Wed, Mar 21 2018, Junio C. Hamano wrote: A release candidate Git v2.17.0-rc1 is now available for testing at the usual places. It is comprised of 493 non-merge commits since v2.16.0, contributed by 62 people, 19 of which are new faces.

Re: Should I try to fix rebase interactive preserve-merges bug

On Sun, Mar 25, 2018 at 10:32 AM, Wink Saville wrote: > There is a "TODO known breakage" in t3404-rebase-interactve.sh: > >not ok 24 - exchange two commits with -p # TODO known breakage > > I'm contemplating trying to fix it. But with --recreate-merges coming > maybe it's

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

On 03/24, 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 shell > script. Once this

Re: [PATCH 4/4] stash: convert pop to builtin

On 03/24, Joel Teichroeb wrote: > --- > builtin/stash--helper.c | 38 ++ > git-stash.sh| 3 ++- > 2 files changed, 40 insertions(+), 1 deletion(-) > > diff --git a/builtin/stash--helper.c b/builtin/stash--helper.c > index 1598b82ac2..b912f84c97

Should I try to fix rebase interactive preserve-merges bug

There is a "TODO known breakage" in t3404-rebase-interactve.sh: not ok 24 - exchange two commits with -p # TODO known breakage I'm contemplating trying to fix it. But with --recreate-merges coming maybe it's not worth the effort. Should I proceed with attempting a fix or is --preserve-merges

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

On 03/24, Joel Teichroeb wrote: > --- > [...] > + > +static const char *ref_stash = "refs/stash"; > +static int quiet; > +static char stash_index_path[PATH_MAX]; > + > +struct stash_info { > + struct object_id w_commit; > + struct object_id b_commit; > + struct object_id i_commit; > +

Re: [PATCH v4] filter-branch: fix errors caused by refs that point at non-committish

Yuki Kokubun writes: > "git filter-branch -- --all" prints error messages when processing refs that > point at objects that are not committish. Such refs can be created by > "git replace" with trees or blobs. And also "git tag" with trees or blobs can > create such refs.

Re: [PATCH] branch -l: print useful info whilst rebasing a non-local branch

Jeff King writes: > IMHO we should do one of: > > 1. Nothing. ;) > > 2. Complain about "-l" in list mode to help educate users about the > current craziness. Nah. We've seen this, perhaps not often but enough times over long period of time. The above two would not fly

[PATCH v5] filter-branch: fix errors caused by refs that point at non-committish

"git filter-branch -- --all" prints error messages when processing refs that point at objects that are not committish. Such refs can be created by "git replace" with trees or blobs. And also "git tag" with trees or blobs can create such refs. Filter these problematic refs out early, before they

Re: [PATCH 2/4] stash: convert branch to builtin

On 03/24, Joel Teichroeb wrote: > --- > builtin/stash--helper.c | 44 > git-stash.sh| 3 ++- > 2 files changed, 46 insertions(+), 1 deletion(-) > > diff --git a/builtin/stash--helper.c b/builtin/stash--helper.c > index

Re: [PATCH v4] filter-branch: fix errors caused by refs that point at non-committish

References: <1521996898-7052-1-git-send-email-orga.chem@gmail.com> Content-Type: text/plain Sorry, I forgot add a line of "Reviewed-by". I'm gonna send the fixed patch again.

[PATCH v4] filter-branch: fix errors caused by refs that point at non-committish

"git filter-branch -- --all" prints error messages when processing refs that point at objects that are not committish. Such refs can be created by "git replace" with trees or blobs. And also "git tag" with trees or blobs can create such refs. Filter these problematic refs out early, before they

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

On Sun, Mar 25, 2018 at 1:09 AM, Christian Couder wrote: > It seems to me that the apply_stash() shell function is also used in > pop_stash() and in apply_to_branch(). Can the new helper be used there > too instead of apply_stash()? And then could apply_stash() be

Re: [PATCH v3] filter-branch: fix errors caused by refs that point at non-committish

References: <5ab46520.0352650a.cc02b.a...@mx.google.com> <20180323050913.5188-1-orga.chem@gmail.com> Content-Type: text/plain > Grammo (third-person singular 'prints' misspelt

Re: [PATCH] run-command: use strbuf_addstr() for adding a string to a strbuf

René Scharfe writes: > Patch generated with Coccinelle and contrib/coccinelle/strbuf.cocci. > > Signed-off-by: Rene Scharfe > --- > That line was added by e73dd78699 (run-command.c: introduce > trace_run_command()). Thanks. > > run-command.c | 2 +- > 1 file

Re: [PATCH] run-command: use strbuf_addstr() for adding a string to a strbuf

On Sun, Mar 25, 2018 at 12:57 PM, René Scharfe wrote: > Patch generated with Coccinelle and contrib/coccinelle/strbuf.cocci. > > Signed-off-by: Rene Scharfe > --- > That line was added by e73dd78699 (run-command.c: introduce > trace_run_command()). > > run-command.c

Re: [PATCH] bisect: use oid_to_hex() for converting object_id hashes to hex strings

"brian m. carlson" writes: > On Sun, Mar 25, 2018 at 12:57:36PM +0200, René Scharfe wrote: >> Patch generated with Coccinelle and contrib/coccinelle/object_id.cocci. >> >> Signed-off-by: Rene Scharfe >> --- >> This is a belated follow-up to

Re: query on git submodule (ignore)

prashant Nidgunde writes: [cc: stefan, for his interest in improving 'git submodules'] > Hello, > > I am new to this community ,so please ignore if I am asking anything silly. > > Case : > Today when I built my submodule , and did a git status , it shows as modified. > >

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

On 03/24, Joel Teichroeb wrote: > --- Missing sign-off? I saw it's missing in the other patches as well. > [...] > +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 4/3] sha1_name: use bsearch_pack() in unique_in_pack()

Am 25.03.2018 um 18:19 schrieb Junio C Hamano: > René Scharfe writes: > >> Replace the custom binary search in unique_in_pack() with a call to >> bsearch_pack(). This reduces code duplication and makes use of the >> fan-out table of packs. >> >> Signed-off-by: Rene Scharfe

[PATCH] unpack-trees: release oid_array after use in check_updates()

Signed-off-by: Rene Scharfe --- That leak was introduced by c0c578b33c (unpack-trees: batch fetching of missing blobs). unpack-trees.c | 1 + 1 file changed, 1 insertion(+) diff --git a/unpack-trees.c b/unpack-trees.c index d5685891a5..e73745051e 100644 --- a/unpack-trees.c +++

Re: [PATCH v3] filter-branch: fix errors caused by refs that point at non-committish

Yuki Kokubun writes: > "git filter-branch -- --all" print error messages when refs that point at > objects that are not committish. Grammo (third-person singular 'prints' misspelt without 's'; the "when" clause has a complex subject but no verb). Perhaps this will

Re: [PATCH 4/3] sha1_name: use bsearch_pack() in unique_in_pack()

René Scharfe writes: > Replace the custom binary search in unique_in_pack() with a call to > bsearch_pack(). This reduces code duplication and makes use of the > fan-out table of packs. > > Signed-off-by: Rene Scharfe > --- > This is basically the same replacement

Hello Beautiful

Hi Dear, my name is Jack and i am seeking for a relationship in which i will feel loved after a series of failed relationships. I am hoping that you would be interested and we could possibly get to know each other more if you do not mind. I am open to answering questions from you as i think

Re: [PATCH] bisect: use oid_to_hex() for converting object_id hashes to hex strings

On Sun, Mar 25, 2018 at 12:57:36PM +0200, René Scharfe wrote: > Patch generated with Coccinelle and contrib/coccinelle/object_id.cocci. > > Signed-off-by: Rene Scharfe > --- > This is a belated follow-up to f0a6068a9f (bisect: debug: convert struct > object to object_id). This

Re: [GSoC] Convert “git stash” to builtin proposal

On 25.03.2018 12:46, Christian Couder wrote: On Sat, Mar 24, 2018 at 8:31 PM, Paul-Sebastian Ungureanu wrote: On 23.03.2018 19:11, Christian Couder wrote: * Ensure that no regression occurred: considering that there are plenty of tests and that I have a good

Re: [GSoC] Convert “git stash” to builtin proposal

On 23.03.2018 19:06, Johannes Schindelin wrote: [... proposal ...] This is a pretty good proposal. The initial draft at converting `stash list` is a good start (it will need to be converted to avoid spawning an extra process, but that is something we can do incrementally, together). Thank

[PATCH v5 1/6] worktree: improve message when creating a new worktree

Currently 'git worktree add' produces output like the following, when '--no-checkout' is not given: Preparing foo (identifier foo) HEAD is now at 26da330922 where the first line is written to stderr, and the second line coming from 'git reset --hard' is written to stdout, even though

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

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 given. However we can do a little better than that, and check the branch out if it is

[PATCH v5 6/6] t2025: rename now outdated branch name

Before the previous commit, the branch named precious was used to check that 'git worktree' wouldn't clobber the branch. While 'git worktree' still shouldn't (and doesn't) modify the branch, that's no longer the main thing the test is checking. Rename the branch to avoid making future readers

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

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 more sense to have it as a separate function. Factor it out now to reduce the patch

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

Thanks Eric for the review of the previous round and Duy and Junio for additional comments. Previous rounds are at <20180121120208.12760-1-t.gumme...@gmail.com>, <20180204221305.28300-1-t.gumme...@gmail.com>, <20180317220830.30963-1-t.gumme...@gmail.com> and

[PATCH v5 2/6] worktree: be clearer when "add" dwim-ery kicks in

Currently there is no indication in the "git worktree add" output that a new branch was created. This would be especially useful information in the case where the dwim of "git worktree add " kicks in, as the user didn't explicitly ask for a new branch, but we create one from them. Print some

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

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. Signed-off-by: Thomas Gummerer --- builtin/worktree.c | 6

RE

I am Ms.Ella Golan, I am the Executive Vice President Banking Division with FIRST INTERNATIONAL BANK OF ISRAEL LTD (FIBI). I am getting in touch with you regarding an extremely important and urgent matter. If you would oblige me the opportunity, I shall provide you with details upon your

Proposal

I have a very profitable business for you

[PATCH] bisect: use oid_to_hex() for converting object_id hashes to hex strings

Patch generated with Coccinelle and contrib/coccinelle/object_id.cocci. Signed-off-by: Rene Scharfe --- This is a belated follow-up to f0a6068a9f (bisect: debug: convert struct object to object_id). bisect.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git

[PATCH] run-command: use strbuf_addstr() for adding a string to a strbuf

Patch generated with Coccinelle and contrib/coccinelle/strbuf.cocci. Signed-off-by: Rene Scharfe --- That line was added by e73dd78699 (run-command.c: introduce trace_run_command()). run-command.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run-command.c

Re: Null pointer dereference in git-submodule

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 reproduce this bug. It is caused when a > submodule is added and then the

Hello Beautiful

Hi Dear, my name is Jack and i am seeking for a relationship in which i will feel loved after a series of failed relationships. I am hoping that you would be interested and we could possibly get to know each other more if you do not mind. I am open to answering questions from you as i think

RE

I am Ms.Ella Golan, I am the Executive Vice President Banking Division with FIRST INTERNATIONAL BANK OF ISRAEL LTD (FIBI). I am getting in touch with you regarding an extremely important and urgent matter. If you would oblige me the opportunity, I shall provide you with details upon your

Re: Null pointer dereference in git-submodule

Reply-To: 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 reproduce this bug. It is caused when a submodule is added and then the directory it resides in is moved or deleted

Re: [GSoC] Convert “git stash” to builtin proposal

On Sat, Mar 24, 2018 at 8:31 PM, Paul-Sebastian Ungureanu wrote: > On 23.03.2018 19:11, Christian Couder wrote: > >>> * Ensure that no regression occurred: considering that there are plenty >>> of tests and that I have a good understanding of the function, this

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

On Sun, Mar 25, 2018 at 8:40 AM, Eric Sunshine wrote: > On Sat, Mar 24, 2018 at 1:37 PM, Joel Teichroeb wrote: >> +static int do_apply_stash(const char *prefix, struct stash_info *info, int >> index) >> +{ >> + if (index) { >> +

Hello Beautiful

Cześć Drogi, nazywam się Jack i szukam związku, w którym będę czuć się kochany po serii nieudanych związków. Mam nadzieję, że byłbyś zainteresowany i moglibyśmy się lepiej poznać, jeśli nie masz nic przeciwko. Jestem otwarty na udzielanie odpowiedzi na pytania od ciebie, ponieważ uważam, że

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

On Fri, Mar 23, 2018 at 11:01 AM, Pratik Karki wrote: > I hope this follow-on patch[1] is ready for merge. This iteration appears to address review comments from the last few rounds, however, see below for a few new ones... > Avoid using pipes downstream of Git commands

Re: [PATCH 2/4] stash: convert branch to builtin

On Sat, Mar 24, 2018 at 6:37 PM, Joel Teichroeb wrote: > diff --git a/git-stash.sh b/git-stash.sh > index 92c084eb17..360643ad4e 100755 > --- a/git-stash.sh > +++ b/git-stash.sh > @@ -736,7 +736,8 @@ pop) > ;; > branch) > shift > - apply_to_branch "$@" >

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

On Sat, Mar 24, 2018 at 6:37 PM, Joel Teichroeb wrote: > diff --git a/git-stash.sh b/git-stash.sh > index fc8f8ae640..92c084eb17 100755 > --- a/git-stash.sh > +++ b/git-stash.sh > @@ -711,7 +711,8 @@ push) > ;; > apply) > shift > - apply_stash "$@" > +

Re: [PATCH] branch -l: print useful info whilst rebasing a non-local branch

On Sunday 25 March 2018 11:18 AM, Eric Sunshine wrote: > On Sun, Mar 25, 2018 at 09:11:34AM +0530, Kaartic Sivaraam wrote: >> On Sunday 25 March 2018 07:04 AM, Eric Sunshine wrote: >>> Can we have a couple new tests: one checking "git branch --list" for >>> the typical case (when rebasing off a

Re: [PATCH] branch -l: print useful info whilst rebasing a non-local branch

On Sat, Mar 24, 2018 at 9:33 PM, Jeff King wrote: > IMHO we should do one of: > > 1. Nothing. ;) > > 2. Complain about "-l" in list mode to help educate users about the > current craziness. > I think we should do this at a minimum. It's easy, and it doesn't break any

Re: query on git submodule (ignore)

On Sat, Mar 24, 2018 at 7:17 PM, prashant Nidgunde wrote: > Hello, > > I am new to this community ,so please ignore if I am asking anything silly. > > Case : > Today when I built my submodule , and did a git status , it shows as modified. > > After reading certain

Re: [RFC][PATCH] git-stash: convert git stash list to C builtin

On Sat, Mar 24, 2018 at 2:23 PM, Paul-Sebastian Ungureanu wrote: > Currently, because git stash is not fully converted to C, I > introduced a new helper that will hold the converted commands. > --- > diff --git a/builtin/stash--helper.c b/builtin/stash--helper.c

  1   2   >