Re: [PATCH v3 2/3] merge: Add merge.renames config setting

Hi, On Thu, 26 Apr 2018, Elijah Newren wrote: > On Thu, Apr 26, 2018 at 7:23 PM, Junio C Hamano wrote: > > Ben Peart writes: > > > >> Color me puzzled. :) The consensus was that the default value for > >> merge.renames come from diff.renames.

Re: What's cooking in git.git (Apr 2018, #03; Wed, 25)

On Wed, Apr 25, 2018 at 4:37 AM, Junio C Hamano wrote: > * tg/worktree-add-existing-branch (2018-04-25) 4 commits > - worktree: teach "add" to check out existing branches > - worktree: factor out dwim_branch function > - worktree: improve message when creating a new worktree

Re: git merge banch w/ different submodule revision

Hi, firstofall: thank all of you for your feedback. Am Donnerstag, den 26.04.2018, 17:19 -0700 schrieb Elijah Newren: > On Thu, Apr 26, 2018 at 3:49 AM, Middelschulte, Leif > wrote: > > Hi, > > > > we're using git-flow as a basic development workflow. However,

Re: What's cooking in git.git (Apr 2018, #03; Wed, 25)

Hi, On Thu, 26 Apr 2018, Derrick Stolee wrote: > On 4/25/2018 1:43 PM, Brandon Williams wrote: > > On 04/25, Ævar Arnfjörð Bjarmason wrote: > > > > * bw/protocol-v2 (2018-03-15) 35 commits > > > > (merged to 'next' on 2018-04-11 at 23ee234a2c) [... snip ...] > > > > (this branch is

Re: In some rebases, `exec git -C ...` has wrong working directory

Hi William, On Thu, 26 Apr 2018, William Chargin wrote: > Here is a repro script: > > #!/bin/sh > set -eux > git --version > tmpdir="$(mktemp -d)" > cd "${tmpdir}" > mkdir target repo > cd repo > git init > touch file; git add file > git commit -m

Re: [PATCH v9 0/4] worktree: teach "add" to check out existing branches

On Tue, Apr 24, 2018 at 5:56 PM, Thomas Gummerer wrote: > Thanks Eric for the review and the suggestions on the previous round. > > Changes since the previous round: > > - UNLEAK new_branch after it was xstrndup'd > - update the commit message of 2/4 according to Eric's

[ANNOUNCE] Gitwin: Git Server for Windows with SSH/HTTP(S) transport and Gitweb

Hi all, This is a ONE-TIME announcement of Gitwin - a Git Server for Windows: Gitwin is a packaging of Git, OpenSSH, Nginx and many other related tools to make it a ready-to-use solution as a secure git repository on Windows. It supports SSH and HTTP(S) transports as well as Gitweb with

[PATCH v1] perf/bisect_run_script: disable codespeed

When bisecting a performance regression using a config file, `./bisect_regression --config my_perf.conf` for example, the config file can contain Codespeed configuration which would instruct the 'aggregate.perl' script called by the 'run' script to output results in the Codespeed format and maybe

Re: [PATCH v3 2/3] merge: Add merge.renames config setting

On Fri, Apr 27, 2018 at 11:23:56AM +0900, Junio C Hamano wrote: > I think demoting from copy to rename-only is a good idea, at least > for now, because I do not believe we have figured out what we want > to happen when we detect copied files are involved in a merge. Does anyone know some threads

[RFC PATCH v2] Teach remote add the --prefix-tags option

When --prefix-tags is passed to `git remote add` the tagopt is set to --prefix-tags and a second fetch line is added so tags are placed in a separate hierarchy per remote. For example: $ git remote add -f --prefix-tags gbenchmark g...@github.com:google/benchmark Updating gbenchmark warning:

[PATCH v2 7/6] doc: normalize [--options] to [options] in git-diff

SYNOPSIS and other manuals use [options] but DESCRIPTION used [--options]. Signed-off-by: Andreas Heiduk --- Documentation/git-diff.txt | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt

Re: [PATCH v2 2/6] doc: align 'diff --no-index' in text with synopsis

On Fri, Apr 27, 2018 at 1:04 PM, Andreas Heiduk wrote: > The two '' parameters are not optional but the option > '--no-index' is. Also move the `--options` part to the same > place where the other variants show them. > > All three items are already correct in the synopsis. > >

Re: [PATCH v2 2/6] doc: align 'diff --no-index' in text with synopsis

Am 27.04.2018 um 19:18 schrieb Martin Ågren: > On 27 April 2018 at 19:04, Andreas Heiduk wrote: >> The two '' parameters are not optional but the option >> '--no-index' is. Also move the `--options` part to the same >> place where the other variants show them. > > Should this

Re: Fetching tags overwrites existing tags

On Tue, Apr 24, 2018 at 9:57 PM, Wink Saville wrote: > If have a repository with a tag "v1.0.0" and I add a remote repository > which also has a tag "v1.0.0" tag is overwritten. I feel like this thread has gotten somewhat side-tracked by the valid discussion about whether we

Re: [PATCH v2 6/6] doc: add note about shell quoting to revision.txt

On Fri, Apr 27, 2018 at 1:04 PM, Andreas Heiduk wrote: > Signed-off-by: Andreas Heiduk > Reviewed-by: Junio C Hamano > --- > diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt > @@ -186,6 +190,8 @@ existing tag

[no subject]

From: Elijah Newren On Thu, Apr 26, 2018 at 5:54 PM, Ben Peart wrote: > Can you write the documentation that clearly explains the exact behavior you > want? That would kill two birds with one stone... :) Sure, something like the following is what I

