Warn user about known Git Rebase bug?!

Hi, we rebased a branch using "--preserve-merges --interactive" and were surprised that the operation reported success although it silently omitted commits (Git 2.12 on Windows). A little search revealed that these are likely known bugs [1]. Would it make sense to print an appropriate warning

Re: [PATCH v6 24/27] t/helper: add test-ref-store to test ref-store functions

On Wed, Mar 22, 2017 at 09:34:12AM -0400, Jeff King wrote: > On Sat, Mar 18, 2017 at 09:03:34AM +0700, Nguyễn Thái Ngọc Duy wrote: > > > diff --git a/t/helper/test-ref-store.c b/t/helper/test-ref-store.c > > new file mode 100644 > > When nd/files-backend-git-dir is merged to 'next', the new

Re: USE_SHA1DC is broken in pu

Hi Junio, On Tue, 21 Mar 2017, Junio C Hamano wrote: > Johannes Schindelin writes: > > > On Fri, 17 Mar 2017, Lars Schneider wrote: > > > >> > On 17 Mar 2017, at 11:18, Lars Schneider > >> > wrote: > >> > > >> > Would it make sense/have

[PATCH 3/3] sequencer: allow the commit-msg hooks to run during a `reword`

The `reword` command used to call `git commit` in a manner that asks for the prepare-commit-msg and commit-msg hooks to do their thing. Converting that part of the interactive rebase to C code introduced the regression where those hooks were no longer run. Let's fix this. Note: the flag is

Re: [PATCH v6 24/27] t/helper: add test-ref-store to test ref-store functions

