Re: git log with ordering option and --first-parent is unnecessarily slow

On Fri, Apr 8, 2016 at 10:01 PM, Jeff King wrote: > I do agree that --date-order on a linear parent walk cannot change the > ordering (which guarantees child-before-parent), and is a noop. But > note that not all first-parent invocations are strictly linear. For > example: > > git log

Re: git log with ordering option and --first-parent is unnecessarily slow

On Fri, Apr 08, 2016 at 08:55:54PM -0700, Josiah Boning wrote: > As measured on linux.git, adding --date-order to a log command can > result in a significant slowdown (~25x here; I've seen ~100x on other > repositories): > > $ time git log --first-parent --max-count=51 master > /dev/null >

Re: [RFC/PATCH 00/18] Add --index-only option to git merge

Elijah Newren writes: > On Fri, Apr 8, 2016 at 11:08 AM, Junio C Hamano wrote: >> Elijah Newren writes: >> >> The goal is stated rather vaguely--when you have a working tree and >> perform this "in index" merge, you would obviously update

git log with ordering option and --first-parent is unnecessarily slow

As measured on linux.git, adding --date-order to a log command can result in a significant slowdown (~25x here; I've seen ~100x on other repositories): $ time git log --first-parent --max-count=51 master > /dev/null real0m0.024s user0m0.006s sys0m0.016s $ time git

Re: [RFC/PATCH 00/18] Add --index-only option to git merge

On Fri, Apr 8, 2016 at 6:01 AM, Michael J Gruber wrote: > I haven't looked at your series thoroughly but immediately had to think > of 'tr/remerge-diff' (on 'pu'), see > http://permalink.gmane.org/gmane.comp.version-control.git/256591 > > There, Thomas used index-only

Re: [RFC/PATCH 00/18] Add --index-only option to git merge

Hi, On Fri, Apr 8, 2016 at 11:08 AM, Junio C Hamano wrote: > Elijah Newren writes: > > The goal is stated rather vaguely--when you have a working tree and > perform this "in index" merge, you would obviously update the index > with the merge result and ...

Re: [RFC/PATCH 01/18] Remove duplicate code

Elijah Newren writes: > Subject: Re: [RFC/PATCH 01/18] Remove duplicate code Subject: [RFC/PATCH 01/18] merge-recursive: remove duplicate code > In commit 51931bf (merge-recursive: Improve handling of rename target vs. > directory addition, 2011-08-11) I apparently added two

Re: [RFC/PATCH 11/18] merge: Add a new --index-only option, not yet implemented

Elijah Newren writes: > +--index-only:: > + Perform merge on index only, leaving working tree alone. Most > + users do NOT want to use this flag, as it will leave the > + working tree and the index completely out of sync, which is > + very likely to confuse

Re: [PATCH v3 03/16] index-helper: new daemon for caching index and related stuff

On Fri, 2016-04-08 at 18:26 +0700, Duy Nguyen wrote: > On Thu, Apr 7, 2016 at 5:11 AM, David Turner < > dtur...@twopensource.com> wrote: > > @@ -1045,4 +1046,21 @@ struct tm *git_gmtime_r(const time_t *, > > struct tm *); > > #define getc_unlocked(fh) getc(fh) > > #endif > > > > +#ifdef

Re: [PATCH 03/24] t1430: test the output and error of some commands more carefully

On Fri, 2016-04-08 at 13:43 -0700, Junio C Hamano wrote: > David Turner writes: > > > Would you like > > me to re-roll with my sign-off, or would you prefer to add it > > yourself? > > I take it that you see no other reason to reroll the series at this > point

Re: [PATCH 03/24] t1430: test the output and error of some commands more carefully

David Turner writes: > Would you like > me to re-roll with my sign-off, or would you prefer to add it yourself? I take it that you see no other reason to reroll the series at this point (otherwise you wouldn't be asking ;-), so I'll check which ones need amending and

Re: [PATCH 6/7] l10n: mv.c: add a comma ',' to string

Vasco Almeida writes: > Add a comma to string marked for translation. Make the string match the > one in rm.c. Now translators have do handle this string only once. I suspect these "comma after Please" is a French invention. Aiming to reduce these minor variants is a

Re: [PATCH 4/7] l10n: builtin/pull.c: mark strings for translation

Vasco Almeida writes: > Some translations might also translate "" and "". > ... > fprintf_ln(stderr, _("See git-pull(1) for details.")); > fprintf(stderr, "\n"); > - fprintf_ln(stderr, "git pull "); > +

Re: [PATCH 3/7] l10n: git-parse-remote.sh: mark strings for translation

Vasco Almeida writes: > + gettextln "You are not currently on a branch." > + if test $op_type = "rebase" if test "$op_type" = rebase that is, $op_type could be an empty string that 'test' may not even see hence it should be double-quoted

Re: [PATCH 1/7] l10n: index-pack: use plural string instead of normal one

Vasco Almeida writes: > Subject: Re: [PATCH 1/7] l10n: index-pack: use plural string instead of > normal one These are probably better prefixed with "i18n:" (i.e. enable translation into many languages) not "l10n:" (i.e. actually translate for languages). > Git could

Re: [PATCH 2/7] l10n: unpack-trees: mark strings for translation

Vasco Almeida writes: > Mark strings seen by the user inside setup_unpack_trees_porcelain() and > display_error_msgs() functions for translation. > > One case Git outputs the named strings is when the user does some editing to > a file on some branch and then checks out

Re: [RFC/PATCH 05/18] Add testcase for --index-only merges needing the recursive strategy

Junio C Hamano writes: > Elijah Newren writes: > >> +test_expect_failure '--index-only with rename/modify works in >> non-bare-clone' ' >> +git checkout B^0 && >> + >> +git merge --index-only -s recursive C^0 && >> + >> +echo "Making sure the

[PATCH 4/7] l10n: builtin/pull.c: mark strings for translation

Some translations might also translate "" and "". Signed-off-by: Vasco Almeida --- builtin/pull.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/builtin/pull.c b/builtin/pull.c index 10eff03..a99d6b9 100644 --- a/builtin/pull.c +++

[PATCH 3/7] l10n: git-parse-remote.sh: mark strings for translation

Change Makefile to include git-parse-remote.sh in LOCALIZED_SH. TODO: remove 3rd argument of error_on_missing_default_upstream function that is no longer required. Signed-off-by: Vasco Almeida --- Makefile| 2 +- git-parse-remote.sh | 49

[PATCH 5/7] l10n: builtin/pull.c: split strings marked for translation

Split string "If you wish to set tracking information for this branch you can do so with:\n" to match occurring string in git-parse-remote.sh. In this case, the translator handles it only once. On the other hand, the translations of the string that were already made are mark as fuzzy and the

[PATCH 7/7] l10n: builtin/branch.c: mark option for translation

Mark description and parameter for option "set-upstream-to" for translation. Signed-off-by: Vasco Almeida --- builtin/branch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/branch.c b/builtin/branch.c index 7b45b6b..5ab106b 100644 ---

[PATCH 6/7] l10n: mv.c: add a comma ',' to string

Add a comma to string marked for translation. Make the string match the one in rm.c. Now translators have do handle this string only once. Signed-off-by: Vasco Almeida --- builtin/mv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/mv.c

[PATCH 1/7] l10n: index-pack: use plural string instead of normal one

Git could output "completed with 1 local objects", but in this case using "object" instead of "objects" is the correct form. Use Q_() instead of _(). Signed-off-by: Vasco Almeida --- builtin/index-pack.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git

[PATCH 2/7] l10n: unpack-trees: mark strings for translation

Mark strings seen by the user inside setup_unpack_trees_porcelain() and display_error_msgs() functions for translation. One case Git outputs the named strings is when the user does some editing to a file on some branch and then checks out other branch, but that file changes by the checkout. This

Re: [RFC/PATCH 05/18] Add testcase for --index-only merges needing the recursive strategy

Elijah Newren writes: > +test_expect_failure '--index-only with rename/modify works in > non-bare-clone' ' > + git checkout B^0 && > + > + git merge --index-only -s recursive C^0 && > + > + echo "Making sure the working copy was not updated" && > + test ! -f b

Re: [RFC/PATCH 04/18] merge-octopus: Abort if index not clean

Elijah Newren writes: > Signed-off-by: Elijah Newren > --- > git-merge-octopus.sh | 5 + > t/t6044-merge-unrelated-index-changes.sh | 21 ++--- > 2 files changed, 11 insertions(+), 15 deletions(-) > > diff --git

Re: [PATCH 03/24] t1430: test the output and error of some commands more carefully

On Fri, 2016-04-08 at 11:14 -0400, Michael Haggerty wrote: > On 04/07/2016 03:02 PM, David Turner wrote: > > From: Michael Haggerty > > > > Signed-off-by: Michael Haggerty > > [...] > > David, even though I wrote these patches, I believe you need to

Re: git 2.8.1 not working with socks5h https proxy anymore

Felix Ruess writes: > I just encountered a problem with the latest git version (2.8.1) that > looks like a regression to me: > When trying to clone a repo via a https socks5 proxy the connection times out: > > $ git config --global 'http.proxy=socks5h://127.0.0.1:1080'

Re: git 2.8.1 not working with socks5h https proxy anymore

On vr, 2016-04-08 at 20:46 +0200, Felix Ruess wrote: > Hi all, > > I just encountered a problem with the latest git version (2.8.1) that > looks like a regression to me: > When trying to clone a repo via a https socks5 proxy the connection > times out: > > $ git config --global

git 2.8.1 not working with socks5h https proxy anymore

Hi all, I just encountered a problem with the latest git version (2.8.1) that looks like a regression to me: When trying to clone a repo via a https socks5 proxy the connection times out: $ git config --global 'http.proxy=socks5h://127.0.0.1:1080' $ export GIT_CURL_VERBOSE=1 $ git clone

Re: [PATCH 1/2] imap-send: check for NOLOGIN capability only when using LOGIN command

Kazuki Yamaguchi writes: > Don't check for NOLOGIN (LOGINDISABLED) capability when imap.authMethod > is specified. > > LOGINDISABLED capability doesn't forbid using AUTHENTICATE, so it should > be allowed, or we can't connect to IMAP servers which only accepts > AUTHENTICATE

Re: [PATCH] format-patch: allow --no-patch to disable patch output

On Fri, Apr 8, 2016 at 11:30 AM, Junio C Hamano wrote: > Jacob Keller writes: > >> So if I want to get the summary of a patch out of a commit without the >> actual diff what would you suggest? > > "git log --stat"? > > If you have a set of (discrete)

Re: [PATCH] format-patch: allow --no-patch to disable patch output

Jacob Keller writes: > So if I want to get the summary of a patch out of a commit without the > actual diff what would you suggest? "git log --stat"? If you have a set of (discrete) commits, "git show --stat A B C"? > Basically, I have a process where we have post

Re: [PATCH] git-format-patch.txt: don't show -s as shorthand for multiple options

On Mon, Apr 4, 2016 at 12:32 PM, Junio C Hamano wrote: > Eric Sunshine writes: > >> Documentation/diff-options.txt | 2 ++ >> 1 file changed, 2 insertions(+) >> >> diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt >> index

Re: [PATCH] format-patch: allow --no-patch to disable patch output

On Thu, Apr 7, 2016 at 2:30 PM, Eric Sunshine wrote: > On Thu, Apr 7, 2016 at 12:46 PM, Jacob Keller > wrote: >> The documentation for format-patch indicates that --no-patch wilL >> suppress patch output. It also incorrectly mentions that -s

Re: [RFC/PATCH 00/18] Add --index-only option to git merge

Elijah Newren writes: > This patch series adds an --index-only flag to git merge, the idea > being to allow a merge to be performed entirely in the index without > touching (or even needing) a working tree. The goal is stated rather vaguely--when you have a working tree and

Re: [PATCH] set_worktree_head_symref(): fix error message

Thanks. Will queue. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: [PATCH] log: allow --graph and --show-linear-break used together

Jan Kundrát writes: > this patch makes it possible to use --show-linear-break in `git log > --graph --oneline --all`. You have multiple roots, just like we would show the histories like this: * A |\ | * B | * C (root) *D *E (another root)

Re: [PATCH v12 2/5] test-parse-options: print quiet as integer

Eric Sunshine writes: > On Sat, Apr 2, 2016 at 7:33 PM, Pranit Bauva wrote: >> Current implementation of parse-options.c treats OPT__QUIET() as integer >> and not boolean and thus it is more appropriate to print it as integer >> to avoid

[PATCH 2/4] imap-send: check NULL return of SSL_CTX_new()

SSL_CTX_new() may fail with return value NULL. Signed-off-by: Kazuki Yamaguchi --- imap-send.c | 4 1 file changed, 4 insertions(+) diff --git a/imap-send.c b/imap-send.c index 0364b326e109..c5e24a35491d 100644 --- a/imap-send.c +++ b/imap-send.c @@ -298,6 +298,10 @@ static

[PATCH 3/4] imap-send: avoid deprecated TLSv1_method()

Use SSLv23_method always and disable SSL if needed. TLSv1_method() function is deprecated in OpenSSL 1.1.0 and the compiler emits a warning. SSLv23_method() is also deprecated, but the alternative, TLS_method(), is new in OpenSSL 1.1.0 so requires checking by configure. Stick to SSLv23_method()

[PATCH 1/4] imap-send: use HMAC() function provided by OpenSSL

Fix compile errors with OpenSSL 1.1.0. HMAC_CTX is made opaque and HMAC_CTX_cleanup is removed in OpenSSL 1.1.0. But since we just want to calculate one HMAC, we can use HMAC() here, which exists since OpenSSL 0.9.6 at least. Signed-off-by: Kazuki Yamaguchi --- Since I don't have

[PATCH 4/4] configure: remove checking for HMAC_CTX_cleanup

We don't need it, as we no longer use HMAC_CTX_cleanup() directly. Signed-off-by: Kazuki Yamaguchi --- Makefile | 6 -- configure.ac | 4 git-compat-util.h | 3 --- 3 files changed, 13 deletions(-) diff --git a/Makefile b/Makefile index

[PATCH 0/4] fix compilation with OpenSSL 1.1.0-pre4

OpenSSL 1.1.0 is not released yet, but the first beta 1.1.0-pre4 was released on Mar 16[1]. According to the OpenSSL's web site[2], only bug fixes will be applied after beta release, and 1.1.0 final will be in a month or two. Thanks, [1]

Re: [PATCH 03/24] t1430: test the output and error of some commands more carefully

On 04/07/2016 03:02 PM, David Turner wrote: > From: Michael Haggerty > > Signed-off-by: Michael Haggerty > [...] David, even though I wrote these patches, I believe you need to sign them off too since you are the one submitting them to the list (it's

Re: [PATCH v3 03/16] index-helper: new daemon for caching index and related stuff

Hi David, On Thu, 7 Apr 2016, David Turner wrote: > On Thu, 2016-04-07 at 16:14 +0200, Johannes Schindelin wrote: > > > > On Thu, 7 Apr 2016, Johannes Sixt wrote: > > > > > Am 07.04.2016 um 00:11 schrieb David Turner: > > > > +static void share_index(struct index_state *istate, struct shm > >

Re: [PATCH] rebase: convert revert to squash on autosquash

On Fri, Apr 08, 2016 at 01:42:12PM +0200, Matthieu Moy wrote: > Johannes Schindelin writes: > > > git revert -n deadbeef > > git commit --squash deadbeef > > > > where "deadbeef" is the placeholder for the actual commit to revert. > > > > And indeed, I use

[PATCH 0/2] imap-send: fixes for CRAM-MD5 authentication

[1/2] Check for LOGINDISABLED capability only when using LOGIN command, as it is unrelated to authentication with CRAM-MD5. [2/2] Remove extra + 1, which is probably mistakenly added. Without this patch I can't open my IMAP server (Dovecot 2.2). Thanks, Kazuki Yamaguchi (2): imap-send: check

[PATCH 1/2] imap-send: check for NOLOGIN capability only when using LOGIN command

Don't check for NOLOGIN (LOGINDISABLED) capability when imap.authMethod is specified. LOGINDISABLED capability doesn't forbid using AUTHENTICATE, so it should be allowed, or we can't connect to IMAP servers which only accepts AUTHENTICATE command. Signed-off-by: Kazuki Yamaguchi

[PATCH 2/2] imap-send: fix CRAM-MD5 response calculation

Remove extra + 1 from resp_len, the length of the byte sequence to be Base64 encoded and passed to the server as the response. Or the response incorrectly contains an extra \0. Signed-off-by: Kazuki Yamaguchi --- imap-send.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

Re: [RFC/PATCH 00/18] Add --index-only option to git merge

Elijah Newren venit, vidit, dixit 08.04.2016 08:58: > This patch series adds an --index-only flag to git merge, the idea > being to allow a merge to be performed entirely in the index without > touching (or even needing) a working tree. > > The core fix, to merge-recursive, was actually quite

Re: [PATCH] log: allow --graph and --show-linear-break used together

On Fri, Apr 08, 2016 at 01:21:07PM +0200, Jan Kundrát wrote: > From 1ac6bb7c31652835d3d046c82e423f0cea6e0904 Mon Sep 17 00:00:00 2001 > From: =?UTF-8?q?Jan=20Kundr=C3=A1t?= > Date: Fri, 8 Apr 2016 13:06:31 +0200 > Subject: [PATCH] log: allow --graph and --show-linear-break used

Re: [PATCH] rev-parse: fix --git-common-dir when executed from subpath of main tree

On Fri, Apr 8, 2016 at 7:47 AM, Duy Nguyen wrote: > On Mon, Apr 4, 2016 at 8:42 AM, Michael Rappazzo wrote: >> Executing `git-rev-parse --git-common-dir` from the root of the main >> worktree results in '.git', which is the relative path to the git dir. >>

Re: [PATCH] rev-parse: fix --git-common-dir when executed from subpath of main tree

On Mon, Apr 4, 2016 at 8:42 AM, Michael Rappazzo wrote: > Executing `git-rev-parse --git-common-dir` from the root of the main > worktree results in '.git', which is the relative path to the git dir. > When executed from a subpath of the main tree it returned somthing like: >

Re: Rename case insensitive

On 08.04.16 12:01, chenjinlei wrote: > > I’m encounter a problem due to my own stupidity… > #1 I pushed a project named Android to my repository. > #2 I `mv Android android`, cause I think it’s no good to use the uppercase as > my project name. > #3 I pushed it to my repository again… > > I

Re: [PATCH] rebase: convert revert to squash on autosquash

On Fri, Apr 08, 2016 at 01:13:51PM +0200, Johannes Schindelin wrote: > Hi Michael, > > On Thu, 7 Apr 2016, Michael S. Tsirkin wrote: > > > On Thu, Apr 07, 2016 at 05:23:09PM +0200, Johannes Schindelin wrote: > > > > > > On Thu, 7 Apr 2016, Michael S. Tsirkin wrote: > > > > > > > Reverts can

Re: [PATCH] rebase: convert revert to squash on autosquash

Johannes Schindelin writes: > git revert -n deadbeef > git commit --squash deadbeef > > where "deadbeef" is the placeholder for the actual commit to revert. > > And indeed, I use exactly this song and dance quite frequently, *iff* my > intention is to drop

Re: [PATCH] rebase: convert revert to squash on autosquash

"Michael S. Tsirkin" writes: > Doing this automatically for all users might be a bit too drastic for > the upstream git. So there could be an option, or something - if > there's interest I can add that. I thought I'd test the waters before > I spend time on that. If the goal

Re: [PATCH v12 2/5] test-parse-options: print quiet as integer

On Tue, Apr 5, 2016 at 10:39 PM, Pranit Bauva wrote: > [+cc:Duy Nguyen, Jonathan Nieder] > > On Mon, Apr 4, 2016 at 3:00 AM, Eric Sunshine wrote: >> On Sat, Apr 2, 2016 at 7:33 PM, Pranit Bauva wrote: >>> Current

[PATCH] log: allow --graph and --show-linear-break used together

Hi, this patch makes it possible to use --show-linear-break in `git log --graph --oneline --all`. (Please Cc me on replies, I'm not subscribed to the Git ML.) Cheers, Jan -- Trojitá, a fast Qt IMAP e-mail client -- http://trojita.flaska.net/From 1ac6bb7c31652835d3d046c82e423f0cea6e0904 Mon

Re: [PATCH v3 03/16] index-helper: new daemon for caching index and related stuff

On Thu, Apr 7, 2016 at 5:11 AM, David Turner wrote: > @@ -1045,4 +1046,21 @@ struct tm *git_gmtime_r(const time_t *, struct tm *); > #define getc_unlocked(fh) getc(fh) > #endif > > +#ifdef __linux__ > +#define UNIX_PATH_MAX 108 > +#elif defined(__APPLE__) ||

Re: [PATCH] rebase: convert revert to squash on autosquash

Hi Michael, On Thu, 7 Apr 2016, Michael S. Tsirkin wrote: > On Thu, Apr 07, 2016 at 05:23:09PM +0200, Johannes Schindelin wrote: > > > > On Thu, 7 Apr 2016, Michael S. Tsirkin wrote: > > > > > Reverts can typically be treated like squash. Eliminating both the > > > original commit and the

bug to report

I’m encounter a problem due to my own stupidity… #1 I pushed a project named Android to my repository. #2 I `mv Android android`, cause I think it’s no good to use the uppercase as my project name. #3 I pushed it to my repository again… I found that there `Adnroid` and `android` exist in my

[PATCH] set_worktree_head_symref(): fix error message

Emit an informative error when failed to hold lock of HEAD. 2233066 (refs: add a new function set_worktree_head_symref) added set_worktree_head_symref() but this is missing a call to unable_to_lock_message() after hold_lock_file_for_update() fails, so it emits an empty error message: % git

[RFC/PATCH 07/18] Add testcase for --index-only merges with the resolve strategy

Including both tests which can be handled without calling the actual git-merge-resolve program (because the merge is trivially resolvable without worrying about 3-way file merges), and ones that do need it to be invoked. Signed-off-by: Elijah Newren ---

[RFC/PATCH 12/18] Add --index-only support for recursive merges

The merge-recursive logic already had the ability to ignore the working directory and operate entirely on the index -- it needed to do this when creating a virtual merge base, i.e. when o->call_depth > 0. The only trick here is that o->call_depth > 0 was also checked to determine whether all

[RFC/PATCH 01/18] Remove duplicate code

In commit 51931bf (merge-recursive: Improve handling of rename target vs. directory addition, 2011-08-11) I apparently added two lines of code that were immediately duplicated a few lines later. No idea why, other than it seems pretty clear this was a mistake: there is no need to remove the same

[RFC/PATCH 18/18] git-merge-octopus.sh: support --index-only option

Signed-off-by: Elijah Newren --- git-merge-octopus.sh| 14 +++--- t/t6043-merge-index-only.sh | 4 ++-- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/git-merge-octopus.sh b/git-merge-octopus.sh index a1d7702..e7915dc 100755 ---

[RFC/PATCH 14/18] Add --index-only support for ff_only merges

From: Elijah Newren Signed-off-by: Elijah Newren --- builtin/merge.c | 1 + builtin/pull.c | 4 ++-- cache.h | 1 + merge.c | 4 +++- sequencer.c | 2 +-

[RFC/PATCH 04/18] merge-octopus: Abort if index not clean

Signed-off-by: Elijah Newren --- git-merge-octopus.sh | 5 + t/t6044-merge-unrelated-index-changes.sh | 21 ++--- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/git-merge-octopus.sh b/git-merge-octopus.sh index

[RFC/PATCH 11/18] merge: Add a new --index-only option, not yet implemented

Subsequent commits will add implementation for each relevant merge strategy Signed-off-by: Elijah Newren --- Documentation/git-merge.txt | 14 ++ builtin/merge.c | 7 +++ git.c | 2 +- merge-recursive.c | 1 +

[RFC/PATCH 06/18] Add testcase for --index-only merges needing an ff update

Signed-off-by: Elijah Newren --- t/t6043-merge-index-only.sh | 70 + 1 file changed, 70 insertions(+) diff --git a/t/t6043-merge-index-only.sh b/t/t6043-merge-index-only.sh index b8b22ab..67c8e92 100755 ---

[RFC/PATCH 15/18] merge: Pass --index-only along to external merge strategy programs

Signed-off-by: Elijah Newren --- builtin/merge-index.c | 9 - builtin/merge.c | 2 +- cache.h | 2 +- merge.c | 4 +++- sequencer.c | 2 +- 5 files changed, 14 insertions(+), 5 deletions(-) diff --git a/builtin/merge-index.c

[RFC/PATCH 08/18] Add testcase for --index-only merges with the octopus strategy

Signed-off-by: Elijah Newren --- t/t6043-merge-index-only.sh | 41 + 1 file changed, 41 insertions(+) diff --git a/t/t6043-merge-index-only.sh b/t/t6043-merge-index-only.sh index 4c3c40a..b01bf79 100755 --- a/t/t6043-merge-index-only.sh

[RFC/PATCH 10/18] Add testcase for --index-only merges with the subtree strategy

Signed-off-by: Elijah Newren --- t/t6043-merge-index-only.sh | 34 ++ 1 file changed, 34 insertions(+) diff --git a/t/t6043-merge-index-only.sh b/t/t6043-merge-index-only.sh index 84c6640..5eda6b3 100755 --- a/t/t6043-merge-index-only.sh +++

[RFC/PATCH 03/18] Document weird bug in octopus merges via testcases

...and check all other merge strategies with testcases while we're at it. When the index has a staged change before running git merge, most the time git merge will error out telling the user that the merge operation would toss their merged changes unless they commit them first. There are two

[RFC/PATCH 00/18] Add --index-only option to git merge

This patch series adds an --index-only flag to git merge, the idea being to allow a merge to be performed entirely in the index without touching (or even needing) a working tree. The core fix, to merge-recursive, was actually quite easy. The recursive merge logic already had the ability to

[RFC/PATCH 02/18] Avoid checking working copy when creating a virtual merge base

There were a few cases in merge-recursive that could result in a check for the presence of files in the working copy while trying to create a virtual merge base. These were rare and innocuous, but somewhat illogical. The two cases were: * When there was naming conflicts (e.g. a D/F conflict)

[RFC/PATCH 17/18] git-merge-resolve.sh: support --index-only option

Signed-off-by: Elijah Newren --- git-merge-resolve.sh| 12 ++-- t/t6043-merge-index-only.sh | 4 ++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/git-merge-resolve.sh b/git-merge-resolve.sh index c9da747..ed4a25b 100755 ---

[RFC/PATCH 05/18] Add testcase for --index-only merges needing the recursive strategy

Signed-off-by: Elijah Newren --- t/t6043-merge-index-only.sh | 170 1 file changed, 170 insertions(+) create mode 100755 t/t6043-merge-index-only.sh diff --git a/t/t6043-merge-index-only.sh b/t/t6043-merge-index-only.sh new file

[RFC/PATCH 09/18] Add testcase for --index-only merges with the ours strategy

This is almost trivial to make work, because we already know that the working tree will need no modifications, but lets test it for completeness anyway. Signed-off-by: Elijah Newren --- t/t6043-merge-index-only.sh | 32 1 file changed, 32

[RFC/PATCH 13/18] Add --index-only support with read_tree_trivial merges, kind of

From: Elijah Newren This almost works. It creates the correct merge commit, updates the branch, but then if the repo is bare it leaves the index as it was before the merge (and if the repo is non-bare it updates the index). I'm totally lost as to why the testcase behaves

[RFC/PATCH 16/18] git-merge-one-file.sh: support --index-only option

Signed-off-by: Elijah Newren --- git-merge-one-file.sh | 44 +++- 1 file changed, 35 insertions(+), 9 deletions(-) diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh index 424b034..78efa00 100755 --- a/git-merge-one-file.sh +++

Re: [PATCH v3 1/2] refs: add a new function set_worktree_head_symref

On Fri, Apr 8, 2016 at 2:37 AM, Kazuki Yamaguchi wrote: > On Thu, Apr 07, 2016 at 05:20:10PM -0400, Eric Sunshine wrote: >> On Sun, Mar 27, 2016 at 10:37 AM, Kazuki Yamaguchi wrote: >> > +int set_worktree_head_symref(const char *gitdir, const char *target) >> > +{ >> >

Re: [PATCH v3 1/2] refs: add a new function set_worktree_head_symref

On Thu, Apr 07, 2016 at 05:20:10PM -0400, Eric Sunshine wrote: > On Sun, Mar 27, 2016 at 10:37 AM, Kazuki Yamaguchi wrote: > > Add a new function set_worktree_head_symref, to update HEAD symref for > > the specified worktree. > > > > To update HEAD of a linked working tree, > >

Re: [PATCH v3 09/16] index-helper: use watchman to avoid refreshing index with lstat()

David Turner writes: > On Thu, 2016-04-07 at 15:52 -0700, Junio C Hamano wrote: >> Junio C Hamano writes: >> >> > > +untracked = data + len + 8 + bitmap_size; >> > >> > This breaks compilation as data here is of type (void *). >> >