Re: [PATCH v2 2/6] doc: align 'diff --no-index' in text with synopsis

Am 27.04.2018 um 19:33 schrieb Eric Sunshine: > On Fri, Apr 27, 2018 at 1:04 PM, Andreas Heiduk wrote: >> The two '' parameters are not optional but the option >> '--no-index' is. Also move the `--options` part to the same >> place where the other variants show them. >> >> All

Re: [RFC PATCH] checkout: Force matching mtime between files

W dniu śro, 25.04.2018 o godzinie 11∶18 -0400, użytkownik Marc Branchaud napisał: > On 2018-04-25 04:48 AM, Junio C Hamano wrote: > > "Robin H. Johnson" writes: > > > > > In the thread from 6 years ago, you asked about tar's behavior for > > > mtimes. 'tar xf' restores mtimes

Re: [PATCH v2 2/6] doc: align 'diff --no-index' in text with synopsis

On 27 April 2018 at 19:04, Andreas Heiduk wrote: > The two '' parameters are not optional but the option > '--no-index' is. Also move the `--options` part to the same > place where the other variants show them. Should this commit message be updated after the changes you did

Confusing documentation for git apply -p

https://git-scm.com/docs/git-apply#git-apply--pltngt > -p > Remove leading slashes from traditional diff paths. The default is 1. This suggests to me the following outcomes: 1) home/user/repos/myrepo with -p1 becomes home/user/repos/myrepo 2) home/user/repos/myrepo with -p2 becomes

Re: [PATCH v2 2/6] doc: align 'diff --no-index' in text with synopsis

On 27 April 2018 at 20:40, Andreas Heiduk wrote: > Am 27.04.2018 um 19:33 schrieb Eric Sunshine: >> On Fri, Apr 27, 2018 at 1:04 PM, Andreas Heiduk wrote: >>> The two '' parameters are not optional but the option >>> '--no-index' is. Also move the

Re: [PATCH v2 2/6] doc: align 'diff --no-index' in text with synopsis

Am 27.04.2018 um 20:45 schrieb Martin Ågren: > On 27 April 2018 at 20:28, Andreas Heiduk wrote: >> Am 27.04.2018 um 19:18 schrieb Martin Ågren: >>> On 27 April 2018 at 19:04, Andreas Heiduk wrote: The two '' parameters are not optional but the option

Re: Fetching tags overwrites existing tags

On Thu, Apr 26, 2018 at 4:24 PM, Junio C Hamano wrote: > Junio C Hamano writes: > > > Hence (1) we should detect and error out when --prefix-tags is used > with mirror fetch near where we do the same for track used without > mirror fetch already, (2) detect