On Sat, Mar 18, 2017 at 09:03:34AM +0700, Nguyễn Thái Ngọc Duy wrote: > diff --git a/t/helper/test-ref-store.c b/t/helper/test-ref-store.c > new file mode 100644 When nd/files-backend-git-dir is merged to 'next', the new tests in t1405/t1406 break. They need this on top (which should probably

[PATCH 2/3] sequencer: make commit options more extensible

It was pointed out during review of the sequencer-i patch series (which taught the sequencer to execute an interactive rebase) that it may be cumbersome to keep extending the signature of the run_git_commit() function whenever a new commit option is needed. While that concern had merit, back then

[PATCH 0/3] rebase -i (reword): call the commit-msg hook again

It is actually not only the commit-msg, but also the prepare-commit-msg hook... Johannes Schindelin (3): t7504: document regression: reword no longer calls commit-msg sequencer: make commit options more extensible sequencer: allow the commit-msg hooks to run during a `reword` sequencer.c

[PATCH 1/3] t7504: document regression: reword no longer calls commit-msg

The `reword` command of an interactive rebase used to call the commit-msg hooks, but that regressed when we switched to the rebase--helper backed by the sequencer. Noticed by Sebastian Schuberth. Signed-off-by: Johannes Schindelin --- t/t7504-commit-msg-hook.sh | 17

Waiting to hear your response regarding the fund tranfer in your account

Looking forward to hear your response regarding the fund tranfer in your account

Re: [PATCH] log: if --decorate is not given, default to --decorate=auto

Alex Henrie writes: > 2017-03-21 16:28 GMT-06:00 Junio C Hamano : >> Junio C Hamano writes: >> test_expect_success 'log.decorate configuration' ' -git log --oneline >expect.none && +git log --oneline

[PATCH v1 3/3] convert: use new sub-process module for filter processes

The filter..process code was refactored into a separate “sub-process” module to facilitate reuse in future patch series. This centralizes the logic in a single place to simplify maintenance. As a side benefit, it also improves the readability of convert.c. Signed-off-by: Ben Peart

[PATCH v1 2/3] sub-process: refactor the filter process code into a reusable module

Create a new sub-process module that can be used to reduce the cost of starting up a sub-process for multiple commands. It does this by keeping the external process running and processing all commands by communicating over standard input and standard output using the packet format (pkt-line)

Re: [PATCH 1/3] t7504: document regression: reword no longer calls commit-msg

Hi Sebastian, On Wed, 22 Mar 2017, Sebastian Schuberth wrote: > On Wed, Mar 22, 2017 at 4:01 PM, Johannes Schindelin > wrote: > > > +# set up fake editor to replace `pick` by `reword` > > +cat > reword-editor <<'EOF' > > +#!/bin/sh > > +mv "$1" "$1".bup && > > +sed

Re: [PATCH 00/10] RFC Partial Clone and Fetch

Dear Jeff I read most of the valuable references you provided but could not find something along the lines describing inline. On 8 March 2017 at 19:50, wrote: > From: Jeff Hostetler > > > [RFC] Partial Clone and Fetch >

difftool-builtin fixes, was Re: What's cooking in git.git (Mar 2017, #08; Mon, 20)

Hi Junio, On Mon, 20 Mar 2017, Junio C Hamano wrote: > * js/difftool-builtin (2017-03-15) 3 commits > (merged to 'next' on 2017-03-16 at 3fccb60a07) > + difftool: handle modified symlinks in dir-diff mode > + t7800: cleanup cruft left behind by tests > + t7800: remove whitespace before

[PATCH] t3600: rename test to describe its functionality

This was an oversight in 55856a35b2 (rm: absorb a submodules git dir before deletion, 2016-12-27), as the body of the test changed without adapting the test subject. Signed-off-by: Stefan Beller Reviewed-by: Jonathan Nieder --- t/t3600-rm.sh | 2 +- 1

[PATCH v1 0/3] Add support for downloading blobs on demand

We have a couple of patch series we’re working on (ObjectDB/Read-Object, Watchman integration) where we could use the ability to have a background process running that can accept multiple commands thus avoiding the overhead of spawning a new process for every command. The ability to do this was

[PATCH v1 1/3] pkt-line: add packet_write_list_gently()

Add packet_write_list_gently() which writes multiple lines in a single call and then calls packet_flush_gently(). This is used later in this patch series. Signed-off-by: Ben Peart --- pkt-line.c | 19 +++ pkt-line.h | 1 + 2 files changed, 20

Re: [PATCH 1/3] t7504: document regression: reword no longer calls commit-msg

On Wed, Mar 22, 2017 at 4:01 PM, Johannes Schindelin wrote: > Noticed by Sebastian Schuberth. Thanks for working on the fix. > +# set up fake editor to replace `pick` by `reword` > +cat > reword-editor <<'EOF' > +#!/bin/sh > +mv "$1" "$1".bup && > +sed

Re: [PATCH v1] travis-ci: build and test Git on Windows

Hi Lars, On Wed, 22 Mar 2017, Lars Schneider wrote: > Things, that might need to be done: > * The Windows box can only process a single build at a time. A second > Windows build would need to wait until the first finishes. This > waiting time and the build time after the wait could exceed

Re: [PATCH 00/10] RFC Partial Clone and Fetch

Hi Kostis, On Wed, 22 Mar 2017, ankostis wrote: > On 8 March 2017 at 19:50, wrote: > > From: Jeff Hostetler > > > > [RFC] Partial Clone and Fetch > > = > > > > This is a WIP RFC for a partial clone and fetch feature

Article on the branch strategy in gitworkflows(7)

Several years ago, I contributed [1] to the gitworkflows(7) documentation, because I thought the process by which git.git does branching was really interesting. Since then, I have found it odd that gitworkflows has mostly remained under the radar. Other, in my opinion, lesser flows, have become

[PATCH 4/6] name-hash: perf improvement for lazy_init_name_hash

From: Jeff Hostetler Improve performance of lazy_init_name_hash() when ignore_case is set. Teach name-hash to build the istate.name_hash and istate.dir_hash simultaneously using a forward-diving technique on the pathname of the index_entry, rather than adding name_hash

[PATCH 1/6] name-hash: specify initial size for istate.dir_hash table

From: Jeff Hostetler Specify an initial size for the istate.dir_hash HashMap matching the size of the istate.name_hash. Previously hashmap_init() was given 0, causing a 64 bucket hashmap to be created. When working with very large repositories, this would cause numerous

Re: [PATCH v2] builtin/describe: introduce --broken flag

Stefan Beller writes: > git-describe tells you the version number you're at, or errors out, e.g. > when you run it outside of a repository, which may happen when downloading > a tar ball instead of using git to obtain the source code. > > To keep this property of only

Re: [PATCH 1/3] t7504: document regression: reword no longer calls commit-msg

Sebastian Schuberth writes: > On Wed, Mar 22, 2017 at 4:01 PM, Johannes Schindelin > wrote: > >> Noticed by Sebastian Schuberth. > > Thanks for working on the fix. > >> +# set up fake editor to replace `pick` by `reword` >> +cat > reword-editor

Re: EOF test fixes (t5615/t7004)

On Wed, Mar 22, 2017 at 10:35 AM, Jan Palus wrote: > Hi, > > attached patch fixes 2 out of 3 tests failing in my env -- missing EOF, > incorrectly placed "&&" after EOF. One test seems to be incorrect as it > fails even after fixing. I suspect the main difference between my

Re: [PATCH 0/6] thread lazy_init_name_hash

On 3/22/2017 2:02 PM, Stefan Beller wrote: On Wed, Mar 22, 2017 at 10:14 AM, wrote: During our testing on the Windows source tree (3.1M files, 500K folders, 450MB index), this change reduced the runtime of lazy_init_name_hash() from 1.4 to 0.27 seconds. This

Re: [PATCH 00/10] RFC Partial Clone and Fetch

On 3/22/2017 12:21 PM, Johannes Schindelin wrote: Hi Kostis, On Wed, 22 Mar 2017, ankostis wrote: On 8 March 2017 at 19:50, wrote: From: Jeff Hostetler [RFC] Partial Clone and Fetch = This is a WIP RFC for a

Re: [PATCH v3 2/2] l10n: Add git-add.txt to localized man pages

Jean-Noël Avila writes: >> I am wondering if Documentation/po part should be a separate >> repository, with a dedicated i18n/l10n coordinator. Would it make >> it easier for (1) those who write code and doc without knowing other >> languages, (2) those who update .pot and

Re: [PATCH 0/6] thread lazy_init_name_hash

On Wed, Mar 22, 2017 at 10:14 AM, wrote: > > During our testing on the Windows source tree (3.1M > files, 500K folders, 450MB index), this change reduced > the runtime of lazy_init_name_hash() from 1.4 to 0.27 > seconds. This sounds promising. :) A fast skim over the

Re: [PATCH 1/3] t7504: document regression: reword no longer calls commit-msg

Johannes Schindelin writes: > In any case, this is *test* code. So I'd prefer to have the changes to the > C code scrutinized a bit more, not the test code as long as it is obvious > what it does. I do not think the tone of this comment serves any productive purpose.

Re: [PATCH 2/3] sequencer: make commit options more extensible

Johannes Schindelin writes: > +#define ALLOW_EMPTY (1<<0) > +#define EDIT_MSG(1<<1) > +#define AMEND_MSG (1<<2) > +#define CLEANUP_MSG (1<<3) These being bits makes it clear that they can be independently set and unset. > @@ -615,8 +620,7 @@ N_("you have

Re: EOF test fixes (t7030/t7406)

It appears more tests are affected: $ grep -r '^[[:space:]]*EOF &&' . ./t7406-submodule-update.sh:EOF && ./t7030-verify-tag.sh: EOF && ./t7030-verify-tag.sh: EOF && ./t7004-tag.sh: EOF && ./t7004-tag.sh: EOF && attaching patch for t7406 and t7030 which both fail even after fix is

[PATCH 3/6] hashmap: Add disallow_rehash setting

From: Jeff Hostetler Teach hashmap to allow rehashes to be suppressed. This is useful when hashmaps are accessed by multiple threads. It still requires the caller to properly manage their locking. This just prevents unexpected rehashing during inserts and deletes.

[PATCH 6/6] name-hash: add perf test for lazy_init_name_hash

From: Jeff Hostetler Created t/perf/p0004-lazy-init-name-hash.sh test to demonstrate correctness and performance gains with the multithreaded version of lazy_init_name_hash(). Signed-off-by: Jeff Hostetler --- t/perf/p0004-lazy-init-name-hash.sh

[PATCH 0/6] thread lazy_init_name_hash

From: Jeff Hostetler This patch series is a performance optimization for lazy_init_name_hash() in name-hash.c on very large repositories. This change allows lazy_init_name_hash() to optionally use multiple threads when building the the_index.dir_hash and