Re: [PATCH v2 2/6] doc: align 'diff --no-index' in text with synopsis

On Fri, Apr 27, 2018 at 2:40 PM, Andreas Heiduk wrote: > Am 27.04.2018 um 19:33 schrieb Eric Sunshine: >> On Fri, Apr 27, 2018 at 1:04 PM, Andreas Heiduk wrote: >>> @@ -13,7 +13,7 @@ SYNOPSIS >>> -'git diff' [options] [--no-index] [--] >>> +'git diff'

Re: Fetching tags overwrites existing tags

On Fri, Apr 27, 2018 at 12:08 PM, Wink Saville wrote: > > The other change was rather than using > ""+refs/tags/*:refs/remote-tags/$name/*" > I've changed it to "+refs/tags/*:refs/remote/tags/$name/*" which seems > cleaner. > Again, if remote-tags is preferred I'll change it

Re: [RFC PATCH] checkout: Force matching mtime between files

On Fri, Apr 27, 2018 at 7:18 PM, Michał Górny wrote: > W dniu śro, 25.04.2018 o godzinie 11∶18 -0400, użytkownik Marc Branchaud > napisał: >> On 2018-04-25 04:48 AM, Junio C Hamano wrote: >> > "Robin H. Johnson" writes: >> > >> > > In the thread from 6

Re: [PATCH v2 6/6] doc: add note about shell quoting to revision.txt

Am 27.04.2018 um 19:36 schrieb Eric Sunshine: > On Fri, Apr 27, 2018 at 1:04 PM, Andreas Heiduk wrote: >> Signed-off-by: Andreas Heiduk >> Reviewed-by: Junio C Hamano >> --- >> diff --git a/Documentation/revisions.txt

Re: [PATCH v2 1/6] doc: improve formatting in githooks.txt

On 27 April 2018 at 19:04, Andreas Heiduk wrote: > Typeset commands and similar things with as `git foo` instead of > 'git foo' or 'git-foo' and add linkgit to the commands which run > the hooks. > > Signed-off-by: Andreas Heiduk > Reviewed-by: Martin

Re: In some rebases, `exec git -C ...` has wrong working directory

Hi Johannes, Thanks for your reply. Part of my confusion was regarding the interaction between `-C` and `--git-dir`. For instance, we have $ git --git-dir target -C /tmp/tmp.Cl4aXMSVis init Initialized empty Git repository in /tmp/tmp.Cl4aXMSVis/target/ which makes sense and is what I

Missing --relative documentation

git format-patch is missing documentation for --relative. There is also no auto complete(or tab complete, whatever it's called) for the --relative switch/argument. https://stackoverflow.com/a/16309416/222054 Thanks, Kelly Elton http://www.kellyelton.com

Re: [PATCH v2 2/6] doc: align 'diff --no-index' in text with synopsis

On 27 April 2018 at 20:28, Andreas Heiduk wrote: > Am 27.04.2018 um 19:18 schrieb Martin Ågren: >> On 27 April 2018 at 19:04, Andreas Heiduk wrote: >>> The two '' parameters are not optional but the option >>> '--no-index' is. Also move the `--options`

Re: fixup! [PATCH 1/6] doc: fix formatting inconsistency in githooks.txt

Am 12.04.2018 um 21:36 schrieb Martin Ågren: > On 11 April 2018 at 23:08, Andreas Heiduk wrote: >> - reflow some paragraphs >> --- >> Documentation/githooks.txt | 14 +++--- >> 1 file changed, 7 insertions(+), 7 deletions(-) > > I have reviewed the resulting

[PATCH v2 0/6] Some doc-fixes

This reroll incorporates the comments of the first version, including a "large scale" rewrtie of githooks.txt. I'v added "Reviewed-by" and "Signed-off-by" as appropriate. Andreas Heiduk (6): doc: improve formatting in githooks.txt doc: align 'diff --no-index' in text with synopsis doc:

[PATCH v2 2/6] doc: align 'diff --no-index' in text with synopsis

The two '' parameters are not optional but the option '--no-index' is. Also move the `--options` part to the same place where the other variants show them. All three items are already correct in the synopsis. Signed-off-by: Andreas Heiduk Reviewed-by: Martin Ågren

Re: [RFC PATCH] checkout: Force matching mtime between files

On Wed, Apr 25, 2018 at 5:18 PM, Marc Branchaud wrote: >> The best approach to do so is to have those people do the "touch" >> thing in their own post-checkout hook. People who use Git as the >> source control system won't have to pay runtime cost of doing the >> touch

branch --contains / tag --merged inconsistency

Hi, I'm moving the IRC discussion here, because this might be a bug report in the end. So, kindly try these steps (103 MB free space required): $ git clone https://github.com/ClusterLabs/pacemaker.git && cd pacemaker [...] $ git branch --contains Pacemaker-0.6.1 * master $ git tag --merged

Re: [PATCH 5/6] git-svn: commit-diff does not support --add-author-from

Am 17.04.2018 um 08:18 schrieb Eric Wong: > Andreas Heiduk wrote: >> Signed-off-by: Andreas Heiduk > > Thanks. > Signed-off-by: Eric Wong > > And pushed for Junio: [...] I'd like to keep the patches together, so I borrow your

Re: Great Investment Offer

Hello In my search for a business partner i got your contact in google search. My client is willing to invest $10 Million to $500 million but my client said he need a trusted partner who he can have a meeting at the point of releasing his funds. I told my client that you have a good profile

[PATCH v2 1/6] doc: improve formatting in githooks.txt

Typeset commands and similar things with as `git foo` instead of 'git foo' or 'git-foo' and add linkgit to the commands which run the hooks. Signed-off-by: Andreas Heiduk Reviewed-by: Martin Ågren --- Documentation/githooks.txt | 115

[PATCH v2 6/6] doc: add note about shell quoting to revision.txt

Signed-off-by: Andreas Heiduk Reviewed-by: Junio C Hamano --- Documentation/revisions.txt | 6 ++ 1 file changed, 6 insertions(+) diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt index dfcc49c72c..c1d3a40a90 100644 ---

[PATCH v2 5/6] git-svn: remove ''--add-author-from' for 'commit-diff'

The subcommand 'commit-diff' does not support the option '--add-author-from'. Signed-off-by: Andreas Heiduk Signed-off-by: Eric Wong --- Documentation/git-svn.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-svn.txt

[PATCH v2 3/6] doc: clarify ignore rules for git ls-files

Explain that `git ls-files --ignored` requires at least one of the `--exclude*` options to do its job. Signed-off-by: Andreas Heiduk --- Documentation/git-ls-files.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Documentation/git-ls-files.txt

[PATCH v2 4/6] doc: add '-d' and '-o' for 'git push'

Add the missing `-o` shortcut for `--push-option` to the synopsis. Add the missing `-d` shortcut for `--delete` in the main section. Signed-off-by: Andreas Heiduk Reviewed-by: Martin Ågren --- Documentation/git-push.txt | 3 ++- 1 file changed, 2

Re: [PATCH v3 2/3] merge: Add merge.renames config setting

Hi Dsco, On Fri, Apr 27, 2018 at 12:23 AM, Johannes Schindelin wrote: > Hi, > > Guys, you argued long and hard that one config setting (diff.renames) > should magically imply another one (merge.renames), on the basis that they > essentially do the same. I apologize

Hello My Dear Friend,

I have a business proposal in the tune of $10.2 Million USD for you to handle with me. I have opportunity to transfer this abandon fund to your bank account in your country which belongs to our client. I am inviting you in this transaction where this money can be shared between us at ratio of

Re: branch --contains / tag --merged inconsistency

Szia Feri, > I'm moving the IRC discussion here, because this might be a bug report > in the end. So, kindly try these steps (103 MB free space required): > > $ git clone https://github.com/ClusterLabs/pacemaker.git && cd pacemaker > [...] > $ git branch --contains Pacemaker-0.6.1 > * master >

[PATCH v6 02/11] commit: Let the callback of for_each_mergetag return on error

This is yet another patch to be filed under the keyword "libification". There is one subtle change in behavior here, where a `git log` that has been asked to show the mergetags would now stop reporting the mergetags upon the first failure, whereas previously, it would have continued to the next

[PATCH v6 04/11] replace: "libify" create_graft() and callees

File this away as yet another patch in the "libification" category. As with all useful functions, in the next commit we want to use create_graft() from a higher-level function where it would be inconvenient if the called function simply die()s: if there is a problem, we want to let the user know

[PATCH v6 07/11] Deprecate support for .git/info/grafts

The grafts feature was a convenient way to "stitch together" ancient history to the fresh start of linux.git. Its implementation is, however, not up to Git's standards, as there are too many ways where it can lead to surprising and unwelcome behavior. For example, when pushing from a repository

[PATCH v6 08/11] filter-branch: stop suggesting to use grafts

The graft file is deprecated now, so let's use replace refs in the example in filter-branch's man page instead. Suggested-by: Eric Sunshine Signed-off-by: Johannes Schindelin --- Documentation/git-filter-branch.txt | 2 +- 1 file changed, 1

[PATCH v6 00/11] Deprecate .git/info/grafts

It is fragile, as there is no way for the revision machinery to say "but now I want to traverse the graph ignoring the graft file" e.g. when pushing commits to a remote repository (which, as a consequence, can miss commits). And we already have a better solution with `git replace --graft [...]`.

[PATCH v6 06/11] Add a test for `git replace --convert-graft-file`

The proof, as the saying goes, lies in the pudding. So here is a regression test that not only demonstrates what the option is supposed to accomplish, but also demonstrates that it does accomplish it. Signed-off-by: Johannes Schindelin --- t/t6050-replace.sh | 20

[PATCH v6 03/11] replace: avoid using die() to indicate a bug

We have the BUG() macro for that purpose. Signed-off-by: Johannes Schindelin --- builtin/replace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/replace.c b/builtin/replace.c index 245d3f4164e..e345a5a0f1c 100644 --- a/builtin/replace.c

[PATCH v6 05/11] replace: introduce --convert-graft-file

This option is intended to help with the transition away from the now-deprecated graft file. Signed-off-by: Johannes Schindelin --- Documentation/git-replace.txt | 11 ++--- builtin/replace.c | 44 ++- 2 files changed,

[PATCH v6 01/11] argv_array: offer to split a string by whitespace

This is a simple function that will interpret a string as a whitespace delimited list of values, and add those values into the array. Note: this function does not (yet) offer to split by arbitrary delimiters, or keep empty values in case of runs of whitespace, or de-quote Unix shell style. All fo

[PATCH v6 09/11] technical/shallow: stop referring to grafts

Now that grafts are deprecated, we should start to assume that readers have no idea what grafts are. So it makes more sense to make the description of the "shallow" feature stand on its own. Suggested-by: Eric Sunshine Helped-by: Junio Hamano

[PATCH v6 11/11] Remove obsolete script to convert grafts to replace refs

The functionality is now implemented as `git replace --convert-graft-file`. Signed-off-by: Johannes Schindelin --- contrib/convert-grafts-to-replace-refs.sh | 28 --- 1 file changed, 28 deletions(-) delete mode 100755

[PATCH 2/6] sequencer: learn about the special "fake root commit" handling

When an interactive rebase wants to recreate a root commit, it - first creates a new, empty root commit, - checks it out, - converts the next `pick` command so that it amends the empty root commit Introduce support in the sequencer to handle such an empty root commit, by looking for the file

[PATCH 1/6] sequencer: extract helper to update active_cache_tree

This patch extracts the code from is_index_unchanged() to initialize or update the index' cache tree (i.e. a tree object reflecting the current index' top-level tree). The new helper will be used in the upcoming code to support `git rebase -i --root` via the sequencer. Signed-off-by: Johannes

[PATCH 4/6] sequencer: allow introducing new root commits

In the context of the new --rebase-merges mode, which was designed specifically to allow for changing the existing branch topology liberally, a user may want to extract commits into a completely fresh branch that starts with a newly-created root commit. This is now possible by inserting the

[PATCH 0/6] Let the sequencer handle `git rebase -i --root`

When I reimplemented the most performance-critical bits of the interactive rebase in the sequencer, to speed up `git rebase -i` particularly on Windows (even if the benefits are still quite notable on Linux or macOS), I punted on the --root part. I had always hoped that some other contributor (or

Re: git merge banch w/ different submodule revision

Hi, On Fri, Apr 27, 2018 at 3:37 AM, Middelschulte, Leif wrote: > Am Donnerstag, den 26.04.2018, 17:19 -0700 schrieb Elijah Newren: >> On Thu, Apr 26, 2018 at 3:49 AM, Middelschulte, Leif >> wrote: >> > Problem case: Merge

[PATCH v4 1/4] rebase -i: demonstrate bugs with fixup!/squash! commit messages

When multiple fixup/squash commands are processed and the last one causes merge conflicts and is skipped, we leave the "This is a combination of ..." comments in the commit message. Noticed by Eric Sunshine. This regression test also demonstrates that we rely on the localized version of

[PATCH v4 0/4] rebase -i: avoid stale "# This is a combination of" in commit messages

Eric Sunshine pointed out that I had such a commit message in https://public-inbox.org/git/CAPig+cRrS0_nYJJY=o6cbov630snqhpv5qgrqdd8mw-syzn...@mail.gmail.com/ and I went on a hunt to figure out how the heck this happened. Turns out that if there is a fixup/squash chain where the *last* command

[PATCH v4 3/4] sequencer: always commit without editing when asked for

Previously, we only called run_git_commit() without EDIT_MSG when we also passed in a default message. However, an upcoming caller will want to commit without EDIT_MSG and *without* a default message: to clean up fixup/squash comments in HEAD's commit message. Let's prepare for that.

[PATCH v4 4/4] rebase --skip: clean up commit message after a failed fixup/squash

During a series of fixup/squash commands, the interactive rebase builds up a commit message with comments. This will be presented to the user in the editor if at least one of those commands was a `squash`. In any case, the commit message will be cleaned up eventually, removing all those

[PATCH v4 2/4] rebase -i: Handle "combination of commits" with GETTEXT_POISON

We previously relied on the localized versions of # This is a combination of commits (which we write into the commit messages during fixup/squash chains) to contain encoded in ASCII. This is not true in general, and certainly not true when compiled with GETTEXT_POISON=TryToKillMe, as

[PATCH v6 10/11] technical/shallow: describe why shallow cannot use replace refs

It is tempting to do away with commit_graft altogether (in the long haul), now that grafts are deprecated. However, the shallow feature needs a couple of things that the replace refs cannot fulfill. Let's point that out in the documentation. Signed-off-by: Johannes Schindelin

Branch deletion question / possible bug?

Hi, I discovered that I was able to delete the feature branch I was in, due to some fat fingering on my part and case insensitivity. I never realized this could be done before. A quick google search did not give me a whole lot to work with... Steps to reproduce: 1. Create a feature

Re: [PATCH v3 2/3] merge: Add merge.renames config setting

On Fri, Apr 27, 2018 at 11:37 AM, Eckhard Maaß wrote: > On Fri, Apr 27, 2018 at 11:23:56AM +0900, Junio C Hamano wrote: >> I think demoting from copy to rename-only is a good idea, at least >> for now, because I do not believe we have figured out what we want >> to

Re: [PATCH v4 4/4] rebase --skip: clean up commit message after a failed fixup/squash

On Fri, Apr 27, 2018 at 1:48 PM, Johannes Schindelin wrote: > During a series of fixup/squash commands, the interactive rebase builds > up a commit message with comments. This will be presented to the user in > the editor if at least one of those commands was a

Re: BUG report: unicode normalization on APFS (Mac OS High Sierra)

On 2018-04-26 19:23, Elijah Newren wrote: On Thu, Apr 26, 2018 at 10:13 AM, Torsten Bögershausen wrote: Hm, thanks for the report. I don't have a high sierra box, but I can probably get one. t0050 -should- pass automagically, so I feel that I can do something. Unless someone

Re: [PATCH v5 00/11] Deprecate .git/info/grafts

Hi Junio, On Thu, 26 Apr 2018, Junio C Hamano wrote: > Johannes Schindelin writes: > > > - if (export_object(_oid, type, raw, tmpfile)) > > - return -1; > > - if (launch_editor(tmpfile, NULL, NULL) < 0) > > - return error("editing object file

Re: [RFC PATCH] checkout: Force matching mtime between files

On 2018-04-27 01:03 PM, Duy Nguyen wrote: On Wed, Apr 25, 2018 at 5:18 PM, Marc Branchaud wrote: The best approach to do so is to have those people do the "touch" thing in their own post-checkout hook. People who use Git as the source control system won't have to pay

Re: [RFC PATCH] checkout: Force matching mtime between files

On Fri, Apr 27, 2018 at 10:03 AM, Duy Nguyen wrote: > On Wed, Apr 25, 2018 at 5:18 PM, Marc Branchaud wrote: >> >> * In a "file checkout" ("git checkout -- path/to/file"), $1 and $2 are >> identical so the above loop does nothing. Offhand I'm not even

Re: [PATCH 18/41] index-pack: abstract away hash function constant

On Thu, Apr 26, 2018 at 05:46:28PM +0200, Duy Nguyen wrote: > On Wed, Apr 25, 2018 at 8:49 PM, Martin Ågren wrote: > > Once that is accomplished, I sort of suspect that this code will want to > > be updated to not always blindly use the_hash_algo, but to always work > >

Re: [PATCH 3/3] rebase --skip: clean up commit message after a failedfixup/squash

Hi Phillip, On Sat, 21 Apr 2018, Phillip Wood wrote: > On 20/04/18 13:18, Johannes Schindelin wrote: > > > > During a series of fixup/squash commands, the interactive rebase builds > > up a commit message with comments. This will be presented to the user in > > the editor if at least one of

[PATCH 3/6] rebase -i --root: let the sequencer handle even the initial part

In this developer's earlier attempt to accelerate interactive rebases by converting large parts from Unix shell script into portable, performant C, the --root handling was specifically excluded (to simplify the task a little bit; it still took over a year to get that reduced set of patches into

[PATCH 6/6] rebase --rebase-merges: root commits can be cousins, too

Reported by Wink Saville: when rebasing with no-rebase-cousins, we will want to refrain from rebasing all of them, even when they are root commits. Signed-off-by: Johannes Schindelin --- sequencer.c | 3 ++- t/t3430-rebase-merges.sh | 25

[PATCH 5/6] rebase --rebase-merges: a "merge" into a new root is a fast-forward

When a user provides a todo list containing something like reset [new root] merge my-branch let's do the same as if pulling into an orphan branch: simply fast-forward. Signed-off-by: Johannes Schindelin --- sequencer.c | 12

Re: [PATCH v6 06/11] Add a test for `git replace --convert-graft-file`

Hallo Johannes, > diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh > index c630aba657e..bed86a0af3d 100755 > --- a/t/t6050-replace.sh > +++ b/t/t6050-replace.sh > @@ -444,4 +444,24 @@ test_expect_success GPG '--graft on a commit with a > mergetag' ' Note the GPG prereq of the previous test.

Re: [PATCH 18/41] index-pack: abstract away hash function constant

On Fri, Apr 27, 2018 at 11:08 PM, brian m. carlson wrote: > On Thu, Apr 26, 2018 at 05:46:28PM +0200, Duy Nguyen wrote: >> On Wed, Apr 25, 2018 at 8:49 PM, Martin Ågren wrote: >> > Once that is accomplished, I sort of suspect that this code

Re: [PATCH 2/5] builtin/config.c: support `--type=` as preferred alias for `--type`

On Thu, Apr 26, 2018 at 2:00 AM, Taylor Blau wrote: > On Thu, Apr 26, 2018 at 02:25:44PM +0900, Junio C Hamano wrote: >> Taylor Blau writes: >> >> > Subject: Re: [PATCH 2/5] builtin/config.c: support `--type=` as >> > preferred alias for `--type` >> >> I'd

Re: [PATCH v2 5/5] builtin/config: introduce `color` type specifier

On Thu, Apr 26, 2018 at 1:58 AM, Taylor Blau wrote: > [...] > For consistency, let's introduce `--type=color` and encourage its use > with `--default` together over `--get-color` alone. > > Signed-off-by: Taylor Blau > --- > diff --git