EOF test fixes (t5615/t7004)

Hi, attached patch fixes 2 out of 3 tests failing in my env -- missing EOF, incorrectly placed "&&" after EOF. One test seems to be incorrect as it fails even after fixing. I suspect the main difference between my env and others is in shell used -- mksh in my case and probably bash in others.

Re: [PATCH] t3600: rename test to describe its functionality

Stefan Beller wrote: > This was an oversight in 55856a35b2 (rm: absorb a submodules git dir > before deletion, 2016-12-27), as the body of the test changed without > adapting the test subject. > > Signed-off-by: Stefan Beller > Reviewed-by: Jonathan Nieder

Re: [PATCH v3 2/2] l10n: Add git-add.txt to localized man pages

On Wed, Mar 22, 2017 at 11:02 AM, Junio C Hamano wrote: > Jean-Noël Avila writes: > >>> I am wondering if Documentation/po part should be a separate >>> repository, with a dedicated i18n/l10n coordinator. Would it make >>> it easier for (1) those who write

Re: [PATCH v3 2/2] l10n: Add git-add.txt to localized man pages

Stefan Beller writes: > I wonder if we could have partial functionality for these "clone and checkout" > fake submodules, by having e.g. the .gitmodules file telling you the URL > and path, but no recorded gitlink in the tree. You can have such a comment in any file

Re: Stable GnuPG interface, git should use GPGME

On 22/03/17 18:15, Werner Koch wrote: > It actually does. For the tasks git uses gpg you should not notice a > difference in gpgme between any of these versions. Bernhard wrote "interoperability problems between [...] key stores". I'm under the impression you are actually answering the question

[PATCH 5/6] name-hash: add test-lazy-init-name-hash

From: Jeff Hostetler Add t/helper/test-lazy-init-name-hash.c test code to demonstrate performance times for lazy_init_name_hash() using the original single-threaded and the new multi-threaded code paths. Includes a --dump option to dump the created hashmaps to stdout.

[PATCH 2/6] hashmap: allow memihash computation to be continued

From: Jeff Hostetler Add variant of memihash() to allow the hash computation to be continued. There are times when we compute the hash on a full path and then the hash on just the path to the parent directory. This can be expensive on large repositories. With this, we

Re: difftool-builtin fixes, was Re: What's cooking in git.git (Mar 2017, #08; Mon, 20)

Johannes Schindelin writes: > Hi Junio, > > On Mon, 20 Mar 2017, Junio C Hamano wrote: > >> * js/difftool-builtin (2017-03-15) 3 commits >> (merged to 'next' on 2017-03-16 at 3fccb60a07) >> + difftool: handle modified symlinks in dir-diff mode >> + t7800: cleanup

Re: Stable GnuPG interface, git should use GPGME

On Fri, 17 Mar 2017 10:56, bernhard.rei...@intevation.de said: > As the command line is not a stable API to GnuPG, there were changes and > there > will be changes to the command line over several versions. It maybe in the That is not true. The command line interface has been stable for the

Re: [PATCH 3/3] sequencer: allow the commit-msg hooks to run during a `reword`

Johannes Schindelin writes: > The `reword` command used to call `git commit` in a manner that asks for > the prepare-commit-msg and commit-msg hooks to do their thing. > > Converting that part of the interactive rebase to C code introduced the > regression where those

Re: Question: xdiff and "pretty" (human readable) diff output

* Stefan Beller [2017-03-22 12:43:41 -0700]: On Wed, Mar 22, 2017 at 12:23 PM, wrote: Good day, I have a question with respect to how git generates "pretty" (ie: human readable) unified diffs. It's to my understanding that git uses its own

Re: [PATCH v2 10/16] tag: change misleading --list documentation

Ævar Arnfjörð Bjarmason writes: >> Please drop "interleaved", as we are not encouraging GNUism. We >> just tolerate it but do not guarantee to keep them working. > > This brings up the same point you made in > , I replied to in >

Re: [PATCH v1] travis-ci: build and test Git on Windows

Lars Schneider writes: > Therefore, we did the following: > * Johannes Schindelin set up a Visual Studio Team Services build > sponsored by Microsoft and made it accessible via an Azure Function > that speaks a super-simple API. We made TravisCI use this API to >

Re: Question: xdiff and "pretty" (human readable) diff output

On Wed, Mar 22, 2017 at 12:23 PM, wrote: > Good day, > > I have a question with respect to how git generates "pretty" (ie: human > readable) unified diffs. It's to my understanding that git uses its own > (simplified/minimized) fork of libxdiff, simply referred to as "xdiff"

Re: EOF test fixes (t5615/t7004)

Jan Palus writes: > diff -ur git-2.12.0.orig/t/t7004-tag.sh git-2.12.0/t/t7004-tag.sh > --- git-2.12.0.orig/t/t7004-tag.sh2017-02-25 14:10:53.059367179 +0100 > +++ git-2.12.0/t/t7004-tag.sh 2017-02-25 14:11:45.105827700 +0100 > @@ -880,17 +880,17 @@ > ' > >

Re: [PATCH 0/6] thread lazy_init_name_hash

Just FYI before I start reading each patch carefully... Subject: [PATCH 2/6] hashmap: allow memihash computation to be continued ERROR: trailing whitespace #28: FILE: hashmap.c:56: + */ $ total: 1 errors, 0 warnings, 30 lines checked Subject:

Re: [PATCH 3/3] t7004, t7030: fix here-doc syntax errors

On Wed, Mar 22, 2017 at 01:08:05PM -0700, Junio C Hamano wrote: > From: Jan Palus > > These all came as part of an earlier st/verify-tag topic that was > merged to 2.12. > > Signed-off-by: Junio C Hamano > --- > > * This should be applied on top of

Re: [PATCH 2/2] remote-curl: allow push options

Brandon Williams writes: > Teach remote-curl to understand push options and to be able to convey > them across HTTP. > > Signed-off-by: Brandon Williams > --- An earlier 438fc684 ("push options: pass push options to the transport helper", 2017-02-08) said:

Re: [PATCH v2 10/16] tag: change misleading --list documentation

On Tue, Mar 21, 2017 at 7:45 PM, Junio C Hamano wrote: > Ævar Arnfjörð Bjarmason writes: > >> And after Jeff's change, one that took multiple patterns: >> >> git tag --list 'v*rc*' --list '*2.8*' > > I do not think this is a correct depiction of the

[PATCH 3/3] t7004, t7030: fix here-doc syntax errors

From: Jan Palus These all came as part of an earlier st/verify-tag topic that was merged to 2.12. Signed-off-by: Junio C Hamano --- * This should be applied on top of 4fea72f4 ("t/t7004-tag: Add --format specifier tests", 2017-01-17)

[PATCH 1/3] t5615: fix a here-doc syntax error

From: Jan Palus This came as part of jk/quote-env-path-list-component and was merged to 2.11.1 and later. Signed-off-by: Junio C Hamano --- * This should be applied on top of 5e74824f ("t5615-alternate-env: double-quotes in file names do not work on

[PATCH 0/3] fix "here-doc" syntax errors

Because I'd prefer to be able to queue fixes on individual topics that introduced the breakages, I splitted the fixes in your two messages into three patches. Please respond to the list, saying it is OK to add your "sign-off" (see Documentation/SubmittingPatches) to these patches. Thanks. Jan

[PATCH 2/3] t7406: fix here-doc syntax errors

From: Jan Palus The came in an earlier sb/submodule-update-initial-runs-custom-script topic that was merged to 2.12. Signed-off-by: Junio C Hamano --- * This should be applied on top of e7b37caf ("submodule update: run custom update script for

Re: [PATCH v1 1/3] pkt-line: add packet_write_list_gently()

Ben Peart writes: > Add packet_write_list_gently() which writes multiple lines in a single > call and then calls packet_flush_gently(). This is used later in this > patch series. I can see how it would be convenient to have a function like this. I'd name it without

Re: [PATCH 0/6] thread lazy_init_name_hash

On 3/22/2017 4:54 PM, Junio C Hamano wrote: Junio C Hamano writes: This patch series replaces my earlier * jh/memihash-opt (2017-02-17) 5 commits patch series. Ahh. I was scratching my head trying to remember why some of these look so familiar. [PATCH v2 ...]

Re: [PATCH 0/2] push options across http

Brandon Williams writes: > This series enables push options to be sent across http using remote-curl > > Thanks to Jonathan Nieder for helping troubleshoot. > > Brandon Williams (2): > send-pack: send push options correctly in stateless-rpc case > remote-curl: allow push

Question: xdiff and "pretty" (human readable) diff output

Good day, I have a question with respect to how git generates "pretty" (ie: human readable) unified diffs. It's to my understanding that git uses its own (simplified/minimized) fork of libxdiff, simply referred to as "xdiff" [1]. Which tool/library is used to take the xdiff output and generate

Re: [PATCH 2/3] t7406: fix here-doc syntax errors

On Wed, Mar 22, 2017 at 01:08:04PM -0700, Junio C Hamano wrote: > diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh > index 347857fa7c..a20df9420a 100755 > --- a/t/t7406-submodule-update.sh > +++ b/t/t7406-submodule-update.sh > @@ -442,9 +442,9 @@ test_expect_success

Re: [PATCH 0/2] push options across http

On Wed, Mar 22, 2017 at 2:17 PM, Junio C Hamano wrote: > Thanks. Why does the topic name sound familiar to me? Did we have > a recent attempt to do the same that didn't work well or something? 'sb/push-options-via-transport' sounds similar. Before that we silently ignored

Re: [PATCH 0/6] thread lazy_init_name_hash

g...@jeffhostetler.com writes: > From: Jeff Hostetler > > This patch series is a performance optimization for > lazy_init_name_hash() in name-hash.c on very large > repositories. > > This change allows lazy_init_name_hash() to optionally > use multiple threads when

[PATCH 1/2] send-pack: send push options correctly in stateless-rpc case

"git send-pack --stateless-rpc" puts each request in a sequence of pkt-lines followed by a flush-pkt. The push option code forgot about this and sends push options and their terminating delimiter as ordinary pkt-lines that get their length header stripped off by remote-curl before being sent to

[PATCH 2/2] remote-curl: allow push options

Teach remote-curl to understand push options and to be able to convey them across HTTP. Signed-off-by: Brandon Williams --- builtin/send-pack.c | 5 + remote-curl.c | 8 t/t5545-push-options.sh | 30 +- 3 files changed,

[PATCH 0/2] push options across http

This series enables push options to be sent across http using remote-curl Thanks to Jonathan Nieder for helping troubleshoot. Brandon Williams (2): send-pack: send push options correctly in stateless-rpc case remote-curl: allow push options builtin/send-pack.c | 5 + remote-curl.c

Re: [PATCH 0/6] thread lazy_init_name_hash

Junio C Hamano writes: >> This patch series replaces my earlier >> * jh/memihash-opt (2017-02-17) 5 commits >> patch series. > > Ahh. I was scratching my head trying to remember why some of these > look so familiar. [PATCH v2 ...] would have helped. > > Thank you for an

Re: [PATCH 1/3] t5615: fix a here-doc syntax error

On Wed, Mar 22, 2017 at 01:08:03PM -0700, Junio C Hamano wrote: > From: Jan Palus > > This came as part of jk/quote-env-path-list-component and was merged > to 2.11.1 and later. > > Signed-off-by: Junio C Hamano > --- > > * This should be applied on

Re: [PATCH 1/2] send-pack: send push options correctly in stateless-rpc case

Brandon Williams wrote: > "git send-pack --stateless-rpc" puts each request in a sequence of pkt-lines > followed by a flush-pkt. The push option code forgot about this and sends push > options and their terminating delimiter as ordinary pkt-lines that get their > length header stripped off by

Re: [PATCH v2 10/16] tag: change misleading --list documentation

Ævar Arnfjörð Bjarmason writes: > Yes, all of this is correct, but not relevant to what I'm describing > in the commit message, because I'm making a documentation change and > describing how you *would* expect git to work if you read the > *documentation*, not if you read the

git svn propset and multi-line svn:externals property

I'd like to be able to set the svn:externals property using "git svn propset". However, that property can be multi-line. I've not had any success in setting this property because git svn doesn't seem to handle the newlines. Is it possible to set multi-line SVN properties somehow? Or could this

Re: [PATCH v2 10/16] tag: change misleading --list documentation

On Wed, Mar 22, 2017 at 11:36 PM, Jeff King wrote: > On Wed, Mar 22, 2017 at 03:26:21PM -0700, Junio C Hamano wrote: > >> Ævar Arnfjörð Bjarmason writes: >> >> > of things you think we should be putting in the test suite. I.e. >> > should the tests be: >> > >> >

Re: [PATCH v2 10/16] tag: change misleading --list documentation

Ævar Arnfjörð Bjarmason writes: > Junio would you be fine with just this on top: > > diff --git a/t/README b/t/README > index 4982d1c521..9e079a360a 100644 > --- a/t/README > +++ b/t/README > @@ -379,2 +379,5 @@ Do: > > + - Include tests which assert that the desired &

Re: [PATCH 1/3] submodule.c: port is_submodule_modified to use porcelain 2

Stefan Beller wrote: > Migrate 'is_submodule_modified' to the new porcelain format of > git-status. > > As the old porcelain only reported ' M' for submodules, no > matter what happened inside the submodule (untracked files, > changes to tracked files or move of HEAD), the new API > properly

Re: [PATCH 2/3] submodule.c, is_submodule_modified: stricter checking for submodules

Stefan Beller wrote: > By having a stricter check in the superproject we catch errors earlier, > instead of spawning a child process to tell us. Plus the error message is clearer. > --- > submodule.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) Reviewed-by: Jonathan Nieder

Re: [PATCH 3/3] short status: improve reporting for submodule changes

Stefan Beller wrote: > Documentation/git-status.txt | 9 + > t/t3600-rm.sh| 18 +- > t/t7506-status-submodule.sh | 24 > wt-status.c | 13 +++-- > 4 files changed, 57 insertions(+), 7 deletions(-) Very

Re: [PATCH v3 2/2] l10n: Add git-add.txt to localized man pages

On Wed, Mar 22, 2017 at 11:56 AM, Junio C Hamano wrote: >> So we'd want to be able to say: >> "get a tarball including all submodules except the superproject" >> (This would produce the "optional language pack tarball") > > You do not need that. Just go to the gitman-l10n

git svn and SVN property svn:original-date

When doing "git svn dcommit", the SVN revision just has the date/time stamp of the time of the dcommit. Apparently SVN revisions can have an "svn:original-date" property, which would be good to set on dcommit, to preserve the timestamp from the git repository.

blame --line-porcelain is providing me with funny output

Hi, everybody! As part of my improvements to difflame I want to use revision information as provided by blame --line-porcelain so that I can avoid some git calls to cat-file -p to get revision information hoping that information would be a match. However I'm not finding that to be the case. $

Re: How do I copy a branch & its config to a new name?

On Wed, Mar 22, 2017 at 11:58 PM, Jeff King wrote: > On Wed, Mar 22, 2017 at 11:46:14PM +0100, Ævar Arnfjörð Bjarmason wrote: > >> But both of these are really just a limited special case for what I'd >> really like, which is given branch "foo", copy it and all its >> configuration

Re: How do I copy a branch & its config to a new name?

On Thu, Mar 23, 2017 at 12:54:48AM +0100, Ævar Arnfjörð Bjarmason wrote: > On Wed, Mar 22, 2017 at 11:58 PM, Jeff King wrote: > > On Wed, Mar 22, 2017 at 11:46:14PM +0100, Ævar Arnfjörð Bjarmason wrote: > > > >> But both of these are really just a limited special case for what I'd

[PATCH 1/3] submodule.c: port is_submodule_modified to use porcelain 2

Migrate 'is_submodule_modified' to the new porcelain format of git-status. As the old porcelain only reported ' M' for submodules, no matter what happened inside the submodule (untracked files, changes to tracked files or move of HEAD), the new API properly reports the different scenarios. In a

[PATCH 3/3] short status: improve reporting for submodule changes

If I add an untracked file to a submodule or modify a tracked file, currently "git status --short" treats the change in the same way as changes to the current HEAD of the submodule: $ git clone --quiet --recurse-submodules https://gerrit.googlesource.com/gerrit $ echo hello

[PATCH 2/3] submodule.c, is_submodule_modified: stricter checking for submodules

By having a stricter check in the superproject we catch errors earlier, instead of spawning a child process to tell us. Signed-off-by: Stefan Beller --- submodule.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/submodule.c b/submodule.c index

[PATCHv3 0/3] short status: improve reporting for submodule changes

This comes as a series; first I'd like to refactor is_submodule_modified to take advantage of the new porcelain=2 plumbing switch to check for changes in the submodule. On top of the refactoring comes the actual change, which moved the rewriting of the submodule change indicator letter to the

Re: [PATCH 2/3] t7406: fix here-doc syntax errors

On Wed, Mar 22, 2017 at 2:07 PM, Jeff King wrote: > On Wed, Mar 22, 2017 at 01:08:04PM -0700, Junio C Hamano wrote: > >> diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh >> index 347857fa7c..a20df9420a 100755 >> --- a/t/t7406-submodule-update.sh >> +++

Re: [PATCH v2 1/3] stash: don't show internal implementation details

On Wed, Mar 22, 2017 at 09:33:47PM +, Thomas Gummerer wrote: > > > - sed -e 1,2d >actual && # drop "Saved..." and "HEAD is now..." > > > + sed -e 1,1d >actual && # drop "Saved..." > > > test_i18ncmp expect actual > > > ' > > > > This too, though I think "1d" would be the more usual way to

Re: [PATCH v2 3/3] stash: keep untracked files intact in stash -k

On 03/21, Jeff King wrote: > On Tue, Mar 21, 2017 at 10:12:19PM +, Thomas Gummerer wrote: > > > Currently when there are untracked changes in a file "one" and in a file > > "two" in the repository and the user uses: > > > > git stash push -k one > > > > all changes in "two" are wiped

Re: [PATCH 2/2] remote-curl: allow push options

Brandon Williams wrote: > --- a/builtin/send-pack.c > +++ b/builtin/send-pack.c > @@ -152,6 +152,7 @@ int cmd_send_pack(int argc, const char **argv, const char > *prefix) > int progress = -1; > int from_stdin = 0; > struct push_cas_option cas = {0}; > + struct string_list

Re: [PATCH v3 3/5] grep: fix bug when recursing with relative pathspec

On 03/21, Duy Nguyen wrote: > On Sat, Mar 18, 2017 at 12:22 AM, Brandon Williams wrote: > > With these two pieces of information a child process can correctly > > interpret the pathspecs provided by the user as well as being able to > > properly format its output relative to

Re: [PATCH] t7406: correct test case for submodule-update initial population

On Wed, Mar 22, 2017 at 02:49:48PM -0700, Stefan Beller wrote: > * The syntax of the here-doc was wrong, such that the entire test was > sucked into the here-doc, which is why the test succeeded successfully. As opposed to succeeding unsuccessfully? :) > * The variable $submodulesha1 was not

Re: [PATCH] t7406: correct test case for submodule-update initial population

On Wed, Mar 22, 2017 at 2:59 PM, Jeff King wrote: > On Wed, Mar 22, 2017 at 02:49:48PM -0700, Stefan Beller wrote: > >> * The syntax of the here-doc was wrong, such that the entire test was >> sucked into the here-doc, which is why the test succeeded successfully. > > As opposed

[PATCH 2/3] t/README: change "Inside part" to "Inside the part"

Change the mention of "Inside the

[PATCH 3/3] t/README: clarify the test_have_prereq documentation

Clarify the test_have_prereq documentation so that it's clear in the reader's mind when the text says "most common use of this directly" what the answer to "as opposed to what?" is. Usually this function isn't used in lieu of using the prerequisite support built into test_expect_*, mention that

[PATCH 1/3] t/README: link to metacpan.org, not search.cpan.org

Change a link to the web version of the TAP::Parser::Grammar documentation to link to metacpan.org instead of search.cpan.org. This is something I added back in commit 20873f45e7 ("t/README: Document the do's and don'ts of tests", 2010-07-02), at the time search.cpan.org was the more actively

  1   2   >