* pw/rebase-reflog-fixes (was Re: What's cooking in git.git (Oct 2022, #06; Wed, 19))
@ 2022-10-20 9:56 0% ` Phillip Wood
0 siblings, 0 replies; 200+ results
From: Phillip Wood @ 2022-10-20 9:56 UTC (permalink / raw)
To: Junio C Hamano, git
Hi Junio
> * pw/rebase-reflog-fixes (2022-10-17) 9 commits
> - rebase: cleanup action handling
> - rebase --abort: improve reflog message
> - rebase --apply: make reflog messages match rebase --merge
> - rebase --apply: respect GIT_REFLOG_ACTION
> - rebase --merge: fix reflog message after skipping
> - rebase --merge: fix reflog when continuing
> - t3406: rework rebase reflog tests
> - rebase --apply: remove duplicated code
> - Merge branch 'pw/rebase-keep-base-fixes' into pw/rebase-reflog-fixes
> (this branch uses pw/rebase-keep-base-fixes.)
>
> Fix some bugs in the reflog messages when rebasing and changes the
> reflog messages of "rebase --apply" to match "rebase --merge" with
> the aim of making the reflog easier to parse.
>
> Will merge to 'next'??
> source: <pull.1150.v3.git.1665567312.gitgitgadget@gmail.com>
Can you hold off on this one please, I'm planning to re-roll next week
to address <xmqq35brh9re.fsf@gitster.g>
Thanks
Phillip
^ permalink raw reply [relevance 0%]
* Re: I think there is error in merge documents - current branch
2023-05-21 13:28 2% ` Minnie Shi
@ 2023-05-21 13:49 0% ` Minnie Shi
0 siblings, 0 replies; 200+ results
From: Minnie Shi @ 2023-05-21 13:49 UTC (permalink / raw)
To: Sergey Organov; +Cc: Junio C Hamano, git
do not worry, I found the instructions:
https://git-scm.com/docs/SubmittingPatches;
also just realized that Kristofer Haugsbakk already submitted a patch
(initially I thought his email was just a response).
We are all good now.
Thanks for your time.
Min
On Sun, May 21, 2023 at 3:28 PM Minnie Shi <minnie.shi@gmail.com> wrote:
>
> Hi All,
>
> What is the procedure to update the document to correct the error? As
> I responded yesterday, see below. we need to change the error.
>
> From: Minnie Shi <minnie.shi@gmail.com>
> Date: Sat, May 20, 2023 at 11:41 AM
> Subject: Re: [PATCH] doc: merge: fix mention of `ORIG_HEAD`
> To: Kristoffer Haugsbakk <code@khaugsbakk.name>
> Cc: <git@vger.kernel.org>, Kristoffer Haugsbakk <code@khaugsbakk.name>
>
>
> Okay, i read one more time, i think it should be read as
>
> Before the operation,
> -`ORIG_HEAD` is set to the tip of the "current" branch (`G`)
>
> instead of
> Before the operation,
> -`ORIG_HEAD` is set to the tip of the "current" branch (`C`)
>
> Kind regards,
> Mi
>
> On Sun, May 21, 2023 at 2:23 PM Sergey Organov <sorganov@gmail.com> wrote:
> >
> > Junio C Hamano <gitster@pobox.com> writes:
> >
> > > Minnie Shi <minnie.shi@gmail.com> writes:
> > >
> > >> in summary the sentence should be read as
> > >>
> > >> Before the operation, ORIG_HEAD is set to the tip of the current branch (H).
> > >> instead of
> > >> Before the operation, ORIG_HEAD is set to the tip of the current branch (C).
> > >
> > > Not C but G (i.e. the tip _before_ the history is updated).
> > >
> > > I notice that we overuse "current" there. One is to refer to the
> > > most recent commit on a branch, the other is to refer to the branch
> > > that is checked out. For the former, we say "the tip" in the other
> > > sentence, and it probably will make it less ambiguous if used that
> > > phrase.
> > >
> > > Then "`git merge topic`" will replay the changes made on the
> > > `topic` branch since it diverged from `master` (i.e., `E`) until
> > > the commit at the tip of the `topic` (`C`) on top of `master`,
> > > and record the result
> > > in a new commit along with the names of the two parent commits and
> > > a log message from the user describing the changes. Before the operation,
> > > `ORIG_HEAD` is set to the tip of the current branch (`G`).
> > >
> > > My reading also hiccupped with "replay"; the first sentence to
> > > explain the command says "incorporate the changes", and that may be
> > > a less confusing expression; "replay" somehow makes me imagine that
> > > the changes are cherry-picked one by one---it may be only me, so I
> > > left it as-is in the suggestion above.
> >
> > For me "apply changes" or even "apply cumulative changes" works much
> > better than "replay changes" in this context, especially provided we
> > will apparently have "git replay" soon.
> >
> > Thanks,
> > -- Sergey Organov
>
>
>
> --
> Kind regards
> Min
--
Kind regards
Min
^ permalink raw reply [relevance 0%]
* Re: [PATCH 21/30] repository: Implement extensions.compatObjectFormat
2023-09-29 18:48 2% ` Junio C Hamano
@ 2023-10-02 0:48 0% ` Eric W. Biederman
0 siblings, 0 replies; 200+ results
From: Eric W. Biederman @ 2023-10-02 0:48 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git, brian m. carlson, Eric W. Biederman
Junio C Hamano <gitster@pobox.com> writes:
> "Eric W. Biederman" <ebiederm@gmail.com> writes:
>
>> Did you have any manual merge conflicts you had to resolve?
>> If so it is possible to see the merge result you had?
>
> The only merge-fix I had to apply to make everything compile was
> this:
>
> diff --git a/bloom.c b/bloom.c
> index ff131893cd..59eb0a0481 100644
> --- a/bloom.c
> +++ b/bloom.c
> @@ -278,7 +278,7 @@ static int has_entries_with_high_bit(struct repository *r, struct tree *t)
> struct tree_desc desc;
> struct name_entry entry;
>
> - init_tree_desc(&desc, t->buffer, t->size);
> + init_tree_desc(&desc, &t->object.oid, t->buffer, t->size);
> while (tree_entry(&desc, &entry)) {
> size_t i;
> for (i = 0; i < entry.pathlen; i++) {
>
> as one topic changed the function signature while the other topic
> added a new callsite.
>
> Everything else was pretty-much auto resolved, I think.
>
> Output from "git show --cc seen" matches my recollection. The above
> does appear as an evil merge.
Thanks, and I found all of this on your seen branch.
After tracking all of these down it appears all of the errors
came from my branch, I will be resending the patches as soon
as I finish going through the review comments.
Looking at the build errors pretty much all of the all of the
automatic test failures came from commit_tree_extended.
There was a strbuf that did
strbuf_init(&buf, 8192);
strbuf_init(&buf, 8192);
twice.
Plus there was another buffer that was allocated and not freed,
in commit_tree_extended.
The leaks were a bit tricky to track down as building with SANITIZE=leak
causes tests to fail somewhat randomly for me with "gcc (Debian
12.2.0-14) 12.2.0".
There was one smatch static-analysis error that suggested using
CALLOC_ARRAY instead of xcalloc.
The "win" build and "linux-gcc-default (ubuntu-lastest)" build failed
because of an over eager gcc warning -Werror=array-bounds.
Claiming:
In file included from /usr/include/string.h:535,
from git-compat-util.h:228,
from commit.c:1:
In function ‘memcpy’,
inlined from ‘oidcpy’ at hash-ll.h:272:2,
inlined from ‘commit_tree_extended’ at commit.c:1705:3:
##[error]/usr/include/x86_64-linux-gnu/bits/string_fortified.h:29:10: ‘__builtin_memcpy’ offset [0, 31] is out of the bounds [0, 0] [-Werror=array-bounds]
29 | return __builtin___memcpy_chk (__dest, __src, __len,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
30 | __glibc_objsize0 (__dest));
| ~~~~~~~~~~~~~~~~~~~~~~~~~~
Previously in commit_tree_extended the structure was:
while (parents) {
struct commit *parent = pop_commit(&parents);
strbuf_addf(&buffer, "parent %s\n",
oid_to_hex(&parent->object.oid));
}
brian had changed it to:
nparents = commit_list_count(parents);
parent_buf = xcalloc(nparents, sizeof(*parent_buf));
for (i = 0; i < nparents; i++) {
struct commit *parent = pop_commit(&parents);
oidcpy(&parent_buf[i], &parent->object.oid);
}
Which is perfectly sound code.
I changed the structure of the loop to:
nparents = commit_list_count(parents);
parent_buf = xcalloc(nparents, sizeof(*parent_buf));
i = 0;
while (parents) {
struct commit *parent = pop_commit(&parents);
oidcpy(&parent_buf[i++], &parent->object.oid);
}
And the "array-bounds" warning had no problems with the code.
So it looks like the error was actually that array-bounds thought
there was a potential NULL pointer dereference at which point
it would not have array bounds, and then it complained about
the array bounds, instead of the NULL pointer dereference.
I am going to fix the patch. If array-bounds causes further
problems you may want to think about disabling it.
Eric
^ permalink raw reply [relevance 0%]
* Re: [PATCH v2 1/2] attr: add attr.tree for setting the treeish to read attributes from
2023-10-04 23:45 1% ` Junio C Hamano
@ 2023-10-06 17:20 0% ` Jonathan Tan
0 siblings, 0 replies; 200+ results
From: Jonathan Tan @ 2023-10-06 17:20 UTC (permalink / raw)
To: Junio C Hamano
Cc: Jonathan Tan, John Cai via GitGitGadget, git, Jeff King, John Cai
Junio C Hamano <gitster@pobox.com> writes:
> As this adds a new call to git_config_get_string(), which will only
> be available by including <config.h>, a merge-fix into 'seen' of
> this topic needs to revert what b1bda751 (parse: separate out
> parsing functions from config.h, 2023-09-29) did, which made this
> file include only <parse.h>.
>
> As this configuration variable was invented to improve the way the
> attribute source tree is supported by emulating how mailmap.blob is
> done, it deserves a bit of comparison.
>
> The way mailmap.c does this is not have any code that reads or
> parses configuration in mailmap.c (which is a rather library-ish
> place), and leaves it up to callers to pre-populate the global
> variable git_mailmap_blob with config.c:git_default_config(). That
> way, they do not need to include <config.h> (nor <parse.h>) that is
> closer to the UI layer. I am wondering why we are not doing the
> same, and instead making an ad-hoc call to git_config_get_string()
> in this code, and if it is a good direction to move the codebase to
> (in which case we may want to make sure that the same pattern is
> followed in other places).
>
> Folks interested in libification, as to the direction of that
> effort, what's your plan on where to draw a line between "library"
> and "userland"? Should library-ish code be allowed to call
> git_config_anything()? I somehow suspect that it might be cleaner
> if they didn't, and instead have the user of the "attr" module to
> supply the necessary values from outside.
I think that ideally library-ish code shouldn't be allowed to call
config, yes. However I think what's practical would be for libraries
that use very few config variables to get the necessary values from
outside, and libraries that use many config variables (e.g. fetch, if it
becomes a library) to call config.
> On the other hand, once the part we have historically called
> "config" API gets a reasonably solid abstraction so that they become
> pluggable and replaceable, random ad-hoc calls from library code
> outside the "config" library code may not be a huge problem, as long
> as we plumb the necessary object handles around (so "attr" library
> would need to be told which "config" backend is in use, probably in
> the form of a struct that holds the various states in to replace
> the current use of globals, plus a vtable to point at
> implementations of the "config" service, and git_config_get_string()
> call in such a truly libified world would grab the value of the named
> variable transparently from whichever "config" backend is currently
> in use).
This is true, but if we were ever to use the attr library elsewhere
(whether in the git.git repo itself to unit test this library, or
in another software project), we would need to supply a mock/stub of
config. If attr uses very few config variables, I think it's clearer if
it takes in the information from outside.
^ permalink raw reply [relevance 0%]
* Re: What's cooking in git.git (Apr 2024, #01; Mon, 1)
2024-04-01 23:08 2% ` Junio C Hamano
@ 2024-04-01 23:27 0% ` Taylor Blau
0 siblings, 0 replies; 200+ results
From: Taylor Blau @ 2024-04-01 23:27 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
On Mon, Apr 01, 2024 at 04:08:01PM -0700, Junio C Hamano wrote:
> Junio C Hamano <gitster@pobox.com> writes:
>
> >>> * tb/pseudo-merge-reachability-bitmap (2024-03-20) 24 commits
> >>> ...
> >> Thanks updating the description. I am waiting to reroll until after it
> >> has received a little bit of review on the technical front.
> >
> > In the meantime I've dropped it as it interacts with tb/midx-write
> > and Eric's khash-to-khashl update.
>
> I think I got merge-fix for integrating this topic with the rest, so
> I'll be resurrecting it and queuing it to 'seen' again.
Thanks. I'll look at what has settled by the time it is ready to be
rerolled and rebase it forward appropriately to try and make your life a
little easier ;-).
Thanks,
Taylor
^ permalink raw reply [relevance 0%]
* Re: [BUG] "git range-diff" does not know X^! is a valid range
2024-04-02 17:45 2% [BUG] "git range-diff" does not know X^! is a valid range Junio C Hamano
@ 2024-04-02 20:24 0% ` René Scharfe
0 siblings, 0 replies; 200+ results
From: René Scharfe @ 2024-04-02 20:24 UTC (permalink / raw)
To: Junio C Hamano, git
Am 02.04.24 um 19:45 schrieb Junio C Hamano:
> When cherry-picking an existing commit X to a different base, which
> may have resulted in conflicts that needed a fix-up, you would want
> to be able to compare X~1..X and HEAD~1..HEAD and naturally, we
> would expect "range-diff" to have a handy way to allow giving the
> command without having to type the overly long branch name X twice.
>
> Individual "diff" for these two ranges are easy to obtain without
> repeating X:
>
> $ git diff X^!
> $ git diff HEAD^!
>
> The "git range-diff" however does not understand that X^! is a valid
> range X~1..X. This command throws an error and ...
>
> $ git range-diff refs/merge-fix/ew/khash-to-khashl^! HEAD^!
> fatal: need two commit ranges
Seems to work fine in this example:
$ git range-diff refs/remotes/origin/maint^! HEAD^!
-: ---------- > 1: c2cbfbd2e2 The thirteenth batch
Are your refs valid? Does "git rev-parse" resolve them properly?
is_range_diff_range() uses setup_revisions(); not sure how it could
misparse "X^!". :-?
> ... to add insult to injury, it shows the huge "git range-diff -h"
> output after that.
Yeah, that's annoying in general, I guess to anyone who has seen it
before or knows that -h or --help will list options. Drowns out the
actual signal.
René
^ permalink raw reply [relevance 0%]
* [PATCH 01/25] documentation: wording improvements
@ 2023-10-08 6:45 1% ` Elijah Newren via GitGitGadget
0 siblings, 0 replies; 200+ results
From: Elijah Newren via GitGitGadget @ 2023-10-08 6:45 UTC (permalink / raw)
To: git; +Cc: Elijah Newren, Elijah Newren
From: Elijah Newren <newren@gmail.com>
Diff best viewed with --color-diff.
Signed-off-by: Elijah Newren <newren@gmail.com>
---
Documentation/CodingGuidelines | 4 ++--
Documentation/ToolsForGit.txt | 2 +-
Documentation/config.txt | 4 ++--
Documentation/config/apply.txt | 2 +-
Documentation/config/branch.txt | 2 +-
Documentation/config/clone.txt | 4 ++--
Documentation/config/credential.txt | 2 +-
Documentation/config/fetch.txt | 4 ++--
Documentation/config/fsck.txt | 4 ++--
Documentation/config/fsmonitor--daemon.txt | 2 +-
Documentation/config/gc.txt | 2 +-
Documentation/config/gpg.txt | 2 +-
Documentation/config/http.txt | 2 +-
Documentation/config/imap.txt | 2 +-
Documentation/config/mergetool.txt | 2 +-
Documentation/config/pack.txt | 6 +++---
Documentation/config/receive.txt | 2 +-
Documentation/config/safe.txt | 4 ++--
Documentation/config/submodule.txt | 2 +-
Documentation/config/trace2.txt | 2 +-
Documentation/config/transfer.txt | 4 ++--
Documentation/config/user.txt | 2 +-
Documentation/diff-generate-patch.txt | 4 ++--
Documentation/diff-options.txt | 2 +-
Documentation/git-apply.txt | 2 +-
Documentation/git-archive.txt | 16 ++++++++--------
Documentation/git-bugreport.txt | 9 +++++----
Documentation/git-checkout-index.txt | 2 +-
Documentation/git-count-objects.txt | 4 ++--
Documentation/git-credential.txt | 2 +-
Documentation/git-diff-index.txt | 4 ++--
Documentation/git-diff-tree.txt | 2 +-
Documentation/git-fast-import.txt | 2 +-
Documentation/git-hash-object.txt | 8 ++++----
Documentation/git-help.txt | 2 +-
Documentation/git-http-backend.txt | 10 +++++-----
Documentation/git-http-fetch.txt | 2 +-
Documentation/git-http-push.txt | 4 ++--
Documentation/git-index-pack.txt | 10 +++++-----
Documentation/git-init.txt | 2 +-
Documentation/git-ls-files.txt | 6 +++---
Documentation/git-maintenance.txt | 6 +++---
Documentation/git-merge.txt | 2 +-
Documentation/git-mergetool.txt | 2 +-
Documentation/git-mktree.txt | 4 ++--
Documentation/git-range-diff.txt | 2 +-
Documentation/git-read-tree.txt | 2 +-
Documentation/git-remote-ext.txt | 2 +-
Documentation/git-repack.txt | 2 +-
Documentation/git-restore.txt | 2 +-
Documentation/git-rev-list.txt | 2 +-
Documentation/git-rev-parse.txt | 2 +-
Documentation/git-send-email.txt | 4 ++--
Documentation/git-send-pack.txt | 10 +++++-----
Documentation/git-status.txt | 2 +-
Documentation/git-stripspace.txt | 2 +-
Documentation/git-var.txt | 2 +-
Documentation/git-whatchanged.txt | 2 +-
Documentation/gitformat-bundle.txt | 6 +++---
Documentation/githooks.txt | 2 +-
Documentation/gitprotocol-capabilities.txt | 14 +++++++-------
Documentation/gitprotocol-http.txt | 4 ++--
Documentation/gitweb.txt | 4 ++--
Documentation/howto/maintain-git.txt | 4 ++--
Documentation/howto/using-merge-subtree.txt | 2 +-
Documentation/i18n.txt | 2 +-
Documentation/mergetools/vimdiff.txt | 4 ++--
Documentation/technical/api-simple-ipc.txt | 2 +-
Documentation/technical/bitmap-format.txt | 2 +-
Documentation/technical/parallel-checkout.txt | 2 +-
Documentation/technical/partial-clone.txt | 2 +-
Documentation/technical/racy-git.txt | 6 +++---
Documentation/technical/reftable.txt | 2 +-
Documentation/urls.txt | 4 ++--
74 files changed, 134 insertions(+), 133 deletions(-)
diff --git a/Documentation/CodingGuidelines b/Documentation/CodingGuidelines
index 65af8d82ced..99b22ff2345 100644
--- a/Documentation/CodingGuidelines
+++ b/Documentation/CodingGuidelines
@@ -1,5 +1,5 @@
-Like other projects, we also have some guidelines to keep to the
-code. For Git in general, a few rough rules are:
+Like other projects, we also have some guidelines for our code. For
+Git in general, a few rough rules are:
- Most importantly, we never say "It's in POSIX; we'll happily
ignore your needs should your system not conform to it."
diff --git a/Documentation/ToolsForGit.txt b/Documentation/ToolsForGit.txt
index 5060d0d2314..5d01e8191aa 100644
--- a/Documentation/ToolsForGit.txt
+++ b/Documentation/ToolsForGit.txt
@@ -32,7 +32,7 @@ information on using the script.
This is adapted from Linux's suggestion in its CodingStyle document:
-- To follow rules of the CodingGuideline, it's useful to put the following in
+- To follow the rules in CodingGuidelines, it's useful to put the following in
GIT_CHECKOUT/.dir-locals.el, assuming you use cperl-mode:
----
;; note the first part is useful for C editing, too
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 229b63a454c..9273c7f1c65 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -11,7 +11,7 @@ file. The file `/etc/gitconfig` can be used to store a system-wide
default configuration.
The configuration variables are used by both the Git plumbing
-and the porcelains. The variables are divided into sections, wherein
+and the porcelain commands. The variables are divided into sections, wherein
the fully qualified variable name of the variable itself is the last
dot-separated segment and the section name is everything before the last
dot. The variable names are case-insensitive, allow only alphanumeric
@@ -103,7 +103,7 @@ was found. See below for examples.
Conditional includes
~~~~~~~~~~~~~~~~~~~~
-You can include a config file from another conditionally by setting a
+You can conditionally include a config file from another by setting a
`includeIf.<condition>.path` variable to the name of the file to be
included.
diff --git a/Documentation/config/apply.txt b/Documentation/config/apply.txt
index 8fb8ef763df..3f9ff19db6b 100644
--- a/Documentation/config/apply.txt
+++ b/Documentation/config/apply.txt
@@ -2,7 +2,7 @@ apply.ignoreWhitespace::
When set to 'change', tells 'git apply' to ignore changes in
whitespace, in the same way as the `--ignore-space-change`
option.
- When set to one of: no, none, never, false tells 'git apply' to
+ When set to one of: no, none, never, false, it tells 'git apply' to
respect all whitespace differences.
See linkgit:git-apply[1].
diff --git a/Documentation/config/branch.txt b/Documentation/config/branch.txt
index 445341a906b..2b05ed3574b 100644
--- a/Documentation/config/branch.txt
+++ b/Documentation/config/branch.txt
@@ -36,7 +36,7 @@ branch.sort::
branch.<name>.remote::
When on branch <name>, it tells 'git fetch' and 'git push'
- which remote to fetch from/push to. The remote to push to
+ which remote to fetch from or push to. The remote to push to
may be overridden with `remote.pushDefault` (for all branches).
The remote to push to, for the current branch, may be further
overridden by `branch.<name>.pushRemote`. If no remote is
diff --git a/Documentation/config/clone.txt b/Documentation/config/clone.txt
index 26f4fb137a7..a16b1b6fa34 100644
--- a/Documentation/config/clone.txt
+++ b/Documentation/config/clone.txt
@@ -4,8 +4,8 @@ clone.defaultRemoteName::
option to linkgit:git-clone[1].
clone.rejectShallow::
- Reject to clone a repository if it is a shallow one, can be overridden by
- passing option `--reject-shallow` in command line. See linkgit:git-clone[1]
+ Reject to clone a repository if it is a shallow one; this can be overridden by
+ passing the `--reject-shallow` option on the command line. See linkgit:git-clone[1]
clone.filterSubmodules::
If a partial clone filter is provided (see `--filter` in
diff --git a/Documentation/config/credential.txt b/Documentation/config/credential.txt
index 512f31876e1..075ef8c9750 100644
--- a/Documentation/config/credential.txt
+++ b/Documentation/config/credential.txt
@@ -31,6 +31,6 @@ credentialCache.ignoreSIGHUP::
credentialStore.lockTimeoutMS::
The length of time, in milliseconds, for git-credential-store to retry
- when trying to lock the credentials file. Value 0 means not to retry at
+ when trying to lock the credentials file. A value of 0 means not to retry at
all; -1 means to try indefinitely. Default is 1000 (i.e., retry for
1s).
diff --git a/Documentation/config/fetch.txt b/Documentation/config/fetch.txt
index 568f0f75b30..c1a7cdd6bf4 100644
--- a/Documentation/config/fetch.txt
+++ b/Documentation/config/fetch.txt
@@ -52,8 +52,8 @@ fetch.pruneTags::
fetch.output::
Control how ref update status is printed. Valid values are
- `full` and `compact`. Default value is `full`. See section
- OUTPUT in linkgit:git-fetch[1] for detail.
+ `full` and `compact`. Default value is `full`. See the
+ OUTPUT section in linkgit:git-fetch[1] for detail.
fetch.negotiationAlgorithm::
Control how information about the commits in the local repository
diff --git a/Documentation/config/fsck.txt b/Documentation/config/fsck.txt
index a3c865df567..fec3eefb5b8 100644
--- a/Documentation/config/fsck.txt
+++ b/Documentation/config/fsck.txt
@@ -17,7 +17,7 @@ Unlike variables like `color.ui` and `core.editor` the
`receive.fsck.<msg-id>` and `fetch.fsck.<msg-id>` variables will not
fall back on the `fsck.<msg-id>` configuration if they aren't set. To
uniformly configure the same fsck settings in different circumstances
-all three of them they must all set to the same values.
+all three of them must be set to the same values.
+
When `fsck.<msg-id>` is set, errors can be switched to warnings and
vice versa by configuring the `fsck.<msg-id>` setting where the
@@ -59,7 +59,7 @@ Unlike variables like `color.ui` and `core.editor` the
`receive.fsck.skipList` and `fetch.fsck.skipList` variables will not
fall back on the `fsck.skipList` configuration if they aren't set. To
uniformly configure the same fsck settings in different circumstances
-all three of them they must all set to the same values.
+all three of them must be set to the same values.
+
Older versions of Git (before 2.20) documented that the object names
list should be sorted. This was never a requirement, the object names
diff --git a/Documentation/config/fsmonitor--daemon.txt b/Documentation/config/fsmonitor--daemon.txt
index c225c6c9e74..671f9b94628 100644
--- a/Documentation/config/fsmonitor--daemon.txt
+++ b/Documentation/config/fsmonitor--daemon.txt
@@ -1,5 +1,5 @@
fsmonitor.allowRemote::
- By default, the fsmonitor daemon refuses to work against network-mounted
+ By default, the fsmonitor daemon refuses to work with network-mounted
repositories. Setting `fsmonitor.allowRemote` to `true` overrides this
behavior. Only respected when `core.fsmonitor` is set to `true`.
diff --git a/Documentation/config/gc.txt b/Documentation/config/gc.txt
index ca47eb20088..17e2a8cc176 100644
--- a/Documentation/config/gc.txt
+++ b/Documentation/config/gc.txt
@@ -24,7 +24,7 @@ gc.auto::
default value is 6700.
+
Setting this to 0 disables not only automatic packing based on the
-number of loose objects, but any other heuristic `git gc --auto` will
+number of loose objects, but also any other heuristic `git gc --auto` will
otherwise use to determine if there's work to do, such as
`gc.autoPackLimit`.
diff --git a/Documentation/config/gpg.txt b/Documentation/config/gpg.txt
index 37e2831cd51..a31faab2edd 100644
--- a/Documentation/config/gpg.txt
+++ b/Documentation/config/gpg.txt
@@ -4,7 +4,7 @@ gpg.program::
same command-line interface as GPG, namely, to verify a detached
signature, "`gpg --verify $signature - <$file`" is run, and the
program is expected to signal a good signature by exiting with
- code 0, and to generate an ASCII-armored detached signature, the
+ code 0. To generate an ASCII-armored detached signature, the
standard input of "`gpg -bsau $key`" is fed with the contents to be
signed, and the program is expected to send the result to its
standard output.
diff --git a/Documentation/config/http.txt b/Documentation/config/http.txt
index 51a70781e58..1d805fdddbc 100644
--- a/Documentation/config/http.txt
+++ b/Documentation/config/http.txt
@@ -260,7 +260,7 @@ http.noEPSV::
http.userAgent::
The HTTP USER_AGENT string presented to an HTTP server. The default
- value represents the version of the client Git such as git/1.7.1.
+ value represents the version of the Git client such as git/1.7.1.
This option allows you to override this value to a more common value
such as Mozilla/4.0. This may be necessary, for instance, if
connecting through a firewall that restricts HTTP connections to a set
diff --git a/Documentation/config/imap.txt b/Documentation/config/imap.txt
index 06166fb5c04..fa0dccc3d83 100644
--- a/Documentation/config/imap.txt
+++ b/Documentation/config/imap.txt
@@ -37,7 +37,7 @@ imap.preformattedHTML::
format=fixed email. Default is `false`.
imap.authMethod::
- Specify authenticate method for authentication with IMAP server.
+ Specify the authentication method for authenticating with the IMAP server.
If Git was built with the NO_CURL option, or if your curl version is older
than 7.34.0, or if you're running git-imap-send with the `--no-curl`
option, the only supported method is 'CRAM-MD5'. If this is not set
diff --git a/Documentation/config/mergetool.txt b/Documentation/config/mergetool.txt
index 56a7eeeffb4..e9abde9d60c 100644
--- a/Documentation/config/mergetool.txt
+++ b/Documentation/config/mergetool.txt
@@ -47,7 +47,7 @@ mergetool.meld.useAutoMerge::
mergetool.vimdiff.layout::
The vimdiff backend uses this variable to control how its split
- windows look like. Applies even if you are using Neovim (`nvim`) or
+ windows appear. Applies even if you are using Neovim (`nvim`) or
gVim (`gvim`) as the merge tool. See BACKEND SPECIFIC HINTS section
ifndef::git-mergetool[]
in linkgit:git-mergetool[1].
diff --git a/Documentation/config/pack.txt b/Documentation/config/pack.txt
index 3748136d141..dcd4c871b3a 100644
--- a/Documentation/config/pack.txt
+++ b/Documentation/config/pack.txt
@@ -83,7 +83,7 @@ pack.indexVersion::
the new pack index with capabilities for packs larger than 4 GB
as well as proper protection against the repacking of corrupted
packs. Version 2 is the default. Note that version 2 is enforced
- and this config option ignored whenever the corresponding pack is
+ and this config option is ignored whenever the corresponding pack is
larger than 2 GB.
+
If you have an old Git that does not understand the version 2 `*.idx` file,
@@ -102,8 +102,8 @@ pack.packSizeLimit::
in the creation of multiple packfiles.
+
Note that this option is rarely useful, and may result in a larger total
-on-disk size (because Git will not store deltas between packs), as well
-as worse runtime performance (object lookup within multiple packs is
+on-disk size (because Git will not store deltas between packs) and
+worse runtime performance (object lookup within multiple packs is
slower than a single pack, and optimizations like reachability bitmaps
cannot cope with multiple packs).
+
diff --git a/Documentation/config/receive.txt b/Documentation/config/receive.txt
index 85d5b5a3d2d..ae526cbf584 100644
--- a/Documentation/config/receive.txt
+++ b/Documentation/config/receive.txt
@@ -19,7 +19,7 @@ receive.certNonceSeed::
key.
receive.certNonceSlop::
- When a `git push --signed` sent a push certificate with a
+ When a `git push --signed` sends a push certificate with a
"nonce" that was issued by a receive-pack serving the same
repository within this many seconds, export the "nonce"
found in the certificate to `GIT_PUSH_CERT_NONCE` to the
diff --git a/Documentation/config/safe.txt b/Documentation/config/safe.txt
index bde7f31459b..577df40223a 100644
--- a/Documentation/config/safe.txt
+++ b/Documentation/config/safe.txt
@@ -14,7 +14,7 @@ repository that contains a bare repository and running a Git command
within that directory.
+
This config setting is only respected in protected configuration (see
-<<SCOPES>>). This prevents the untrusted repository from tampering with
+<<SCOPES>>). This prevents untrusted repositories from tampering with
this value.
safe.directory::
@@ -32,7 +32,7 @@ override any such directories specified in the system config), add a
`safe.directory` entry with an empty value.
+
This config setting is only respected in protected configuration (see
-<<SCOPES>>). This prevents the untrusted repository from tampering with this
+<<SCOPES>>). This prevents untrusted repositories from tampering with this
value.
+
The value of this setting is interpolated, i.e. `~/<path>` expands to a
diff --git a/Documentation/config/submodule.txt b/Documentation/config/submodule.txt
index 6490527b45b..665419fa135 100644
--- a/Documentation/config/submodule.txt
+++ b/Documentation/config/submodule.txt
@@ -2,7 +2,7 @@ submodule.<name>.url::
The URL for a submodule. This variable is copied from the .gitmodules
file to the git config via 'git submodule init'. The user can change
the configured URL before obtaining the submodule via 'git submodule
- update'. If neither submodule.<name>.active or submodule.active are
+ update'. If neither submodule.<name>.active nor submodule.active are
set, the presence of this variable is used as a fallback to indicate
whether the submodule is of interest to git commands.
See linkgit:git-submodule[1] and linkgit:gitmodules[5] for details.
diff --git a/Documentation/config/trace2.txt b/Documentation/config/trace2.txt
index fe1642f0d40..3b6bca2b7ae 100644
--- a/Documentation/config/trace2.txt
+++ b/Documentation/config/trace2.txt
@@ -66,6 +66,6 @@ trace2.destinationDebug::
trace2.maxFiles::
Integer. When writing trace files to a target directory, do not
- write additional traces if we would exceed this many files. Instead,
+ write additional traces if doing so would exceed this many files. Instead,
write a sentinel file that will block further tracing to this
directory. Defaults to 0, which disables this check.
diff --git a/Documentation/config/transfer.txt b/Documentation/config/transfer.txt
index c3ac767d1e4..55e13428db1 100644
--- a/Documentation/config/transfer.txt
+++ b/Documentation/config/transfer.txt
@@ -7,7 +7,7 @@ transfer.credentialsInUrl::
and any other direct use of the configured URL.
+
Note that this is currently limited to detecting credentials in
-`remote.<name>.url` configuration, it won't detect credentials in
+`remote.<name>.url` configuration; it won't detect credentials in
`remote.<name>.pushurl` configuration.
+
You might want to enable this to prevent inadvertent credentials
@@ -26,7 +26,7 @@ exposure, e.g. because:
documented in procfs(5) allows for configuring this behavior.
+
If such concerns don't apply to you then you probably don't need to be
-concerned about credentials exposure due to storing that sensitive
+concerned about credentials exposure due to storing sensitive
data in git's configuration files. If you do want to use this, set
`transfer.credentialsInUrl` to one of these values:
+
diff --git a/Documentation/config/user.txt b/Documentation/config/user.txt
index ec9233b060a..958e62464a5 100644
--- a/Documentation/config/user.txt
+++ b/Documentation/config/user.txt
@@ -10,7 +10,7 @@ committer.email::
If you need the `author` or `committer` to be different, the
`author.name`, `author.email`, `committer.name` or
`committer.email` variables can be set.
- Also, all of these can be overridden by the `GIT_AUTHOR_NAME`,
+ All of these can be overridden by the `GIT_AUTHOR_NAME`,
`GIT_AUTHOR_EMAIL`, `GIT_COMMITTER_NAME`,
`GIT_COMMITTER_EMAIL` and `EMAIL` environment variables.
+
diff --git a/Documentation/diff-generate-patch.txt b/Documentation/diff-generate-patch.txt
index 546adf79e5a..55df903abd1 100644
--- a/Documentation/diff-generate-patch.txt
+++ b/Documentation/diff-generate-patch.txt
@@ -146,7 +146,7 @@ information about detected contents movement (renames and
copying detection) are designed to work with diff of two
<tree-ish> and are not used by combined diff format.
-3. It is followed by two-line from-file/to-file header
+3. It is followed by a two-line from-file/to-file header:
--- a/file
+++ b/file
@@ -157,7 +157,7 @@ files.
+
However, if the --combined-all-paths option is provided, instead of a
two-line from-file/to-file you get a N+1 line from-file/to-file header,
-where N is the number of parents in the merge commit
+where N is the number of parents in the merge commit:
--- a/file
--- a/file
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 35fae7c87c8..8917ce7a9e1 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -733,7 +733,7 @@ matches "`fooasdfbar`" and "`foo/bar/baz/asdf`" but not "`foobarx`".
--rotate-to=<file>::
Discard the files before the named <file> from the output
(i.e. 'skip to'), or move them to the end of the output
- (i.e. 'rotate to'). These were invented primarily for use
+ (i.e. 'rotate to'). These options were invented primarily for the use
of the `git difftool` command, and may not be very useful
otherwise.
diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt
index 5e16e6db7e2..b6e7510d068 100644
--- a/Documentation/git-apply.txt
+++ b/Documentation/git-apply.txt
@@ -159,7 +159,7 @@ discouraged.
--allow-binary-replacement::
--binary::
- Historically we did not allow binary patch applied
+ Historically we did not allow binary patch application
without an explicit permission from the user, and this
flag was the way to do so. Currently we always allow binary
patch application, so this is a no-op.
diff --git a/Documentation/git-archive.txt b/Documentation/git-archive.txt
index 6bab201d375..98526f2beba 100644
--- a/Documentation/git-archive.txt
+++ b/Documentation/git-archive.txt
@@ -21,14 +21,14 @@ structure for the named tree, and writes it out to the standard
output. If <prefix> is specified it is
prepended to the filenames in the archive.
-'git archive' behaves differently when given a tree ID versus when
-given a commit ID or tag ID. In the first case the current time is
-used as the modification time of each file in the archive. In the latter
-case the commit time as recorded in the referenced commit object is
-used instead. Additionally the commit ID is stored in a global
-extended pax header if the tar format is used; it can be extracted
-using 'git get-tar-commit-id'. In ZIP files it is stored as a file
-comment.
+'git archive' behaves differently when given a tree ID as opposed to a
+commit ID or tag ID. When a tree ID is provided, the current time is
+used as the modification time of each file in the archive. On the
+other hand, when a commit ID or tag ID is provided, the commit time as
+recorded in the referenced commit object is used instead.
+Additionally the commit ID is stored in a global extended pax header
+if the tar format is used; it can be extracted using 'git
+get-tar-commit-id'. In ZIP files it is stored as a file comment.
OPTIONS
-------
diff --git a/Documentation/git-bugreport.txt b/Documentation/git-bugreport.txt
index eca726e5791..392d9eb6aec 100644
--- a/Documentation/git-bugreport.txt
+++ b/Documentation/git-bugreport.txt
@@ -13,10 +13,11 @@ SYNOPSIS
DESCRIPTION
-----------
-Captures information about the user's machine, Git client, and repository state,
-as well as a form requesting information about the behavior the user observed,
-into a single text file which the user can then share, for example to the Git
-mailing list, in order to report an observed bug.
+Collects information about the user's machine, Git client, and repository
+state, in addition to a form requesting information about the behavior the
+user observed, and stores it in a single text file which the user can then
+share, for example to the Git mailing list, in order to report an observed
+bug.
The following information is requested from the user:
diff --git a/Documentation/git-checkout-index.txt b/Documentation/git-checkout-index.txt
index 01dbd5cbf54..d1738f43308 100644
--- a/Documentation/git-checkout-index.txt
+++ b/Documentation/git-checkout-index.txt
@@ -18,7 +18,7 @@ SYNOPSIS
DESCRIPTION
-----------
-Will copy all files listed from the index to the working directory
+Copies all listed files from the index to the working directory
(not overwriting existing files).
OPTIONS
diff --git a/Documentation/git-count-objects.txt b/Documentation/git-count-objects.txt
index cb9b4d2e460..b28cc3a510a 100644
--- a/Documentation/git-count-objects.txt
+++ b/Documentation/git-count-objects.txt
@@ -12,7 +12,7 @@ SYNOPSIS
DESCRIPTION
-----------
-This counts the number of unpacked object files and disk space consumed by
+Counts the number of unpacked object files and disk space consumed by
them, to help you decide when it is a good time to repack.
@@ -20,7 +20,7 @@ OPTIONS
-------
-v::
--verbose::
- Report in more detail:
+ Provide more detailed reports:
+
count: the number of loose objects
+
diff --git a/Documentation/git-credential.txt b/Documentation/git-credential.txt
index a220afed4f3..918a0aa42b2 100644
--- a/Documentation/git-credential.txt
+++ b/Documentation/git-credential.txt
@@ -94,7 +94,7 @@ unlocked) before it returned `password=secr3t`.
that `git credential` will ask for a new password in its next
invocation. In either case, `git credential` should be fed with
the credential description obtained from step (2) (which also
- contain the ones provided in step (1)).
+ contains the fields provided in step (1)).
[[IOFMT]]
INPUT/OUTPUT FORMAT
diff --git a/Documentation/git-diff-index.txt b/Documentation/git-diff-index.txt
index c30d8f0da8a..4de1d4c8f11 100644
--- a/Documentation/git-diff-index.txt
+++ b/Documentation/git-diff-index.txt
@@ -13,10 +13,10 @@ SYNOPSIS
DESCRIPTION
-----------
-Compares the content and mode of the blobs found in a tree object
+Compare the content and mode of the blobs found in a tree object
with the corresponding tracked files in the working tree, or with the
corresponding paths in the index. When <path> arguments are present,
-compares only paths matching those patterns. Otherwise all tracked
+compare only paths matching those patterns. Otherwise all tracked
files are compared.
OPTIONS
diff --git a/Documentation/git-diff-tree.txt b/Documentation/git-diff-tree.txt
index 274d5eaba93..81caad5c95c 100644
--- a/Documentation/git-diff-tree.txt
+++ b/Documentation/git-diff-tree.txt
@@ -15,7 +15,7 @@ SYNOPSIS
DESCRIPTION
-----------
-Compares the content and mode of the blobs found via two tree objects.
+Compare the content and mode of blobs found via two tree objects.
If there is only one <tree-ish> given, the commit is compared with its parents
(see --stdin below).
diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt
index 8b5dd6add00..a6a054f86d2 100644
--- a/Documentation/git-fast-import.txt
+++ b/Documentation/git-fast-import.txt
@@ -622,7 +622,7 @@ in octal. Git only supports the following modes:
* `100755` or `755`: A normal, but executable, file.
* `120000`: A symlink, the content of the file will be the link target.
* `160000`: A gitlink, SHA-1 of the object refers to a commit in
- another repository. Git links can only be specified by SHA or through
+ another repository. Git links can only be specified either by SHA or through
a commit mark. They are used to implement submodules.
* `040000`: A subdirectory. Subdirectories can only be specified by
SHA or through a tree mark set with `--import-marks`.
diff --git a/Documentation/git-hash-object.txt b/Documentation/git-hash-object.txt
index 8577f7a7d40..ef4719ae41c 100644
--- a/Documentation/git-hash-object.txt
+++ b/Documentation/git-hash-object.txt
@@ -39,10 +39,10 @@ OPTIONS
of from the command-line.
--path::
- Hash object as it were located at the given path. The location of
- file does not directly influence on the hash value, but path is
- used to determine what Git filters should be applied to the object
- before it can be placed to the object database, and, as result of
+ Hash object as if it were located at the given path. The location of
+ the file does not directly influence the hash value, but the path is
+ used to determine which Git filters should be applied to the object
+ before it can be placed in the object database. As a result of
applying filters, the actual blob put into the object database may
differ from the given file. This option is mainly useful for hashing
temporary files located outside of the working directory or files
diff --git a/Documentation/git-help.txt b/Documentation/git-help.txt
index 2b0b5e390dc..7cb4b4bda18 100644
--- a/Documentation/git-help.txt
+++ b/Documentation/git-help.txt
@@ -109,7 +109,7 @@ other display programs (see below).
format. A web browser will be used for that purpose.
+
The web browser can be specified using the configuration variable
-`help.browser`, or `web.browser` if the former is not set. If none of
+`help.browser`, or `web.browser` if the former is not set. If neither of
these config variables is set, the 'git web{litdd}browse' helper script
(called by 'git help') will pick a suitable default. See
linkgit:git-web{litdd}browse[1] for more information about this.
diff --git a/Documentation/git-http-backend.txt b/Documentation/git-http-backend.txt
index 0c5c0dde19f..f37ddaded82 100644
--- a/Documentation/git-http-backend.txt
+++ b/Documentation/git-http-backend.txt
@@ -23,7 +23,7 @@ discussion of `GIT_PROTOCOL` in the ENVIRONMENT section below.
It verifies that the directory has the magic file
"git-daemon-export-ok", and it will refuse to export any Git directory
that hasn't explicitly been marked for export this way (unless the
-`GIT_HTTP_EXPORT_ALL` environmental variable is set).
+`GIT_HTTP_EXPORT_ALL` environment variable is set).
By default, only the `upload-pack` service is enabled, which serves
'git fetch-pack' and 'git ls-remote' clients, which are invoked from
@@ -42,12 +42,12 @@ http.getanyfile::
any file within the repository, including objects that are
no longer reachable from a branch but are still present.
It is enabled by default, but a repository can disable it
- by setting this configuration item to `false`.
+ by setting this configuration value to `false`.
http.uploadpack::
This serves 'git fetch-pack' and 'git ls-remote' clients.
It is enabled by default, but a repository can disable it
- by setting this configuration item to `false`.
+ by setting this configuration value to `false`.
http.receivepack::
This serves 'git send-pack' clients, allowing push. It is
@@ -265,12 +265,12 @@ by the invoking web server, including:
* QUERY_STRING
* REQUEST_METHOD
-The `GIT_HTTP_EXPORT_ALL` environmental variable may be passed to
+The `GIT_HTTP_EXPORT_ALL` environment variable may be passed to
'git-http-backend' to bypass the check for the "git-daemon-export-ok"
file in each repository before allowing export of that repository.
The `GIT_HTTP_MAX_REQUEST_BUFFER` environment variable (or the
-`http.maxRequestBuffer` config variable) may be set to change the
+`http.maxRequestBuffer` config option) may be set to change the
largest ref negotiation request that git will handle during a fetch; any
fetch requiring a larger buffer will not succeed. This value should not
normally need to be changed, but may be helpful if you are fetching from
diff --git a/Documentation/git-http-fetch.txt b/Documentation/git-http-fetch.txt
index 319062c021b..4ec7c68d3b9 100644
--- a/Documentation/git-http-fetch.txt
+++ b/Documentation/git-http-fetch.txt
@@ -31,7 +31,7 @@ commit-id::
Report what is downloaded.
-w <filename>::
- Writes the commit-id into the filename under $GIT_DIR/refs/<filename> on
+ Writes the commit-id into the specified filename under $GIT_DIR/refs/<filename> on
the local end after the transfer is complete.
--stdin::
diff --git a/Documentation/git-http-push.txt b/Documentation/git-http-push.txt
index 7c6a6dd7f6a..8b4a5791c8c 100644
--- a/Documentation/git-http-push.txt
+++ b/Documentation/git-http-push.txt
@@ -83,8 +83,8 @@ and where it is pushed is determined by using the destination side.
Without `--force`, the <src> ref is stored at the remote only if
<dst> does not exist, or <dst> is a proper subset (i.e. an
ancestor) of <src>. This check, known as "fast-forward check",
-is performed in order to avoid accidentally overwriting the
-remote ref and lose other peoples' commits from there.
+is performed to avoid accidentally overwriting the
+remote ref and losing other peoples' commits from there.
With `--force`, the fast-forward check is disabled for all refs.
diff --git a/Documentation/git-index-pack.txt b/Documentation/git-index-pack.txt
index 4e71c256ecb..6486620c3d8 100644
--- a/Documentation/git-index-pack.txt
+++ b/Documentation/git-index-pack.txt
@@ -16,10 +16,10 @@ SYNOPSIS
DESCRIPTION
-----------
-Reads a packed archive (.pack) from the specified file, and
-builds a pack index file (.idx) for it. Optionally writes a
+Reads a packed archive (.pack) from the specified file,
+builds a pack index file (.idx) for it, and optionally writes a
reverse-index (.rev) for the specified pack. The packed
-archive together with the pack index can then be placed in
+archive, together with the pack index, can then be placed in
the objects/pack/ directory of a Git repository.
@@ -68,8 +68,8 @@ OPTIONS
updated to use objects contained in the pack.
--keep=<msg>::
- Like --keep create a .keep file before moving the index into
- its final destination, but rather than creating an empty file
+ Like --keep, create a .keep file before moving the index into
+ its final destination. However, instead of creating an empty file
place '<msg>' followed by an LF into the .keep file. The '<msg>'
message can later be searched for within all .keep files to
locate any which have outlived their usefulness.
diff --git a/Documentation/git-init.txt b/Documentation/git-init.txt
index 160dea1372c..30ab86ab96a 100644
--- a/Documentation/git-init.txt
+++ b/Documentation/git-init.txt
@@ -99,7 +99,7 @@ specified.
'group' (or 'true')::
-Make the repository group-writable, (and g+sx, since the git group may be not
+Make the repository group-writable, (and g+sx, since the git group may not be
the primary group of all users). This is used to loosen the permissions of an
otherwise safe umask(2) value. Note that the umask still applies to the other
permission bits (e.g. if umask is '0022', using 'group' will not remove read
diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt
index 1bc0328bb78..60d1cca1496 100644
--- a/Documentation/git-ls-files.txt
+++ b/Documentation/git-ls-files.txt
@@ -25,12 +25,12 @@ SYNOPSIS
DESCRIPTION
-----------
-This merges the file listing in the index with the actual working
+This command merges the file listing in the index with the actual working
directory list, and shows different combinations of the two.
-One or more of the options below may be used to determine the files
+Several flags can be used to determine which files are
shown, and each file may be printed multiple times if there are
-multiple entries in the index or multiple statuses are applicable for
+multiple entries in the index or if multiple statuses are applicable for
the relevant file selection options.
OPTIONS
diff --git a/Documentation/git-maintenance.txt b/Documentation/git-maintenance.txt
index 805e5a2e3a0..51d0f7e94b6 100644
--- a/Documentation/git-maintenance.txt
+++ b/Documentation/git-maintenance.txt
@@ -102,9 +102,9 @@ prefetch::
requested refs within `refs/prefetch/`. Also, tags are not updated.
+
This is done to avoid disrupting the remote-tracking branches. The end users
-expect these refs to stay unmoved unless they initiate a fetch. With prefetch
-task, however, the objects necessary to complete a later real fetch would
-already be obtained, so the real fetch would go faster. In the ideal case,
+expect these refs to stay unmoved unless they initiate a fetch. However,
+with the prefetch task, the objects necessary to complete a later real fetch
+would already be obtained, making the real fetch faster. In the ideal case,
it will just become an update to a bunch of remote-tracking branches without
any object transfer.
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 8625c5cb0ec..e8ab3403191 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -336,7 +336,7 @@ After seeing a conflict, you can do two things:
You can work through the conflict with a number of tools:
* Use a mergetool. `git mergetool` to launch a graphical
- mergetool which will work you through the merge.
+ mergetool which will work through the merge with you.
* Look at the diffs. `git diff` will show a three-way diff,
highlighting changes from both the `HEAD` and `MERGE_HEAD`
diff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt
index 07535f6576e..800a3cbe6f3 100644
--- a/Documentation/git-mergetool.txt
+++ b/Documentation/git-mergetool.txt
@@ -115,7 +115,7 @@ These are safe to remove once a file has been merged and its
`git mergetool` session has completed.
Setting the `mergetool.keepBackup` configuration variable to `false`
-causes `git mergetool` to automatically remove the backup as files
+causes `git mergetool` to automatically remove the backup files as files
are successfully merged.
BACKEND SPECIFIC HINTS
diff --git a/Documentation/git-mktree.txt b/Documentation/git-mktree.txt
index 76b44f4da10..383f09dd333 100644
--- a/Documentation/git-mktree.txt
+++ b/Documentation/git-mktree.txt
@@ -25,13 +25,13 @@ OPTIONS
--missing::
Allow missing objects. The default behaviour (without this option)
- is to verify that each tree entry's sha1 identifies an existing
+ is to verify that each tree entry's hash identifies an existing
object. This option has no effect on the treatment of gitlink entries
(aka "submodules") which are always allowed to be missing.
--batch::
Allow building of more than one tree object before exiting. Each
- tree is separated by a single blank line. The final new-line is
+ tree is separated by a single blank line. The final newline is
optional. Note - if the `-z` option is used, lines are terminated
with NUL.
diff --git a/Documentation/git-range-diff.txt b/Documentation/git-range-diff.txt
index 0b393715d70..605a92e224e 100644
--- a/Documentation/git-range-diff.txt
+++ b/Documentation/git-range-diff.txt
@@ -70,7 +70,7 @@ to revert to color all lines according to the outer diff markers
Defaults to 60. Try a larger value if `git range-diff` erroneously
considers a large change a total rewrite (deletion of one commit
and addition of another), and a smaller one in the reverse case.
- See the ``Algorithm`` section below for an explanation why this is
+ See the ``Algorithm`` section below for an explanation of why this is
needed.
--left-only::
diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt
index b09707474df..32065318532 100644
--- a/Documentation/git-read-tree.txt
+++ b/Documentation/git-read-tree.txt
@@ -25,7 +25,7 @@ fast-forward (i.e. 2-way) merge, or a 3-way merge, with the `-m`
flag. When used with `-m`, the `-u` flag causes it to also update
the files in the work tree with the result of the merge.
-Trivial merges are done by 'git read-tree' itself. Only conflicting paths
+Only trivial merges are done by 'git read-tree' itself. Only conflicting paths
will be in unmerged state when 'git read-tree' returns.
OPTIONS
diff --git a/Documentation/git-remote-ext.txt b/Documentation/git-remote-ext.txt
index 88ea7e1cc01..17d84f23c99 100644
--- a/Documentation/git-remote-ext.txt
+++ b/Documentation/git-remote-ext.txt
@@ -82,7 +82,7 @@ begins with `ext::`. Examples:
"ext::ssh -i /home/foo/.ssh/somekey user@host.example %S 'foo/repo'"::
Like host.example:foo/repo, but use /home/foo/.ssh/somekey as
- keypair and user as user on remote side. This avoids needing to
+ keypair and user as user on remote side. This avoids the need to
edit .ssh/config.
"ext::socat -t3600 - ABSTRACT-CONNECT:/git-server %G/somerepo"::
diff --git a/Documentation/git-repack.txt b/Documentation/git-repack.txt
index 4017157949e..cbc0ece61e3 100644
--- a/Documentation/git-repack.txt
+++ b/Documentation/git-repack.txt
@@ -165,7 +165,7 @@ depth is 4095.
Exclude the given pack from repacking. This is the equivalent
of having `.keep` file on the pack. `<pack-name>` is the
pack file name without leading directory (e.g. `pack-123.pack`).
- The option could be specified multiple times to keep multiple
+ The option can be specified multiple times to keep multiple
packs.
--unpack-unreachable=<when>::
diff --git a/Documentation/git-restore.txt b/Documentation/git-restore.txt
index c70444705b5..ad546a37cff 100644
--- a/Documentation/git-restore.txt
+++ b/Documentation/git-restore.txt
@@ -105,7 +105,7 @@ in linkgit:git-checkout[1] for details.
specified. Unmerged paths on the working tree are left alone.
--ignore-skip-worktree-bits::
- In sparse checkout mode, by default is to only update entries
+ In sparse checkout mode, the default is to only update entries
matched by `<pathspec>` and sparse patterns in
$GIT_DIR/info/sparse-checkout. This option ignores the sparse
patterns and unconditionally restores any files in
diff --git a/Documentation/git-rev-list.txt b/Documentation/git-rev-list.txt
index 51029a22715..fbe913ee746 100644
--- a/Documentation/git-rev-list.txt
+++ b/Documentation/git-rev-list.txt
@@ -17,7 +17,7 @@ DESCRIPTION
:git-rev-list: 1
include::rev-list-description.txt[]
-'rev-list' is a very essential Git command, since it
+'rev-list' is an essential Git command, since it
provides the ability to build and traverse commit ancestry graphs. For
this reason, it has a lot of different options that enables it to be
used by commands as different as 'git bisect' and
diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt
index 6a4968f68a3..2294e9a519a 100644
--- a/Documentation/git-rev-parse.txt
+++ b/Documentation/git-rev-parse.txt
@@ -36,7 +36,7 @@ Each of these options must appear first on the command line.
--sq-quote::
Use 'git rev-parse' in shell quoting mode (see SQ-QUOTE
section below). In contrast to the `--sq` option below, this
- mode does only quoting. Nothing else is done to command input.
+ mode only does quoting. Nothing else is done to command input.
Options for --parseopt
~~~~~~~~~~~~~~~~~~~~~~
diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
index 492a82323da..e90d041817e 100644
--- a/Documentation/git-send-email.txt
+++ b/Documentation/git-send-email.txt
@@ -468,8 +468,8 @@ Information
--dump-aliases::
Instead of the normal operation, dump the shorthand alias names from
- the configured alias file(s), one per line in alphabetical order. Note,
- this only includes the alias name and not its expanded email addresses.
+ the configured alias file(s), one per line in alphabetical order. Note
+ that this only includes the alias name and not its expanded email addresses.
See 'sendemail.aliasesfile' for more information about aliases.
diff --git a/Documentation/git-send-pack.txt b/Documentation/git-send-pack.txt
index 595b002152f..e76c262d7f9 100644
--- a/Documentation/git-send-pack.txt
+++ b/Documentation/git-send-pack.txt
@@ -55,7 +55,7 @@ be in a separate packet, and the list must end with a flush packet.
--force::
Usually, the command refuses to update a remote ref that
is not an ancestor of the local ref used to overwrite it.
- This flag disables the check. What this means is that
+ This flag disables the check. This means that
the remote repository can lose commits; use it with
care.
@@ -117,7 +117,7 @@ When one or more '<ref>' are specified explicitly (whether on the
command line or via `--stdin`), it can be either a
single pattern, or a pair of such pattern separated by a colon
":" (this means that a ref name cannot have a colon in it). A
-single pattern '<name>' is just a shorthand for '<name>:<name>'.
+single pattern '<name>' is just shorthand for '<name>:<name>'.
Each pattern pair consists of the source side (before the colon)
and the destination side (after the colon). The ref to be
@@ -143,9 +143,9 @@ name. See linkgit:git-rev-parse[1].
Without `--force`, the <src> ref is stored at the remote only if
<dst> does not exist, or <dst> is a proper subset (i.e. an
-ancestor) of <src>. This check, known as "fast-forward check",
-is performed in order to avoid accidentally overwriting the
-remote ref and lose other peoples' commits from there.
+ancestor) of <src>. This check, known as the "fast-forward check",
+is performed to avoid accidentally overwriting the
+remote ref and losing other people's commits from there.
With `--force`, the fast-forward check is disabled for all refs.
diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt
index b27d127b5e2..51f38218f0d 100644
--- a/Documentation/git-status.txt
+++ b/Documentation/git-status.txt
@@ -251,7 +251,7 @@ Submodules have more state and instead report
m the submodule has modified content
? the submodule has untracked files
-since modified content or untracked files in a submodule cannot be added
+This is since modified content or untracked files in a submodule cannot be added
via `git add` in the superproject to prepare a commit.
'm' and '?' are applied recursively. For example if a nested submodule
diff --git a/Documentation/git-stripspace.txt b/Documentation/git-stripspace.txt
index 2438f76da05..3dc630da4b7 100644
--- a/Documentation/git-stripspace.txt
+++ b/Documentation/git-stripspace.txt
@@ -41,7 +41,7 @@ OPTIONS
-c::
--comment-lines::
- Prepend comment character and blank to each line. Lines will automatically
+ Prepend the comment character and a blank space to each line. Lines will automatically
be terminated with a newline. On empty lines, only the comment character
will be prepended.
diff --git a/Documentation/git-var.txt b/Documentation/git-var.txt
index c38fb3968bc..0680568dfda 100644
--- a/Documentation/git-var.txt
+++ b/Documentation/git-var.txt
@@ -19,7 +19,7 @@ no value.
OPTIONS
-------
-l::
- Cause the logical variables to be listed. In addition, all the
+ Display the logical variables. In addition, all the
variables of the Git configuration file .git/config are listed
as well. (However, the configuration variables listing functionality
is deprecated in favor of `git config -l`.)
diff --git a/Documentation/git-whatchanged.txt b/Documentation/git-whatchanged.txt
index 8b63ceb00e7..5cbb31f33e3 100644
--- a/Documentation/git-whatchanged.txt
+++ b/Documentation/git-whatchanged.txt
@@ -20,7 +20,7 @@ New users are encouraged to use linkgit:git-log[1] instead. The
`whatchanged` command is essentially the same as linkgit:git-log[1]
but defaults to show the raw format diff output and to skip merges.
-The command is kept primarily for historical reasons; fingers of
+The command is primarily kept for historical reasons; fingers of
many people who learned Git long before `git log` was invented by
reading Linux kernel mailing list are trained to type it.
diff --git a/Documentation/gitformat-bundle.txt b/Documentation/gitformat-bundle.txt
index 00e0a20e657..f1acf196e10 100644
--- a/Documentation/gitformat-bundle.txt
+++ b/Documentation/gitformat-bundle.txt
@@ -86,10 +86,10 @@ In the bundle format, there can be a comment following a prerequisite obj-id.
This is a comment and it has no specific meaning. The writer of the bundle MAY
put any string here. The reader of the bundle MUST ignore the comment.
-Note on the shallow clone and a Git bundle
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Note on shallow clones and Git bundles
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Note that the prerequisites does not represent a shallow-clone boundary. The
+Note that the prerequisites do not represent a shallow-clone boundary. The
semantics of the prerequisites and the shallow-clone boundaries are different,
and the Git bundle v2 format cannot represent a shallow clone repository.
diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt
index 86f804720ae..63eb030b34d 100644
--- a/Documentation/githooks.txt
+++ b/Documentation/githooks.txt
@@ -345,7 +345,7 @@ for the user.
The default 'update' hook, when enabled--and with
`hooks.allowunannotated` config option unset or set to false--prevents
-unannotated tags to be pushed.
+unannotated tags from being pushed.
[[proc-receive]]
proc-receive
diff --git a/Documentation/gitprotocol-capabilities.txt b/Documentation/gitprotocol-capabilities.txt
index 0fb5ea0c1ca..5d5e39a7039 100644
--- a/Documentation/gitprotocol-capabilities.txt
+++ b/Documentation/gitprotocol-capabilities.txt
@@ -61,8 +61,8 @@ complete cut across the DAG, or the client has said "done".
Without multi_ack, a client sends have lines in --date-order until
the server has found a common base. That means the client will send
have lines that are already known by the server to be common, because
-they overlap in time with another branch that the server hasn't found
-a common base on yet.
+they overlap in time with another branch on which the server hasn't found
+a common base yet.
For example suppose the client has commits in caps that the server
doesn't and the server has commits in lower case that the client
@@ -135,7 +135,7 @@ to disable the feature in a backwards-compatible manner.
side-band, side-band-64k
------------------------
-This capability means that server can send, and client understand multiplexed
+This capability means that the server can send, and the client can understand, multiplexed
progress reports and error info interleaved with the packfile itself.
These two options are mutually exclusive. A modern client always
@@ -163,14 +163,14 @@ Further, with side-band and its up to 1000-byte messages, it's actually
same deal, you have up to 65519 bytes of data and 1 byte for the stream
code.
-The client MUST send only maximum of one of "side-band" and "side-
-band-64k". Server MUST diagnose it as an error if client requests
+The client MUST send only one of "side-band" and "side-
+band-64k". The server MUST diagnose it as an error if client requests
both.
ofs-delta
---------
-Server can send, and client understand PACKv2 with delta referring to
+The server can send, and the client can understand, PACKv2 with delta referring to
its base by position in pack rather than by an obj-id. That is, they can
send/read OBJ_OFS_DELTA (aka type 6) in a packfile.
@@ -252,7 +252,7 @@ the current shallow boundary, instead of the depth from remote refs.
no-progress
-----------
-The client was started with "git clone -q" or something, and doesn't
+The client was started with "git clone -q" or something similar, and doesn't
want that side band 2. Basically the client just says "I do not
wish to receive stream 2 on sideband, so do not send it to me, and if
you did, I will drop it on the floor anyway". However, the sideband
diff --git a/Documentation/gitprotocol-http.txt b/Documentation/gitprotocol-http.txt
index ccc13f0a407..fcc2b25ee9f 100644
--- a/Documentation/gitprotocol-http.txt
+++ b/Documentation/gitprotocol-http.txt
@@ -379,7 +379,7 @@ C: Place any object seen into set `advertised`.
C: Build an empty set, `common`, to hold the objects that are later
determined to be on both ends.
-C: Build a set, `want`, of the objects from `advertised` the client
+C: Build a set, `want`, of the objects from `advertised` that the client
wants to fetch, based on what it saw during ref discovery.
C: Start a queue, `c_pending`, ordered by commit time (popping newest
@@ -423,7 +423,7 @@ multiple commands. Object names MUST be given using the object format
negotiated through the `object-format` capability (default SHA-1).
The `have` list is created by popping the first 32 commits
-from `c_pending`. Less can be supplied if `c_pending` empties.
+from `c_pending`. Fewer can be supplied if `c_pending` empties.
If the client has sent 256 "have" commits and has not yet
received one of those back from `s_common`, or the client has
diff --git a/Documentation/gitweb.txt b/Documentation/gitweb.txt
index af6bf3c45ec..bb9cbad7f3f 100644
--- a/Documentation/gitweb.txt
+++ b/Documentation/gitweb.txt
@@ -20,13 +20,13 @@ Gitweb provides a web interface to Git repositories. Its features include:
* Browsing every revision of the repository.
* Viewing the contents of files in the repository at any revision.
* Viewing the revision log of branches, history of files and directories,
- see what was changed when, by who.
+ seeing what was changed, when, and by whom.
* Viewing the blame/annotation details of any file (if enabled).
* Generating RSS and Atom feeds of commits, for any branch.
The feeds are auto-discoverable in modern web browsers.
* Viewing everything that was changed in a revision, and step through
revisions one at a time, viewing the history of the repository.
-* Finding commits which commit messages matches given search term.
+* Finding commits whose commit messages match a given search term.
See http://repo.or.cz/w/git.git/tree/HEAD:/gitweb/[] for gitweb source code,
browsed using gitweb itself.
diff --git a/Documentation/howto/maintain-git.txt b/Documentation/howto/maintain-git.txt
index d07c6d44e53..29c473e5e04 100644
--- a/Documentation/howto/maintain-git.txt
+++ b/Documentation/howto/maintain-git.txt
@@ -104,7 +104,7 @@ by doing the following:
files in mbox format).
- Write his own patches to address issues raised on the list but
- nobody has stepped up solving. Send it out just like other
+ nobody has stepped up to solve. Send it out just like other
contributors do, and pick them up just like patches from other
contributors (see above).
@@ -417,7 +417,7 @@ are merged together, the reference to the variable newly added by
the latter topic will still use the old name in the result.
The Meta/Reintegrate script that is used by redo-jch and redo-seen
-scripts implements a crude but usable way to work this issue around.
+scripts implements a crude but usable way to work around this issue.
When the script merges branch $X, it checks if "refs/merge-fix/$X"
exists, and if so, the effect of it is squashed into the result of
the mechanical merge. In other words,
diff --git a/Documentation/howto/using-merge-subtree.txt b/Documentation/howto/using-merge-subtree.txt
index a499a94ac22..3bd581ac359 100644
--- a/Documentation/howto/using-merge-subtree.txt
+++ b/Documentation/howto/using-merge-subtree.txt
@@ -11,7 +11,7 @@ Message-ID: <BAYC1-PASMTP12374B54BA370A1E1C6E78AE4E0@CEZ.ICE>
How to use the subtree merge strategy
=====================================
-There are situations where you want to include contents in your project
+There are situations where you want to include content in your project
from an independently developed project. You can just pull from the
other project as long as there are no conflicting paths.
diff --git a/Documentation/i18n.txt b/Documentation/i18n.txt
index 6c6baeeeb75..0efb1153d27 100644
--- a/Documentation/i18n.txt
+++ b/Documentation/i18n.txt
@@ -46,7 +46,7 @@ mind.
------------
+
Commit objects created with the above setting record the value
-of `i18n.commitEncoding` in its `encoding` header. This is to
+of `i18n.commitEncoding` in their `encoding` header. This is to
help other people who look at them later. Lack of this header
implies that the commit log message is encoded in UTF-8.
diff --git a/Documentation/mergetools/vimdiff.txt b/Documentation/mergetools/vimdiff.txt
index 2d631e9b1f2..c36c5479392 100644
--- a/Documentation/mergetools/vimdiff.txt
+++ b/Documentation/mergetools/vimdiff.txt
@@ -32,10 +32,10 @@ have special meaning:
- `+` is used to "open a new tab"
- `,` is used to "open a new vertical split"
- `/` is used to "open a new horizontal split"
- - `@` is used to indicate which is the file containing the final version after
+ - `@` is used to indicate the file containing the final version after
solving the conflicts. If not present, `MERGED` will be used by default.
-The precedence of the operators is this one (you can use parentheses to change
+The precedence of the operators is as follows (you can use parentheses to change
it):
`@` > `+` > `/` > `,`
diff --git a/Documentation/technical/api-simple-ipc.txt b/Documentation/technical/api-simple-ipc.txt
index d44ada98e7d..6c127b5dddf 100644
--- a/Documentation/technical/api-simple-ipc.txt
+++ b/Documentation/technical/api-simple-ipc.txt
@@ -102,4 +102,4 @@ stateless request, receive an application-specific
response, and disconnect. It is a one round trip facility for
querying the server. The Simple-IPC routines hide the socket,
named pipe, and thread pool details and allow the application
-layer to focus on the application at hand.
+layer to focus on the task at hand.
diff --git a/Documentation/technical/bitmap-format.txt b/Documentation/technical/bitmap-format.txt
index c2e652b71a7..687c58cebcc 100644
--- a/Documentation/technical/bitmap-format.txt
+++ b/Documentation/technical/bitmap-format.txt
@@ -114,7 +114,7 @@ result in an empty bitmap (no bits set).
* N entries with compressed bitmaps, one for each indexed commit
+
-Where `N` is the total amount of entries in this bitmap index.
+Where `N` is the total number of entries in this bitmap index.
Each entry contains the following:
** {empty}
diff --git a/Documentation/technical/parallel-checkout.txt b/Documentation/technical/parallel-checkout.txt
index 47c9b6183cf..91a5eb26efd 100644
--- a/Documentation/technical/parallel-checkout.txt
+++ b/Documentation/technical/parallel-checkout.txt
@@ -185,7 +185,7 @@ quite straightforward: for each parallel-eligible entry, the main
process must remove all files that prevent this entry from being written
(before enqueueing it). This includes any non-directory file in the
leading path of the entry. Later, when a worker gets assigned the entry,
-it looks again for the non-directories files and for an already existing
+it looks again for the non-directory files and for an already existing
file at the entry's path. If any of these checks finds something, the
worker knows that there was a path collision.
diff --git a/Documentation/technical/partial-clone.txt b/Documentation/technical/partial-clone.txt
index 92fcee2bfff..b01cff6912a 100644
--- a/Documentation/technical/partial-clone.txt
+++ b/Documentation/technical/partial-clone.txt
@@ -265,7 +265,7 @@ Future Work
- Improve the way to specify the order in which promisor remotes are
tried.
+
-For example this could allow to specify explicitly something like:
+For example this could allow specifying explicitly something like:
"When fetching from this remote, I want to use these promisor remotes
in this order, though, when pushing or fetching to that remote, I want
to use those promisor remotes in that order."
diff --git a/Documentation/technical/racy-git.txt b/Documentation/technical/racy-git.txt
index ceda4bbfda4..783e87e6aa4 100644
--- a/Documentation/technical/racy-git.txt
+++ b/Documentation/technical/racy-git.txt
@@ -165,9 +165,9 @@ Avoiding runtime penalty
In order to avoid the above runtime penalty, post 1.4.2 Git used
to have a code that made sure the index file
-got timestamp newer than the youngest files in the index when
-there are many young files with the same timestamp as the
-resulting index file would otherwise would have by waiting
+got a timestamp newer than the youngest files in the index when
+there were many young files with the same timestamp as the
+resulting index file otherwise would have by waiting
before finishing writing the index file out.
I suspected that in practice the situation where many paths in the
diff --git a/Documentation/technical/reftable.txt b/Documentation/technical/reftable.txt
index 6a67cc4174f..d7d066d876a 100644
--- a/Documentation/technical/reftable.txt
+++ b/Documentation/technical/reftable.txt
@@ -115,7 +115,7 @@ Varint encoding
Varint encoding is identical to the ofs-delta encoding method used
within pack files.
-Decoder works such as:
+Decoder works as follows:
....
val = buf[ptr] & 0x7f
diff --git a/Documentation/urls.txt b/Documentation/urls.txt
index 1c229d75815..4e79c1589ec 100644
--- a/Documentation/urls.txt
+++ b/Documentation/urls.txt
@@ -6,9 +6,9 @@ address of the remote server, and the path to the repository.
Depending on the transport protocol, some of this information may be
absent.
-Git supports ssh, git, http, and https protocols (in addition, ftp,
+Git supports ssh, git, http, and https protocols (in addition, ftp
and ftps can be used for fetching, but this is inefficient and
-deprecated; do not use it).
+deprecated; do not use them).
The native transport (i.e. git:// URL) does no authentication and
should be used with caution on unsecured networks.
--
gitgitgadget
^ permalink raw reply related [relevance 1%]
* Git Test Coverage Report (Tuesday, Nov 13)
@ 2018-11-13 18:05 1% Derrick Stolee
0 siblings, 0 replies; 200+ results
From: Derrick Stolee @ 2018-11-13 18:05 UTC (permalink / raw)
To: Git List
Here is the test coverage report for today.
Thanks,
-Stolee
[1] https://dev.azure.com/git/git/_build/results?buildId=256&view=logs
---
pu: a849d4c48bb308cdf3f9d7dc84251d92b4d7ff03
jch: e3cb78b4131db2f98330ff110525db31c6abff16
next: 17fedb746fde9e40924a6ce11c0976a097eb126b
master: d166e6afe5f257217836ef24a73764eba390c58d
master@{1}: 8858448bb49332d353febc078ce4a3abcc962efe
Uncovered code in 'pu' not in 'jch'
--------------------------------------
builtin/blame.c
a849d4c48b builtin/blame.c 200)
repo_unuse_commit_buffer(the_repository, commit, message);
74e8221b52 builtin/blame.c 928) blame_date_width = sizeof("Thu Oct 19
16:00");
74e8221b52 builtin/blame.c 929) break;
builtin/describe.c
a849d4c48b builtin/describe.c 257) repo_parse_commit(the_repository, p);
builtin/pack-objects.c
a849d4c48b builtin/pack-objects.c 2832) if
(!repo_has_object_file(the_repository, &obj->oid) &&
is_promisor_object(&obj->oid))
builtin/remote.c
b7f4e371e7 builtin/remote.c 1551) die(_("--save-to-push cannot be used
with other options"));
b7f4e371e7 builtin/remote.c 1575) die(_("--save-to-push can only be used
when only one url is defined"));
date.c
74e8221b52 113) die("Timestamp too large for this system: %"PRItime, time);
74e8221b52 216) if (tm->tm_mon == human_tm->tm_mon) {
74e8221b52 217) if (tm->tm_mday > human_tm->tm_mday) {
74e8221b52 219) } else if (tm->tm_mday == human_tm->tm_mday) {
74e8221b52 220) hide.date = hide.wday = 1;
74e8221b52 221) } else if (tm->tm_mday + 5 > human_tm->tm_mday) {
74e8221b52 223) hide.date = 1;
74e8221b52 231) gettimeofday(&now, NULL);
74e8221b52 232) show_date_relative(time, tz, &now, buf);
74e8221b52 233) return;
74e8221b52 246) hide.seconds = 1;
74e8221b52 247) hide.tz |= !hide.date;
74e8221b52 248) hide.wday = hide.time = !hide.year;
74e8221b52 262) strbuf_rtrim(buf);
74e8221b52 287) gettimeofday(&now, NULL);
74e8221b52 290) human_tz = local_time_tzoffset(now.tv_sec, &human_tm);
74e8221b52 886) static int auto_date_style(void)
74e8221b52 888) return (isatty(1) || pager_in_use()) ? DATE_HUMAN :
DATE_NORMAL;
74e8221b52 909) return DATE_HUMAN;
74e8221b52 911) return auto_date_style();
diff.c
b613de67c4 316) ret |= COLOR_MOVED_WS_ERROR;
b613de67c4 348) unsigned cm = parse_color_moved_ws(value);
b613de67c4 349) if (cm & COLOR_MOVED_WS_ERROR)
fast-import.c
a849d4c48b 2935) buf = repo_read_object_file(the_repository, oid, &type,
&size);
a849d4c48b 3041) buf = repo_read_object_file(the_repository, oid, &unused,
fsck.c
a849d4c48b 858) repo_unuse_commit_buffer(the_repository, commit, buffer);
a849d4c48b 878) repo_read_object_file(the_repository,
a849d4c48b 879) &tag->object.oid, &type, &size);
http-push.c
a849d4c48b 1635) if (!repo_has_object_file(the_repository, &head_oid))
a849d4c48b 1642) if (!repo_has_object_file(the_repository,
&remote_ref->old_oid))
negotiator/default.c
a849d4c48b 71) if (repo_parse_commit(the_repository, commit))
remote.c
879b6a9e6f 1140) return error(_("dst ref %s receives from more than one
src."),
revision.c
a849d4c48b 726) if (repo_parse_commit(the_repository, p) < 0)
sequencer.c
a849d4c48b 1643) repo_unuse_commit_buffer(the_repository, head_commit,
a849d4c48b 3914) repo_unuse_commit_buffer(the_repository,
sha1-array.c
bba406749a 91) oidcpy(&oids[dst], &oids[src]);
submodule.c
b303ef65e7 524) the_repository->submodule_prefix :
e2419f7e30 1378) strbuf_release(&gitdir);
7454fe5cb6 1501) struct get_next_submodule_task *task = task_cb;
7454fe5cb6 1505) get_next_submodule_task_release(task);
7454fe5cb6 1532) return 0;
7454fe5cb6 1536) goto out;
7454fe5cb6 1551) return 0;
tree.c
a849d4c48b 108) if (repo_parse_commit(the_repository, commit))
wrapper.c
5efde212fc 70) die("Out of memory, malloc failed (tried to allocate %"
PRIuMAX " bytes)",
5efde212fc 73) error("Out of memory, malloc failed (tried to allocate
%" PRIuMAX " bytes)",
Commits introducing uncovered code:
Ævar Arnfjörð Bjarmason 879b6a9e6: i18n: remote.c: mark error(...)
messages for translation
Denton Liu b7f4e371e: remote: add --save-to-push option to git
remote set-url
Junio C Hamano a849d4c48: merge-fix/dl/remote-save-to-push
Linus Torvalds 74e8221b5: Add 'human' date format
Martin Koegler 5efde212f: zlib.c: use size_t for size
Stefan Beller 7454fe5cb: fetch: try fetching submodules if needed
objects were not fetched
Stefan Beller b303ef65e: submodule: use submodule repos for object
lookup
Stefan Beller b613de67c: diff: differentiate error handling in
parse_color_moved_ws
Stefan Beller bba406749: sha1-array: provide oid_array_filter
Stefan Beller e2419f7e3: submodule: migrate get_next_submodule to
use repository structs
Uncovered code in 'jch' not in 'next'
----------------------------------------
archive.c
c6e7965ddf 399) die(_("not a valid object name: %s"), name);
c6e7965ddf 412) die(_("not a tree object: %s"), oid_to_hex(&oid));
c6e7965ddf 422) die(_("current working directory is untracked"));
attr.c
ad8f8f4aed 369) fprintf_ln(stderr, _("%s not allowed: %s:%d"),
blame.c
fb998eae6c 1717) obj = deref_tag(revs->repo, obj, NULL, 0);
fb998eae6c 1724) head_commit = lookup_commit_reference_gently(revs->repo,
builtin/branch.c
0ecb1fc726 builtin/branch.c 456) die(_("could not resolve HEAD"));
0ecb1fc726 builtin/branch.c 462) die(_("HEAD (%s) points outside of
refs/heads/"), refname);
builtin/bundle.c
74ae4b638d builtin/bundle.c 64) return !!unbundle(the_repository,
&header, bundle_fd, 0) ||
builtin/fsck.c
674ba34038 builtin/fsck.c 87) ret = _("unknown");
674ba34038 builtin/fsck.c 167) objerror(parent, _("wrong object type in
link"));
674ba34038 builtin/fsck.c 278) printf_ln(_("unreachable %s %s"),
printable_type(obj),
674ba34038 builtin/fsck.c 306) error(_("could not create lost-found"));
674ba34038 builtin/fsck.c 313) die_errno(_("could not write '%s'"),
filename);
674ba34038 builtin/fsck.c 317) die_errno(_("could not finish '%s'"),
674ba34038 builtin/fsck.c 334) fprintf_ln(stderr, _("Checking %s"),
describe_object(obj));
674ba34038 builtin/fsck.c 352) fprintf_ln(stderr, _("Checking
connectivity (%d objects)"), max);
674ba34038 builtin/fsck.c 371) fprintf_ln(stderr, _("Checking %s %s"),
674ba34038 builtin/fsck.c 384) printf_ln(_("root %s"),
674ba34038 builtin/fsck.c 420) return error(_("%s: object corrupt or
missing"),
674ba34038 builtin/fsck.c 459) fprintf_ln(stderr, _("Checking reflog
%s->%s"),
674ba34038 builtin/fsck.c 583) error(_("%s: object could not be parsed:
%s"),
674ba34038 builtin/fsck.c 618) fprintf_ln(stderr, _("Checking object
directory"));
287d68a44b builtin/fsck.c 636) fprintf_ln(stderr, _("Checking %s link"),
head_ref_name);
287d68a44b builtin/fsck.c 641) return error(_("invalid %s"), head_ref_name);
674ba34038 builtin/fsck.c 670) fprintf_ln(stderr, _("Checking cache tree"));
674ba34038 builtin/fsck.c 686) err |= objerror(obj, _("non-tree in
cache-tree"));
builtin/merge.c
9440b831ad builtin/merge.c 131) return error(_("option `%s' requires a
value"), opt->long_name);
builtin/pack-objects.c
ca473cef91 builtin/pack-objects.c 2086) die(_("object %s inconsistent
object length (%"PRIuMAX" vs %"PRIuMAX")"),
ca473cef91 builtin/pack-objects.c 2087) oid_to_hex(&trg_entry->idx.oid),
(uintmax_t)sz,
ca473cef91 builtin/pack-objects.c 2113) die(_("object %s inconsistent
object length (%"PRIuMAX" vs %"PRIuMAX")"),
ca473cef91 builtin/pack-objects.c 2114) oid_to_hex(&src_entry->idx.oid),
(uintmax_t)sz,
builtin/rebase--interactive.c
005af339c9 builtin/rebase--interactive.c 262) ret =
rearrange_squash(the_repository);
005af339c9 builtin/rebase--interactive.c 265) ret =
sequencer_add_exec_commands(the_repository, cmd);
builtin/rebase.c
3249c1251e 544) ret = -1;
3249c1251e 545) goto leave_reset_head;
bac2a1e36f 549) ret = error(_("could not determine HEAD revision"));
bac2a1e36f 550) goto leave_reset_head;
3249c1251e 568) ret = error(_("could not read index"));
3249c1251e 569) goto leave_reset_head;
bac2a1e36f 573) ret = error(_("failed to find tree of %s"),
oid_to_hex(oid));
bac2a1e36f 574) goto leave_reset_head;
3249c1251e 578) ret = error(_("failed to find tree of %s"),
oid_to_hex(oid));
3249c1251e 579) goto leave_reset_head;
3249c1251e 592) goto leave_reset_head;
builtin/reflog.c
dd509db342 builtin/reflog.c 592) usage(_(reflog_expire_usage));
dd509db342 builtin/reflog.c 643) status |= error(_("%s points
nowhere!"), argv[i]);
dd509db342 builtin/reflog.c 689) usage(_(reflog_delete_usage));
dd509db342 builtin/reflog.c 695) return error(_("no reflog specified to
delete"));
dd509db342 builtin/reflog.c 704) status |= error(_("not a reflog: %s"),
argv[i]);
dd509db342 builtin/reflog.c 709) status |= error(_("no reflog for
'%s'"), argv[i]);
dd509db342 builtin/reflog.c 744) usage(_(reflog_exists_usage));
dd509db342 builtin/reflog.c 752) usage(_(reflog_exists_usage));
dd509db342 builtin/reflog.c 755) die(_("invalid ref format: %s"),
argv[start]);
builtin/repack.c
c83d950e59 200) die(_("could not start pack-objects to repack promisor
objects"));
287d68a44b 239) die(_("repack: Expecting full hex object ID lines only
from pack-objects."));
c83d950e59 250) die_errno(_("unable to create '%s'"), promisor_name);
287d68a44b 411) die(_("repack: Expecting full hex object ID lines only
from pack-objects."));
builtin/stash.c
3d5ec65ce8 builtin/stash--helper.c 126) error(_("'%s' is not a
stash-like commit"), revision);
3d5ec65ce8 builtin/stash--helper.c 127) free_stash_info(info);
3d5ec65ce8 builtin/stash--helper.c 128) exit(128);
3d5ec65ce8 builtin/stash--helper.c 161) free_stash_info(info);
3d5ec65ce8 builtin/stash--helper.c 162) fprintf_ln(stderr, _("No stash
entries found."));
3d5ec65ce8 builtin/stash--helper.c 163) return -1;
3d5ec65ce8 builtin/stash--helper.c 198) free_stash_info(info);
7005771171 builtin/stash--helper.c 225) return error(_("git stash clear
with parameters is "
3d5ec65ce8 builtin/stash--helper.c 241) return -1;
3d5ec65ce8 builtin/stash--helper.c 249) return -1;
3d5ec65ce8 builtin/stash--helper.c 262) return -1;
3d5ec65ce8 builtin/stash--helper.c 265) return error(_("unable to write
new index file"));
3d5ec65ce8 builtin/stash--helper.c 377) remove_path(stash_index_path.buf);
3d5ec65ce8 builtin/stash--helper.c 378) return -1;
3d5ec65ce8 builtin/stash--helper.c 405) return -1;
3d5ec65ce8 builtin/stash--helper.c 408) return error(_("cannot apply a
stash in the middle of a merge"));
3d5ec65ce8 builtin/stash--helper.c 418) strbuf_release(&out);
3d5ec65ce8 builtin/stash--helper.c 419) return error(_("Could not
generate diff %s^!."),
3d5ec65ce8 builtin/stash--helper.c 426) return error(_("Conflicts in
index."
3d5ec65ce8 builtin/stash--helper.c 432) return error(_("Could not save
index tree"));
3d5ec65ce8 builtin/stash--helper.c 439) return error(_("could not
restore untracked files from stash"));
3d5ec65ce8 builtin/stash--helper.c 470) return -1;
3d5ec65ce8 builtin/stash--helper.c 475) strbuf_release(&out);
3d5ec65ce8 builtin/stash--helper.c 480) strbuf_release(&out);
3d5ec65ce8 builtin/stash--helper.c 481) return -1;
7005771171 builtin/stash--helper.c 557) return error(_("%s: Could not
drop stash entry"),
5bf62a19c0 builtin/stash--helper.c 632) printf_ln(_("The stash entry is
kept in case "
104eb50d14 builtin/stash--helper.c 766) free_stash_info(&info);
193c3e3516 builtin/stash.c 767)
usage_with_options(git_stash_show_usage, options);
813904a0ce builtin/stash--helper.c 783) stash_msg = "Created via \"git
stash store\".";
813904a0ce builtin/stash--helper.c 789) if (!quiet) {
813904a0ce builtin/stash--helper.c 790) fprintf_ln(stderr, _("Cannot
update %s with %s"),
813904a0ce builtin/stash--helper.c 793) return -1;
813904a0ce builtin/stash--helper.c 817) if (!quiet)
813904a0ce builtin/stash--helper.c 818) fprintf_ln(stderr, _("\"git
stash store\" requires one "
813904a0ce builtin/stash--helper.c 820) return -1;
9f630e7480 builtin/stash--helper.c 902) return -1;
9f630e7480 builtin/stash--helper.c 962) ret = -1;
9f630e7480 builtin/stash--helper.c 963) goto done;
9f630e7480 builtin/stash--helper.c 968) ret = -1;
9f630e7480 builtin/stash--helper.c 969) goto done;
9f630e7480 builtin/stash--helper.c 974) ret = -1;
9f630e7480 builtin/stash--helper.c 975) goto done;
9f630e7480 builtin/stash--helper.c 1001) ret = -1;
9f630e7480 builtin/stash--helper.c 1002) goto done;
9f630e7480 builtin/stash--helper.c 1013) ret = -1;
9f630e7480 builtin/stash--helper.c 1014) goto done;
9f630e7480 builtin/stash--helper.c 1020) ret = -1;
9f630e7480 builtin/stash--helper.c 1021) goto done;
9f630e7480 builtin/stash--helper.c 1028) ret = -1;
9f630e7480 builtin/stash--helper.c 1029) goto done;
9f630e7480 builtin/stash--helper.c 1054) ret = -1;
9f630e7480 builtin/stash--helper.c 1055) goto done;
9f630e7480 builtin/stash--helper.c 1067) ret = -1;
9f630e7480 builtin/stash--helper.c 1068) goto done;
9f630e7480 builtin/stash--helper.c 1074) ret = -1;
9f630e7480 builtin/stash--helper.c 1075) goto done;
9f630e7480 builtin/stash--helper.c 1086) ret = -1;
9f630e7480 builtin/stash--helper.c 1087) goto done;
9f630e7480 builtin/stash--helper.c 1092) ret = -1;
9f630e7480 builtin/stash--helper.c 1093) goto done;
c2cc69f192 builtin/stash--helper.c 1128) fprintf_ln(stderr, _("You do
not have "
9f630e7480 builtin/stash--helper.c 1137) ret = 1;
9f630e7480 builtin/stash--helper.c 1138) goto done;
c2cc69f192 builtin/stash--helper.c 1154) if (!quiet)
c2cc69f192 builtin/stash--helper.c 1155) fprintf_ln(stderr, _("Cannot
save the current "
9f630e7480 builtin/stash--helper.c 1157) ret = -1;
9f630e7480 builtin/stash--helper.c 1158) goto done;
c2cc69f192 builtin/stash--helper.c 1163) if (!quiet)
c2cc69f192 builtin/stash--helper.c 1164) fprintf_ln(stderr, _("Cannot save "
9f630e7480 builtin/stash--helper.c 1166) ret = -1;
9f630e7480 builtin/stash--helper.c 1167) goto done;
c2cc69f192 builtin/stash--helper.c 1174) if (!quiet)
c2cc69f192 builtin/stash--helper.c 1175) fprintf_ln(stderr, _("Cannot
save the current "
9f630e7480 builtin/stash--helper.c 1177) goto done;
c2cc69f192 builtin/stash--helper.c 1183) if (!quiet)
c2cc69f192 builtin/stash--helper.c 1184) fprintf_ln(stderr, _("Cannot
save the current "
9f630e7480 builtin/stash--helper.c 1186) ret = -1;
9f630e7480 builtin/stash--helper.c 1187) goto done;
c2cc69f192 builtin/stash--helper.c 1213) if (!quiet)
c2cc69f192 builtin/stash--helper.c 1214) fprintf_ln(stderr, _("Cannot
record "
9f630e7480 builtin/stash--helper.c 1216) ret = -1;
9f630e7480 builtin/stash--helper.c 1217) goto done;
1a0f0409a7 builtin/stash--helper.c 1289) ret = -1;
1a0f0409a7 builtin/stash--helper.c 1290) goto done;
1a0f0409a7 builtin/stash--helper.c 1300) ret = -1;
c2cc69f192 builtin/stash--helper.c 1301) if (!quiet)
c2cc69f192 builtin/stash--helper.c 1302) fprintf_ln(stderr, _("Cannot
initialize stash"));
1a0f0409a7 builtin/stash--helper.c 1303) goto done;
1a0f0409a7 builtin/stash--helper.c 1313) ret = -1;
c2cc69f192 builtin/stash--helper.c 1314) if (!quiet)
c2cc69f192 builtin/stash--helper.c 1315) fprintf_ln(stderr, _("Cannot
save the current status"));
1a0f0409a7 builtin/stash--helper.c 1316) goto done;
1a0f0409a7 builtin/stash--helper.c 1333) ret = -1;
1a0f0409a7 builtin/stash--helper.c 1352) ret = -1;
1a0f0409a7 builtin/stash--helper.c 1353) goto done;
1a0f0409a7 builtin/stash--helper.c 1362) ret = -1;
1a0f0409a7 builtin/stash--helper.c 1363) goto done;
1a0f0409a7 builtin/stash--helper.c 1371) ret = -1;
1a0f0409a7 builtin/stash--helper.c 1380) ret = -1;
1a0f0409a7 builtin/stash--helper.c 1391) ret = -1;
1a0f0409a7 builtin/stash--helper.c 1392) goto done;
1a0f0409a7 builtin/stash--helper.c 1401) ret = -1;
1a0f0409a7 builtin/stash--helper.c 1402) goto done;
1a0f0409a7 builtin/stash--helper.c 1410) ret = -1;
1a0f0409a7 builtin/stash--helper.c 1436) ret = -1;
193c3e3516 builtin/stash.c 1568)
usage_msg_opt(xstrfmt(_("unknown subcommand: %s"), argv[0]),
193c3e3516 builtin/stash.c 1596) continue;
bundle.c
74ae4b638d 380) struct commit *one = lookup_commit_reference(revs->repo,
&oid);
delta-islands.c
385cb64ff3 216) parse_object(r, &obj->oid);
fast-import.c
ca473cef91 2958) strbuf_addf(&line, "%s %s %"PRIuMAX"\n", oid_to_hex(oid),
git.c
8aa8c14097 341) die_errno(_("while expanding alias '%s': '%s'"),
8aa8c14097 350) die(_("alias '%s' changes environment variables.\n"
8aa8c14097 358) die(_("empty alias for %s"), alias_command);
8aa8c14097 361) die(_("recursive alias: %s"), alias_command);
8aa8c14097 412) die(_("%s doesn't support --super-prefix"), p->cmd);
8aa8c14097 436) die_errno(_("write failure on standard output"));
8aa8c14097 438) die(_("unknown write failure on standard output"));
8aa8c14097 440) die_errno(_("close failed on standard output"));
8aa8c14097 658) die(_("%s doesn't support --super-prefix"), argv[0]);
8aa8c14097 770) die(_("cannot handle %s as a builtin"), cmd);
hex.c
b3a41547ce 93) char *sha1_to_hex_r(char *buffer, const unsigned char *sha1)
b3a41547ce 95) return hash_to_hex_algop_r(buffer, sha1,
&hash_algos[GIT_HASH_SHA1]);
b3a41547ce 116) char *hash_to_hex(const unsigned char *hash)
b3a41547ce 118) return hash_to_hex_algop(hash, the_hash_algo);
http-walker.c
b69fb867b4 http-walker.c 550) loose_object_path(the_repository, &buf,
req->sha1);
http.c
d73019feb4 289) return git_config_string(&curl_http_version, var, value);
d73019feb4 797) static int get_curl_http_version_opt(const char
*version_string, long *opt)
d73019feb4 808) for (i = 0; i < ARRAY_SIZE(choice); i++) {
d73019feb4 809) if (!strcmp(version_string, choice[i].name)) {
d73019feb4 810) *opt = choice[i].opt_token;
d73019feb4 811) return 0;
d73019feb4 815) warning("unknown value given to http.version: '%s'",
version_string);
d73019feb4 816) return -1; /* not found */
d73019feb4 841) if (!get_curl_http_version_opt(curl_http_version, &opt)) {
d73019feb4 843) curl_easy_setopt(result, CURLOPT_HTTP_VERSION, opt);
merge-recursive.c
37b65ce36b 1584) return -1;
37b65ce36b 1587) return -1;
37b65ce36b 1593) return -1;
37b65ce36b 1596) return -1;
37b65ce36b 1663) return -1;
37b65ce36b 1666) return -1;
37b65ce36b 1669) return -1;
7f8671656f 1702) return -1;
48c9cb9d6d 1758) return -1;
48c9cb9d6d 1806) return -1;
48c9cb9d6d 1812) return -1;
48c9cb9d6d 1815) return -1;
48c9cb9d6d 1825) return -1;
48c9cb9d6d 1831) return -1;
48c9cb9d6d 1834) return -1;
parse-options-cb.c
9440b831ad 21) return error(_("option `%s' expects a numerical value"),
9440b831ad 51) return error(_("option `%s' expects \"always\",
\"auto\", or \"never\""),
parse-options.c
9440b831ad 88) return error(_("%s takes no value"), optname(opt, flags));
9440b831ad 90) return error(_("%s isn't available"), optname(opt, flags));
9440b831ad 92) return error(_("%s takes no value"), optname(opt, flags));
9440b831ad 178) return error(_("%s expects a numerical value"),
9440b831ad 194) return error(_("%s expects a non-negative integer value"
8900342628 356) error(_("did you mean `--%s` (with two dashes ?)"), arg);
8900342628 651) error(_("unknown non-ascii option in string: `%s'"),
9440b831ad 785) strbuf_addf(&sb, "option `no-%s'", opt->long_name);
protocol.c
c95f252809 37) die(_("Unrecognized protocol version"));
c95f252809 39) die(_("Unrecognized protocol_version"));
read-cache.c
9d0a9e9089 675) die(_("will not add file alias '%s' ('%s' already
exists in index)"),
9d0a9e9089 676) ce->name, alias->name);
9d0a9e9089 691) die(_("cannot create an empty blob in the object
database"));
9d0a9e9089 712) return error(_("%s: can only add regular files,
symbolic links or git-directories"), path);
9d0a9e9089 786) return error(_("unable to add '%s' to index"), path);
9d0a9e9089 822) error(_("invalid path '%s'"), path);
9d0a9e9089 848) error(_("invalid path '%s'"), path);
9d0a9e9089 1686) return error(_("bad signature 0x%08x"),
hdr->hdr_signature);
9d0a9e9089 1689) return error(_("bad index version %d"), hdr_version);
9d0a9e9089 1728) return error(_("index uses %.4s extension, which we do
not understand"),
9d0a9e9089 1730) fprintf_ln(stderr, _("ignoring %.4s extension"), ext);
9d0a9e9089 1777) die(_("unknown index entry format 0x%08x"),
extended_flags);
9d0a9e9089 1848) die(_("unordered stage entries in index"));
9d0a9e9089 1851) die(_("multiple stage entries for merged file '%s'"),
9d0a9e9089 1854) die(_("unordered stage entries for '%s'"),
9d0a9e9089 2148) die_errno(_("%s: index file open failed"), path);
9d0a9e9089 2152) die_errno(_("%s: cannot stat the open index"), path);
9d0a9e9089 2156) die(_("%s: index file smaller than expected"), path);
9d0a9e9089 2160) die_errno(_("%s: unable to map index file"), path);
9d0a9e9089 2250) warning(_("could not freshen shared index '%s'"),
shared_index);
9d0a9e9089 2285) die(_("broken index, expect %s in %s, got %s"),
9d0a9e9089 3071) error(_("cannot fix permission bits on '%s'"),
get_tempfile_path(*temp));
9d0a9e9089 3217) return error(_("%s: cannot drop to stage #0"),
ref-filter.c
bbfc042ef9 238) oi_deref.info.sizep = &oi_deref.size;
bbfc042ef9 247) return strbuf_addf_ret(err, -1, _("unrecognized
%%(objectsize) argument: %s"), arg);
ab0e367154 255) return strbuf_addf_ret(err, -1, _("%%(deltabase) does
not take arguments"));
9440b831ad 2380) return error(_("option `%s' is incompatible with
--no-merged"),
remote.c
0b9c3afdbf 362) warning(_("config remote shorthand cannot begin with
'/': %s"),
0b9c3afdbf 417) error(_("more than one uploadpack given, using the
first"));
0b9c3afdbf 683) die(_("key '%s' of pattern had no '*'"), key);
0b9c3afdbf 693) die(_("value '%s' of pattern has no '*'"), value);
0b9c3afdbf 1044) error(_("unable to delete '%s': remote ref does not
exist"),
0b9c3afdbf 1066) return error(_("dst ref %s receives from more than one
src"),
0b9c3afdbf 1785) die(_("couldn't find remote ref %s"), name);
0b9c3afdbf 1798) error(_("* Ignoring funny ref '%s' locally"),
0b9c3afdbf 1893) die(_("revision walk setup failed"));
0b9c3afdbf 2166) return error(_("cannot parse expected object name '%s'"),
sequencer.c
f11c958054 593) istate->cache_tree = cache_tree();
18e711a162 2387) opts->quiet = 1;
f11c958054 3977) res = error_dirty_index(r->index, opts);
sha1-file.c
2f90b9d9b4 sha1-file.c 172) int hash_algo_by_name(const char *name)
2f90b9d9b4 sha1-file.c 175) if (!name)
2f90b9d9b4 sha1-file.c 176) return GIT_HASH_UNKNOWN;
2f90b9d9b4 sha1-file.c 177) for (i = 1; i < GIT_HASH_NALGOS; i++)
2f90b9d9b4 sha1-file.c 178) if (!strcmp(name, hash_algos[i].name))
2f90b9d9b4 sha1-file.c 179) return i;
2f90b9d9b4 sha1-file.c 180) return GIT_HASH_UNKNOWN;
2f90b9d9b4 sha1-file.c 183) int hash_algo_by_id(uint32_t format_id)
2f90b9d9b4 sha1-file.c 186) for (i = 1; i < GIT_HASH_NALGOS; i++)
2f90b9d9b4 sha1-file.c 187) if (format_id == hash_algos[i].format_id)
2f90b9d9b4 sha1-file.c 188) return i;
2f90b9d9b4 sha1-file.c 189) return GIT_HASH_UNKNOWN;
f0eaf63819 sha1-file.c 2207) return r;
Commits introducing uncovered code:
brian m. carlson 2f90b9d9b: sha1-file: provide functions to look up
hash algorithms
brian m. carlson b3a41547c: hex: introduce functions to print
arbitrary hashes
Daniels Umanovskis 0ecb1fc72: branch: introduce --show-current
display option
Elijah Newren 18e711a16: git-rebase, sequencer: extend --quiet
option for the interactive machinery
Elijah Newren 37b65ce36: merge-recursive: new function for better
colliding conflict resolutions
Elijah Newren 48c9cb9d6: merge-recursive: improve
rename/rename(1to2)/add[/add] handling
Elijah Newren 7f8671656: merge-recursive: fix rename/add conflict
handling
Force Charlie d73019feb: http: add support selecting http version
Jeff King b69fb867b: sha1_file_name(): overwrite buffer instead of
appending
Jeff King f0eaf6381: sha1-file: use an object_directory for the
main object dir
Joel Teichroeb 3d5ec65ce: stash: convert apply to builtin
Joel Teichroeb 5bf62a19c: stash: convert pop to builtin
Joel Teichroeb 700577117: stash: convert drop and clear to builtin
Johannes Schindelin 3249c1251: rebase: consolidate clean-up code
before leaving reset_head()
Johannes Schindelin bac2a1e36: built-in rebase: reinstate `checkout
-q` behavior where appropriate
Josh Steadmon c95f25280: protocol: advertise multiple supported
versions
Junio C Hamano 287d68a44: Merge branch 'nd/i18n' into jch
Nguyễn Thái Ngọc Duy 005af339c: sequencer.c: remove implicit
dependency on the_repository
Nguyễn Thái Ngọc Duy 0b9c3afdb: remote.c: mark messages for translation
Nguyễn Thái Ngọc Duy 385cb64ff: delta-islands.c: remove
the_repository references
Nguyễn Thái Ngọc Duy 674ba3403: fsck: mark strings for translation
Nguyễn Thái Ngọc Duy 74ae4b638: bundle.c: remove the_repository
references
Nguyễn Thái Ngọc Duy 890034262: parse-options.c: mark more strings
for translation
Nguyễn Thái Ngọc Duy 8aa8c1409: git.c: mark more strings for
translation
Nguyễn Thái Ngọc Duy 9440b831a: parse-options: replace opterror()
with optname()
Nguyễn Thái Ngọc Duy 9d0a9e908: read-cache.c: mark more strings for
translation
Nguyễn Thái Ngọc Duy ad8f8f4ae: attr.c: mark more string for
translation
Nguyễn Thái Ngọc Duy c6e7965dd: archive.c: mark more strings for
translation
Nguyễn Thái Ngọc Duy c83d950e5: repack: mark more strings for
translation
Nguyễn Thái Ngọc Duy dd509db34: reflog: mark strings for translation
Nguyễn Thái Ngọc Duy f11c95805: sequencer.c: remove implicit
dependency on the_index
Nguyễn Thái Ngọc Duy fb998eae6: blame.c: remove implicit dependency
the_repository
Olga Telezhnaya ab0e36715: ref-filter: add deltabase option
Olga Telezhnaya bbfc042ef: ref-filter: add objectsize:disk option
Paul-Sebastian Ungureanu 104eb50d1: stash: convert show to builtin
Paul-Sebastian Ungureanu 193c3e351: stash: convert
`stash--helper.c` into `stash.c`
Paul-Sebastian Ungureanu 1a0f0409a: stash: convert push to builtin
Paul-Sebastian Ungureanu 813904a0c: stash: convert store to builtin
Paul-Sebastian Ungureanu 9f630e748: stash: convert create to builtin
Paul-Sebastian Ungureanu c2cc69f19: stash: make push -q quiet
Torsten Bögershausen ca473cef9: Upcast size_t variables to
uintmax_t when printing
Uncovered code in 'next' not in 'master'
--------------------------------------------
apply.c
517fe807d6 4776) BUG_ON_OPT_NEG(unset);
735ca208c5 4830) return -1;
builtin/am.c
fce5664805 2117) *opt_value = PATCH_FORMAT_UNKNOWN;
builtin/archive.c
e001fd3a50 builtin/archive.c 78) die(_("git archive: expected ACK/NAK,
got a flush packet"));
e001fd3a50 builtin/archive.c 80) if (starts_with(reader.line, "NACK "))
e001fd3a50 builtin/archive.c 81) die(_("git archive: NACK %s"),
reader.line + 5);
e001fd3a50 builtin/archive.c 82) if (starts_with(reader.line, "ERR "))
e001fd3a50 builtin/archive.c 83) die(_("remote error: %s"), reader.line
+ 4);
e001fd3a50 builtin/archive.c 84) die(_("git archive: protocol error"));
e001fd3a50 builtin/archive.c 89) die(_("git archive: expected a flush"));
fb19d32f05 builtin/archive.c 99) if (version != discover_version(&reader))
fb19d32f05 builtin/archive.c 100) die(_("git archive: received different
protocol versions in subsequent requests"));
builtin/blame.c
517fe807d6 builtin/blame.c 759) BUG_ON_OPT_NEG(unset);
builtin/cat-file.c
0eb8d3767c builtin/cat-file.c 609) return error(_("only one batch option
may be specified"));
builtin/grep.c
fd6263fb73 builtin/grep.c 1051) warning(_("invalid option combination,
ignoring --threads"));
fd6263fb73 builtin/grep.c 1057) die(_("invalid number of threads
specified (%d)"), num_threads);
builtin/log.c
517fe807d6 builtin/log.c 1196) BUG_ON_OPT_NEG(unset);
builtin/pull.c
01a31f3bca 565) die(_("unable to access commit %s"),
builtin/show-branch.c
517fe807d6 builtin/show-branch.c 607) BUG_ON_OPT_NEG(unset);
builtin/show-ref.c
517fe807d6 builtin/show-ref.c 154) BUG_ON_OPT_NEG(unset);
builtin/upload-archive.c
e001fd3a50 builtin/upload-archive.c 113) if (version == protocol_v0 ||
version == protocol_v1)
e001fd3a50 builtin/upload-archive.c 114) packet_write_fmt(1, "NACK
unable to spawn subprocess\n");
e001fd3a50 builtin/upload-archive.c 115) else if (version == protocol_v2)
e001fd3a50 builtin/upload-archive.c 116) error_clnt("unable to spawn
subprocess\n");
http-backend.c
fb19d32f05 646) argv[1] = ".";
fb19d32f05 647) argv[2] = NULL;
midx.c
name-hash.c
2179045fd0 532) die(_("unable to create lazy_dir thread: %s"),
strerror(err));
2179045fd0 554) die(_("unable to create lazy_name thread: %s"),
strerror(err));
2179045fd0 560) die(_("unable to join lazy_name thread: %s"),
strerror(err));
preload-index.c
2179045fd0 137) die(_("unable to create threaded lstat: %s"),
strerror(err));
revision.c
b45424181e 2942) return;
b45424181e 2945) return;
b45424181e 2951) c->object.flags |= UNINTERESTING;
b45424181e 2954) return;
b45424181e 2957) mark_parents_uninteresting(c);
b45424181e 2980) return;
b45424181e 2983) return;
b45424181e 3048) continue;
f0d9cc4196 3097) if (!revs->ignore_missing_links)
f0d9cc4196 3098) die("Failed to traverse parents of commit %s",
f0d9cc4196 3099) oid_to_hex(&commit->object.oid));
b45424181e 3107) continue;
run-command.c
2179045fd0 1229) error(_("cannot create async thread: %s"), strerror(err));
send-pack.c
c0e40a2d66 207) close(fd[1]);
transport-helper.c
fb19d32f05 643) if (!data->connect && !data->stateless_connect)
Commits introducing uncovered code:
Derrick Stolee b45424181: revision.c: generation-based topo-order
algorithm
Derrick Stolee f0d9cc419: revision.c: begin refactoring
--topo-order logic
Jeff King 01a31f3bc: pull: handle --verify-signatures for unborn branch
Jeff King 0eb8d3767: cat-file: report an error on multiple --batch
options
Jeff King 517fe807d: assert NOARG/NONEG behavior of parse-options
callbacks
Jeff King 735ca208c: apply: return -1 from option callback instead
of calling exit(1)
Jeff King fce566480: am: handle --no-patch-format option
Josh Steadmon e001fd3a5: archive: implement protocol v2 archive command
Josh Steadmon fb19d32f0: archive: allow archive over HTTP(S) with
proto v2
Nguyễn Thái Ngọc Duy 2179045fd: Clean up pthread_create() error
handling
Nguyễn Thái Ngọc Duy c0e40a2d6: send-pack.c: move async's #ifdef
NO_PTHREADS back to run-command.c
Nguyễn Thái Ngọc Duy fd6263fb7: grep: clean up num_threads handling
Uncovered code in 'master' not in 'master@{1}'
----------------------------------------------------
builtin/add.c
d1664e73ad builtin/add.c 458) die(_("index file corrupt"));
builtin/cat-file.c
98f425b453 builtin/cat-file.c 56) die("unable to stream %s to stdout",
oid_to_hex(oid));
builtin/fetch.c
builtin/fsck.c
b29759d89a builtin/fsck.c 613) fprintf(stderr, "Checking %s link\n",
head_ref_name);
b29759d89a builtin/fsck.c 618) return error("Invalid %s", head_ref_name);
builtin/grep.c
76e9bdc437 builtin/grep.c 439) grep_read_unlock();
builtin/reflog.c
c9ef0d95eb builtin/reflog.c 580) all_worktrees = 0;
c9ef0d95eb builtin/reflog.c 616) continue;
combine-diff.c
0074c9110d 377) state->sline[state->nb-1].p_lno =
0074c9110d 378) xcalloc(state->num_parent, sizeof(unsigned long));
date.c
c27cc94fad 904) tm->tm_mon = number-1;
c27cc94fad 908) else if (number > 69 && number < 100)
c27cc94fad 909) tm->tm_year = number;
c27cc94fad 910) else if (number < 38)
c27cc94fad 911) tm->tm_year = 100 + number;
c27cc94fad 952) pending_number(tm, num);
dir.c
8a2c174677 287) name = to_free = xmemdupz(name, namelen);
midx.c
1dcd9f2043 184) return;
refs.c
3a3b9d8cde 657) return 0;
refs/files-backend.c
remote.c
85daa01f6b 1219) continue;
85daa01f6b 1225) continue;
sequencer.c
bcd33ec25f 683) np = strchrnul(buf, '\n');
bcd33ec25f 684) return error(_("no key present in '%.*s'"),
bcd33ec25f 695) return error(_("unable to dequote value of '%s'"),
bcd33ec25f 737) goto finish;
bcd33ec25f 742) name_i = error(_("'GIT_AUTHOR_NAME' already given"));
bcd33ec25f 747) email_i = error(_("'GIT_AUTHOR_EMAIL' already given"));
bcd33ec25f 752) date_i = error(_("'GIT_AUTHOR_DATE' already given"));
bcd33ec25f 756) err = error(_("unknown variable '%s'"),
bcd33ec25f 761) error(_("missing 'GIT_AUTHOR_NAME'"));
bcd33ec25f 763) error(_("missing 'GIT_AUTHOR_EMAIL'"));
bcd33ec25f 765) error(_("missing 'GIT_AUTHOR_DATE'"));
setup.c
58b284a2e9 413) return config_error_nonbool(var);
submodule-config.c
bcbc780d14 739) return CONFIG_INVALID_KEY;
45f5ef3d77 754) warning(_("Could not update .gitmodules entry %s"), key);
worktree.c
3a3b9d8cde 495) return -1;
3a3b9d8cde 508) return -1;
3a3b9d8cde 517) return -1;
ab3e1f78ae 537) break;
xdiff-interface.c
xdiff/xutils.c
611e42a598 405) return -1;
Commits introducing uncovered code:
Antonio Ospite 45f5ef3d7: submodule: factor out a
config_set_in_gitmodules_file_gently function
Antonio Ospite 76e9bdc43: submodule: support reading .gitmodules
when it's not in the working tree
Antonio Ospite bcbc780d1: submodule: add a
print_config_from_gitmodules() helper
Ben Peart d1664e73a: add: speed up cmd_add() by utilizing
read_cache_preload()
Derrick Stolee 1dcd9f204: midx: close multi-pack-index on repack
Derrick Stolee 85daa01f6: remote: make add_missing_tags() linear
Jeff King 0074c9110: combine-diff: use an xdiff hunk callback
Jeff King 611e42a59: xdiff: provide a separate emit callback for hunks
Jeff King 8a2c17467: pathspec: handle non-terminated strings with
:(attr)
Jeff King 98f425b45: cat-file: handle streaming failures consistently
Jeff King c27cc94fa: approxidate: handle pending number for "specials"
Nguyễn Thái Ngọc Duy 3a3b9d8cd: refs: new ref types to make
per-worktree refs visible to all worktrees
Nguyễn Thái Ngọc Duy 58b284a2e: worktree: add per-worktree config files
Nguyễn Thái Ngọc Duy ab3e1f78a: revision.c: better error reporting
on ref from different worktrees
Nguyễn Thái Ngọc Duy b29759d89: fsck: check HEAD and reflog from
other worktrees
Nguyễn Thái Ngọc Duy c9ef0d95e: reflog expire: cover reflog from
all worktrees
Phillip Wood bcd33ec25: add read_author_script() to libgit
^ permalink raw reply [relevance 1%]
* Re: [PATCH v2 1/2] attr: add attr.tree for setting the treeish to read attributes from
@ 2023-10-04 23:45 1% ` Junio C Hamano
2023-10-06 17:20 0% ` Jonathan Tan
0 siblings, 1 reply; 200+ results
From: Junio C Hamano @ 2023-10-04 23:45 UTC (permalink / raw)
To: John Cai via GitGitGadget, Jonathan Tan; +Cc: git, Jeff King, John Cai
[jc: JTan CC'ed as he seems to have took over the polishing of
b1bda751 (parse: separate out parsing functions from config.h,
2023-09-29)]
"John Cai via GitGitGadget" <gitgitgadget@gmail.com> writes:
> diff --git a/attr.c b/attr.c
> index 71c84fbcf86..bb0d54eb967 100644
> --- a/attr.c
> +++ b/attr.c
> @@ -1205,6 +1205,13 @@ static void compute_default_attr_source(struct object_id *attr_source)
> if (!default_attr_source_tree_object_name)
> default_attr_source_tree_object_name = getenv(GIT_ATTR_SOURCE_ENVIRONMENT);
>
> + if (!default_attr_source_tree_object_name) {
> + char *attr_tree;
> +
> + if (!git_config_get_string("attr.tree", &attr_tree))
> + default_attr_source_tree_object_name = attr_tree;
> + }
> +
> if (!default_attr_source_tree_object_name || !is_null_oid(attr_source))
> return;
As this adds a new call to git_config_get_string(), which will only
be available by including <config.h>, a merge-fix into 'seen' of
this topic needs to revert what b1bda751 (parse: separate out
parsing functions from config.h, 2023-09-29) did, which made this
file include only <parse.h>.
As this configuration variable was invented to improve the way the
attribute source tree is supported by emulating how mailmap.blob is
done, it deserves a bit of comparison.
The way mailmap.c does this is not have any code that reads or
parses configuration in mailmap.c (which is a rather library-ish
place), and leaves it up to callers to pre-populate the global
variable git_mailmap_blob with config.c:git_default_config(). That
way, they do not need to include <config.h> (nor <parse.h>) that is
closer to the UI layer. I am wondering why we are not doing the
same, and instead making an ad-hoc call to git_config_get_string()
in this code, and if it is a good direction to move the codebase to
(in which case we may want to make sure that the same pattern is
followed in other places).
Folks interested in libification, as to the direction of that
effort, what's your plan on where to draw a line between "library"
and "userland"? Should library-ish code be allowed to call
git_config_anything()? I somehow suspect that it might be cleaner
if they didn't, and instead have the user of the "attr" module to
supply the necessary values from outside.
On the other hand, once the part we have historically called
"config" API gets a reasonably solid abstraction so that they become
pluggable and replaceable, random ad-hoc calls from library code
outside the "config" library code may not be a huge problem, as long
as we plumb the necessary object handles around (so "attr" library
would need to be told which "config" backend is in use, probably in
the form of a struct that holds the various states in to replace
the current use of globals, plus a vtable to point at
implementations of the "config" service, and git_config_get_string()
call in such a truly libified world would grab the value of the named
variable transparently from whichever "config" backend is currently
in use).
Anyway, I think I wiggled this patch into 'seen' so I'll push out
today's integration result shortly.
^ permalink raw reply [relevance 1%]
* [PATCH 1/3] unpack-trees: fix "read-tree -u --reset A B" with conflicted index
@ 2013-11-01 22:44 1% ` Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2013-11-01 22:44 UTC (permalink / raw)
To: git; +Cc: Jeff King
From: Jeff King <peff@peff.net>
When we call "read-tree --reset -u HEAD ORIG_HEAD", the first thing we
do with the index is to call read_cache_unmerged. Originally that
would read the index, leaving aside any unmerged entries. However, as
of d1a43f2 (reset --hard/read-tree --reset -u: remove unmerged new
paths, 2008-10-15), it actually creates a new cache entry to serve as
a placeholder, so that we later know to update the working tree.
However, we later noticed that the sha1 of that unmerged entry was
just copied from some higher stage, leaving you with random content in
the index. That was fixed by e11d7b5 ("reset --merge": fix unmerged
case, 2009-12-31), which instead puts the null sha1 into the newly
created entry, and sets a CE_CONFLICTED flag. At the same time, it
teaches the unpack-trees machinery to pay attention to this flag, so
that oneway_merge throws away the current value.
However, it did not update the code paths for twoway_merge, which is
where we end up in the two-way read-tree with --reset. We notice that
the HEAD and ORIG_HEAD versions are the same, and say "oh, we can just
reuse the current version". But that's not true. The current version
is bogus.
Notice this case and make sure we do not keep the bogus entry; either
we do not have that path in the tree we are moving to (i.e. remove
it), or we want to have the cache entry we created for the tree we are
moving to (i.e. resolve by explicitly saying the "newtree" version is
what we want).
[jc: this is from the almost year-old $gmane/212316; the credit goes
to Peff, but we need his sign-off]
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
unpack-trees.c | 25 +++++++++++++++++--------
1 file changed, 17 insertions(+), 8 deletions(-)
diff --git a/unpack-trees.c b/unpack-trees.c
index 7c9ecf6..bf978e1 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -1728,14 +1728,23 @@ int twoway_merge(struct cache_entry **src, struct unpack_trees_options *o)
newtree = NULL;
if (current) {
- if ((!oldtree && !newtree) || /* 4 and 5 */
- (!oldtree && newtree &&
- same(current, newtree)) || /* 6 and 7 */
- (oldtree && newtree &&
- same(oldtree, newtree)) || /* 14 and 15 */
- (oldtree && newtree &&
- !same(oldtree, newtree) && /* 18 and 19 */
- same(current, newtree))) {
+ if (current->ce_flags & CE_CONFLICTED) {
+ if (same(oldtree, newtree) || o->reset) {
+ if (!newtree)
+ return deleted_entry(current, current, o);
+ else
+ return merged_entry(newtree, current, o);
+ }
+ return o->gently ? -1 : reject_merge(current, o);
+ }
+ else if ((!oldtree && !newtree) || /* 4 and 5 */
+ (!oldtree && newtree &&
+ same(current, newtree)) || /* 6 and 7 */
+ (oldtree && newtree &&
+ same(oldtree, newtree)) || /* 14 and 15 */
+ (oldtree && newtree &&
+ !same(oldtree, newtree) && /* 18 and 19 */
+ same(current, newtree))) {
return keep_entry(current, o);
}
else if (oldtree && !newtree && same(current, oldtree)) {
--
1.8.5-rc0-281-g8951339
^ permalink raw reply related [relevance 1%]
* [PATCH] add_pending_object_with_path(): work around "gcc -O3" complaint
@ 2021-06-10 13:06 1% Jeff King
0 siblings, 0 replies; 200+ results
From: Jeff King @ 2021-06-10 13:06 UTC (permalink / raw)
To: git; +Cc: Ævar Arnfjörð Bjarmason
When compiling with -O3, some gcc versions (10.2.1 here) complain about
an out-of-bounds subscript:
revision.c: In function ‘do_add_index_objects_to_pending’:
revision.c:321:22: error: array subscript [1, 2147483647] is outside array bounds of ‘char[1]’ [-Werror=array-bounds]
321 | if (0 < len && name[len] && buf.len)
| ~~~~^~~~~
The "len" parameter here comes from calling interpret_branch_name(),
which intends to return the number of characters of "name" it parsed.
But the compiler doesn't realize this. It knows the size of the empty
string "name" passed in from do_add_index_objects_to_pending(), but it
has no clue that the "len" we get back will be constrained to "0" in
that case.
And I don't think the warning is telling us about some subtle or clever
bug. The implementation of interpret_branch_name() is in another file
entirely, and the compiler can't see it (you can even verify there is no
clever LTO going on by replacing it with "return 0" and still getting
the warning).
We can work around this by replacing our "did we hit the trailing NUL"
subscript dereference with a length check. We do not even have to pay
the cost for an extra strlen(), as we can pass our new length into
interpret_branch_name(), which was converting our "0" into a call to
strlen() anyway.
Signed-off-by: Jeff King <peff@peff.net>
---
Together with ab/trace2-squelch-gcc-warning and the ll-merge fix I
posted in [0], this makes the whole project compile cleanly with "-O3"
for me.
I suspect after this patch we could drop the "if len is 0, call strlen()
as a courtesy" code from interpret_branch_name() entirely. But the call
stack gets pretty hairy (some of these len values come directly from
the get_oid functions directly!) so I wasn't brave enough to follow
through on that.
It's even possible the current code in interpret_branch_name() could be
buggy here, if some caller is using a non-NUL-terminated buffer or a
portion of a string, and we mistake a true "0" size for a request to
call strlen(). That might be worth poking at, but I didn't want to spend
time on it just now.
[0] https://lore.kernel.org/git/YMIKwsEFnkqz6PWa@coredump.intra.peff.net/
revision.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/revision.c b/revision.c
index 8140561b6c..cddd0542a6 100644
--- a/revision.c
+++ b/revision.c
@@ -316,9 +316,10 @@ static void add_pending_object_with_path(struct rev_info *revs,
revs->no_walk = 0;
if (revs->reflog_info && obj->type == OBJ_COMMIT) {
struct strbuf buf = STRBUF_INIT;
- int len = interpret_branch_name(name, 0, &buf, &options);
+ size_t namelen = strlen(name);
+ int len = interpret_branch_name(name, namelen, &buf, &options);
- if (0 < len && name[len] && buf.len)
+ if (0 < len && len < namelen && buf.len)
strbuf_addstr(&buf, name + len);
add_reflog_for_walk(revs->reflog_info,
(struct commit *)obj,
--
2.32.0.529.g079a794268
^ permalink raw reply related [relevance 1%]
* Re: [PATCH] How to keep a project's canonical history correct.
@ 2014-05-09 21:05 1% ` Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2014-05-09 21:05 UTC (permalink / raw)
To: Stephen P. Smith; +Cc: git
"Stephen P. Smith" <ischis2@cox.net> writes:
> During the mail thread about "Pull is mostly evil" a user asked how
> the first parent could become reversed.
>
> This howto explains how the first parent can get reversed when viewed
> by the project and then explains a method to keep the history correct.
>
> Signed-off-by: Stephen P. Smith <ischis2@cox.net>
> ---
I needed a few tweaks on top while queuing. You will find the
result on 'pu' after I push it out.
In addition to one typofix ("because" lacking "c"), here are what I
did:
- Typeset concrete command e.g. `git pull` in monospace.
- The second and subsequent paragraphs continued with "+" need to
be flushed to the left; leaving them indented will format them in
monospace (see "with `git pull --rebase` or something").
- Be more explicit in describing 'trunk' being 'the first-parent
chain' in the text.
- Refer to a newer article that discusses this exact topic.
- De-emphasize 'fix-bug-12345' in "Merge fix-bug-12345" log message.
- Describe what the final history illustration shows.
Unless you have objections to the below (or suggestions for better
alternatives), there is no need to resend the patch.
Thanks.
diff --git a/Documentation/howto/keep-canonical-history-correct.txt b/Documentation/howto/keep-canonical-history-correct.txt
index 5979a79..35d48ef 100644
--- a/Documentation/howto/keep-canonical-history-correct.txt
+++ b/Documentation/howto/keep-canonical-history-correct.txt
@@ -38,12 +38,12 @@ central repository:
---o---o---A---X---Y---Z
------------
-Now, if you "git push" at this point, beause your history that leads
+Now, if you `git push` at this point, because your history that leads
to `C` lacks `X`, `Y` and `Z`, it will fail. You need to somehow make
the tip of your history a descendant of `Z`.
One suggested way to solve the problem is "fetch and then merge", aka
-"git pull". When you fetch, your repository will have a history like
+`git pull`. When you fetch, your repository will have a history like
this:
------------
@@ -65,8 +65,9 @@ you will create a merge `M` and make the history look like this:
repository. Such a merge `M` does not lose any commit in both
histories, so in that sense it may not be wrong, but when people want
to talk about "the authoritative canonical history that is shared
-among the project participants", i.e. "the trunk", the way they often
-use is to do:
+among the project participants", i.e. "the trunk", they often view
+it as "commits you see by following the first-parent chain", and use
+this command to view it:
------------
$ git log --first-parent
@@ -91,11 +92,11 @@ did `X` and then `Y` and then `Z` and merged a change that consists of
two commits `B` and `C` that achieves a single goal. You may have
worked on fixing the bug #12345 with these two patches, and the merge
`M'` with swapped parents can say in its log message "Merge
-'fix-bug-12345'". Having a way to tell "git pull" to create a merge
+fix-bug-12345". Having a way to tell `git pull` to create a merge
but record the parents in reverse order may be a way to do so.
Note that I said "achieves a single goal" above, because this is
-important. "swapping the merge order" only covers a special case
+important. "Swapping the merge order" only covers a special case
where the project does not care too much about having unrelated
things done on a single merge but cares a lot about first-parent
chain.
@@ -111,7 +112,7 @@ There are multiple schools of thought about the "trunk" management.
---o---o---A---X---Y---Z---B---C
------------
+
- with `git pull --rebase` or something.
+with `git pull --rebase` or something.
2. Some projects tolerate merges in their history, but do not worry
too much about the first-parent order, and allow fast-forward
@@ -190,7 +191,7 @@ and push it back to the central repository.
It is very much possible that while you are merging topic-b and
topic-c, somebody again advanced the history in the central repository
-to put `W` on top of `Z`, and make your "git push" fail.
+to put `W` on top of `Z`, and make your `git push` fail.
In such a case, you would rewind to discard `M` and `N`, update the
tip of your 'master' again and redo the two merges:
@@ -202,6 +203,8 @@ tip of your 'master' again and redo the two merges:
$ git merge topic-c
------------
+The procedure will result in a history that looks like this:
+
------------
C0--C1--------------C2
/ \
@@ -210,4 +213,4 @@ tip of your 'master' again and redo the two merges:
B0--B1---------B2
------------
-See http://git-blame.blogspot.com/2012/03/fun-with-first-parent.html
+See also http://git-blame.blogspot.com/2013/09/fun-with-first-parent-history.html
^ permalink raw reply related [relevance 1%]
* [PATCH v3] merge: fix cache_entry use-after-free
@ 2015-10-14 22:07 1% David Turner
0 siblings, 1 reply; 200+ results
From: David Turner @ 2015-10-14 22:07 UTC (permalink / raw)
To: git; +Cc: Keith McGuigan, David Turner
From: Keith McGuigan <kmcguigan@twitter.com>
During merges, we would previously free entries that we no longer need
in the destination index. But those entries might also be stored in
the dir_entry cache, and when a later call to add_to_index found them,
they would be used after being freed.
To prevent this, add a ref count for struct cache_entry. Whenever
a cache entry is added to a data structure, the ref count is incremented;
when it is removed from the data structure, it is decremented. When
it hits zero, the cache_entry is freed.
Signed-off-by: Keith McGuigan <kmcguigan@twitter.com>
Signed-off-by: David Turner <dturner@twopensource.com>
---
Fix type of ref_count (from unsigned int to int).
cache.h | 27 +++++++++++++++++++++++++++
name-hash.c | 7 ++++++-
read-cache.c | 6 +++++-
split-index.c | 13 ++++++++-----
unpack-trees.c | 6 ++++--
5 files changed, 50 insertions(+), 9 deletions(-)
diff --git a/cache.h b/cache.h
index 752031e..7906026 100644
--- a/cache.h
+++ b/cache.h
@@ -149,6 +149,7 @@ struct stat_data {
struct cache_entry {
struct hashmap_entry ent;
+ int ref_count; /* count the number of refs to this in dir_hash */
struct stat_data ce_stat_data;
unsigned int ce_mode;
unsigned int ce_flags;
@@ -213,6 +214,32 @@ struct cache_entry {
struct pathspec;
/*
+ * Increment the cache_entry reference count. Should be called
+ * whenever a pointer to a cache_entry is retained in a data structure,
+ * thus marking it as alive.
+ */
+static inline void add_ce_ref(struct cache_entry *ce)
+{
+ assert(ce != NULL && ce->ref_count >= 0);
+ ce->ref_count++;
+}
+
+/*
+ * Decrement the cache_entry reference count. Should be called whenever
+ * a pointer to a cache_entry is dropped. Once the counter drops to 0
+ * the cache_entry memory will be safely freed.
+ */
+static inline void drop_ce_ref(struct cache_entry *ce)
+{
+ if (ce != NULL) {
+ assert(ce->ref_count >= 0);
+ if (--ce->ref_count < 1) {
+ free(ce);
+ }
+ }
+}
+
+/*
* Copy the sha1 and stat state of a cache entry from one to
* another. But we never change the name, or the hash state!
*/
diff --git a/name-hash.c b/name-hash.c
index 702cd05..f12c919 100644
--- a/name-hash.c
+++ b/name-hash.c
@@ -66,6 +66,7 @@ static struct dir_entry *hash_dir_entry(struct index_state *istate,
dir = xcalloc(1, sizeof(struct dir_entry));
hashmap_entry_init(dir, memihash(ce->name, namelen));
dir->namelen = namelen;
+ add_ce_ref(ce);
dir->ce = ce;
hashmap_add(&istate->dir_hash, dir);
@@ -92,7 +93,9 @@ static void remove_dir_entry(struct index_state *istate, struct cache_entry *ce)
struct dir_entry *dir = hash_dir_entry(istate, ce, ce_namelen(ce));
while (dir && !(--dir->nr)) {
struct dir_entry *parent = dir->parent;
- hashmap_remove(&istate->dir_hash, dir, NULL);
+ struct dir_entry *removed = hashmap_remove(&istate->dir_hash, dir, NULL);
+ assert(removed == dir);
+ drop_ce_ref(dir->ce);
free(dir);
dir = parent;
}
@@ -105,6 +108,7 @@ static void hash_index_entry(struct index_state *istate, struct cache_entry *ce)
ce->ce_flags |= CE_HASHED;
hashmap_entry_init(ce, memihash(ce->name, ce_namelen(ce)));
hashmap_add(&istate->name_hash, ce);
+ add_ce_ref(ce);
if (ignore_case)
add_dir_entry(istate, ce);
@@ -147,6 +151,7 @@ void remove_name_hash(struct index_state *istate, struct cache_entry *ce)
return;
ce->ce_flags &= ~CE_HASHED;
hashmap_remove(&istate->name_hash, ce, ce);
+ drop_ce_ref(ce);
if (ignore_case)
remove_dir_entry(istate, ce);
diff --git a/read-cache.c b/read-cache.c
index 87204a5..8b685bb 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -52,7 +52,9 @@ static const char *alternate_index_output;
static void set_index_entry(struct index_state *istate, int nr, struct cache_entry *ce)
{
+ /* istate->cache[nr] is assumed to not hold a live value */
istate->cache[nr] = ce;
+ add_ce_ref(ce);
add_name_hash(istate, ce);
}
@@ -62,7 +64,7 @@ static void replace_index_entry(struct index_state *istate, int nr, struct cache
replace_index_entry_in_base(istate, old, ce);
remove_name_hash(istate, old);
- free(old);
+ drop_ce_ref(old);
set_index_entry(istate, nr, ce);
ce->ce_flags |= CE_UPDATE_IN_BASE;
istate->cache_changed |= CE_ENTRY_CHANGED;
@@ -75,6 +77,7 @@ void rename_index_entry_at(struct index_state *istate, int nr, const char *new_n
new = xmalloc(cache_entry_size(namelen));
copy_cache_entry(new, old);
+ new->ref_count = 0;
new->ce_flags &= ~CE_HASHED;
new->ce_namelen = namelen;
new->index = 0;
@@ -1426,6 +1429,7 @@ static struct cache_entry *cache_entry_from_ondisk(struct ondisk_cache_entry *on
{
struct cache_entry *ce = xmalloc(cache_entry_size(len));
+ ce->ref_count = 0;
ce->ce_stat_data.sd_ctime.sec = get_be32(&ondisk->ctime.sec);
ce->ce_stat_data.sd_mtime.sec = get_be32(&ondisk->mtime.sec);
ce->ce_stat_data.sd_ctime.nsec = get_be32(&ondisk->ctime.nsec);
diff --git a/split-index.c b/split-index.c
index 968b780..61b5631 100644
--- a/split-index.c
+++ b/split-index.c
@@ -124,7 +124,7 @@ static void replace_entry(size_t pos, void *data)
src->ce_flags |= CE_UPDATE_IN_BASE;
src->ce_namelen = dst->ce_namelen;
copy_cache_entry(dst, src);
- free(src);
+ drop_ce_ref(src);
si->nr_replacements++;
}
@@ -227,7 +227,7 @@ void prepare_to_write_split_index(struct index_state *istate)
base->ce_flags = base_flags;
if (ret)
ce->ce_flags |= CE_UPDATE_IN_BASE;
- free(base);
+ drop_ce_ref(base);
si->base->cache[ce->index - 1] = ce;
}
for (i = 0; i < si->base->cache_nr; i++) {
@@ -302,7 +302,7 @@ void save_or_free_index_entry(struct index_state *istate, struct cache_entry *ce
ce == istate->split_index->base->cache[ce->index - 1])
ce->ce_flags |= CE_REMOVE;
else
- free(ce);
+ drop_ce_ref(ce);
}
void replace_index_entry_in_base(struct index_state *istate,
@@ -314,8 +314,11 @@ void replace_index_entry_in_base(struct index_state *istate,
istate->split_index->base &&
old->index <= istate->split_index->base->cache_nr) {
new->index = old->index;
- if (old != istate->split_index->base->cache[new->index - 1])
- free(istate->split_index->base->cache[new->index - 1]);
+ if (old != istate->split_index->base->cache[new->index - 1]) {
+ struct cache_entry *ce = istate->split_index->base->cache[new->index - 1];
+ drop_ce_ref(ce);
+ }
istate->split_index->base->cache[new->index - 1] = new;
+ add_ce_ref(new);
}
}
diff --git a/unpack-trees.c b/unpack-trees.c
index f932e80..1a0a637 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -606,8 +606,10 @@ static int unpack_nondirectories(int n, unsigned long mask,
o);
for (i = 0; i < n; i++) {
struct cache_entry *ce = src[i + o->merge];
- if (ce != o->df_conflict_entry)
- free(ce);
+ if (ce != o->df_conflict_entry) {
+ drop_ce_ref(ce);
+ src[i + o->merge] = NULL;
+ }
}
return rc;
}
--
2.4.2.644.g97b850b-twtrsrc
^ permalink raw reply related [relevance 1%]
* [PATCH v2] merge: fix cache_entry use-after-free
@ 2015-10-12 22:03 1% David Turner
0 siblings, 0 replies; 200+ results
From: David Turner @ 2015-10-12 22:03 UTC (permalink / raw)
To: git; +Cc: Keith McGuigan
From: Keith McGuigan <kmcguigan@twitter.com>
During merges, we would previously free entries that we no longer need
in the destination index. But those entries might also be stored in
the dir_entry cache, and when a later call to add_to_index found them,
they would be used after being freed.
To prevent this, add a ref count for struct cache_entry. Whenever
a cache entry is added to a data structure, the ref count is incremented;
when it is removed from the data structure, it is decremented. When
it hits zero, the cache_entry is freed.
Signed-off-by: Keith McGuigan <kmcguigan@twitter.com>
---
This version addresses Junio's comments on v1. It adds a missing
add_ce_ref, and fixes a formatting nit.
| 27 +++++++++++++++++++++++++++
| 7 ++++++-
| 6 +++++-
| 13 ++++++++-----
| 6 ++++--
5 files changed, 50 insertions(+), 9 deletions(-)
--git a/cache.h b/cache.h
index 752031e..738f76d 100644
--- a/cache.h
+++ b/cache.h
@@ -149,6 +149,7 @@ struct stat_data {
struct cache_entry {
struct hashmap_entry ent;
+ unsigned int ref_count; /* count the number of refs to this in dir_hash */
struct stat_data ce_stat_data;
unsigned int ce_mode;
unsigned int ce_flags;
@@ -213,6 +214,32 @@ struct cache_entry {
struct pathspec;
/*
+ * Increment the cache_entry reference count. Should be called
+ * whenever a pointer to a cache_entry is retained in a data structure,
+ * thus marking it as alive.
+ */
+static inline void add_ce_ref(struct cache_entry *ce)
+{
+ assert(ce != NULL && ce->ref_count >= 0);
+ ce->ref_count++;
+}
+
+/*
+ * Decrement the cache_entry reference count. Should be called whenever
+ * a pointer to a cache_entry is dropped. Once the counter drops to 0
+ * the cache_entry memory will be safely freed.
+ */
+static inline void drop_ce_ref(struct cache_entry *ce)
+{
+ if (ce != NULL) {
+ assert(ce->ref_count >= 0);
+ if (--ce->ref_count < 1) {
+ free(ce);
+ }
+ }
+}
+
+/*
* Copy the sha1 and stat state of a cache entry from one to
* another. But we never change the name, or the hash state!
*/
--git a/name-hash.c b/name-hash.c
index 702cd05..f12c919 100644
--- a/name-hash.c
+++ b/name-hash.c
@@ -66,6 +66,7 @@ static struct dir_entry *hash_dir_entry(struct index_state *istate,
dir = xcalloc(1, sizeof(struct dir_entry));
hashmap_entry_init(dir, memihash(ce->name, namelen));
dir->namelen = namelen;
+ add_ce_ref(ce);
dir->ce = ce;
hashmap_add(&istate->dir_hash, dir);
@@ -92,7 +93,9 @@ static void remove_dir_entry(struct index_state *istate, struct cache_entry *ce)
struct dir_entry *dir = hash_dir_entry(istate, ce, ce_namelen(ce));
while (dir && !(--dir->nr)) {
struct dir_entry *parent = dir->parent;
- hashmap_remove(&istate->dir_hash, dir, NULL);
+ struct dir_entry *removed = hashmap_remove(&istate->dir_hash, dir, NULL);
+ assert(removed == dir);
+ drop_ce_ref(dir->ce);
free(dir);
dir = parent;
}
@@ -105,6 +108,7 @@ static void hash_index_entry(struct index_state *istate, struct cache_entry *ce)
ce->ce_flags |= CE_HASHED;
hashmap_entry_init(ce, memihash(ce->name, ce_namelen(ce)));
hashmap_add(&istate->name_hash, ce);
+ add_ce_ref(ce);
if (ignore_case)
add_dir_entry(istate, ce);
@@ -147,6 +151,7 @@ void remove_name_hash(struct index_state *istate, struct cache_entry *ce)
return;
ce->ce_flags &= ~CE_HASHED;
hashmap_remove(&istate->name_hash, ce, ce);
+ drop_ce_ref(ce);
if (ignore_case)
remove_dir_entry(istate, ce);
--git a/read-cache.c b/read-cache.c
index 87204a5..8b685bb 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -52,7 +52,9 @@ static const char *alternate_index_output;
static void set_index_entry(struct index_state *istate, int nr, struct cache_entry *ce)
{
+ /* istate->cache[nr] is assumed to not hold a live value */
istate->cache[nr] = ce;
+ add_ce_ref(ce);
add_name_hash(istate, ce);
}
@@ -62,7 +64,7 @@ static void replace_index_entry(struct index_state *istate, int nr, struct cache
replace_index_entry_in_base(istate, old, ce);
remove_name_hash(istate, old);
- free(old);
+ drop_ce_ref(old);
set_index_entry(istate, nr, ce);
ce->ce_flags |= CE_UPDATE_IN_BASE;
istate->cache_changed |= CE_ENTRY_CHANGED;
@@ -75,6 +77,7 @@ void rename_index_entry_at(struct index_state *istate, int nr, const char *new_n
new = xmalloc(cache_entry_size(namelen));
copy_cache_entry(new, old);
+ new->ref_count = 0;
new->ce_flags &= ~CE_HASHED;
new->ce_namelen = namelen;
new->index = 0;
@@ -1426,6 +1429,7 @@ static struct cache_entry *cache_entry_from_ondisk(struct ondisk_cache_entry *on
{
struct cache_entry *ce = xmalloc(cache_entry_size(len));
+ ce->ref_count = 0;
ce->ce_stat_data.sd_ctime.sec = get_be32(&ondisk->ctime.sec);
ce->ce_stat_data.sd_mtime.sec = get_be32(&ondisk->mtime.sec);
ce->ce_stat_data.sd_ctime.nsec = get_be32(&ondisk->ctime.nsec);
--git a/split-index.c b/split-index.c
index 968b780..61b5631 100644
--- a/split-index.c
+++ b/split-index.c
@@ -124,7 +124,7 @@ static void replace_entry(size_t pos, void *data)
src->ce_flags |= CE_UPDATE_IN_BASE;
src->ce_namelen = dst->ce_namelen;
copy_cache_entry(dst, src);
- free(src);
+ drop_ce_ref(src);
si->nr_replacements++;
}
@@ -227,7 +227,7 @@ void prepare_to_write_split_index(struct index_state *istate)
base->ce_flags = base_flags;
if (ret)
ce->ce_flags |= CE_UPDATE_IN_BASE;
- free(base);
+ drop_ce_ref(base);
si->base->cache[ce->index - 1] = ce;
}
for (i = 0; i < si->base->cache_nr; i++) {
@@ -302,7 +302,7 @@ void save_or_free_index_entry(struct index_state *istate, struct cache_entry *ce
ce == istate->split_index->base->cache[ce->index - 1])
ce->ce_flags |= CE_REMOVE;
else
- free(ce);
+ drop_ce_ref(ce);
}
void replace_index_entry_in_base(struct index_state *istate,
@@ -314,8 +314,11 @@ void replace_index_entry_in_base(struct index_state *istate,
istate->split_index->base &&
old->index <= istate->split_index->base->cache_nr) {
new->index = old->index;
- if (old != istate->split_index->base->cache[new->index - 1])
- free(istate->split_index->base->cache[new->index - 1]);
+ if (old != istate->split_index->base->cache[new->index - 1]) {
+ struct cache_entry *ce = istate->split_index->base->cache[new->index - 1];
+ drop_ce_ref(ce);
+ }
istate->split_index->base->cache[new->index - 1] = new;
+ add_ce_ref(new);
}
}
--git a/unpack-trees.c b/unpack-trees.c
index f932e80..1a0a637 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -606,8 +606,10 @@ static int unpack_nondirectories(int n, unsigned long mask,
o);
for (i = 0; i < n; i++) {
struct cache_entry *ce = src[i + o->merge];
- if (ce != o->df_conflict_entry)
- free(ce);
+ if (ce != o->df_conflict_entry) {
+ drop_ce_ref(ce);
+ src[i + o->merge] = NULL;
+ }
}
return rc;
}
--
2.4.2.644.g97b850b-twtrsrc
^ permalink raw reply related [relevance 1%]
* [PATCH 2/7] rebase --merge: fix reflog when continuing
2022-02-21 11:10 2% ` [PATCH 3/7] rebase --merge: fix reflog message after skipping Phillip Wood via GitGitGadget
@ 2022-02-21 11:10 1% ` Phillip Wood via GitGitGadget
2 siblings, 0 replies; 200+ results
From: Phillip Wood via GitGitGadget @ 2022-02-21 11:10 UTC (permalink / raw)
To: git; +Cc: Phillip Wood, Phillip Wood
From: Phillip Wood <phillip.wood@dunelm.org.uk>
The reflog message for a conflict resolution committed by "rebase
--continue" looks like
rebase (continue): commit subject line
Unfortunately the reflog message each subsequent pick look like
rebase (continue) (pick): commit subject line
Fix this by setting the reflog message for "rebase --continue" in
sequencer_continue() so it does not affect subsequent commits. This
introduces a memory leak similar to the one leaking GIT_REFLOG_ACTION
in pick_commits(). Both of these will be fixed in a future series that
stops the sequencer calling setenv().
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
---
builtin/rebase.c | 2 -
sequencer.c | 5 ++
t/t3406-rebase-message.sh | 120 +++++++++++++++++++++++++-------------
3 files changed, 86 insertions(+), 41 deletions(-)
diff --git a/builtin/rebase.c b/builtin/rebase.c
index 4832f16e675..cd9a4f3e2f1 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -1247,8 +1247,6 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
int fd;
options.action = "continue";
- set_reflog_action(&options);
-
/* Sanity check */
if (get_oid("HEAD", &head))
die(_("Cannot read HEAD"));
diff --git a/sequencer.c b/sequencer.c
index bdd66b4b67a..3634ad5baa9 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -4777,6 +4777,8 @@ int sequencer_continue(struct repository *r, struct replay_opts *opts)
if (read_populate_opts(opts))
return -1;
if (is_rebase_i(opts)) {
+ char *previous_reflog_action;
+
if ((res = read_populate_todo(r, &todo_list, opts)))
goto release_todo_list;
@@ -4787,10 +4789,13 @@ int sequencer_continue(struct repository *r, struct replay_opts *opts)
unlink(rebase_path_dropped());
}
+ previous_reflog_action = xstrdup(getenv(GIT_REFLOG_ACTION));
+ setenv(GIT_REFLOG_ACTION, reflog_message(opts, "continue", NULL), 1);
if (commit_staged_changes(r, opts, &todo_list)) {
res = -1;
goto release_todo_list;
}
+ setenv(GIT_REFLOG_ACTION, previous_reflog_action, 1);
} else if (!file_exists(get_todo_path(opts)))
return continue_single_pick(r, opts);
else if ((res = read_populate_todo(r, &todo_list, opts)))
diff --git a/t/t3406-rebase-message.sh b/t/t3406-rebase-message.sh
index d17b450e811..3ca2fbb0d59 100755
--- a/t/t3406-rebase-message.sh
+++ b/t/t3406-rebase-message.sh
@@ -10,10 +10,16 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
test_expect_success 'setup' '
test_commit O fileO &&
test_commit X fileX &&
+ git branch fast-forward &&
test_commit A fileA &&
test_commit B fileB &&
test_commit Y fileY &&
+ git checkout -b conflicts O &&
+ test_commit P &&
+ test_commit conflict-X fileX &&
+ test_commit Q &&
+
git checkout -b topic O &&
git cherry-pick A B &&
test_commit Z fileZ &&
@@ -79,54 +85,90 @@ test_expect_success 'error out early upon -C<n> or --whitespace=<bad>' '
test_i18ngrep "Invalid whitespace option" err
'
-test_expect_success 'GIT_REFLOG_ACTION' '
- git checkout start &&
- test_commit reflog-onto &&
- git checkout -b reflog-topic start &&
- test_commit reflog-to-rebase &&
-
- git rebase reflog-onto &&
- git log -g --format=%gs -3 >actual &&
- cat >expect <<-\EOF &&
- rebase (finish): returning to refs/heads/reflog-topic
- rebase (pick): reflog-to-rebase
- rebase (start): checkout reflog-onto
+write_reflog_expect () {
+ if test $mode = --apply
+ then
+ sed 's/.*(finish)/rebase finished/; s/ ([^)]*)//'
+ else
+ cat
+ fi >expect
+}
+
+test_reflog () {
+ mode=$1
+ reflog_action="$2"
+
+ test_expect_success "rebase $mode reflog${reflog_action:+ GIT_REFLOG_ACTION=$reflog_action}" '
+ git checkout conflicts &&
+ test_when_finished "git reset --hard Q" &&
+
+ (
+ if test -n "$reflog_action"
+ then
+ GIT_REFLOG_ACTION="$reflog_action" &&
+ export GIT_REFLOG_ACTION
+ fi &&
+ test_must_fail git rebase $mode main &&
+ echo resolved >fileX &&
+ git add fileX &&
+ git rebase --continue
+ ) &&
+
+ git log -g --format=%gs -5 >actual &&
+ write_reflog_expect <<-EOF &&
+ ${reflog_action:-rebase} (finish): returning to refs/heads/conflicts
+ ${reflog_action:-rebase} (pick): Q
+ ${reflog_action:-rebase} (continue): conflict-X
+ ${reflog_action:-rebase} (pick): P
+ ${reflog_action:-rebase} (start): checkout main
EOF
test_cmp expect actual &&
- git checkout -b reflog-prefix reflog-to-rebase &&
- GIT_REFLOG_ACTION=change-the-reflog git rebase reflog-onto &&
- git log -g --format=%gs -3 >actual &&
- cat >expect <<-\EOF &&
- change-the-reflog (finish): returning to refs/heads/reflog-prefix
- change-the-reflog (pick): reflog-to-rebase
- change-the-reflog (start): checkout reflog-onto
+ git log -g --format=%gs -1 conflicts >actual &&
+ write_reflog_expect <<-EOF &&
+ ${reflog_action:-rebase} (finish): refs/heads/conflicts onto $(git rev-parse main)
EOF
- test_cmp expect actual
-'
-
-test_expect_success 'rebase --apply reflog' '
- git checkout -b reflog-apply start &&
- old_head_reflog="$(git log -g --format=%gs -1 HEAD)" &&
-
- git rebase --apply Y &&
+ test_cmp expect actual &&
- git log -g --format=%gs -4 HEAD >actual &&
- cat >expect <<-EOF &&
- rebase finished: returning to refs/heads/reflog-apply
- rebase: Z
- rebase: checkout Y
- $old_head_reflog
+ # check there is only one new entry in the branch reflog
+ test_cmp_rev conflicts@{1} Q
+ '
+
+ test_expect_success "rebase $mode fast-forward reflog${reflog_action:+ GIT_REFLOG_ACTION=$reflog_action}" '
+ git checkout fast-forward &&
+ test_when_finished "git reset --hard X" &&
+
+ (
+ if test -n "$reflog_action"
+ then
+ GIT_REFLOG_ACTION="$reflog_action" &&
+ export GIT_REFLOG_ACTION
+ fi &&
+ git rebase $mode main
+ ) &&
+
+ git log -g --format=%gs -2 >actual &&
+ write_reflog_expect <<-EOF &&
+ ${reflog_action:-rebase} (finish): returning to refs/heads/fast-forward
+ ${reflog_action:-rebase} (start): checkout main
EOF
test_cmp expect actual &&
- git log -g --format=%gs -2 reflog-apply >actual &&
- cat >expect <<-EOF &&
- rebase finished: refs/heads/reflog-apply onto $(git rev-parse Y)
- branch: Created from start
+ git log -g --format=%gs -1 fast-forward >actual &&
+ write_reflog_expect <<-EOF &&
+ ${reflog_action:-rebase} (finish): refs/heads/fast-forward onto $(git rev-parse main)
EOF
- test_cmp expect actual
-'
+ test_cmp expect actual &&
+
+ # check there is only one new entry in the branch reflog
+ test_cmp_rev fast-forward@{1} X
+ '
+}
+
+test_reflog --merge
+test_reflog --merge my-reflog-action
+test_reflog --apply
+test_reflog --apply my-reflog-action
test_expect_success 'rebase -i onto unrelated history' '
git init unrelated &&
--
gitgitgadget
^ permalink raw reply related [relevance 1%]
* [PATCH 0/1] merge: fix cache_entry use-after-free
@ 2015-10-08 18:47 1% ` David Turner
2015-10-08 20:00 2% ` Junio C Hamano
0 siblings, 1 reply; 200+ results
From: David Turner @ 2015-10-08 18:47 UTC (permalink / raw)
To: git; +Cc: Keith McGuigan, David Turner
From: Keith McGuigan <kmcguigan@twitter.com>
During merges, we would previously free entries that we no longer need
in the destination index. But those entries might also be stored in
the dir_entry cache, and when a later call to add_to_index found them,
they would be used after being freed.
To prevent this, add a ref count for struct cache_entry. Whenever
a cache entry is added to a data structure, the ref count is incremented;
when it is removed from the data structure, it is decremented. When
it hits zero, the cache_entry is freed.
Signed-off-by: David Turner <dturner@twopensource.com>
Signed-off-by: Keith McGuigan <kmcguigan@twitter.com>
---
| 27 +++++++++++++++++++++++++++
| 7 ++++++-
| 5 ++++-
| 12 +++++++-----
| 6 ++++--
5 files changed, 48 insertions(+), 9 deletions(-)
--git a/cache.h b/cache.h
index 752031e..7563658 100644
--- a/cache.h
+++ b/cache.h
@@ -149,6 +149,7 @@ struct stat_data {
struct cache_entry {
struct hashmap_entry ent;
+ unsigned int ref_count; /* count the number of refs to this in dir_hash */
struct stat_data ce_stat_data;
unsigned int ce_mode;
unsigned int ce_flags;
@@ -213,6 +214,32 @@ struct cache_entry {
struct pathspec;
/*
+ * Increment the cache_entry reference count. Should be called
+ * whenever a pointer to a cache_entry is retained in a data structure,
+ * thus marking it as alive.
+ */
+static inline void add_ce_ref(struct cache_entry *ce)
+{
+ assert(ce != NULL && ce->ref_count >= 0);
+ ++ce->ref_count;
+}
+
+/*
+ * Decrement the cache_entry reference count. Should be called whenever
+ * a pointer to a cache_entry is dropped. Once the counter drops to 0
+ * the cache_entry memory will be safely freed.
+ */
+static inline void drop_ce_ref(struct cache_entry *ce)
+{
+ if (ce != NULL) {
+ assert(ce->ref_count >= 0);
+ if (--ce->ref_count < 1) {
+ free(ce);
+ }
+ }
+}
+
+/*
* Copy the sha1 and stat state of a cache entry from one to
* another. But we never change the name, or the hash state!
*/
--git a/name-hash.c b/name-hash.c
index 702cd05..f12c919 100644
--- a/name-hash.c
+++ b/name-hash.c
@@ -66,6 +66,7 @@ static struct dir_entry *hash_dir_entry(struct index_state *istate,
dir = xcalloc(1, sizeof(struct dir_entry));
hashmap_entry_init(dir, memihash(ce->name, namelen));
dir->namelen = namelen;
+ add_ce_ref(ce);
dir->ce = ce;
hashmap_add(&istate->dir_hash, dir);
@@ -92,7 +93,9 @@ static void remove_dir_entry(struct index_state *istate, struct cache_entry *ce)
struct dir_entry *dir = hash_dir_entry(istate, ce, ce_namelen(ce));
while (dir && !(--dir->nr)) {
struct dir_entry *parent = dir->parent;
- hashmap_remove(&istate->dir_hash, dir, NULL);
+ struct dir_entry *removed = hashmap_remove(&istate->dir_hash, dir, NULL);
+ assert(removed == dir);
+ drop_ce_ref(dir->ce);
free(dir);
dir = parent;
}
@@ -105,6 +108,7 @@ static void hash_index_entry(struct index_state *istate, struct cache_entry *ce)
ce->ce_flags |= CE_HASHED;
hashmap_entry_init(ce, memihash(ce->name, ce_namelen(ce)));
hashmap_add(&istate->name_hash, ce);
+ add_ce_ref(ce);
if (ignore_case)
add_dir_entry(istate, ce);
@@ -147,6 +151,7 @@ void remove_name_hash(struct index_state *istate, struct cache_entry *ce)
return;
ce->ce_flags &= ~CE_HASHED;
hashmap_remove(&istate->name_hash, ce, ce);
+ drop_ce_ref(ce);
if (ignore_case)
remove_dir_entry(istate, ce);
--git a/read-cache.c b/read-cache.c
index 87204a5..442de34 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -53,6 +53,7 @@ static const char *alternate_index_output;
static void set_index_entry(struct index_state *istate, int nr, struct cache_entry *ce)
{
istate->cache[nr] = ce;
+ add_ce_ref(ce);
add_name_hash(istate, ce);
}
@@ -62,7 +63,7 @@ static void replace_index_entry(struct index_state *istate, int nr, struct cache
replace_index_entry_in_base(istate, old, ce);
remove_name_hash(istate, old);
- free(old);
+ drop_ce_ref(old);
set_index_entry(istate, nr, ce);
ce->ce_flags |= CE_UPDATE_IN_BASE;
istate->cache_changed |= CE_ENTRY_CHANGED;
@@ -75,6 +76,7 @@ void rename_index_entry_at(struct index_state *istate, int nr, const char *new_n
new = xmalloc(cache_entry_size(namelen));
copy_cache_entry(new, old);
+ new->ref_count = 0;
new->ce_flags &= ~CE_HASHED;
new->ce_namelen = namelen;
new->index = 0;
@@ -1426,6 +1428,7 @@ static struct cache_entry *cache_entry_from_ondisk(struct ondisk_cache_entry *on
{
struct cache_entry *ce = xmalloc(cache_entry_size(len));
+ ce->ref_count = 0;
ce->ce_stat_data.sd_ctime.sec = get_be32(&ondisk->ctime.sec);
ce->ce_stat_data.sd_mtime.sec = get_be32(&ondisk->mtime.sec);
ce->ce_stat_data.sd_ctime.nsec = get_be32(&ondisk->ctime.nsec);
--git a/split-index.c b/split-index.c
index 968b780..ad28f7b 100644
--- a/split-index.c
+++ b/split-index.c
@@ -124,7 +124,7 @@ static void replace_entry(size_t pos, void *data)
src->ce_flags |= CE_UPDATE_IN_BASE;
src->ce_namelen = dst->ce_namelen;
copy_cache_entry(dst, src);
- free(src);
+ drop_ce_ref(src);
si->nr_replacements++;
}
@@ -227,7 +227,7 @@ void prepare_to_write_split_index(struct index_state *istate)
base->ce_flags = base_flags;
if (ret)
ce->ce_flags |= CE_UPDATE_IN_BASE;
- free(base);
+ drop_ce_ref(base);
si->base->cache[ce->index - 1] = ce;
}
for (i = 0; i < si->base->cache_nr; i++) {
@@ -302,7 +302,7 @@ void save_or_free_index_entry(struct index_state *istate, struct cache_entry *ce
ce == istate->split_index->base->cache[ce->index - 1])
ce->ce_flags |= CE_REMOVE;
else
- free(ce);
+ drop_ce_ref(ce);
}
void replace_index_entry_in_base(struct index_state *istate,
@@ -314,8 +314,10 @@ void replace_index_entry_in_base(struct index_state *istate,
istate->split_index->base &&
old->index <= istate->split_index->base->cache_nr) {
new->index = old->index;
- if (old != istate->split_index->base->cache[new->index - 1])
- free(istate->split_index->base->cache[new->index - 1]);
+ if (old != istate->split_index->base->cache[new->index - 1]) {
+ struct cache_entry *ce = istate->split_index->base->cache[new->index - 1];
+ drop_ce_ref(ce);
+ }
istate->split_index->base->cache[new->index - 1] = new;
}
}
--git a/unpack-trees.c b/unpack-trees.c
index f932e80..1a0a637 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -606,8 +606,10 @@ static int unpack_nondirectories(int n, unsigned long mask,
o);
for (i = 0; i < n; i++) {
struct cache_entry *ce = src[i + o->merge];
- if (ce != o->df_conflict_entry)
- free(ce);
+ if (ce != o->df_conflict_entry) {
+ drop_ce_ref(ce);
+ src[i + o->merge] = NULL;
+ }
}
return rc;
}
--
2.4.2.644.g97b850b-twtrsrc
^ permalink raw reply related [relevance 1%]
* [PATCH 3/3] checkout -m: attempt merge when deletion of path was staged
@ 2014-08-13 0:03 1% ` Jonathan Nieder
0 siblings, 0 replies; 200+ results
From: Jonathan Nieder @ 2014-08-13 0:03 UTC (permalink / raw)
To: Stefan Beller; +Cc: gitster, Johannes.Schindelin, barkalow, git
twoway_merge() is missing an o->gently check in the case where a file
that needs to be modified is missing from the index but present in the
old and new trees. As a result, in this case 'git checkout -m' errors
out instead of trying to perform a merge.
Fix it by checking o->gently. While at it, inline the o->gently check
into reject_merge to prevent future call sites from making the same
mistake.
Noticed by code inspection. The motivating case hasn't been tested.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
This is the most iffy of the three patches, mostly because I was too
lazy to write a test. I believe it's safe as-is nonetheless.
Thanks for reading.
unpack-trees.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/unpack-trees.c b/unpack-trees.c
index 187b15b..6c45af7 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -1178,7 +1178,8 @@ return_failed:
static int reject_merge(const struct cache_entry *ce,
struct unpack_trees_options *o)
{
- return add_rejected_path(o, ERROR_WOULD_OVERWRITE, ce->name);
+ return o->gently ? -1 :
+ add_rejected_path(o, ERROR_WOULD_OVERWRITE, ce->name);
}
static int same(const struct cache_entry *a, const struct cache_entry *b)
@@ -1633,7 +1634,7 @@ int threeway_merge(const struct cache_entry * const *stages,
/* #14, #14ALT, #2ALT */
if (remote && !df_conflict_head && head_match && !remote_match) {
if (index && !same(index, remote) && !same(index, head))
- return o->gently ? -1 : reject_merge(index, o);
+ return reject_merge(index, o);
return merged_entry(remote, index, o);
}
/*
@@ -1641,7 +1642,7 @@ int threeway_merge(const struct cache_entry * const *stages,
* make sure that it matches head.
*/
if (index && !same(index, head))
- return o->gently ? -1 : reject_merge(index, o);
+ return reject_merge(index, o);
if (head) {
/* #5ALT, #15 */
@@ -1770,7 +1771,7 @@ int twoway_merge(const struct cache_entry * const *src,
else
return merged_entry(newtree, current, o);
}
- return o->gently ? -1 : reject_merge(current, o);
+ return reject_merge(current, o);
} else if ((!oldtree && !newtree) || /* 4 and 5 */
(!oldtree && newtree &&
same(current, newtree)) || /* 6 and 7 */
@@ -1788,7 +1789,7 @@ int twoway_merge(const struct cache_entry * const *src,
/* 20 or 21 */
return merged_entry(newtree, current, o);
} else
- return o->gently ? -1 : reject_merge(current, o);
+ return reject_merge(current, o);
}
else if (newtree) {
if (oldtree && !o->initial_checkout) {
--
^ permalink raw reply related [relevance 1%]
* Re: What's cooking in git.git (Nov 2018, #03; Wed, 7)
2018-11-07 22:09 2% ` Junio C Hamano
@ 2018-11-08 6:09 1% ` Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2018-11-08 6:09 UTC (permalink / raw)
To: Duy Nguyen; +Cc: SZEDER Gábor, Git Mailing List
Junio C Hamano <gitster@pobox.com> writes:
>> Not surprising. The i18n series makes fsck output localized strings
>> and without updating grep to test_i18ngrep, new tests will fail. If
>> 'pu' was passing before, I'm ok with just ejecting this series for
>> now. Then I wait for the other to land, rebase, fixup and resubmit.
>
> Let me first see if I can come up with a merge-fix that can be
> carried around during the time this topic cooks, before talking
> about dropping and reattempting the series.
>
> For a change like this, a time-window in which the codebase is
> quiescent enough may never come, and because the changes go all over
> the place, mostly but not entirely repetitive, it costs a lot, not
> just to write but also to review them.
I have configured the machinery used to rebuild integration branches
so that the following is squashed in when the nd/i18n topic is
merged.
The part that touches t1450 needs to be split out and squashed when
nd/per-worktree-ref-iteration gets merged, *if* the nd/i18n topic
needs to jump over the other topic, but I'll worry about it when it
happens---I think per-worktree ref iteration series that is in next
should be ready enough that we do not mind having nd/i18n waiting
for it.
Anyway, here is what is in refs/merge-fix/nd/i18n, which gets
cherry-picked and squashed into the merge when nd/i18n is merged.
t/t1450-fsck.sh | 8 ++++----
t/t5616-partial-clone.sh | 2 +-
t/t5703-upload-pack-ref-in-want.sh | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/t/t1450-fsck.sh b/t/t1450-fsck.sh
index 8a5f4c7189..2e5e979336 100755
--- a/t/t1450-fsck.sh
+++ b/t/t1450-fsck.sh
@@ -109,7 +109,7 @@ test_expect_success 'HEAD link pointing at a funny object (from different wt)' '
echo $ZERO_OID >.git/HEAD &&
# avoid corrupt/broken HEAD from interfering with repo discovery
test_must_fail git -C wt fsck 2>out &&
- grep "main-worktree/HEAD: detached HEAD points" out
+ test_i18ngrep "main-worktree/HEAD: detached HEAD points" out
'
test_expect_success 'other worktree HEAD link pointing at a funny object' '
@@ -117,7 +117,7 @@ test_expect_success 'other worktree HEAD link pointing at a funny object' '
git worktree add other &&
echo $ZERO_OID >.git/worktrees/other/HEAD &&
test_must_fail git fsck 2>out &&
- grep "worktrees/other/HEAD: detached HEAD points" out
+ test_i18ngrep "worktrees/other/HEAD: detached HEAD points" out
'
test_expect_success 'other worktree HEAD link pointing at missing object' '
@@ -125,7 +125,7 @@ test_expect_success 'other worktree HEAD link pointing at missing object' '
git worktree add other &&
echo "Contents missing from repo" | git hash-object --stdin >.git/worktrees/other/HEAD &&
test_must_fail git fsck 2>out &&
- grep "worktrees/other/HEAD: invalid sha1 pointer" out
+ test_i18ngrep "worktrees/other/HEAD: invalid sha1 pointer" out
'
test_expect_success 'other worktree HEAD link pointing at a funny place' '
@@ -133,7 +133,7 @@ test_expect_success 'other worktree HEAD link pointing at a funny place' '
git worktree add other &&
echo "ref: refs/funny/place" >.git/worktrees/other/HEAD &&
test_must_fail git fsck 2>out &&
- grep "worktrees/other/HEAD points to something strange" out
+ test_i18ngrep "worktrees/other/HEAD points to something strange" out
'
test_expect_success 'email without @ is okay' '
diff --git a/t/t5616-partial-clone.sh b/t/t5616-partial-clone.sh
index 336f02a41a..9643acb161 100755
--- a/t/t5616-partial-clone.sh
+++ b/t/t5616-partial-clone.sh
@@ -281,7 +281,7 @@ test_expect_success 'upon cloning, check that all refs point to objects' '
test_must_fail git -c protocol.version=2 clone \
--filter=blob:none $HTTPD_URL/one_time_sed/server repo 2>err &&
- grep "did not send all necessary objects" err &&
+ test_i18ngrep "did not send all necessary objects" err &&
# Ensure that the one-time-sed script was used.
! test -e "$HTTPD_ROOT_PATH/one-time-sed"
diff --git a/t/t5703-upload-pack-ref-in-want.sh b/t/t5703-upload-pack-ref-in-want.sh
index 3f58f05cbb..7053899cb5 100755
--- a/t/t5703-upload-pack-ref-in-want.sh
+++ b/t/t5703-upload-pack-ref-in-want.sh
@@ -208,7 +208,7 @@ test_expect_success 'server is initially ahead - no ref in want' '
cp -r "$LOCAL_PRISTINE" local &&
inconsistency master 1234567890123456789012345678901234567890 &&
test_must_fail git -C local fetch 2>err &&
- grep "ERR upload-pack: not our ref" err
+ test_i18ngrep "ERR upload-pack: not our ref" err
'
test_expect_success 'server is initially ahead - ref in want' '
@@ -254,7 +254,7 @@ test_expect_success 'server loses a ref - ref in want' '
echo "s/master/raster/" >"$HTTPD_ROOT_PATH/one-time-sed" &&
test_must_fail git -C local fetch 2>err &&
- grep "ERR unknown ref refs/heads/raster" err
+ test_i18ngrep "ERR unknown ref refs/heads/raster" err
'
stop_httpd
--
2.19.1-856-g8858448bb4
^ permalink raw reply related [relevance 1%]
* Re: [PATCH v3] merge: fix cache_entry use-after-free
2015-10-19 22:27 2% ` David Turner
@ 2015-10-20 2:13 1% ` Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2015-10-20 2:13 UTC (permalink / raw)
To: David Turner; +Cc: René Scharfe, git, Keith McGuigan
David Turner <dturner@twopensource.com> writes:
> The problem is not the name_hash, but with the dir_hash. The dir_hash
> is only even populated on case-insensitive filesystems (which is why you
> and Linus don't see this bug). The dir_hash is not designed to catch
> d/f conflicts, but rather case conflicts (one side of a merge has
> foo/bar; the other has FOO/bar). For each directory, it maintains a
> pointer to a cache_entry. Then add_to_index uses that cache_entry to
> rewrite incoming entries' parent directories to the expected case.
> Weirdly, that part of add_to_index is, so far as I can tell, never
> called during a merge. So where's are we using the freed value?
> Probably in dir_entry_cmp, while adding another entry to the hashmap;
> that's where our crash seems to have happened. And our failure depended
> on the details of the hash function as well; if a certain collision did
> not happen, we would not see it.
>
> There is, I think, another way to handle this: we could *copy* the path
> into the struct dir_entry instead of pointing to a cache_entry. But
> this seems like a bunch of extra work; the refcounting is simpler.
This codepath is a mess. Whoever wrote hash_dir_entry() seems to
have already known that the code is buggy by leaving this comment
there:
* Note that the cache_entry stored with the dir_entry merely
* supplies the name of the directory (up to dir_entry.namelen). We
* track the number of 'active' files in a directory in dir_entry.nr,
* so we can tell if the directory is still relevant, e.g. for git
* status. However, if cache_entries are removed, we cannot pinpoint
* an exact cache_entry that's still active. It is very possible that
* multiple dir_entries point to the same cache_entry.
If you add "a/frotz" to the index, the code will somehow create a
dir_entry to represent that the canonical case for directory "a/" is
such, so that when you later try to add "A/nitfol", the code can
grab the canonical path "a/" from dir_entry hash and turn it into
"a/nitfol". That is what happens in add_to_index in read-cache.c
But what happens if, after adding "a/frotz" and "a/nitfol" to the
index like that, you remove "a/frotz"? I do not see any code that
notices the poitner to "a/frotz" will become stale and replace it
with a pointer to "a/nitfol" that is still in the system. The next
time you try to add "a/xyzzy", find_dir_entry() will try to see if
there is an existing entry that matches "a/xyzzy"'s directory, and
one of the dir_entries has a stale pointer to ce for "a/frotz" that
is already gone.
I think the root cause of the bug is the external interface to the
index_dir_exists() function. For the above processing, there is no
reason for dir_entry() to hold a pointer to ce for "a/frotz" or
"a/nitfol". All it needs to have is an embedded string in the
structure itself, i.e.
struct dir_entry {
struct hashmap_entry ent;
struct dir_entry *parent;
int nr;
unsigned int namelen;
char name[FLEX_ARRAY];
};
The caller of index_dir_exists() in add_to_index() can be adjusted
to work with a new function in name-hash.c that does this part:
const char *startPtr = ce->name;
const char *ptr = startPtr;
while (*ptr) {
while (*ptr && *ptr != '/')
++ptr;
if (*ptr == '/') {
struct cache_entry *foundce;
++ptr;
foundce = index_dir_exists(istate, ce->name, ptr - ce->name - 1);
if (foundce) {
memcpy((void *)startPtr, foundce->name + (startPtr - ce->name), ptr - startPtr);
startPtr = ptr;
}
}
}
Perhaps name it "adjust_dirname_case(istate, ce->name)" and have it
do the whole while loop above, all inside name-hash.c. That would
make this caller a lot easier to read and understand what is going
on.
The other one, directory_exists_in_index_icase() in dir.c, expects
that a ce is returned, but the way it uses the returned value does
not really require the function to return a ce. It does look at the
ce->ce_mode but that is only because the way index_dir_exists()
tells its caller if there is a directory (hence some files inside
it) or if there is a submodule (hence there is nothing below it) by
making a fallback call internally to index_file_exists() and returns
the ce for gitlink only when (1) there is no directory in dir_hash
and (2) file_hash as a submodule in that path.
A more cleaner helper function to give what this caller really wants
to know that name-hash.c can provide would be a function that takes
pathname and len and returns an enum: "there is nothing there",
"there is a directory", or "there is a submodule". For completeness
of the API, even though this sole caller does not need it, we could
throw in "there is a regular file" there, too, if we wanted to.
If I were to clean this up, I would probably use the above updated
definition of struct dir_entry and:
* drop the fallback "return gitlink if there is one" from
index_dir_exists(), and make index_dir_exists() return 0 (false)
or 1 (true).
* have directory_exists_in_index() first call the updated
index_dir_exists() via the cache_dir_exists() convenience macro.
If it returned true, it should return index_direcgtory. If it
returned false, make a call to cache_file_exists() to see if
there is a gitlink and rturn index_gitdir when that is the case.
When all of the above fails, return index_nonexistent.
That way, we do not have to worry about "this ce no longer exists in
the main index but we need to keep it around", saving 8-bytes from
each ce and refcounting mess in the code.
^ permalink raw reply [relevance 1%]
* [PATCH] rebase --merge: fix for rebasing more than 7 commits.
@ 2006-06-22 8:44 1% Junio C Hamano
2006-06-22 8:54 2% ` Junio C Hamano
0 siblings, 1 reply; 200+ results
From: Junio C Hamano @ 2006-06-22 8:44 UTC (permalink / raw)
To: Eric Wong; +Cc: git
Instead of using 4-digit numbers to name commits being rebased,
just use "cmt.$msgnum" string, with $msgnum as a decimal number
without leading zero padding. This makes it possible to rebase
more than 9999 commits, but of more practical importance is that
the earlier code used "printf" to format already formatted
$msgnum and barfed when it counted up to 0008. In other words,
the old code was incapable of rebasing more than 7 commits, and
this fixes that problem.
Signed-off-by: Junio C Hamano <junkio@cox.net>
---
* I wanted to raise my confidence level in the new rebase --merge
code, so I did a little exercise which resulted in finding this
buglet.
I did not have "read/write-tree --prefix" on the "master"
branch, when I received the patch series that begins with
"Make git-write-tree a builtin" from Lukas. Now, my policy
is to avoid starting a new topic based on "next" (because it
would make later pulling in the topic into "master" without
all the other uncooked stuff in "next" impossible), but the
series was based on "next" (which was actually nice, since
write-tree between "master" and "next" were somewhat diverged
back then), and I couldn't easily rebase Lukas's patch series
on top of "master" because we did not have "rebase --merge"
option. Now I can with the updated "rebase".
So the exercise went like this:
(1) Start from a clone of git.git, with "master" at 8c278ab
(where the "master" was before "read/write-tree --prefix"
was merged), and "ls/am" at ab195e1 (what applying
Lukas's series on top of "next" would have produced).
Use "reset --hard" as needed.
(2) "git rebase --merge --onto master ls/am~9" (ls/am~8 being
the first one of the series). This fails with a merge
conflict on builtin-write-tree.c (the "rebase --merge"
code did the right thing with the renamed path). Fix it
up and also fix builtin.h (signature of write_tree()
needs to be changed to drop prefix).
It was very helpful to view:
git diff :3:builtin-write-tree.c builtin-write-tree.c
during the hand resolution of the conflicts; it lets me
see what Lukas did, so I can adjust the patch by removing
parts that are specific to "next" and not applicable to
"master".
(3) "git update-index builtin-write-tree.c builtin.h" and then
"git rebase --continue". The bug manifests itself during
the finalization step, which this commit fixes.
With this fix, the above works beautifully. I am reasonably
happy with this shiny new toy. Good job, Eric! and thanks.
git-rebase.sh | 23 ++++++++++-------------
1 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/git-rebase.sh b/git-rebase.sh
index b9ce112..9159477 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -67,16 +67,16 @@ continue_merge () {
prev_head=`git-rev-parse HEAD^0`
# save the resulting commit so we can read-tree on it later
- echo "$prev_head" > "$dotest/`printf %0${prec}d $msgnum`.result"
+ echo "$prev_head" > "$dotest/cmt.$msgnum.result"
echo "$prev_head" > "$dotest/prev_head"
# onto the next patch:
msgnum=$(($msgnum + 1))
- printf "%0${prec}d" "$msgnum" > "$dotest/msgnum"
+ echo "$msgnum" >"$dotest/msgnum"
}
call_merge () {
- cmt="$(cat $dotest/`printf %0${prec}d $1`)"
+ cmt="$(cat $dotest/cmt.$1)"
echo "$cmt" > "$dotest/current"
git-merge-$strategy "$cmt^" -- HEAD "$cmt"
rv=$?
@@ -108,15 +108,12 @@ finish_rb_merge () {
end="`cat $dotest/end`"
while test "$msgnum" -le "$end"
do
- msgnum=`printf "%0${prec}d" "$msgnum"`
- printf "%0${prec}d" "$msgnum" > "$dotest/msgnum"
-
- git-read-tree `cat "$dotest/$msgnum.result"`
+ git-read-tree `cat "$dotest/cmt.$msgnum.result"`
git-checkout-index -q -f -u -a
- git-commit -C "`cat $dotest/$msgnum`"
+ git-commit -C "`cat $dotest/cmt.$msgnum`"
- echo "Committed $msgnum"
- echo ' '`git-rev-list --pretty=oneline -1 HEAD | \
+ printf "Committed %0${prec}d" $msgnum
+ echo ' '`git-rev-list --pretty=oneline -1 HEAD | \
sed 's/^[a-f0-9]\+ //'`
msgnum=$(($msgnum + 1))
done
@@ -322,11 +319,11 @@ for cmt in `git-rev-list --no-merges "$u
| perl -e 'print reverse <>'`
do
msgnum=$(($msgnum + 1))
- echo "$cmt" > "$dotest/`printf "%0${prec}d" $msgnum`"
+ echo "$cmt" > "$dotest/cmt.$msgnum"
done
-printf "%0${prec}d" 1 > "$dotest/msgnum"
-printf "%0${prec}d" "$msgnum" > "$dotest/end"
+echo 1 >"$dotest/msgnum"
+echo $msgnum >"$dotest/end"
end=$msgnum
msgnum=1
--
1.4.0.gfba6
^ permalink raw reply related [relevance 1%]
* [BUG] two-way read-tree can write null sha1s into index
@ 2012-12-29 20:51 1% ` Jeff King
0 siblings, 0 replies; 200+ results
From: Jeff King @ 2012-12-29 20:51 UTC (permalink / raw)
To: Jonathan Nieder; +Cc: git, Junio C Hamano
On Sat, Dec 29, 2012 at 06:05:41AM -0500, Jeff King wrote:
> [clear state from last run]
> $ rm -rf .git/rebase-apply
> $ git reset --hard
>
> [apply the patch; we get a conflict]
> $ git am -3sc queue-3.2/alsa-usb-audio-fix-missing-autopm-for-midi-input.patch
>
> [now run just the read-tree from "am --abort"]
> $ git.compile read-tree --reset -u HEAD ORIG_HEAD
> warning: cache entry has null sha1: sound/usb/midi.c
>
> [and now check our index]
> $ git ls-files -s sound/usb/midi.c
> 100644 0000000000000000000000000000000000000000 0 sound/usb/midi.c
>
> [yes, this index is bogus]
> $ git write-tree
> error: invalid object 100644 0000000000000000000000000000000000000000 for 'sound/usb/midi.c'
> fatal: git-write-tree: error building trees
>
> So I think this check may actually be finding a real bug. I have seen
> these null sha1s in the wild, but I was never able to track down the
> actual cause. Maybe this will give us a clue. Now we just need to work
> backwards and figure out who is putting it in the in-memory index and
> why.
I made some progress on this, but I'd like a sanity check from others
(especially Junio). As far as I can tell, this is a bug in read-tree.
When we call "read-tree --reset -u HEAD ORIG_HEAD", the first thing we
do with the index is call read_cache_unmerged. Originally that would
read the index, leaving aside any unmerged entries. However, as of
d1a43f2 (reset --hard/read-tree --reset -u: remove unmerged new paths,
2008-10-15), it actually creates a new cache entry. This serves as a
placeholder, so that we later know to update the working tree.
However, we later noticed that the sha1 of that unmerged entry was
just copied from some higher stage, leaving you with random content in
the index. That was fixed by e11d7b5 ("reset --merge": fix unmerged
case, 2009-12-31), which instead puts the null sha1 into the newly
created entry, and sets a CE_CONFLICTED flag. At the same time, it
teaches the unpack-trees machinery to pay attention to this flag, so
that oneway_merge throws away the current value.
However, it did not update the code paths for twoway_merge, which is
where we end up in the read-tree above. We notice that the HEAD and
ORIG_HEAD versions are the same, and say "oh, we can just reuse the
current version". But that's not true. The current version is bogus.
So I think we need to update twoway_merge to recognize unmerged entries,
which gives us two options:
1. Reject the merge.
2. Throw away the current unmerged entry in favor of the "new" entry
(when old and new are the same, of course; otherwise we would
reject).
I think (2) is the right thing. It fixes the entry of the bogus sha1
into the index, _and_ it solves the problem that "git am --abort" leaves
the conflicted entry as a modification. It should just go away. But
maybe I am forgetting some other case where read-tree should be more
conservative, and (1) is a safer choice.
Something like this patch:
diff --git a/unpack-trees.c b/unpack-trees.c
index 6d96366..e06e01f 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -1746,14 +1746,19 @@ int twoway_merge(struct cache_entry **src, struct unpack_trees_options *o)
newtree = NULL;
if (current) {
- if ((!oldtree && !newtree) || /* 4 and 5 */
- (!oldtree && newtree &&
- same(current, newtree)) || /* 6 and 7 */
- (oldtree && newtree &&
- same(oldtree, newtree)) || /* 14 and 15 */
- (oldtree && newtree &&
- !same(oldtree, newtree) && /* 18 and 19 */
- same(current, newtree))) {
+ if (current->ce_flags & CE_CONFLICTED) {
+ if (same(oldtree, newtree))
+ return merged_entry(newtree, current, o);
+ return o->gently ? -1 : reject_merge(current, o);
+ }
+ else if ((!oldtree && !newtree) || /* 4 and 5 */
+ (!oldtree && newtree &&
+ same(current, newtree)) || /* 6 and 7 */
+ (oldtree && newtree &&
+ same(oldtree, newtree)) || /* 14 and 15 */
+ (oldtree && newtree &&
+ !same(oldtree, newtree) && /* 18 and 19 */
+ same(current, newtree))) {
return keep_entry(current, o);
}
else if (oldtree && !newtree && same(current, oldtree)) {
I suspect threeway_merge may need a similar update, but I haven't looked
too carefully yet.
-Peff
^ permalink raw reply related [relevance 1%]
* [PATCH] oneway_merge(): only lstat() when told to update worktree
@ 2012-12-20 17:37 1% Martin von Zweigbergk
0 siblings, 0 replies; 200+ results
From: Martin von Zweigbergk @ 2012-12-20 17:37 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano, Martin von Zweigbergk
Although the subject line of 613f027 (read-tree -u one-way merge fix
to check out locally modified paths., 2006-05-15) mentions "read-tree
-u", it did not seem to check whether -u was in effect. Not checking
whether -u is in effect makes e.g. "read-tree --reset" lstat() the
worktree, even though the worktree stat should not matter for that
operation.
This speeds up e.g. "git reset" a little on the linux-2.6 repo (best
of five, warm cache):
Before After
real 0m0.288s 0m0.233s
user 0m0.190s 0m0.150s
sys 0m0.090s 0m0.080s
---
I am very unfamiliar with this part of git, so my attempt at a
motivation may be totally off.
I have another twenty-or-so patches to reset.c coming up that take the
timings down to around 90 ms, but this patch was quite unrelated to
that. Those other patches actually make this patch pointless for "git
reset" (it takes another path), but I hope this is still a good change
for other operations that use oneway_merge.
unpack-trees.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/unpack-trees.c b/unpack-trees.c
index 6d96366..61acc5e 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -1834,7 +1834,7 @@ int oneway_merge(struct cache_entry **src, struct unpack_trees_options *o)
if (old && same(old, a)) {
int update = 0;
- if (o->reset && !ce_uptodate(old) && !ce_skip_worktree(old)) {
+ if (o->reset && o->update && !ce_uptodate(old) && !ce_skip_worktree(old)) {
struct stat st;
if (lstat(old->name, &st) ||
ie_match_stat(o->src_index, old, &st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE))
--
1.8.0.1.240.ge8a1f5a
^ permalink raw reply related [relevance 1%]
* Re: [PATCH v1 0/5] Allocate cache entries from memory pool
@ 2018-04-23 16:19 1% ` Jameson Miller
1 sibling, 0 replies; 200+ results
From: Jameson Miller @ 2018-04-23 16:19 UTC (permalink / raw)
To: Junio C Hamano, Jameson Miller
Cc: git@vger.kernel.org, pclouds@gmail.com, jonathantanmy@google.com
On 04/18/2018 12:49 AM, Junio C Hamano wrote:
> Jameson Miller <jamill@microsoft.com> writes:
>
>> This patch series improves the performance of loading indexes by
>> reducing the number of malloc() calls. ...
>>
>> Jameson Miller (5):
>> read-cache: teach refresh_cache_entry to take istate
>> Add an API creating / discarding cache_entry structs
>> mem-pool: fill out functionality
>> Allocate cache entries from memory pools
>> Add optional memory validations around cache_entry lifecyle
>>
>> apply.c | 26 +++---
>> blame.c | 5 +-
>> builtin/checkout.c | 8 +-
>> builtin/difftool.c | 8 +-
>> builtin/reset.c | 6 +-
>> builtin/update-index.c | 26 +++---
>> cache.h | 40 ++++++++-
>> git.c | 3 +
>> mem-pool.c | 136 ++++++++++++++++++++++++++++-
>> mem-pool.h | 34 ++++++++
>> merge-recursive.c | 4 +-
>> read-cache.c | 229 +++++++++++++++++++++++++++++++++++++++----------
>> resolve-undo.c | 6 +-
>> split-index.c | 31 +++++--
>> tree.c | 4 +-
>> unpack-trees.c | 27 +++---
>> 16 files changed, 476 insertions(+), 117 deletions(-)
>>
>>
>> base-commit: cafaccae98f749ebf33495aec42ea25060de8682
> I couldn't quite figure out what these five patches were based on,
> even with this line. Basing on and referring to a commit that is
> not part of our published history with "base-commit" is not all that
> useful to others.
My apologies - this patch series should be applied to the 'next'
branch. It applies cleanly on top of
b46fe60e1d ("merge-fix/ps/test-chmtime-get", 2018-04-20), which
is a commit in the 'next' branch.
> Offhand without applying these patches and viewing the changes in
> wider contexts, one thing that makes me wonder is how the two
> allocation schemes can be used with two implementations of free().
> Upon add_index_entry() that replaces an index entry for an existing
> path, we'd discard an entry that was originally read as part of
> read_cache(). If we do that again, the second add_index_entry()
> will be discading, in its call to replace_index_entry(), the entry
> that was allocated by the caller of the first add_index_entry()
> call. And replace_index_entry() would not have a way to know from
> which allocation the entry's memory came from.
>
> Perhaps it is not how you are using the "transient" stuff, and from
> the comment in 2/5, it is for "entries that are not meant to go into
> the index", but then higher stage index entries in unpack_trees seem
> to be allocated via the "transient" stuff, so I am not sure what the
> plans are for things like merge_recursive() that uses unpack_trees()
> to prepare the index and then later "fix it up" by further futzing
> around the index to adjust for renames it finds, etc.
Good points. The intention with this logic is that any entries
that *could* go into an index are allocated from the memory
pool. The "transient" entries only exist for a short period of
time. These have a defined lifetime and we can always trace the
corresponding "free" call. make_transient_cache_entry() is only
used to construct a temporary cache_entry to pass to the
checkout_entry() / write_entry(). There is a note in checkout.c
indicating that write_entry() needs to be re-factored to not take
a cache_entry.
The cache_entry type could gain knowledge about where it was
allocated from. This would allow us to only have a
single "free()" function, which could inspect the cache_entry to
see if it was allocated from a mem_pool (and possibly which
mem_pool) and take the appropriate action. The downside of this
approach is that cache_entry would need to gain a field to track
this information, and I *think* all of the bit field spots are
taken.
> Let me read it fully once we know where these patches are to be
> applied, but before that I cannot say much about them X-<.
>
> Thanks.
>
^ permalink raw reply [relevance 1%]
* [PATCH v2 9/9] merge: fix misleading pre-merge check documentation
@ 2018-07-01 1:25 1% ` Elijah Newren
0 siblings, 0 replies; 200+ results
From: Elijah Newren @ 2018-07-01 1:25 UTC (permalink / raw)
To: git; +Cc: gitster, pclouds, Elijah Newren
builtin/merge.c contains this important requirement for merge strategies:
...the index must be in sync with the head commit. The strategies are
responsible to ensure this.
However, Documentation/git-merge.txt says:
...[merge will] abort if there are any changes registered in the index
relative to the `HEAD` commit. (One exception is when the changed
index entries are in the state that would result from the merge
already.)
Interestingly, prior to commit c0be8aa06b85 ("Documentation/git-merge.txt:
Partial rewrite of How Merge Works", 2008-07-19),
Documentation/git-merge.txt said much more:
...the index file must match the tree of `HEAD` commit...
[NOTE]
This is a bit of a lie. In certain special cases [explained
in detail]...
Otherwise, merge will refuse to do any harm to your repository
(that is...your working tree...and index are left intact).
So, this suggests that the exceptions existed because there were special
cases where it would case no harm, and potentially be slightly more
convenient for the user. While the current text in git-merge.txt does
list a condition under which it would be safe to proceed despite the index
not matching HEAD, it does not match what is actually implemented, in
three different ways:
* The exception is written to describe what unpack-trees allows. Not
all merge strategies allow such an exception, though, making this
description misleading. 'ours' and 'octopus' merges have strictly
enforced index==HEAD for a while, and the commit previous to this
one made 'recursive' do so as well.
* If someone did a three-way content merge on a specific file using
versions from the relevant commits and staged it prior to running
merge, then that path would technically satisfy the exception listed
in git-merge.txt. unpack-trees.c would still error out on the path,
though, because it defers the three-way content merge logic to other
parts of the code (resolve, octopus, or recursive) and has no way of
checking whether the index entry from before the merge will match
the end result of the merge.
* The exception as implemented in unpack-trees actually only checked
that the index matched the MERGE_HEAD version of the file and that
HEAD matched the merge base. Assuming no renames, that would indeed
provide cases where the index matches the end result we'd get from a
merge. But renames means unpack-trees is checking that it instead
matches something other than what the final result will be, risking
either erroring out when we shouldn't need to, or not erroring out
when we should and overwriting the user's staged changes.
In addition to the wording behind this exception being misleading, it is
also somewhat surprising to see how many times the code for the special
cases were wrong or the check to make sure the index matched head was
forgotten altogether:
* Prior to commit ee6566e8d70d ("[PATCH] Rewrite read-tree", 2005-09-05),
there were many cases where an unclean index entry was allowed (look for
merged_entry_allow_dirty()); it appears that in those cases, the merge
would have simply overwritten staged changes with the result of the
merge. Thus, the merge result would have been correct, but the user's
uncommitted changes could be thrown away without warning.
* Prior to commit 160252f81626 ("git-merge-ours: make sure our index
matches HEAD", 2005-11-03), the 'ours' merge strategy did not check
whether the index matched HEAD. If it didn't, the resulting merge
would include all the staged changes, and thus wasn't really an 'ours'
strategy.
* Prior to commit 3ec62ad9ffba ("merge-octopus: abort if index does not
match HEAD", 2016-04-09), 'octopus' merges did not check whether the
index matched HEAD, also resulting in any staged changes from before
the commit silently being folded into the resulting merge. commit
a6ee883b8eb5 ("t6044: new merge testcases for when index doesn't match
HEAD", 2016-04-09) was also added at the same time to try to test to
make sure all strategies did the necessary checking for the requirement
that the index match HEAD. Sadly, it didn't catch all the cases, as
evidenced by the remainder of this list...
* Prior to commit 65170c07d466 ("merge-recursive: avoid incorporating
uncommitted changes in a merge", 2017-12-21), merge-recursive simply
relied on unpack_trees() to do the necessary check, but in one special
case it avoided calling unpack_trees() entirely and accidentally ended
up silently including any staged changes from before the merge in the
resulting merge commit.
* The commit immediately before this one in this series noted that the
exceptions were written in a way that assumed no renames, making it
unsafe for merge-recursive to use. merge-recursive was modified to
use its own check to enforce that index==HEAD.
This history makes it very tempting to go into builtin/merge.c and replace
the comment that strategies must enforce that index matches HEAD with code
that just enforces it. At this point, that would only affect the
'resolve' strategy; all other strategies have each been modified to
manually enforce it. (However, note that index==HEAD is not strictly
enforced for fast-forward merges, as those are not considered a merge
strategy and they trigger in builtin/merge.c before the section in the
code where the relevant comment is found.)
But, even if we don't take the step of just fixing these problems by
enforcing index==HEAD for all strategies, we at least need to update this
misleading documentation in git-merge.txt. For now, just modify the claim
in Documentation/git-merge.txt to fix the error. The precise details
around combination of merges strategies and special cases probably is not
relevant to most users, so simply state that exceptions may exist but are
narrow and vary depending upon which merge strategy is in use.
Signed-off-by: Elijah Newren <newren@gmail.com>
---
Documentation/git-merge.txt | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 6a5c00e2c..b050c8c2e 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -122,9 +122,9 @@ merge' may need to update.
To avoid recording unrelated changes in the merge commit,
'git pull' and 'git merge' will also abort if there are any changes
-registered in the index relative to the `HEAD` commit. (One
-exception is when the changed index entries are in the state that
-would result from the merge already.)
+registered in the index relative to the `HEAD` commit. (Special
+narrow exceptions to this rule may exist depending on which merge
+strategy is in use, but generally, the index must match HEAD.)
If all named commits are already ancestors of `HEAD`, 'git merge'
will exit early with the message "Already up to date."
--
2.18.0.137.g2a11d05a6.dirty
^ permalink raw reply related [relevance 1%]
* [RFC PATCH 7/7] merge: fix misleading pre-merge check documentation
@ 2018-06-03 6:58 1% ` Elijah Newren
1 sibling, 0 replies; 200+ results
From: Elijah Newren @ 2018-06-03 6:58 UTC (permalink / raw)
To: git; +Cc: jrnieder, Elijah Newren
builtin/merge.c contains this important requirement for merge strategies:
...the index must be in sync with the head commit. The strategies are
responsible to ensure this.
However, Documentation/git-merge.txt says:
...[merge will] abort if there are any changes registered in the index
relative to the `HEAD` commit. (One exception is when the changed
index entries are in the state that would result from the merge
already.)
Interestingly, prior to commit c0be8aa06b85 ("Documentation/git-merge.txt:
Partial rewrite of How Merge Works", 2008-07-19),
Documentation/git-merge.txt said much more:
...the index file must match the tree of `HEAD` commit...
[NOTE]
This is a bit of a lite. In certain special cases [explained
in detail]...
Otherwise, merge will refuse to do any harm to your repository
(that is...your working tree...and index are left intact).
So, this suggests that the exceptions existed because there were special
cases where it would case no harm, and potentially be slightly more
convenient for the user. While the current text in git-merge.txt does
list a condition under which it would be safe to proceed despite the index
not matching HEAD, it does not match what is actually implemented, in
three different ways:
* The exception is written to describe what unpack-trees allows. Not
all merge strategies allow such an exception, though, making this
description misleading. 'ours' and 'octopus' merges have strictly
enforced index==HEAD for a while, and the commit previous to this
one made 'recursive' do so as well.
* If someone did a three-way content merge on a specific file using
versions from the relevant commits and staged it prior to running
merge, then that path would technically satisfy the exception listed
in git-merge.txt. unpack-trees.c would still error out on the path,
though, because it defers the three-way content merge logic to other
parts of the code (resolve, octopus, or recursive) and has no way of
checking whether the index entry from before the merge will match
the end result of the merge.
* The exception as implemented in unpack-trees actually only checked
that the index matched the MERGE_HEAD version of the file and that
HEAD matched the merge base. Assuming no renames, that would indeed
provide cases where the index matches the end result we'd get from a
merge. But renames means unpack-trees is checking that it instead
matches something other than what the final result will be, risking
either erroring out when we shouldn't need to, or not erroring out
when we should and overwriting the user's staged changes.
In addition to the wording behind this exception being misleading, it is
also somewhat surprising to see how many times the code for the special
cases were wrong or the check to make sure the index matched head was
forgotten altogether:
* Prior to commit ee6566e8d70d ("[PATCH] Rewrite read-tree", 2005-09-05),
there were many cases where an unclean index entry was allowed (look for
merged_entry_allow_dirty()); it appears that in those cases, the merge
would have simply overwritten staged changes with the result of the
merge. Thus, the merge result would have been correct, but the user's
uncommitted changes could be thrown away without warning.
* Prior to commit 160252f81626 ("git-merge-ours: make sure our index
matches HEAD", 2005-11-03), the 'ours' merge strategy did not check
whether the index matched HEAD. If it didn't, the resulting merge
would include all the staged changes, and thus wasn't really an 'ours'
strategy.
* Prior to commit 3ec62ad9ffba ("merge-octopus: abort if index does not
match HEAD", 2016-04-09), 'octopus' merges did not check whether the
index matched HEAD, also resulting in any staged changes from before
the commit silently being folded into the resulting merge. commit
a6ee883b8eb5 ("t6044: new merge testcases for when index doesn't match
HEAD", 2016-04-09) was also added at the same time to try to test to
make sure all strategies did the necessary checking for the requirement
that the index match HEAD. Sadly, it didn't catch all the cases, as
evidenced by the remainder of this list...
* Prior to commit 65170c07d466 ("merge-recursive: avoid incorporating
uncommitted changes in a merge", 2017-12-21), merge-recursive simply
relied on unpack_trees() to do the necessary check, but in one special
case it avoided calling unpack_trees() entirely and accidentally ended
up silently including any staged changes from before the merge in the
resulting merge commit.
* The commit immediately before this one in this series noted that the
exceptions were written in a way that assumed no renames, making it
unsafe for merge-recursive to use. merge-recursive was modified to
use its own check to enforce that index==HEAD.
This history makes it very tempting to go into builtin/merge.c and replace
the comment that strategies must enforce that index matches HEAD with code
that just enforces it. At this point, that would only affect the
'resolve' strategy; all other strategies have each been modified to
manually enforce it. (However, note that index==HEAD is not strictly
enforced for fast-forward merges, as those are not considered a merge
strategy and they trigger in builtin/merge.c before the section in the
code where the relevant comment is found.)
But, even if we don't take the step of just fixing these problems by
enforcing index==HEAD for all strategies, we at least need to update this
misleading documentation in git-merge.txt. For now, just modify the claim
in Documentation/git-merge.txt to fix the error. The precise details
around combination of merges strategies and special cases probably is not
relevant to most users, so simply state that exceptions may exist but are
narrow and vary depending upon which merge strategy is in use.
Signed-off-by: Elijah Newren <newren@gmail.com>
---
Documentation/git-merge.txt | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index d5dfd8430f..141bd72284 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -122,9 +122,9 @@ merge' may need to update.
To avoid recording unrelated changes in the merge commit,
'git pull' and 'git merge' will also abort if there are any changes
-registered in the index relative to the `HEAD` commit. (One
-exception is when the changed index entries are in the state that
-would result from the merge already.)
+registered in the index relative to the `HEAD` commit. (Special
+narrow exceptions to this rule may exist depending on which merge
+strategy is in use, but generally, the index must match HEAD.)
If all named commits are already ancestors of `HEAD`, 'git merge'
will exit early with the message "Already up to date."
--
2.18.0.rc0.49.g3c08dc0fef
^ permalink raw reply related [relevance 1%]
* Re: [PATCH 04/11] hashmap_entry: detect improper initialization
@ 2019-08-27 22:16 1% ` Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2019-08-27 22:16 UTC (permalink / raw)
To: Eric Wong; +Cc: Johannes Schindelin, git
Eric Wong <e@80x24.org> writes:
> I renamed it to intentionally break my build.
This cuts both ways. If you work without any throw-away merges, it
is GOOD to make sure any new use other people added will be spotted
by the compiler by breaking the build. It will force you to resolve
all such breakages until you can move on to other topics, and it
will also force you to commit to your topic that deliberately breaks
the build by renaming.
If you want to avoid committing to the current iteration of topic,
however, then that would mean you'd need a reliable way to rebuild
evil merges (aka resolution of semantic conflicts) so that you can
keep parts of more recent history more flexible (similar to how 'pu'
is managed).
My plan is to have ew/hashmap topic for a few days while ejecting
the js/add-i topic which semantically conflicts with the changed way
hashmaps ought to be used temporarily, and when I have enough time
and concentration, try to see if I can come up with a good semantic
conflict resolution that I can keep reusing (aka refs/merge-fix/).
If it happens, we'll see both topics, and if it doesn't, I'll then
drop ew/hashmap and queue js/add-i and rinse and repeat from there
;-)
^ permalink raw reply [relevance 1%]
* Re: [PATCH v2 0/7] Provide API to invalidate refs cache
@ 2011-10-11 17:26 2% ` Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2011-10-11 17:26 UTC (permalink / raw)
To: Michael Haggerty
Cc: git, Jeff King, Drew Northup, Jakub Narebski, Heiko Voigt,
Johan Herland, Julian Phillips, Martin Fick, Christian Couder,
Christian Couder, Thomas Rast
Michael Haggerty <mhagger@alum.mit.edu> writes:
> On 10/11/2011 02:02 AM, Junio C Hamano wrote:
> ...
>> I could rebase your series, but it always is more error prone to have
>> somebody who is not the original author rebase a series than the original
>> author build for the intended base tree from the beginning.
>
> I don't mind rebasing this little series on jp/get-ref-dir-unsorted.
> ...
> Rebasing 78 patches is going to be a morass of clerical work.
I do not think it is "clerical" in the first place.
Realistically, I expect that a 50+ patch series that touch fairly an
important part of the system to take 2 cycles and a half before it hits a
released version, judging from our recent experience with the recursive
merge fix-up series.
When we already have a patch that has been discussed well enough on the
list to fix somebody's real world problem, can we afford to block it and
give an exclusive write lock to part of the codebase for 2 cycles to your
series, or anybody's for that matter?
> Is there any alternative?
I think an alternative is not to hold on to a series before it gets so
large to make you feel adjusting to the needs to other changes in the
codebase is "clerical". Commit often and early while developing the
initial pass, re-read often and throughout the whole process looking for
things you regret you would have done in early in the series that you
didn't (aka "oops, here is a fixup for the thinko in the early patch in
the series), and clean-up early while preparing to publish. Reorder the
parts that you are more confident that they do not need to change to come
early in the series, and unleash these early parts when you reach certain
confidence level.
I think your iterate-refs series was an example of good execution. It made
the codeflow a lot clearer by reducing the special casing of the submodule
parameter. In your grand scheme of things (e.g. read only parts of the ref
namespace as needed) you might consider it a mere side effect, but the
series by itself was a good thing to have.
Sometimes you may feel that a part of your series when taken out of
context would not justify itself like the iterate-refs series did, until
later parts of the series start taking advantage of the change. But that
is what commit log messages are for: e.g. "this change to encapsulate
these global variables into a single structure does not make a difference
in the current codebase, but in a later patch this and that callers will
need additional pieces of information passed aruond in the callchain, and
will add new members to the structure".
> ... So maybe
> I brought this whole mess down on my own head :-(
No, it is not anybody's fault in particular. That's life and open source.
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (Jan 2010, #08; Sun, 24)
@ 2010-01-25 4:39 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2010-01-25 4:39 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
marked with '.' do not appear in any of the integration branches, but I am
still holding onto them.
--------------------------------------------------
[Graduated to "master"]
* jc/fix-tree-walk (2009-09-14) 7 commits
(merged to 'next' on 2010-01-13 at 1c01b87)
+ read-tree --debug-unpack
+ unpack-trees.c: look ahead in the index
+ unpack-trees.c: prepare for looking ahead in the index
+ Aggressive three-way merge: fix D/F case
+ traverse_trees(): handle D/F conflict case sanely
+ more D/F conflict tests
+ tests: move convenience regexp to match object names to test-lib.sh
This is fix for a tricky codepath; I've been using this personally during
the whole cycle up to point, so hopefully it finally have nailed all the
corner cases? Knock wood...
--------------------------------------------------
[New Topics]
* cc/reset-keep (2010-01-19) 5 commits
- reset: disallow using --keep when there are unmerged entries
- reset: disallow "reset --keep" outside a work tree
- Documentation: reset: describe new "--keep" option
- reset: add test cases for "--keep" option
- reset: add option "--keep" to "git reset"
I do not think I'd ever use this, and I am not convinced I can sell this
to users as a great new feature without confusing them unnecessarily, but
perhaps queuing it to pu to give it wider visibility may help somebody
coming up with a better way to defend the feature and introduce it to
users without confusing them than Christan nor I managed to.
* jc/ce-uptodate (2010-01-24) 1 commit
- Make ce_uptodate() trustworthy again
I think this and Jens Lehmann's follow-up patch to avoid calling
is_submodule_modified() are needed before 1.7.0
--------------------------------------------------
[Cooking]
* jh/notes (2010-01-17) 20 commits
- builtin-gc: Teach the new --notes option to garbage-collect notes
- Notes API: gc_notes(): Prune notes that belong to non-existing objects
- t3305: Verify that removing notes triggers automatic fanout consolidation
- builtin-notes: Teach -d option for deleting existing notes
- Teach builtin-notes to remove empty notes
- Teach notes code to properly preserve non-notes in the notes tree
- t3305: Verify that adding many notes with git-notes triggers increased fanout
- t3301: Verify successful annotation of non-commits
- Builtin-ify git-notes
- Refactor notes concatenation into a flexible interface for combining notes
- Notes API: Allow multiple concurrent notes trees with new struct notes_tree
- Notes API: write_notes_tree(): Store the notes tree in the database
- Notes API: for_each_note(): Traverse the entire notes tree with a callback
- Notes API: get_note(): Return the note annotating the given object
- Notes API: remove_note(): Remove note objects from the notes tree structure
- Notes API: add_note(): Add note objects to the internal notes tree structure
- Notes API: init_notes(): Initialize the notes tree from the given notes ref
- Add tests for checking correct handling of $GIT_NOTES_REF and core.notesRef
- Notes API: get_commit_notes() -> format_note() + remove the commit restriction
- Minor non-functional fixes to notes.c
The changes to test vector this series makes to t3301 breaks tests that
are in 'master', so 'pu' doesn't pass it.
* jh/gitweb-cached (2010-01-13) 9 commits
- gitweb: File based caching layer (from git.kernel.org)
- gitweb: Convert output to using indirect file handle
- gitweb: cleanup error message produced by undefined $site_header
- gitweb: add a get function to compliment print_sort_th
- gitweb: add a get function to compliment print_local_time
- gitweb: Makefile improvements
- gitweb: Add option to force version match
- gitweb: change die_error to take "extra" argument for extended die information
- gitweb: Load checking
I know there is a series to split the later ones into smaller chunks that
are being discussed on the list, but they don't appear here. I'd prefer
to pick the series up after all the dust from the discussion settles.
* jc/grep-author-all-match-implicit (2010-01-17) 1 commit
- "log --author=me --grep=it" should find intersection, not union
^ permalink raw reply [relevance 2%]
* [PATCH v3 2/2] read-cache: fix directory/file conflict handling in read_index_unmerged()
@ 2018-07-31 17:12 2% ` Elijah Newren
0 siblings, 0 replies; 200+ results
From: Elijah Newren @ 2018-07-31 17:12 UTC (permalink / raw)
To: gitster; +Cc: git, sunshine, Elijah Newren
read_index_unmerged() has two intended purposes:
* return 1 if there are any unmerged entries, 0 otherwise
* drops any higher-stage entries down to stage #0
There are several callers of read_index_unmerged() that check the return
value to see if it is non-zero, all of which then die() if that condition
is met. For these callers, dropping higher-stage entries down to stage #0
is a waste of resources, and returning immediately on first unmerged entry
would be better. But it's probably only a very minor difference and isn't
the focus of this series.
The remaining callers ignore the return value and call this function for
the side effect of dropping higher-stage entries down to stage #0. As
mentioned in commit e11d7b596970 ("'reset --merge': fix unmerged case",
2009-12-31),
The _only_ reason we want to keep a previously unmerged entry in the
index at stage #0 is so that we don't forget the fact that we have
corresponding file in the work tree in order to be able to remove it
when the tree we are resetting to does not have the path.
In fact, prior to commit d1a43f2aa4bf ("reset --hard/read-tree --reset -u:
remove unmerged new paths", 2008-10-15), read_index_unmerged() did just
remove unmerged entries from the cache immediately but that had the
unwanted effect of leaving around new untracked files in the tree from
aborted merges.
So, that's the intended purpose of this function. The problem is that
when directory/files conflicts are present, trying to add the file to the
index at stage 0 fails (because there is still a directory in the way),
and the function returns early with a -1 return code to signify the error.
As noted above, none of the callers who want the drop-to-stage-0 behavior
check the return status, though, so this means all remaining unmerged
entries remain in the index and the callers proceed assuming otherwise.
Users then see errors of the form:
error: 'DIR-OR-FILE' appears as both a file and as a directory
error: DIR-OR-FILE: cannot drop to stage #0
and potentially also messages about other unmerged entries which came
lexicographically later than whatever pathname was both a file and a
directory. Google finds a few hits searching for those messages,
suggesting there were probably a couple people who hit this besides me.
Luckily, calling `git reset --hard` multiple times would workaround
this bug.
Since the whole purpose here is to just put the entry *temporarily* into
the index so that any associated file in the working copy can be removed,
we can just skip the DFCHECK and allow both the file and directory to
appear in the index. The temporary simultaneous appearance of the
directory and file entries in the index will be removed by the callers
by calling unpack_trees(), which excludes these unmerged entries marked
with CE_CONFLICTED flag from the resulting index, before they attempt to
write the index anywhere.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
read-cache.c | 13 ++++++++-----
t/t1015-read-index-unmerged.sh | 8 ++++----
t/t6020-merge-df.sh | 3 ---
t/t6042-merge-rename-corner-cases.sh | 2 --
4 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/read-cache.c b/read-cache.c
index 372588260e..666d295a5a 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -2632,10 +2632,13 @@ int write_locked_index(struct index_state *istate, struct lock_file *lock,
/*
* Read the index file that is potentially unmerged into given
- * index_state, dropping any unmerged entries. Returns true if
- * the index is unmerged. Callers who want to refuse to work
- * from an unmerged state can call this and check its return value,
- * instead of calling read_cache().
+ * index_state, dropping any unmerged entries to stage #0 (potentially
+ * resulting in a path appearing as both a file and a directory in the
+ * index; the caller is responsible to clear out the extra entries
+ * before writing the index to a tree). Returns true if the index is
+ * unmerged. Callers who want to refuse to work from an unmerged
+ * state can call this and check its return value, instead of calling
+ * read_cache().
*/
int read_index_unmerged(struct index_state *istate)
{
@@ -2658,7 +2661,7 @@ int read_index_unmerged(struct index_state *istate)
new_ce->ce_flags = create_ce_flags(0) | CE_CONFLICTED;
new_ce->ce_namelen = len;
new_ce->ce_mode = ce->ce_mode;
- if (add_index_entry(istate, new_ce, 0))
+ if (add_index_entry(istate, new_ce, ADD_CACHE_SKIP_DFCHECK))
return error("%s: cannot drop to stage #0",
new_ce->name);
}
diff --git a/t/t1015-read-index-unmerged.sh b/t/t1015-read-index-unmerged.sh
index 32ef6bdcfa..55d22da32c 100755
--- a/t/t1015-read-index-unmerged.sh
+++ b/t/t1015-read-index-unmerged.sh
@@ -30,7 +30,7 @@ test_expect_success 'setup modify/delete + directory/file conflict' '
)
'
-test_expect_failure 'read-tree --reset cleans unmerged entries' '
+test_expect_success 'read-tree --reset cleans unmerged entries' '
test_when_finished "git -C df_plus_modify_delete clean -f" &&
test_when_finished "git -C df_plus_modify_delete reset --hard" &&
(
@@ -45,7 +45,7 @@ test_expect_failure 'read-tree --reset cleans unmerged entries' '
)
'
-test_expect_failure 'One reset --hard cleans unmerged entries' '
+test_expect_success 'One reset --hard cleans unmerged entries' '
test_when_finished "git -C df_plus_modify_delete clean -f" &&
test_when_finished "git -C df_plus_modify_delete reset --hard" &&
(
@@ -87,7 +87,7 @@ test_expect_success 'setup directory/file conflict + simple edit/edit' '
)
'
-test_expect_failure 'git merge --abort succeeds despite D/F conflict' '
+test_expect_success 'git merge --abort succeeds despite D/F conflict' '
test_when_finished "git -C df_plus_edit_edit clean -f" &&
test_when_finished "git -C df_plus_edit_edit reset --hard" &&
(
@@ -103,7 +103,7 @@ test_expect_failure 'git merge --abort succeeds despite D/F conflict' '
)
'
-test_expect_failure 'git am --skip succeeds despite D/F conflict' '
+test_expect_success 'git am --skip succeeds despite D/F conflict' '
test_when_finished "git -C df_plus_edit_edit clean -f" &&
test_when_finished "git -C df_plus_edit_edit reset --hard" &&
(
diff --git a/t/t6020-merge-df.sh b/t/t6020-merge-df.sh
index 2af1beec5f..46b506b3b7 100755
--- a/t/t6020-merge-df.sh
+++ b/t/t6020-merge-df.sh
@@ -89,9 +89,6 @@ test_expect_success 'modify/delete + directory/file conflict' '
'
test_expect_success 'modify/delete + directory/file conflict; other way' '
- # Yes, we really need the double reset since "letters" appears as
- # both a file and a directory.
- git reset --hard &&
git reset --hard &&
git clean -f &&
git checkout modify^0 &&
diff --git a/t/t6042-merge-rename-corner-cases.sh b/t/t6042-merge-rename-corner-cases.sh
index 411550d2b6..de77bfaf4f 100755
--- a/t/t6042-merge-rename-corner-cases.sh
+++ b/t/t6042-merge-rename-corner-cases.sh
@@ -235,7 +235,6 @@ test_expect_success 'setup content merge + rename/directory conflict' '
'
test_expect_success 'rename/directory conflict + clean content merge' '
- git reset --hard &&
git reset --hard &&
git clean -fdqx &&
@@ -259,7 +258,6 @@ test_expect_success 'rename/directory conflict + clean content merge' '
'
test_expect_success 'rename/directory conflict + content merge conflict' '
- git reset --hard &&
git reset --hard &&
git clean -fdqx &&
--
2.18.0.2.gf4c50c7885
^ permalink raw reply related [relevance 2%]
* [PATCH v2 2/2] read-cache: fix directory/file conflict handling in read_index_unmerged()
@ 2018-07-13 16:33 2% ` Elijah Newren
1 sibling, 0 replies; 200+ results
From: Elijah Newren @ 2018-07-13 16:33 UTC (permalink / raw)
To: gitster; +Cc: git, sunshine, Elijah Newren
read_index_unmerged() has two intended purposes:
* return 1 if there are any unmerged entries, 0 otherwise
* drops any higher-stage entries down to stage #0
There are several callers of read_index_unmerged() that check the return
value to see if it is non-zero, all of which then die() if that condition
is met. For these callers, dropping higher-stage entries down to stage #0
is a waste of resources, and returning immediately on first unmerged entry
would be better. But it's probably only a very minor difference and isn't
the focus of this series.
The remaining callers ignore the return value and call this function for
the side effect of dropping higher-stage entries down to stage #0. As
mentioned in commit e11d7b596970 ("'reset --merge': fix unmerged case",
2009-12-31),
The _only_ reason we want to keep a previously unmerged entry in the
index at stage #0 is so that we don't forget the fact that we have
corresponding file in the work tree in order to be able to remove it
when the tree we are resetting to does not have the path.
In fact, prior to commit d1a43f2aa4bf ("reset --hard/read-tree --reset -u:
remove unmerged new paths", 2008-10-15), read_index_unmerged() did just
remove unmerged entries from the cache immediately but that had the
unwanted effect of leaving around new untracked files in the tree from
aborted merges.
So, that's the intended purpose of this function. The problem is that
when directory/files conflicts are present, trying to add the file to the
index at stage 0 fails (because there is still a directory in the way),
and the function returns early with a -1 return code to signify the error.
As noted above, none of the callers who want the drop-to-stage-0 behavior
check the return status, though, so this means all remaining unmerged
entries remain in the index and the callers proceed assuming otherwise.
Users then see errors of the form:
error: 'DIR-OR-FILE' appears as both a file and as a directory
error: DIR-OR-FILE: cannot drop to stage #0
and potentially also messages about other unmerged entries which came
lexicographically later than whatever pathname was both a file and a
directory. Google finds a few hits searching for those messages,
suggesting there were probably a couple people who hit this besides me.
Luckily, calling `git reset --hard` multiple times would workaround
this bug.
Since the whole purpose here is to just put the entry *temporarily* into
the index so that any associated file in the working copy can be removed,
we can just skip the DFCHECK and allow both the file and directory to
appear in the index. The temporary simultaneous appearance of the
directory and file entries in the index will be removed by the callers
by calling unpack_trees(), which excludes these unmerged entries marked
with CE_CONFLICTED flag from the resulting index, before they attempt to
write the index anywhere.
Signed-off-by: Elijah Newren <newren@gmail.com>
---
read-cache.c | 13 ++++++++-----
t/t1015-read-index-unmerged.sh | 8 ++++----
t/t6020-merge-df.sh | 3 ---
t/t6042-merge-rename-corner-cases.sh | 1 -
4 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/read-cache.c b/read-cache.c
index 372588260e..666d295a5a 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -2632,10 +2632,13 @@ int write_locked_index(struct index_state *istate, struct lock_file *lock,
/*
* Read the index file that is potentially unmerged into given
- * index_state, dropping any unmerged entries. Returns true if
- * the index is unmerged. Callers who want to refuse to work
- * from an unmerged state can call this and check its return value,
- * instead of calling read_cache().
+ * index_state, dropping any unmerged entries to stage #0 (potentially
+ * resulting in a path appearing as both a file and a directory in the
+ * index; the caller is responsible to clear out the extra entries
+ * before writing the index to a tree). Returns true if the index is
+ * unmerged. Callers who want to refuse to work from an unmerged
+ * state can call this and check its return value, instead of calling
+ * read_cache().
*/
int read_index_unmerged(struct index_state *istate)
{
@@ -2658,7 +2661,7 @@ int read_index_unmerged(struct index_state *istate)
new_ce->ce_flags = create_ce_flags(0) | CE_CONFLICTED;
new_ce->ce_namelen = len;
new_ce->ce_mode = ce->ce_mode;
- if (add_index_entry(istate, new_ce, 0))
+ if (add_index_entry(istate, new_ce, ADD_CACHE_SKIP_DFCHECK))
return error("%s: cannot drop to stage #0",
new_ce->name);
}
diff --git a/t/t1015-read-index-unmerged.sh b/t/t1015-read-index-unmerged.sh
index 32ef6bdcfa..55d22da32c 100755
--- a/t/t1015-read-index-unmerged.sh
+++ b/t/t1015-read-index-unmerged.sh
@@ -30,7 +30,7 @@ test_expect_success 'setup modify/delete + directory/file conflict' '
)
'
-test_expect_failure 'read-tree --reset cleans unmerged entries' '
+test_expect_success 'read-tree --reset cleans unmerged entries' '
test_when_finished "git -C df_plus_modify_delete clean -f" &&
test_when_finished "git -C df_plus_modify_delete reset --hard" &&
(
@@ -45,7 +45,7 @@ test_expect_failure 'read-tree --reset cleans unmerged entries' '
)
'
-test_expect_failure 'One reset --hard cleans unmerged entries' '
+test_expect_success 'One reset --hard cleans unmerged entries' '
test_when_finished "git -C df_plus_modify_delete clean -f" &&
test_when_finished "git -C df_plus_modify_delete reset --hard" &&
(
@@ -87,7 +87,7 @@ test_expect_success 'setup directory/file conflict + simple edit/edit' '
)
'
-test_expect_failure 'git merge --abort succeeds despite D/F conflict' '
+test_expect_success 'git merge --abort succeeds despite D/F conflict' '
test_when_finished "git -C df_plus_edit_edit clean -f" &&
test_when_finished "git -C df_plus_edit_edit reset --hard" &&
(
@@ -103,7 +103,7 @@ test_expect_failure 'git merge --abort succeeds despite D/F conflict' '
)
'
-test_expect_failure 'git am --skip succeeds despite D/F conflict' '
+test_expect_success 'git am --skip succeeds despite D/F conflict' '
test_when_finished "git -C df_plus_edit_edit clean -f" &&
test_when_finished "git -C df_plus_edit_edit reset --hard" &&
(
diff --git a/t/t6020-merge-df.sh b/t/t6020-merge-df.sh
index 2af1beec5f..46b506b3b7 100755
--- a/t/t6020-merge-df.sh
+++ b/t/t6020-merge-df.sh
@@ -89,9 +89,6 @@ test_expect_success 'modify/delete + directory/file conflict' '
'
test_expect_success 'modify/delete + directory/file conflict; other way' '
- # Yes, we really need the double reset since "letters" appears as
- # both a file and a directory.
- git reset --hard &&
git reset --hard &&
git clean -f &&
git checkout modify^0 &&
diff --git a/t/t6042-merge-rename-corner-cases.sh b/t/t6042-merge-rename-corner-cases.sh
index 1cbd946fc2..583e68997e 100755
--- a/t/t6042-merge-rename-corner-cases.sh
+++ b/t/t6042-merge-rename-corner-cases.sh
@@ -323,7 +323,6 @@ test_expect_success 'rename/directory conflict + content merge conflict' '
(
cd rename-directory-1 &&
- git reset --hard &&
git reset --hard &&
git clean -fdqx &&
--
2.18.0.645.g72fe132ec2
^ permalink raw reply related [relevance 2%]
* [PATCH 2/2] read-cache: fix directory/file conflict handling in read_index_unmerged()
@ 2018-07-11 5:18 2% ` Elijah Newren
1 sibling, 0 replies; 200+ results
From: Elijah Newren @ 2018-07-11 5:18 UTC (permalink / raw)
To: git; +Cc: gitster, Elijah Newren
read_index_unmerged() has two intended purposes:
* return 1 if there are any unmerged entries, 0 otherwise
* drops any higher-stage entries down to stage #0
There are several callers of read_index_unmerged() that check the return
value to see if it is non-zero, all of which then die() if that condition
is met. For these callers, dropping higher-stage entries down to stage #0
is a waste of resources, and returning immediately on first unmerged entry
would be better. But it's probably only a very minor difference and isn't
the focus of this series.
The remaining callers ignore the return value and call this function for
the side effect of dropping higher-stage entries down to stage #0. As
mentioned in commit e11d7b596970 ("'reset --merge': fix unmerged case",
2009-12-31),
The _only_ reason we want to keep a previously unmerged entry in the
index at stage #0 is so that we don't forget the fact that we have
corresponding file in the work tree in order to be able to remove it
when the tree we are resetting to does not have the path.
In fact, prior to commit d1a43f2aa4bf ("reset --hard/read-tree --reset -u:
remove unmerged new paths", 2008-10-15), read_index_unmerged() did just
remove unmerged entries from the cache immediately but that had the
unwanted effect of leaving around new untracked files in the tree from
aborted merges.
So, that's the intended purpose of this function. The problem is that
when directory/files conflicts are present, trying to add the file to the
index at stage 0 fails (because there is still a directory in the way),
and the function returns early with a -1 return code to signify the error.
As noted above, none of the callers who want the drop-to-stage-0 behavior
check the return status, though, so this means all remaining unmerged
entries remain in the index and the callers proceed assuming otherwise.
Users then see errors of the form:
error: 'DIR-OR-FILE' appears as both a file and as a directory
error: DIR-OR-FILE: cannot drop to stage #0
and potentially also messages about other unmerged entries which came
lexicographically later than whatever pathname was both a file and a
directory. Google finds a few hits searching for those messages,
suggesting there were probably a couple people who hit this besides me.
Luckily, calling `git reset --hard` multiple times would workaround
this bug.
Since the whole purpose here is to just put the entry *temporarily* into
the index so that any associated file in the working copy can be removed,
we can just skip the DFCHECK and allow both the file and directory to
appear in the index. The temporary simultaneous appearance of the
directory and file entries in the index will be removed by the callers
before they attempt to write the index anywhere.
Signed-off-by: Elijah Newren <newren@gmail.com>
---
read-cache.c | 13 ++++++++-----
t/t1015-read-index-unmerged.sh | 8 ++++----
t/t6020-merge-df.sh | 3 ---
t/t6042-merge-rename-corner-cases.sh | 1 -
4 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/read-cache.c b/read-cache.c
index 372588260..666d295a5 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -2632,10 +2632,13 @@ int write_locked_index(struct index_state *istate, struct lock_file *lock,
/*
* Read the index file that is potentially unmerged into given
- * index_state, dropping any unmerged entries. Returns true if
- * the index is unmerged. Callers who want to refuse to work
- * from an unmerged state can call this and check its return value,
- * instead of calling read_cache().
+ * index_state, dropping any unmerged entries to stage #0 (potentially
+ * resulting in a path appearing as both a file and a directory in the
+ * index; the caller is responsible to clear out the extra entries
+ * before writing the index to a tree). Returns true if the index is
+ * unmerged. Callers who want to refuse to work from an unmerged
+ * state can call this and check its return value, instead of calling
+ * read_cache().
*/
int read_index_unmerged(struct index_state *istate)
{
@@ -2658,7 +2661,7 @@ int read_index_unmerged(struct index_state *istate)
new_ce->ce_flags = create_ce_flags(0) | CE_CONFLICTED;
new_ce->ce_namelen = len;
new_ce->ce_mode = ce->ce_mode;
- if (add_index_entry(istate, new_ce, 0))
+ if (add_index_entry(istate, new_ce, ADD_CACHE_SKIP_DFCHECK))
return error("%s: cannot drop to stage #0",
new_ce->name);
}
diff --git a/t/t1015-read-index-unmerged.sh b/t/t1015-read-index-unmerged.sh
index bbd64587c..5034ed931 100755
--- a/t/t1015-read-index-unmerged.sh
+++ b/t/t1015-read-index-unmerged.sh
@@ -30,7 +30,7 @@ test_expect_success 'setup modify/delete + directory/file conflict' '
)
'
-test_expect_failure 'read-tree --reset cleans unmerged entries' '
+test_expect_success 'read-tree --reset cleans unmerged entries' '
test_when_finished "git -C df_plus_modify_delete clean -f" &&
test_when_finished "git -C df_plus_modify_delete reset --hard" &&
(
@@ -45,7 +45,7 @@ test_expect_failure 'read-tree --reset cleans unmerged entries' '
)
'
-test_expect_failure 'One reset --hard cleans unmerged entries' '
+test_expect_success 'One reset --hard cleans unmerged entries' '
test_when_finished "git -C df_plus_modify_delete clean -f" &&
test_when_finished "git -C df_plus_modify_delete reset --hard" &&
(
@@ -87,7 +87,7 @@ test_expect_success 'setup directory/file conflict + simple edit/edit' '
)
'
-test_expect_failure 'git merge --abort succeeds despite D/F conflict' '
+test_expect_success 'git merge --abort succeeds despite D/F conflict' '
test_when_finished "git -C df_plus_edit_edit clean -f" &&
test_when_finished "git -C df_plus_edit_edit reset --hard" &&
(
@@ -103,7 +103,7 @@ test_expect_failure 'git merge --abort succeeds despite D/F conflict' '
)
'
-test_expect_failure 'git am --skip succeeds despite D/F conflict' '
+test_expect_success 'git am --skip succeeds despite D/F conflict' '
test_when_finished "git -C df_plus_edit_edit clean -f" &&
test_when_finished "git -C df_plus_edit_edit reset --hard" &&
(
diff --git a/t/t6020-merge-df.sh b/t/t6020-merge-df.sh
index 2af1beec5..46b506b3b 100755
--- a/t/t6020-merge-df.sh
+++ b/t/t6020-merge-df.sh
@@ -89,9 +89,6 @@ test_expect_success 'modify/delete + directory/file conflict' '
'
test_expect_success 'modify/delete + directory/file conflict; other way' '
- # Yes, we really need the double reset since "letters" appears as
- # both a file and a directory.
- git reset --hard &&
git reset --hard &&
git clean -f &&
git checkout modify^0 &&
diff --git a/t/t6042-merge-rename-corner-cases.sh b/t/t6042-merge-rename-corner-cases.sh
index 1cbd946fc..583e68997 100755
--- a/t/t6042-merge-rename-corner-cases.sh
+++ b/t/t6042-merge-rename-corner-cases.sh
@@ -323,7 +323,6 @@ test_expect_success 'rename/directory conflict + content merge conflict' '
(
cd rename-directory-1 &&
- git reset --hard &&
git reset --hard &&
git clean -fdqx &&
--
2.18.0.138.g557c5d94c.dirty
^ permalink raw reply related [relevance 2%]
* [PATCH v2] oneway_merge(): only lstat() when told to update worktree
@ 2012-12-20 21:03 2% ` Martin von Zweigbergk
0 siblings, 0 replies; 200+ results
From: Martin von Zweigbergk @ 2012-12-20 21:03 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git, Martin von Zweigbergk
Although the subject line of 613f027 (read-tree -u one-way merge fix
to check out locally modified paths., 2006-05-15) mentions "read-tree
-u", it did not seem to check whether -u was in effect. Not checking
whether -u is in effect makes e.g. "read-tree --reset" lstat() the
worktree, even though the worktree stat should not matter for that
operation.
This speeds up e.g. "git reset" a little on the linux-2.6 repo (best
of five, warm cache):
Before After
real 0m0.288s 0m0.233s
user 0m0.190s 0m0.150s
sys 0m0.090s 0m0.080s
Signed-off-by: Martin von Zweigbergk <martinvonz@gmail.com>
---
unpack-trees.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/unpack-trees.c b/unpack-trees.c
index 6d96366..61acc5e 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -1834,7 +1834,7 @@ int oneway_merge(struct cache_entry **src, struct unpack_trees_options *o)
if (old && same(old, a)) {
int update = 0;
- if (o->reset && !ce_uptodate(old) && !ce_skip_worktree(old)) {
+ if (o->reset && o->update && !ce_uptodate(old) && !ce_skip_worktree(old)) {
struct stat st;
if (lstat(old->name, &st) ||
ie_match_stat(o->src_index, old, &st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE))
--
1.8.0.1.240.ge8a1f5a
^ permalink raw reply related [relevance 2%]
* Re: Collaborative conflict resolution feature request
@ 2020-06-13 16:44 2% ` Junio C Hamano
1 sibling, 0 replies; 200+ results
From: Junio C Hamano @ 2020-06-13 16:44 UTC (permalink / raw)
To: Philip Oakley
Cc: Curtin, Eric, Christian Couder, git@vger.kernel.org, Geary, Niall,
rowlands, scott, Michael Haggerty
Philip Oakley <philipoakley@iee.email> writes:
> Maybe have a parallel 'merge' branch that is used (say weekly) to do
> trial merges and will essentially record the conflict resolutions while
> they are fresh in folks memories. That branch is distinct from, either
> of the two main branches, but will act as a filter and a hand rail to
> highlight future difficulties."
An aside that probably would not directly help Eric, but I know the
above workflow helps reasonably well. The 'pu' branch is rebuilt
not on top of 'next', but is rebuilt with all topics (including
those already in 'next') in flight directly on top of 'master',
which serves as a way to anticipate conflicts that will require
resolution in the future before the topics can enter 'next' branch.
And these resolutions are ...
> Also look at 'rerere'.
... remembered in the rerere database (and even trickier ones that
rerere cannot handle are recorded in the merge-fix commits, but that
is a separate story). When topics are ready to be merged to 'next'
and to 'master', the correct resolutions are likely to be known and
the result tested in 'pu' and 'next', respectively, for some time
already.
^ permalink raw reply [relevance 2%]
* Re: I think there is error in merge documents - current branch
@ 2023-05-21 13:28 2% ` Minnie Shi
2023-05-21 13:49 0% ` Minnie Shi
0 siblings, 1 reply; 200+ results
From: Minnie Shi @ 2023-05-21 13:28 UTC (permalink / raw)
To: Sergey Organov; +Cc: Junio C Hamano, git
Hi All,
What is the procedure to update the document to correct the error? As
I responded yesterday, see below. we need to change the error.
From: Minnie Shi <minnie.shi@gmail.com>
Date: Sat, May 20, 2023 at 11:41 AM
Subject: Re: [PATCH] doc: merge: fix mention of `ORIG_HEAD`
To: Kristoffer Haugsbakk <code@khaugsbakk.name>
Cc: <git@vger.kernel.org>, Kristoffer Haugsbakk <code@khaugsbakk.name>
Okay, i read one more time, i think it should be read as
Before the operation,
-`ORIG_HEAD` is set to the tip of the "current" branch (`G`)
instead of
Before the operation,
-`ORIG_HEAD` is set to the tip of the "current" branch (`C`)
Kind regards,
Mi
On Sun, May 21, 2023 at 2:23 PM Sergey Organov <sorganov@gmail.com> wrote:
>
> Junio C Hamano <gitster@pobox.com> writes:
>
> > Minnie Shi <minnie.shi@gmail.com> writes:
> >
> >> in summary the sentence should be read as
> >>
> >> Before the operation, ORIG_HEAD is set to the tip of the current branch (H).
> >> instead of
> >> Before the operation, ORIG_HEAD is set to the tip of the current branch (C).
> >
> > Not C but G (i.e. the tip _before_ the history is updated).
> >
> > I notice that we overuse "current" there. One is to refer to the
> > most recent commit on a branch, the other is to refer to the branch
> > that is checked out. For the former, we say "the tip" in the other
> > sentence, and it probably will make it less ambiguous if used that
> > phrase.
> >
> > Then "`git merge topic`" will replay the changes made on the
> > `topic` branch since it diverged from `master` (i.e., `E`) until
> > the commit at the tip of the `topic` (`C`) on top of `master`,
> > and record the result
> > in a new commit along with the names of the two parent commits and
> > a log message from the user describing the changes. Before the operation,
> > `ORIG_HEAD` is set to the tip of the current branch (`G`).
> >
> > My reading also hiccupped with "replay"; the first sentence to
> > explain the command says "incorporate the changes", and that may be
> > a less confusing expression; "replay" somehow makes me imagine that
> > the changes are cherry-picked one by one---it may be only me, so I
> > left it as-is in the suggestion above.
>
> For me "apply changes" or even "apply cumulative changes" works much
> better than "replay changes" in this context, especially provided we
> will apparently have "git replay" soon.
>
> Thanks,
> -- Sergey Organov
--
Kind regards
Min
^ permalink raw reply [relevance 2%]
* Re: [PATCH v3] merge: fix cache_entry use-after-free
2015-10-16 7:05 2% ` David Turner
@ 2015-10-16 16:04 2% ` Junio C Hamano
2015-10-19 22:27 2% ` David Turner
0 siblings, 1 reply; 200+ results
From: Junio C Hamano @ 2015-10-16 16:04 UTC (permalink / raw)
To: David Turner; +Cc: René Scharfe, git, Keith McGuigan
David Turner <dturner@twopensource.com> writes:
> We also do dozens or hundreds of merges per day and only saw this quite
> rarely. Interestingly, we could only trigger it with an alternate
> hashing function for git's hashmap implementation, and only once a
> certain bug in that implementation was *fixed*. But that was just a
> trigger; it was certainly not the cause. The bug would, in general,
> have caused more hash collisions due to worse mixing, but I believe it
> is possible that some particular collision would have been present in
> the non-bugged version of the code but not in the bugged version.
>
> It may have also had something to do with a case-insensitive filesystem;
> we never saw anyone reproduce it on anything but OS X, and even there it
> was quite difficult to reproduce.
>
> In short, I don't think we know why the bug was not seen widely.
It has been a long time since I looked at name-hash.c and I am fuzzy
on what the four functions (cache|index)_(file|dir)_exists are meant
for, but I have this feeling that the original premise of the patch,
"we may free a ce because we no longer use it in the index, but it
may still need to keep a reference to it in name-hash" may be wrong
in the first place. The proposed "fix" conceptually feels wrong.
The whole point of the name-hash is so that we can detect collisions
in two names, one of which wants to have a file in one place while
the other wants to have a directory, at the same path in the index.
The pathnames and cache entries registered in the name-hash have to
be the ones that are relevant to the index in quesition. If a new
ce will be added to the index, the name-hash will have to know about
its path (and that is what CE_HASHED bit is about). On the other
hand, if you are going to remove an existing ce from the index, its
sub-paths should no longer prevent other cache entries to be there.
E.g. if you have "a/b", it must prevent "A" from entering the index
and the name-hash helps you to do so; when you remove "a/b", then
name-hash must now allow "A" to enter the index. So "a/b" must be
removed from the name-hash by calling remove_name_hash() and normal
codepaths indeed do so.
I do not doubt the existence of "use-after-free bug" you observed,
but I am not convinced that refcounting is "fixing" the problem; it
smells like papering over a different bug that is the root cause of
the use-after-free.
For example, if we forget to "unhash" a ce from name-hash when we
remove a ce from the index (or after we "hashed" it, expecting to
add it to the index, but in the end decided not to add to the index,
perhaps), we would see a now-freed ce still in the name-hash.
Checking a path against the name-hash in such a state would have to
use the ce->name from that stale ce, which is a use-after-free bug.
In such a situation, isn't the real cause of the bug the fact that
the stale ce that is no longer relevant to the true index contents
still in name-hash? The refcounting does not fix the fact that a
ce->name of a stale ce that is no longer relevant being used for D/F
collision checking.
I am not saying that I found such a codepath that forgets to unhash,
but from the overall design and purpose of the name-hash subsystem,
anything that deliberately _allows_ a stale ce that does not exist
in the index in there smells like a workaround going in a wrong
direction.
^ permalink raw reply [relevance 2%]
* Re: [PATCH v1 0/5] Allocate cache entries from memory pool
@ 2018-04-23 16:44 2% ` Jameson Miller
0 siblings, 0 replies; 200+ results
From: Jameson Miller @ 2018-04-23 16:44 UTC (permalink / raw)
To: Stefan Beller, Junio C Hamano
Cc: Jameson Miller, git@vger.kernel.org, pclouds@gmail.com,
jonathantanmy@google.com
On 04/20/2018 01:49 PM, Stefan Beller wrote:
>>> base-commit: cafaccae98f749ebf33495aec42ea25060de8682
>>
>> I couldn't quite figure out what these five patches were based on,
>> even with this line. Basing on and referring to a commit that is
>> not part of our published history with "base-commit" is not all that
>> useful to others.
>
> I'd like to second this. In the object store refactoring, I am at a point where
> I'd want to migrate the memory management of {object, tree, commit, tag}.c
> which currently is done in alloc.c to a memory pool, that has a dedicated
> pointer to it.
>
> So I'd either have to refactor alloc.c to take the_repository[1] or
> I'd play around with the mem_pool to manage memory in the
> object layer. I guess this playing around can happen with
> what is at origin/jm/mem-pool, however the life cycle management
> part of the third patch[2] would allow for stopping memleaks there.
> So I am interested in this series as well.
>
Sorry about the confusion here. This patch series can be applied to the
next branch. They apply cleanly on [3]. The lifecycle functions are
re-introduced in [4], which we could incorporate sooner if useful. I
didn't have a consumer for the calls in the original patch series, and
so deferred them until there was a caller. I would be interested to
understand how the mem_pool would fit your needs, and if it is
sufficient or needs modification for your use cases.
> [1] proof of concept in patches nearby
> https://public-inbox.org/git/20180206001749.218943-31-sbeller@google.com/
>
> [2] https://public-inbox.org/git/20180417163400.3875-5-jamill@microsoft.com/
>
> Thanks,
> Stefan
>
[3] b46fe60e1d ("merge-fix/ps/test-chmtime-get", 2018-04-20)
[4]
https://public-inbox.org/git/20180417163400.3875-5-jamill@microsoft.com/
^ permalink raw reply [relevance 2%]
* Re: Merging five months of Linux kernel history
@ 2006-10-29 20:34 2% ` Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2006-10-29 20:34 UTC (permalink / raw)
To: Jan-Benedict Glaw; +Cc: git
Jan-Benedict Glaw <jbglaw@lug-owl.de> writes:
> Hi!
>
> Due to a move to a new flat and other reasons, I wasn't able to
> do daily merges from Linus's tree into our vax-linux tree.
> My time situation has improved and I want to merge all the new
> and shiny stuff, but it seems a straight "git pull" isn't the
> best way to do that.
>
> What I'd actually love to do is to go through all commits since the
> last merge and pull/accept/cherry-pick then one by one. That way I'll
> learn about new stuff. I'll specifically see generic changes that
> imply arch-specific stuff, things I'll need to implement later on.
>
> Is there any sane way to cluse such a large gap? I don't mind looking
> through tenthousands of commits, as long as I get a chance to spot
> "important" ones.
I think the best way is:
git pull
git log ORIG_HEAD..
The latter would give your ten thousands of commits to inspect.
If the pull results in a conflict, then
git pull
git log --merge
... fix conflicts ...
git commit
git log ORIG_HEAD..
Since ORIG_HEAD is transient, and you probably would want to
revisit the list of these ten thousands of commits later, it
might make sense to do
git tag WHERE_WE_WERE
before "git pull" in either case.
^ permalink raw reply [relevance 2%]
* Re: performance problem: "git commit filename"
@ 2008-01-13 11:09 2% ` Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2008-01-13 11:09 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Git Mailing List, Kristian H?gsberg
Junio C Hamano <gitster@pobox.com> writes:
> The fact that we write out a temporary index and then rebuild
> the real index means CE_UPTODATE flag we populate in the
> temporary index is lost and we still need to lstat(2) while
> building the real index, which is a bit unfortunate. I suspect
> that we can use the one-way merge to reset the index when
> building the real index after we are done building the temporary
> index, instead of discarding the in-core temporary index and
> re-reading the real index.
This comment is completely bogus. With your earlier one-way
merge fix, as the way CE_UPTODATE patch was written we preserve
in-core CE_UPTODATE bit across write_index(), the code already
should be taking advantage of an earlier lstat(2).
^ permalink raw reply [relevance 2%]
* Re: What's cooking in git.git (Nov 2012, #03; Tue, 13)
@ 2012-11-13 20:01 2% ` Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2012-11-13 20:01 UTC (permalink / raw)
To: Jeff King; +Cc: git
Jeff King <peff@peff.net> writes:
> This is my final "what's cooking" as interim maintainer. I didn't
> graduate anything to master, but I updated my plans for each topic to
> give Junio an idea of where I was.
After exploding the first-parent history between your master..pu
into component topics and recreating one new merge-fix for
nd/wildmatch topic, I think I now know how to rebuild your
integration branches.
I still haven't caught up with the past discussions (and still am
slightly jetlagged), but I think I can take it over from here with
help from contributors.
Thanks.
^ permalink raw reply [relevance 2%]
* Re: [PATCH 1/2] dir.c: Make git-status --ignored more consistent
@ 2012-12-30 21:36 2% ` Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2012-12-30 21:36 UTC (permalink / raw)
To: Antoine Pelisse; +Cc: git, Jeff King, Adam Spiers
Antoine Pelisse <apelisse@gmail.com> writes:
> By the way, that merges without conflicts with Adam's series, but it
> will not compile as he renamed functions that I'm now using
> (path_excluded() -> is_path_excluded() that is).
>
> By the way, Junio, how do you handle this situation as a maintainer ?
> Do you keep a note to manually make the change every time you remerge
> the series together ? That is the kind of use-case you can't handle
> with git-rerere, and I've been trying to find a solution to it.
I'll finish the write-up on jc/doc-maintainer topic not in a very
distant future, but not today.
In the meantime, the hint is in the use of refs/merge-fix/ hierarchy
in the Reintegrate script found on my 'todo' branch (which I have a
separate clone/checkout of in "Meta/" directory in my main working
tree).
^ permalink raw reply [relevance 2%]
* Re: What's cooking in git.git (Nov 2015, #04; Tue, 24)
@ 2015-12-01 23:10 2% ` Jeff King
0 siblings, 0 replies; 200+ results
From: Jeff King @ 2015-12-01 23:10 UTC (permalink / raw)
To: brian m. carlson, git
On Sat, Nov 28, 2015 at 05:09:32PM +0000, brian m. carlson wrote:
> > I got a bunch of conflicts trying to merge it into 'next' and 'pu' and
> > punted on it. I think the tricky bits are coming from
> > dt/refs-backend-pre-vtable, where there was a lot of code movement.
>
> I think as for merging into the latest pu, the thing you want to do in
> refs.c is simply take what pu has. You'll have to fix up one additional
> struct object call site. The same thing goes for builtin/merge.c and
> builtin/branch.c, where the code I changed has since been eliminated.
>
> I also noticed that merge-recursive.c and builtin/ff-refs.c needed some
> minor fixups as well, but a quick compile will show you where those are.
> I've included a diff for those two below.
Thanks, this gave me an opportunity to play with Junio's merge-fix
scripts. :) The result will be in the "pu" I push out shortly.
-Peff
^ permalink raw reply [relevance 2%]
* Re: What's cooking in git.git (Nov 2018, #03; Wed, 7)
@ 2018-11-07 22:09 2% ` Junio C Hamano
2018-11-08 6:09 1% ` Junio C Hamano
0 siblings, 1 reply; 200+ results
From: Junio C Hamano @ 2018-11-07 22:09 UTC (permalink / raw)
To: Duy Nguyen; +Cc: SZEDER Gábor, Git Mailing List
Duy Nguyen <pclouds@gmail.com> writes:
> On Wed, Nov 7, 2018 at 2:09 PM SZEDER Gábor <szeder.dev@gmail.com> wrote:
>>
>> On Wed, Nov 07, 2018 at 06:41:45PM +0900, Junio C Hamano wrote:
>> > * nd/i18n (2018-11-06) 16 commits
>> > - fsck: mark strings for translation
>> > - fsck: reduce word legos to help i18n
>> > ...
>> > More _("i18n") markings.
>>
>> When this patch is merged into 'pu' all four tests added to
>> 't1450-fsck.sh' in b29759d89a (fsck: check HEAD and reflog from other
>> worktrees, 2018-10-21) as part of 'nd/per-worktree-ref-iteration'
>> below fail when run with GETTEXT_POISON=y. The test suite passes in
>> both of these topics on their own, even with GETTEXT_POISON, it's
>> their merge that is somehow problematic.
>
> Not surprising. The i18n series makes fsck output localized strings
> and without updating grep to test_i18ngrep, new tests will fail. If
> 'pu' was passing before, I'm ok with just ejecting this series for
> now. Then I wait for the other to land, rebase, fixup and resubmit.
Let me first see if I can come up with a merge-fix that can be
carried around during the time this topic cooks, before talking
about dropping and reattempting the series.
For a change like this, a time-window in which the codebase is
quiescent enough may never come, and because the changes go all over
the place, mostly but not entirely repetitive, it costs a lot, not
just to write but also to review them.
^ permalink raw reply [relevance 2%]
* Re: [PATCH 1/1] fixup! Merge branch 'js/vsts-ci' into pu
@ 2019-01-29 17:50 2% ` Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2019-01-29 17:50 UTC (permalink / raw)
To: Johannes Schindelin via GitGitGadget; +Cc: git, Johannes Schindelin
"Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
writes:
> From: Johannes Schindelin <johannes.schindelin@gmx.de>
>
> The js/vsts-ci and sg/travis-specific-cc branches do not interact so
> well... While Travis has the Homebrew package gcc@8 installed in their
> Xcode 10.1 images, Azure Pipelines' agents do not.
>
> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> ---
> ci/lib.sh | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Thanks; will use as a merge-fix/ recipe (assuming that sg/travis
would graduate before vsts-ci).
> diff --git a/ci/lib.sh b/ci/lib.sh
> index 276b99693d..16f4ecbc67 100755
> --- a/ci/lib.sh
> +++ b/ci/lib.sh
> @@ -123,7 +123,7 @@ then
> echo "$SYSTEM_TASKDEFINITIONSURI$SYSTEM_TEAMPROJECT/_build/results?buildId=$1"
> }
>
> - BREW_INSTALL_PACKAGES=
> + BREW_INSTALL_PACKAGES=gcc@8
> export GIT_PROVE_OPTS="--timer --jobs 10 --state=failed,slow,save"
> export GIT_TEST_OPTS="--verbose-log -x --write-junit-xml"
> export MAKEFLAGS="--jobs=10"
^ permalink raw reply [relevance 2%]
* Re: [PATCH v6 07/27] checkout: inform the user when removing branch state
@ 2019-07-02 17:51 2% ` Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2019-07-02 17:51 UTC (permalink / raw)
To: Duy Nguyen
Cc: SZEDER Gábor, eckhard.s.maass, git, jacob.keller,
martin.agren, newren, phillip.wood123, rybak.a.v, sunshine
Duy Nguyen <pclouds@gmail.com> writes:
> I agree, this is not "canceling". I think this series causes conflicts
> with pw/clean-sequencer-state-upon-final-commit and the warning is
> accidentally enabled (partly my fault since I named the argument
> "verbose").
>
> Junio, in this conflict resolution (merging nd/switch-and-restore to
> next), we should pass '0' instead of 'verbose' to
> sequencer_post_commit_cleanup().
Thanks for an update to the merge-fix. What should the name of the
parameter to the sequencer_post_commit_cleanup() funcion be then,
though? Perhaps we'd want an update after the topic graduates to
the 'master' branch.
>
> diff --cc builtin/commit.c
> index 1921401117,fa5982cc86..145d50caf0
> --- a/builtin/commit.c
> +++ b/builtin/commit.c
> @@@ -1658,7 -1666,8 +1658,7 @@@ int cmd_commit(int argc, const char **a
> die("%s", err.buf);
> }
>
> - sequencer_post_commit_cleanup(the_repository);
> - unlink(git_path_cherry_pick_head(the_repository));
> - unlink(git_path_revert_head(the_repository));
> ++ sequencer_post_commit_cleanup(the_repository, verbose);
> unlink(git_path_merge_head(the_repository));
> unlink(git_path_merge_msg(the_repository));
> unlink(git_path_merge_mode(the_repository));
> --
> Duy
^ permalink raw reply [relevance 2%]
* Re: [PATCH] submodule add: show 'add --dry-run' stderr when aborting
@ 2020-01-16 20:23 2% ` Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2020-01-16 20:23 UTC (permalink / raw)
To: Johannes Schindelin; +Cc: Kyle Meyer, git, Yaroslav O Halchenko
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> I think this got mis-merged when merging down `km/submodule-add-errmsg`:
> it needs to be prefixed with `hint:` because of `hw/advice-add-nothing`,
> i.e.
>
> -- snipsnap --
> diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh
> index 42a00f95b9d..a6973a3003c 100755
> --- a/t/t7400-submodule-basic.sh
> +++ b/t/t7400-submodule-basic.sh
> @@ -158,7 +158,7 @@ test_expect_success 'submodule add to .gitignored path fails' '
> cat <<-\EOF >expect &&
> The following paths are ignored by one of your .gitignore files:
> submod
> - Use -f if you really want to add them.
> + hint: Use -f if you really want to add them.
> EOF
> # Does not use test_commit due to the ignore
> echo "*" > .gitignore &&
Thanks, will prepare merge-fix material for this.
^ permalink raw reply [relevance 2%]
* Re: [PATCH 10/11] strvec: drop argv_array compatibility layer
@ 2020-07-29 0:44 2% ` Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2020-07-29 0:44 UTC (permalink / raw)
To: Jeff King; +Cc: git
Jeff King <peff@peff.net> writes:
> Worse than the resolutions are all the new calls which needed to be
> fixed up. I know your scripts keep a fix-up commit for this, but I don't
> think you publish it.
They are found in refs/merge-fix/$topicname, and the broken-out
mirror repository https://github.com/gitster/git/ should have them.
^ permalink raw reply [relevance 2%]
* Re: [PATCH v3 00/20] Maintenance builtin, allowing 'gc --auto' customization
@ 2020-07-31 2:58 2% ` Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2020-07-31 2:58 UTC (permalink / raw)
To: Derrick Stolee via GitGitGadget
Cc: git, Johannes.Schindelin, sandals, steadmon, jrnieder, peff,
congdanhqx, phillip.wood123, emilyshaffer, sluongng,
jonathantanmy, Derrick Stolee
Junio C Hamano <gitster@pobox.com> writes:
> "Derrick Stolee via GitGitGadget" <gitgitgadget@gmail.com> writes:
>
>> * This series is now based on jk/strvec, as there are several places where
>> I was adding new callers to argv_array_push* and run_command_v_opt()
>> which have been replaced with strvec_push*() and run_command(), using a
>> 'struct child_process'.
>
> It probably has been a good way to gain experience with the renamed
> API for you to rebase this series, but I think we'd have to spend a
> similar amount of effort yet again, as I expect that the jk/strvec
> series would be rerolled at least once more, with the items[] array
> renamed to something else, like v[].
>
> Let's see how it goes.
So, ... jk/strvec got updated, and just applying these twenty
patches on top no longer compiles, so I rebased them ;-)
I also adjusted the merge-fix for the 6 patches on es/config-hooks
topic before making tonight's final push-out of 'seen'.
Thanks.
^ permalink raw reply [relevance 2%]
* Re: [PATCH] t7900: add '--scheduler=launchctl' parameter to fix test
@ 2021-08-31 15:59 2% ` Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2021-08-31 15:59 UTC (permalink / raw)
To: Ramsay Jones; +Cc: Derrick Stolee, Lénaïc Huard, GIT Mailing-list
Ramsay Jones <ramsay@ramsayjones.plus.com> writes:
> On 30/08/2021 17:02, Junio C Hamano wrote:
>> Ramsay Jones <ramsay@ramsayjones.plus.com> writes:
>>
> [snip]
>>
>> This test comes from outside Lénaïc's series. I guess I am seeing a
>> botched semantic merge conflict resolution of mine where the two
>> topics met.
>
> Oops! :( My apologies to you both.
>
> My build of 'seen' had two test failures (t5319.19 and this one), and
> I had to be somewhere else in about 30 mins ...
>
> I should know by now not to rush out a patch ... Sorry to have wasted
> your time.
No, the input was very valuable to me. Neither topic has enough to
solve the issue because the new test got created in the topic that
does not yet have the --scheduler option in the "git maintenance"
command, and the other topic that added the option does not yet have
the test yet.
Unless one topic is made to build on the other, it is a semantic
context for me to resolve.
Hopefully what is near the tip of 'seen' now has the merge fix.
THanks.
^ permalink raw reply [relevance 2%]
* Re: What's cooking in git.git (Apr 2024, #01; Mon, 1)
@ 2024-04-01 23:08 2% ` Junio C Hamano
2024-04-01 23:27 0% ` Taylor Blau
0 siblings, 1 reply; 200+ results
From: Junio C Hamano @ 2024-04-01 23:08 UTC (permalink / raw)
To: Taylor Blau; +Cc: git
Junio C Hamano <gitster@pobox.com> writes:
>>> * tb/pseudo-merge-reachability-bitmap (2024-03-20) 24 commits
>>> ...
>> Thanks updating the description. I am waiting to reroll until after it
>> has received a little bit of review on the technical front.
>
> In the meantime I've dropped it as it interacts with tb/midx-write
> and Eric's khash-to-khashl update.
I think I got merge-fix for integrating this topic with the rest, so
I'll be resurrecting it and queuing it to 'seen' again.
^ permalink raw reply [relevance 2%]
* Re: [PATCH 00/13] reftable: prepare for re-seekable iterators
@ 2024-05-09 0:16 2% ` Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2024-05-09 0:16 UTC (permalink / raw)
To: Patrick Steinhardt; +Cc: git
Junio C Hamano <gitster@pobox.com> writes:
> diff --git c/reftable/reader.c w/reftable/reader.c
> index 2ea830bdb6..fd516e01db 100644
> --- c/reftable/reader.c
> +++ w/reftable/reader.c
> @@ -841,7 +841,7 @@ int reftable_reader_print_blocks(const char *tablename)
> },
> };
> struct reftable_block_source src = { 0 };
> - struct table_iter ti = TABLE_ITER_INIT;
> + struct table_iter *ti;
> struct reftable_reader *r = NULL;
> size_t i;
> int err;
... an unusually early error could skip everything here ...
> @@ -880,6 +883,6 @@ int reftable_reader_print_blocks(const char *tablename)
>
> done:
> reftable_reader_free(r);
> - table_iter_close(&ti);
> + table_iter_close(ti);
... and cause this to break. In the version of the merge-fix I
used, *ti is initialized to NULL and the _close() is called only
when ti is not NULL.
> return err;
> }
^ permalink raw reply [relevance 2%]
* [ANNOUNCE] Git v2.0.2
@ 2014-07-16 22:02 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2014-07-16 22:02 UTC (permalink / raw)
To: git; +Cc: Linux Kernel
The latest maintenance release Git v2.0.2 is now available at
the usual places.
The tarballs are found at:
https://www.kernel.org/pub/software/scm/git/
The following public repositories all have a copy of the 'v2.0.2'
tag and the 'maint' branch that the tag points at:
url = https://kernel.googlesource.com/pub/scm/git/git
url = git://repo.or.cz/alt-git.git
url = https://code.google.com/p/git-core/
url = git://git.sourceforge.jp/gitroot/git-core/git.git
url = git://git-core.git.sourceforge.net/gitroot/git-core/git-core
url = https://github.com/gitster/git
Git v2.0.2 Release Notes
========================
* Documentation for "git submodule sync" forgot to say that the subcommand
can take the "--recursive" option.
* Mishandling of patterns in .gitignore that has trailing SPs quoted
with backslashes (e.g. ones that end with "\ ") have been
corrected.
* Recent updates to "git repack" started to duplicate objects that
are in packfiles marked with .keep flag into the new packfile by
mistake.
* "git clone -b brefs/tags/bar" would have mistakenly thought we were
following a single tag, even though it was a name of the branch,
because it incorrectly used strstr().
* "%G" (nothing after G) is an invalid pretty format specifier, but
the parser did not notice it as garbage.
* Code to avoid adding the same alternate object store twice was
subtly broken for a long time, but nobody seems to have noticed.
* A handful of code paths had to read the commit object more than
once when showing header fields that are usually not parsed. The
internal data structure to keep track of the contents of the commit
object has been updated to reduce the need for this double-reading,
and to allow the caller find the length of the object.
* During "git rebase --merge", a conflicted patch could not be
skipped with "--skip" if the next one also conflicted.
----------------------------------------------------------------
Changes since v2.0.1 are as follows:
Jeff King (27):
repack: do not accidentally pack kept objects by default
repack: respect pack.writebitmaps
repack: s/write_bitmap/&s/ in code
commit_tree: take a pointer/len pair rather than a const strbuf
replace dangerous uses of strbuf_attach
alloc: include any-object allocations in alloc_report
commit: push commit_index update into alloc_commit_node
do not create "struct commit" with xcalloc
logmsg_reencode: return const buffer
sequencer: use logmsg_reencode in get_message
provide a helper to free commit buffer
provide a helper to set the commit buffer
provide helpers to access the commit buffer
use get_cached_commit_buffer where appropriate
use get_commit_buffer to avoid duplicate code
convert logmsg_reencode to get_commit_buffer
use get_commit_buffer everywhere
commit-slab: provide a static initializer
commit: convert commit->buffer to a slab
commit: record buffer length in cache
reuse cached commit buffer when parsing signatures
t7510: stop referring to master in later tests
t7510: test a commit signed by an unknown key
t7510: check %G* pretty-format output
pretty: avoid reading past end-of-string with "%G"
move "%G" format test from t7510 to t6006
t7300: repair filesystem permissions with test_when_finished
Junio C Hamano (4):
t0008: do not depend on 'echo' handling backslashes specially
builtin/clone.c: detect a clone starting at a tag correctly
Start preparing for 2.0.2
Git 2.0.2
Matthew Chen (1):
submodule: document "sync --recursive"
Michael J Gruber (1):
t7510: use consistent &&-chains in loop
Pasha Bolokhov (1):
dir.c:trim_trailing_spaces(): fix for " \ " sequence
René Scharfe (2):
sha1_file: avoid overrunning alternate object base string
annotate: use argv_array
Ronnie Sahlberg (1):
enums: remove trailing ',' after last item in enum
brian m. carlson (1):
rebase--merge: fix --skip with two conflicts in a row
^ permalink raw reply [relevance 2%]
* Re: Beginner question on "Pull is mostly evil"
@ 2014-05-07 20:15 2% ` Junio C Hamano
0 siblings, 1 reply; 200+ results
From: Junio C Hamano @ 2014-05-07 20:15 UTC (permalink / raw)
To: Jim Garrison; +Cc: git@vger.kernel.org
Jim Garrison <jim.garrison@nwea.org> writes:
> During my initial self-education I came across the maxim "don't
> pull, fetch+merge instead" and have been doing that. I think I
> followed most of the "pull is (mostly) evil" discussion but one
> facet still puzzles me: the idea that pull will do a merge "in the
> wrong direction" sometimes.
[administrivia: wrap your lines to reasonable length like ~70 cols,
please]
> Do I understand correctly that this occurs only in the presence of
> multiple remotes?
No. This is most often true for people who use a single repository
as a place for everybody to meet, in the same way as SVN.
Suppose that that central repository has this history:
---o---o---A
which ends at commit A (time flows from left to right and each node
in the graph is a commit, lines between them indicating parent-child
relationship).
Then you clone it and work on your own commits, which leads you to
have this in *your* repository:
---o---o---A---B---C
Imagine your coworker did the same and built on top of A in *his*
repository this history in the meantime, and then pushed it to the
central repository:
---o---o---A---X---Y---Z
Now, if you "git push" at this point, beause your history that leads
to C lack X, Y and Z, it will fail. You need to somehow make the
tip of your history a descendant of Z.
One way that "mostly evil" thread discusses is to "pull", which is
"fetch and then merge" (note that I am saying "don't pull, instead
fetch and merge" is not an advice to solve "pull is mostly evil"
issue at all). If you fetch, your repository will have a history
like this:
---o---o---A---B---C
\
X---Y---Z
And then if you did merge after that, while still on *your* branch,
i.e. C, you will create a merge M and make the history look like
this:
---o---o---A---B---C---M
\ /
X---Y---Z
M is a descendant of Z, so you can push to update the central
repository. Such a merge M does not lose any commit in both
histories, so in that sense it may not be wrong, but when people
would want to talk about "the authoritative canonical history that
is shared among the project participants", i.e. "the trunk", the way
they often use is to do:
$ git log --first-parent
For all other people who observed the central repository after your
coworker pushed Z but before you pushed M, the commit on the trunk
used to be "o-o-A-X-Y-Z". But because you made M while you were on
C, M's first parent is C, so by pushing M to advance the central
repository, you made X-Y-Z a side branch, not on the trunk.
You would rather want to have a history of this shape:
---o---o---A---X---Y---Z---M'
\ /
B-----------C
so that in the first-parent chain, it is clear that the project
first did X and then Y and then Z and merged a change that consists
of two commits B and C that achieves a single goal. You may have
worked on fixing the bug #12345 with these two patches, and the
merge M' with swapped parents can say in its log message "Merge
'fix-bug-12345'".
Note that I said "achieves a single goal" above, because this is
important. "swapping the merge order" only covers a special case
where the project does not care too much about having unrelated
things done on a single merge but cares a lot about first-parent
chain.
There are multiple schools of thought about the "trunk" management.
1. Some projects want to keep a completely linear history without
any merges. Obviously, swapping the merge order would not help
their taste. You would need to flatten your history on top of
the updated upstream to result in a history of this shape
instead:
---o---o---A---X---Y---Z---B---C
with "git pull --rebase" or something.
2. Some projects tolerate merges in their history, but do not worry
too much about the first-parent order, and allows fast-forward
merges. To them, swapping the merge order does not hurt, but
it is unnecessary.
3. Some projects want each commit on the "trunk" to do one single
thing. The output of "git log --first-parent" in such a project
would show either a merge of a side branch that completes a
single theme, or a single commit that completes a single theme
by itself. If your two commits B and C (or they may even be two
groups of commits) were solving two independent issues, then the
merge M' we made in the earlier example by swapping the merge
order is still not up to the project standard. It merges two
unrelated efforts B and C at the same time.
For projects in the last category (git itself is one of them),
individual developers would want to prepare a history more like
this:
C0--C1--C2 topic-c
/
---o---o---A master
\
B0--B1--B2 topic-b
That is, keeping separate topics on separate branches, perhaps like
so:
$ git clone $URL work && cd work
$ git checkout -b topic-b master
$ ... work to create B0, B1 and B2 to complete one theme
$ git checkout -b topic-c master
$ ... same for the theme of topic-c
And then
$ git checkout master
$ git pull --ff-only
would grab X, Y and Z from the upstream and advance your master
branch:
C0--C1--C2
/
---o---o---A---X---Y---Z
\
B0--B1--B2
And then you would merge these two branches separately:
$ git merge topic-b
$ git merge topic-c
to result in
C0--C1---------C2
/ \
---o---o---A---X---Y---Z---M---N
\ /
B0--B1-----B2
and push it back to the central repository.
It is very much possible that while you are merging topic-b and
topic-c, somebody again advanced the history in the central
repository to put W on top of Z, and make your "git push" fail.
In such a case, you would rewind to discard M and N, update the tip
of your 'master' again and redo the two merges:
$ git reset --hard origin/master
$ git pull --ff-only
$ git merge topic-b
$ git merge topic-c
C0--C1--------------C2
/ \
---o---o---A---X---Y---Z---W---M'--N
\ /
B0--B1---------B2
So one part of the solution to "pull is mostly evil" has to involve
making this "recreating your work on top of the updated upstream"
easier for users. Otherwise, even if people *know* that rewinding
and rebuilding is the right thing to do, they will find it too
cumbersome and end up pushing merges in random order.
For another way to put this, see
http://git-blame.blogspot.com/2012/03/fun-with-first-parent.html
HTH.
^ permalink raw reply [relevance 2%]
* Re: [PATCH v6 00/10] The final building block for a faster rebase -i
@ 2017-07-20 21:38 2% ` Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2017-07-20 21:38 UTC (permalink / raw)
To: Johannes Schindelin
Cc: git, Philip Oakley, Jeff King, Phillip Wood, Liam Beguin
Johannes Schindelin <johannes.schindelin@gmx.de> writes:
> Changes since v5:
>
> - replaced a get_sha1() call by a get_oid() call already.
>
> - adjusted to hashmap API changes
Applying this to the tip of 'master' yields exactly the same result
as merging the previous round js/rebase-i-final to the tip of
'master' and then applying merge-fix/js/rebase-i-final to adjust to
the codebase, so the net effect of this reroll is none. Which is a
good sign, as it means there wasn't any rebase mistake and the evil
merge we've been carrying was a good one.
But at the same time, I prefer to avoid rebasing to newer 'master'
until the codebase starts drifting too far apart, or until a new
feature release is made out of newer 'master'. This is primarily
because I want dates on commits to mean something---namely, "this
change hasn't seen a need to be updated for 'oops, that was wrong'
since this date". This use of commit dates as 'priority date'
matters much less for a topic not in 'next', but as a general
principle, my workflow tries to preserve commit dates for all
topics.
For the above reason, I may hold onto this patch series in my inbox
without actually updating js/rebase-i-final topic until the current
cycle is over; please do not mistake it as this new reroll being
ignored.
Thanks.
^ permalink raw reply [relevance 2%]
* [PATCH v3 3/8] rebase --merge: fix reflog when continuing
2022-10-12 9:35 2% ` [PATCH v3 " Phillip Wood via GitGitGadget
2022-10-21 9:21 2% ` [PATCH v4 " Phillip Wood via GitGitGadget
2022-10-12 9:35 2% ` [PATCH v3 " Phillip Wood via GitGitGadget
@ 2022-10-12 9:35 2% ` Phillip Wood via GitGitGadget
2 siblings, 0 replies; 200+ results
From: Phillip Wood via GitGitGadget @ 2022-10-12 9:35 UTC (permalink / raw)
To: git
Cc: Phillip Wood, Christian Couder, Elijah Newren,
Ævar Arnfjörð Bjarmason, Calvin Wan, Emily Shaffer,
Glen Choo, Victoria Dye, Phillip Wood, Phillip Wood
From: Phillip Wood <phillip.wood@dunelm.org.uk>
The reflog message for a conflict resolution committed by "rebase
--continue" looks like
rebase (continue): commit subject line
Unfortunately the reflog message each subsequent pick look like
rebase (continue) (pick): commit subject line
Fix this by setting the reflog message for "rebase --continue" in
sequencer_continue() so it does not affect subsequent commits. This
introduces a memory leak similar to the one leaking GIT_REFLOG_ACTION
in pick_commits(). Both of these will be fixed in a future series that
stops the sequencer calling setenv().
If we fail to commit the staged changes then we error out so
GIT_REFLOG_ACTION does not need to be reset in that case.
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
---
builtin/rebase.c | 2 --
sequencer.c | 5 +++++
t/t3406-rebase-message.sh | 9 +++++++--
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/builtin/rebase.c b/builtin/rebase.c
index 51accb4fd61..488e6bdfd3e 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -1271,8 +1271,6 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
int fd;
options.action = "continue";
- set_reflog_action(&options);
-
/* Sanity check */
if (get_oid("HEAD", &head))
die(_("Cannot read HEAD"));
diff --git a/sequencer.c b/sequencer.c
index 61a8e0020d5..5790b35d763 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -4785,6 +4785,8 @@ int sequencer_continue(struct repository *r, struct replay_opts *opts)
if (read_populate_opts(opts))
return -1;
if (is_rebase_i(opts)) {
+ char *previous_reflog_action;
+
if ((res = read_populate_todo(r, &todo_list, opts)))
goto release_todo_list;
@@ -4795,10 +4797,13 @@ int sequencer_continue(struct repository *r, struct replay_opts *opts)
unlink(rebase_path_dropped());
}
+ previous_reflog_action = xstrdup(getenv(GIT_REFLOG_ACTION));
+ setenv(GIT_REFLOG_ACTION, reflog_message(opts, "continue", NULL), 1);
if (commit_staged_changes(r, opts, &todo_list)) {
res = -1;
goto release_todo_list;
}
+ setenv(GIT_REFLOG_ACTION, previous_reflog_action, 1);
} else if (!file_exists(get_todo_path(opts)))
return continue_single_pick(r, opts);
else if ((res = read_populate_todo(r, &todo_list, opts)))
diff --git a/t/t3406-rebase-message.sh b/t/t3406-rebase-message.sh
index 5253dd1551d..3ca2fbb0d59 100755
--- a/t/t3406-rebase-message.sh
+++ b/t/t3406-rebase-message.sh
@@ -17,6 +17,7 @@ test_expect_success 'setup' '
git checkout -b conflicts O &&
test_commit P &&
+ test_commit conflict-X fileX &&
test_commit Q &&
git checkout -b topic O &&
@@ -107,13 +108,17 @@ test_reflog () {
GIT_REFLOG_ACTION="$reflog_action" &&
export GIT_REFLOG_ACTION
fi &&
- git rebase $mode main
+ test_must_fail git rebase $mode main &&
+ echo resolved >fileX &&
+ git add fileX &&
+ git rebase --continue
) &&
- git log -g --format=%gs -4 >actual &&
+ git log -g --format=%gs -5 >actual &&
write_reflog_expect <<-EOF &&
${reflog_action:-rebase} (finish): returning to refs/heads/conflicts
${reflog_action:-rebase} (pick): Q
+ ${reflog_action:-rebase} (continue): conflict-X
${reflog_action:-rebase} (pick): P
${reflog_action:-rebase} (start): checkout main
EOF
--
gitgitgadget
^ permalink raw reply related [relevance 2%]
* What's cooking in git.git (Oct 2009, #03; Mon, 19)
@ 2009-10-19 8:05 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2009-10-19 8:05 UTC (permalink / raw)
To: git
What's cooking in git.git (Oct 2009, #03; Mon, 19)
--------------------------------------------------
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
marked with '.' do not appear in any of the integration branches, but I am
still holding onto them.
In 1.7.0, we plan to correct handful of warts in the interfaces everybody
agrees that they were mistakes. The resulting system may not be strictly
backward compatible. Currently planeed changes are:
* refuse push to update the checked out branch in a non-bare repo by
default
Make "git push" into a repository to update the branch that is checked
out fail by default. You can countermand this default by setting a
configuration variable in the receiving repository.
http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007
* refuse push to delete the current branch by default
Make "git push $there :$killed" to delete the branch that is pointed at
by its HEAD fail by default. You can countermand this default by
setting a configuration variable in the receiving repository.
http://thread.gmane.org/gmane.comp.version-control.git/108862/focus=108936
* git-send-email won't make deep threads by default
Many people said that by default when sending more than 2 patches the
threading git-send-email makes by default is hard to read, and they
prefer the default be one cover letter and each patch as a direct
follow-up to the cover letter. You can countermand this by setting a
configuration variable.
http://article.gmane.org/gmane.comp.version-control.git/109790
* git-status won't be "git-commit --dry-run" anymore
http://thread.gmane.org/gmane.comp.version-control.git/125989/focus=125993
* "git-diff -w --exit-code" will exit success if only differences it
found are whitespace changes that are stripped away from the output.
http://thread.gmane.org/gmane.comp.version-control.git/119731/focus=119751
--------------------------------------------------
[Graduated to "master"]
* jp/maint-send-email-fold (2009-10-08) 1 commit.
+ git-send-email.perl: fold multiple entry "Cc:" and multiple single line "RCPT TO:"s
* pv/maint-add-p-no-exclude (2009-10-10) 1 commit.
(merged to 'next' on 2009-10-11 at 0ff2e96)
+ git-add--interactive: never skip files included in index
* dk/blame-el (2009-09-29) 1 commit.
+ git-blame.el: Change how blame information is shown.
* jn/gitweb-patch (2009-10-09) 1 commit.
+ gitweb: Do not show 'patch' link for merge commits
* mr/instaweb-cgid (2009-09-26) 1 commit.
(merged to 'next' on 2009-10-11 at 99bcfaf)
+ instaweb: support mod_cgid for apache2
* tf/doc-pt-br (2009-09-23) 1 commit.
+ Documentation: update pt-BR
The current AsciiDoc may barf on NOME and SINOPSE, as pt_BR language
definition is not widely distributed yet (it just hit the development
tree).
* bg/rebase-reword (2009-10-07) 2 commits.
+ rebase-i: fix reword when using a terminal editor
+ Teach 'rebase -i' the command "reword"
* jp/fetch-tag-match (2009-09-17) 1 commit.
+ fetch: Speed up fetch by rewriting find_non_local_tags
* jn/gitweb-show-size (2009-09-07) 1 commit.
+ gitweb: Add 'show-sizes' feature to show blob sizes in tree view
* jc/maint-1.6.0-blank-at-eof (2009-09-14) 15 commits.
(merged to 'next' on 2009-10-11 at 7f34fb3)
+ diff -B: colour whitespace errors
+ diff.c: emit_add_line() takes only the rest of the line
+ diff.c: split emit_line() from the first char and the rest of the line
+ diff.c: shuffling code around
+ diff --whitespace: fix blank lines at end
+ core.whitespace: split trailing-space into blank-at-{eol,eof}
+ diff --color: color blank-at-eof
+ diff --whitespace=warn/error: fix blank-at-eof check
+ diff --whitespace=warn/error: obey blank-at-eof
+ diff.c: the builtin_diff() deals with only two-file comparison
+ apply --whitespace: warn blank but not necessarily empty lines at EOF
+ apply --whitespace=warn/error: diagnose blank at EOF
+ apply.c: split check_whitespace() into two
+ apply --whitespace=fix: detect new blank lines at eof correctly
+ apply --whitespace=fix: fix handling of blank lines at the eof
(this branch is used by jc/maint-blank-at-eof.)
This is a fix for an ancient bug (or inconsistent set of features); the
topic is based on an ancient codebase and is designed to be merged
upwards. jc/maint-blank-at-eof serves that purpose.
--------------------------------------------------
[New Topics]
* ak/bisect-reset-to-switch (2009-10-13) 1 commit.
- bisect reset: Allow resetting to any commit, not just a branch
* fc/doc-fast-forward (2009-10-11) 1 commit.
- user-manual: use 'fast-forward'
* gb/maint-gitweb-esc-param (2009-10-13) 1 commit.
(merged to 'next' on 2009-10-14 at 105f997)
+ gitweb: fix esc_param
(this branch is used by sb/gitweb-link-author.)
* jc/maint-1.6.3-graft-trailing-space (2009-10-14) 1 commit.
- info/grafts: allow trailing whitespaces at the end of line
* jc/strbuf-nested-expand (2009-10-18) 5 commits
- Teach --wrap to only indent without wrapping
- Add %[wrap(width,in1,in2)<<any-string>>%] implementation
- strbuf_nested_expand(): allow expansion to interrupt in the middle
- Add strbuf_add_wrapped_text() to utf8.[ch]
- print_wrapped_text(): allow hard newlines
(this branch uses js/log-rewrap.)
* jk/maint-cvsimport-pathname (2009-10-19) 1 commit.
(merged to 'next' on 2009-10-19 at 77824f2)
+ cvsimport: fix relative argument filenames
* jn/show-normalized-refs (2009-10-12) 3 commits.
- check-ref-format: simplify --print implementation
- git check-ref-format --print
- Add tests for git check-ref-format
* sb/gitweb-link-author (2009-10-14) 1 commit.
- gitweb: linkify author/committer names with search
(this branch uses gb/maint-gitweb-esc-param.)
* jc/checkout-auto-track (2009-10-18) 3 commits
- git checkout --nodwim
- DWIM "git checkout frotz" to "git checkout -b frotz origin/frotz"
- check_filename(): make verify_filename() callable without dying
--------------------------------------------------
[Stalled]
* db/vcs-helper-rest (2009-09-03) 6 commits.
- Allow helpers to report in "list" command that the ref is unchanged
- Add support for "import" helper command
- Add a config option for remotes to specify a foreign vcs
- Allow programs to not depend on remotes having urls
- Allow fetch to modify refs
- Use a function to determine whether a remote is valid
(this branch is used by jh/cvs-helper.)
This holds the remainder of the db/vcs-helper topic that has already
merged in 1.6.5. If people want to replace this with improvements it
would be a good time to do so.
* jl/submodule-add-noname (2009-09-22) 1 commit.
- git submodule add: make the <path> parameter optional
Dscho started an interesting discussion regarding the larger workflow in
which the "submodule add" is used. I think the patch itself makes sense
but at the same time it probably makes sense to also take the <path> and
infer the <repository> as Dscho suggested, probably in "git submodule
add", not in "git add" proper, at least initially.
* sr/gfi-options (2009-09-06) 6 commits.
- fast-import: test the new option command
- fast-import: add option command
- fast-import: test the new feature command
- fast-import: add feature command
- fast-import: put marks reading in it's own function
- fast-import: put option parsing code in separate functions
(this branch is used by jh/notes.)
Ejected from 'next' as fast-import folks still seem to be discussing with
how to proceed.
* je/send-email-no-subject (2009-08-05) 1 commit.
(merged to 'next' on 2009-10-11 at 1b99c56)
+ send-email: confirm on empty mail subjects
The existing tests cover the positive case (i.e. as long as the user says
"yes" to the "do you really want to send this message that lacks subject",
the message is sent) of this feature, but the feature itself needs its own
test to verify the negative case (i.e. does it correctly stop if the user
says "no"?)
* jh/cvs-helper (2009-08-18) 8 commits.
- More fixes to the git-remote-cvs installation procedure
- Fix the Makefile-generated path to the git_remote_cvs package in git-remote-cvs
- Add simple selftests of git-remote-cvs functionality
- git-remote-cvs: Remote helper program for CVS repositories
- 2/2: Add Python support library for CVS remote helper
- 1/2: Add Python support library for CVS remote helper
- Basic build infrastructure for Python scripts
- Allow helpers to request marks for fast-import
(this branch uses db/vcs-helper-rest.)
Builds on db/vcs-helper.
--------------------------------------------------
[Cooking]
* tr/stash-format (2009-10-16) 5 commits
. stash list: drop the default limit of 10 stashes
. stash list: use new %g formats instead of sed
. Introduce new pretty formats %g[sdD] for reflog information
. reflog-walk: refactor the branch@{num} formatting
. Refactor pretty_print_commit arguments into a struct
Expecting a re-roll.
* ks/precompute-completion (2009-10-05) 1 commit.
(merged to 'next' on 2009-10-14 at adf722a)
+ Speedup bash completion loading
* sp/smart-http (2009-10-14) 17 commits
- Smart HTTP fetch: gzip requests
- Smart fetch over HTTP: client side
- Smart push over HTTP: client side
- Discover refs via smart HTTP server when available
- Smart fetch and push over HTTP: server side
- Add stateless RPC options to upload-pack, receive-pack
- Git-aware CGI to provide dumb HTTP transport
- Move WebDAV HTTP push under remote-curl
- remote-helpers: Support custom transport options
- remote-helpers: Fetch more than one ref in a batch
- fetch: Allow transport -v -v -v to set verbosity to 3
- remote-curl: Refactor walker initialization
- Add multi_ack_detailed capability to fetch-pack/upload-pack
- Move "get_ack()" back to fetch-pack
- fetch-pack: Use a strbuf to compose the want list
- pkt-line: Make packet_read_line easier to debug
- pkt-line: Add strbuf based functions
* ef/msys-imap (2009-10-13) 8 commits.
- MSVC: Enable OpenSSL, and translate -lcrypto
- mingw: enable OpenSSL
- mingw: wrap SSL_set_(w|r)fd to call _get_osfhandle
- imap-send: build imap-send on Windows
- imap-send: fix compilation-error on Windows
- imap-send: use run-command API for tunneling
- imap-send: use separate read and write fds
- imap-send: remove useless uid code
Is this good to go yet?
* mr/gitweb-snapshot (2009-09-26) 2 commits.
- gitweb: append short hash ids to snapshot files
(merged to 'next' on 2009-10-11 at 22ba047)
+ gitweb: check given hash before trying to create snapshot
* jc/pretty-lf (2009-10-04) 1 commit.
- Pretty-format: %[+-]x to tweak inter-item newlines
* js/log-rewrap (2008-11-10) 2 commits
- Add strbuf_add_wrapped_text() to utf8.[ch]
- print_wrapped_text(): allow hard newlines
(this branch is used by jc/strbuf-nested-expand.)
* js/diff-verbose-submodule (2009-10-14) 4 commits.
- add tests for git diff --submodule-summary
- fix output for deleted submodules in git diff --submodule-summary
- fix indentation depth for git diff --submodule-summary
- Add the --submodule-summary option to the diff option family
There was an attempted re-roll and it looked very promising with a minor
fix-up, but I ran out of time to pick it up and unilaterally tweaking it.
Waiting for a response.
* jc/fix-tree-walk (2009-09-14) 10 commits.
- read-tree --debug-unpack
(merged to 'next' on 2009-10-11 at 0b058e2)
+ unpack-trees.c: look ahead in the index
+ unpack-trees.c: prepare for looking ahead in the index
+ Aggressive three-way merge: fix D/F case
+ traverse_trees(): handle D/F conflict case sanely
+ more D/F conflict tests
+ tests: move convenience regexp to match object names to test-lib.sh
+ unpack_callback(): use unpack_failed() consistently
+ unpack-trees: typofix
+ diff-lib.c: fix misleading comments on oneway_diff()
This is my replacement for Linus's lt/maint-traverse-trees-fix patch. It
is not so much as a counter-proposal; I originally thought it might make
sense to walk the index and drive the walker to return the entries from
trees to match entries from the index, but I ended up doing pretty much
what Linus outlined --- walk the trees, and have the index walker follow
it. It turned out that the index side also needed some hairy look-ahead,
This includes the fix to aggressive mode of three-way merge used by the
resolve strategy.
* jh/notes (2009-10-09) 22 commits.
- fast-import: Proper notes tree manipulation using the notes API
- Refactor notes concatenation into a flexible interface for combining notes
- Notes API: Allow multiple concurrent notes trees with new struct notes_tree
- Notes API: for_each_note(): Traverse the entire notes tree with a callback
- Notes API: get_note(): Return the note annotating the given object
- Notes API: add_note(): Add note objects to the internal notes tree structure
- Notes API: init_notes(): Initialize the notes tree from the given notes ref
- Notes API: get_commit_notes() -> format_note() + remove the commit restriction
- Add selftests verifying concatenation of multiple notes for the same commit
- Refactor notes code to concatenate multiple notes annotating the same object
- Add selftests verifying that we can parse notes trees with various fanouts
- Teach the notes lookup code to parse notes trees with various fanout schemes
- Teach notes code to free its internal data structures on request
- Add '%N'-format for pretty-printing commit notes
- Add flags to get_commit_notes() to control the format of the note string
- t3302-notes-index-expensive: Speed up create_repo()
- fast-import: Add support for importing commit notes
- Teach "-m <msg>" and "-F <file>" to "git notes edit"
- Add an expensive test for git-notes
- Speed up git notes lookup
- Add a script to edit/inspect notes
- Introduce commit notes
(this branch uses sr/gfi-options.)
Is this good for 'next' now?
* jn/gitweb-blame (2009-09-01) 5 commits.
- gitweb: Minify gitweb.js if JSMIN is defined
- gitweb: Create links leading to 'blame_incremental' using JavaScript
(merged to 'next' on 2009-10-11 at 73c4a83)
+ gitweb: Colorize 'blame_incremental' view during processing
+ gitweb: Incremental blame (using JavaScript)
+ gitweb: Add optional "time to generate page" info in footer
Ajax-y blame.
* nd/sparse (2009-08-20) 19 commits.
- sparse checkout: inhibit empty worktree
- Add tests for sparse checkout
- read-tree: add --no-sparse-checkout to disable sparse checkout support
- unpack-trees(): ignore worktree check outside checkout area
- unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index
- unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout
- unpack-trees.c: generalize verify_* functions
- unpack-trees(): add CE_WT_REMOVE to remove on worktree alone
- Introduce "sparse checkout"
- dir.c: export excluded_1() and add_excludes_from_file_1()
- excluded_1(): support exclude files in index
- unpack-trees(): carry skip-worktree bit over in merged_entry()
- Read .gitignore from index if it is skip-worktree
- Avoid writing to buffer in add_excludes_from_file_1()
- Teach Git to respect skip-worktree bit (writing part)
- Teach Git to respect skip-worktree bit (reading part)
- Introduce "skip-worktree" bit in index, teach Git to get/set this bit
- Add test-index-version
- update-index: refactor mark_valid() in preparation for new options
--------------------------------------------------
[For 1.7.0]
* jk/1.7.0-status (2009-09-05) 5 commits.
- docs: note that status configuration affects only long format
(merged to 'next' on 2009-10-11 at 65c8513)
+ commit: support alternate status formats
+ status: add --porcelain output format
+ status: refactor format option parsing
+ status: refactor short-mode printing to its own function
(this branch uses jc/1.7.0-status.)
Gives the --short output format to post 1.7.0 "git commit --dry-run" that
is similar to that of post 1.7.0 "git status".
* jc/1.7.0-status (2009-09-05) 4 commits.
(merged to 'next' on 2009-10-11 at 9558627)
+ status: typo fix in usage
+ git status: not "commit --dry-run" anymore
+ git stat -s: short status output
+ git stat: the beginning of "status that is not a dry-run of commit"
(this branch is used by jk/1.7.0-status.)
With this, "git status" is no longer "git commit --dry-run".
* jc/1.7.0-send-email-no-thread-default (2009-08-22) 1 commit.
(merged to 'next' on 2009-10-11 at 043acdf)
+ send-email: make --no-chain-reply-to the default
* jc/1.7.0-diff-whitespace-only-status (2009-08-30) 4 commits.
(merged to 'next' on 2009-10-11 at 546c74d)
+ diff.c: fix typoes in comments
+ Make test case number unique
+ diff: Rename QUIET internal option to QUICK
+ diff: change semantics of "ignore whitespace" options
This changes exit code from "git diff --ignore-whitespace" and friends
when there is no actual output. It is a backward incompatible change, but
we could argue that it is a bugfix.
* jc/1.7.0-push-safety (2009-02-09) 2 commits.
(merged to 'next' on 2009-10-11 at 81b8128)
+ Refuse deleting the current branch via push
+ Refuse updating the current branch in a non-bare repository via push
--------------------------------------------------
[I have been too busy to purge these]
* jc/log-tz (2009-03-03) 1 commit.
- Allow --date=local --date=other-format to work as expected
Maybe some people care about this. I dunno.
* jc/mailinfo-remove-brackets (2009-07-15) 1 commit.
- mailinfo: -b option keeps [bracketed] strings that is not a [PATCH] marker
Maybe some people care about this. I dunno.
* ne/rev-cache (2009-09-07) 7 commits.
. support for commit grafts, slight change to general mechanism
. support for path name caching in rev-cache
. full integration of rev-cache into git, completed test suite
. administrative functions for rev-cache, start of integration into git
. support for non-commit object caching in rev-cache
. basic revision cache system, no integration or features
. man page and technical discussion for rev-cache
This seems to break at least t6001 when merged to 'pu'.
* jg/log-format-body-indent (2009-09-19) 1 commit.
. git-log --format: Add %B tag with %B(x) option
Ejected from 'pu' as this is merely a short-hand for %[wrap(0,x,x)%b%].
^ permalink raw reply [relevance 2%]
* [PATCH v4 3/8] rebase --merge: fix reflog when continuing
2022-10-21 9:21 2% ` [PATCH v4 " Phillip Wood via GitGitGadget
@ 2022-10-21 9:21 2% ` Phillip Wood via GitGitGadget
2022-10-21 9:21 2% ` [PATCH v4 4/8] rebase --merge: fix reflog message after skipping Phillip Wood via GitGitGadget
1 sibling, 1 reply; 200+ results
From: Phillip Wood via GitGitGadget @ 2022-10-21 9:21 UTC (permalink / raw)
To: git
Cc: Phillip Wood, Christian Couder, Elijah Newren,
Ævar Arnfjörð Bjarmason, Calvin Wan, Emily Shaffer,
Glen Choo, Victoria Dye, Phillip Wood, Phillip Wood
From: Phillip Wood <phillip.wood@dunelm.org.uk>
The reflog message for a conflict resolution committed by "rebase
--continue" looks like
rebase (continue): commit subject line
Unfortunately the reflog message each subsequent pick look like
rebase (continue) (pick): commit subject line
Fix this by setting the reflog message for "rebase --continue" in
sequencer_continue() so it does not affect subsequent commits. This
introduces a memory leak similar to the one leaking GIT_REFLOG_ACTION
in pick_commits(). Both of these will be fixed in a future series that
stops the sequencer calling setenv().
If we fail to commit the staged changes then we error out so
GIT_REFLOG_ACTION does not need to be reset in that case.
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
---
builtin/rebase.c | 2 --
sequencer.c | 5 +++++
t/t3406-rebase-message.sh | 9 +++++++--
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/builtin/rebase.c b/builtin/rebase.c
index e67020b3586..414526f83a8 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -1271,8 +1271,6 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
int fd;
options.action = "continue";
- set_reflog_action(&options);
-
/* Sanity check */
if (get_oid("HEAD", &head))
die(_("Cannot read HEAD"));
diff --git a/sequencer.c b/sequencer.c
index 61a8e0020d5..5790b35d763 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -4785,6 +4785,8 @@ int sequencer_continue(struct repository *r, struct replay_opts *opts)
if (read_populate_opts(opts))
return -1;
if (is_rebase_i(opts)) {
+ char *previous_reflog_action;
+
if ((res = read_populate_todo(r, &todo_list, opts)))
goto release_todo_list;
@@ -4795,10 +4797,13 @@ int sequencer_continue(struct repository *r, struct replay_opts *opts)
unlink(rebase_path_dropped());
}
+ previous_reflog_action = xstrdup(getenv(GIT_REFLOG_ACTION));
+ setenv(GIT_REFLOG_ACTION, reflog_message(opts, "continue", NULL), 1);
if (commit_staged_changes(r, opts, &todo_list)) {
res = -1;
goto release_todo_list;
}
+ setenv(GIT_REFLOG_ACTION, previous_reflog_action, 1);
} else if (!file_exists(get_todo_path(opts)))
return continue_single_pick(r, opts);
else if ((res = read_populate_todo(r, &todo_list, opts)))
diff --git a/t/t3406-rebase-message.sh b/t/t3406-rebase-message.sh
index 5253dd1551d..3ca2fbb0d59 100755
--- a/t/t3406-rebase-message.sh
+++ b/t/t3406-rebase-message.sh
@@ -17,6 +17,7 @@ test_expect_success 'setup' '
git checkout -b conflicts O &&
test_commit P &&
+ test_commit conflict-X fileX &&
test_commit Q &&
git checkout -b topic O &&
@@ -107,13 +108,17 @@ test_reflog () {
GIT_REFLOG_ACTION="$reflog_action" &&
export GIT_REFLOG_ACTION
fi &&
- git rebase $mode main
+ test_must_fail git rebase $mode main &&
+ echo resolved >fileX &&
+ git add fileX &&
+ git rebase --continue
) &&
- git log -g --format=%gs -4 >actual &&
+ git log -g --format=%gs -5 >actual &&
write_reflog_expect <<-EOF &&
${reflog_action:-rebase} (finish): returning to refs/heads/conflicts
${reflog_action:-rebase} (pick): Q
+ ${reflog_action:-rebase} (continue): conflict-X
${reflog_action:-rebase} (pick): P
${reflog_action:-rebase} (start): checkout main
EOF
--
gitgitgadget
^ permalink raw reply related [relevance 2%]
* [PATCH] notes: send "Automatic notes merge failed" messages to stderr
@ 2017-11-14 16:17 2% ` Todd Zullinger
0 siblings, 0 replies; 200+ results
From: Todd Zullinger @ 2017-11-14 16:17 UTC (permalink / raw)
To: Johan Herland; +Cc: Junio C Hamano, Santiago Torres, git
All other error messages from notes use stderr. Do the same when
alerting users of an unresolved notes merge.
Fix the output redirection in t3310 and t3320 as well. Previously, the
tests directed output to a file, but stderr was either not captured or
not sent to the file due to the order of the redirection operators.
Signed-off-by: Todd Zullinger <tmz@pobox.com>
---
Johan Herland wrote:
> ACK :-)
>
> Error messages should go to stderr, and redirection in the tests
> should be fixed.
Excellent, thanks Johan!
Here's what I came up with. Hopefully I caught all the tests that need
adjustment. The test suite passes for me, but it's always possible that I've
missed something.
Style-wise, I'm not sure about the re-wrapping of the error message text. If
that should be avoided to make the patch's change from printf to fprintf
clearer or should be wrapped differently, let me know.
builtin/notes.c | 8 ++++----
t/t3310-notes-merge-manual-resolve.sh | 8 ++++----
t/t3320-notes-merge-worktrees.sh | 2 +-
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/builtin/notes.c b/builtin/notes.c
index 12afdf1907..4468adaf29 100644
--- a/builtin/notes.c
+++ b/builtin/notes.c
@@ -865,10 +865,10 @@ static int merge(int argc, const char **argv, const char *prefix)
if (create_symref("NOTES_MERGE_REF", default_notes_ref(), NULL))
die(_("failed to store link to current notes ref (%s)"),
default_notes_ref());
- printf(_("Automatic notes merge failed. Fix conflicts in %s and "
- "commit the result with 'git notes merge --commit', or "
- "abort the merge with 'git notes merge --abort'.\n"),
- git_path(NOTES_MERGE_WORKTREE));
+ fprintf(stderr, _("Automatic notes merge failed. Fix conflicts in %s "
+ "and commit the result with 'git notes merge --commit', "
+ "or abort the merge with 'git notes merge --abort'.\n"),
+ git_path(NOTES_MERGE_WORKTREE));
}
free_notes(t);
diff --git a/t/t3310-notes-merge-manual-resolve.sh b/t/t3310-notes-merge-manual-resolve.sh
index baef2d6924..9c1bf6eb3d 100755
--- a/t/t3310-notes-merge-manual-resolve.sh
+++ b/t/t3310-notes-merge-manual-resolve.sh
@@ -176,7 +176,7 @@ git rev-parse refs/notes/z > pre_merge_z
test_expect_success 'merge z into m (== y) with default ("manual") resolver => Conflicting 3-way merge' '
git update-ref refs/notes/m refs/notes/y &&
git config core.notesRef refs/notes/m &&
- test_must_fail git notes merge z >output &&
+ test_must_fail git notes merge z >output 2>&1 &&
# Output should point to where to resolve conflicts
test_i18ngrep "\\.git/NOTES_MERGE_WORKTREE" output &&
# Inspect merge conflicts
@@ -379,7 +379,7 @@ git rev-parse refs/notes/z > pre_merge_z
test_expect_success 'redo merge of z into m (== y) with default ("manual") resolver => Conflicting 3-way merge' '
git update-ref refs/notes/m refs/notes/y &&
git config core.notesRef refs/notes/m &&
- test_must_fail git notes merge z >output &&
+ test_must_fail git notes merge z >output 2>&1 &&
# Output should point to where to resolve conflicts
test_i18ngrep "\\.git/NOTES_MERGE_WORKTREE" output &&
# Inspect merge conflicts
@@ -413,7 +413,7 @@ git rev-parse refs/notes/y > pre_merge_y
git rev-parse refs/notes/z > pre_merge_z
test_expect_success 'redo merge of z into m (== y) with default ("manual") resolver => Conflicting 3-way merge' '
- test_must_fail git notes merge z >output &&
+ test_must_fail git notes merge z >output 2>&1 &&
# Output should point to where to resolve conflicts
test_i18ngrep "\\.git/NOTES_MERGE_WORKTREE" output &&
# Inspect merge conflicts
@@ -494,7 +494,7 @@ cp expect_log_y expect_log_m
test_expect_success 'redo merge of z into m (== y) with default ("manual") resolver => Conflicting 3-way merge' '
git update-ref refs/notes/m refs/notes/y &&
- test_must_fail git notes merge z >output &&
+ test_must_fail git notes merge z >output 2>&1 &&
# Output should point to where to resolve conflicts
test_i18ngrep "\\.git/NOTES_MERGE_WORKTREE" output &&
# Inspect merge conflicts
diff --git a/t/t3320-notes-merge-worktrees.sh b/t/t3320-notes-merge-worktrees.sh
index b9c3bc2487..10bfc8b947 100755
--- a/t/t3320-notes-merge-worktrees.sh
+++ b/t/t3320-notes-merge-worktrees.sh
@@ -61,7 +61,7 @@ test_expect_success 'merge z into x while mid-merge on y succeeds' '
(
cd worktree2 &&
git config core.notesRef refs/notes/x &&
- test_must_fail git notes merge z 2>&1 >out &&
+ test_must_fail git notes merge z >out 2>&1 &&
test_i18ngrep "Automatic notes merge failed" out &&
grep -v "A notes merge into refs/notes/x is already in-progress in" out
) &&
--
2.15.0
^ permalink raw reply related [relevance 2%]
* Re: Collaborative conflict resolution feature request
@ 2020-06-17 18:32 2% ` Curtin, Eric
0 siblings, 0 replies; 200+ results
From: Curtin, Eric @ 2020-06-17 18:32 UTC (permalink / raw)
To: Stefan Moch, Philip Oakley
Cc: Sergey Organov, Christian Couder, git@vger.kernel.org,
Geary, Niall, rowlands, scott, Michael Haggerty
Hi Guys,
Yes I think you all understand the conundrum well. Conflict resolution
by definition is a collaborative effort, but git doesn't support it as a,
collaborative effort, only one user can resolve it in git. It will be hard to
change my whole orgs thinking around avoiding conflicts or making
them easier conflicts to solve. There will always be some conflicts.
> * developers do test merges on temporary branches between their
> feature branch and the main development – or other feature
> branches if necessary (maybe create test merges on a regular
> basis to minimize the new conflicts)
> * these temporary branches get pushed, but not merged to other
> branches
> * the branch manager fetches these branches and uses
> `rerere-train.sh` to fill the local rerere database with
> conflict resolutions from the test merges
> * the temporary branches get deleted
> * the recorded resolutions get reused when needed (keep in mind
> rerere's gc config, see gc.rerereResolved and gc.rerereUnresolved)
I certainly want to play around with rere and see if it helps things. I
suspect if I shared a technique like this with the 100 or so developers
on the project this will be deemed too complex though.
A per file solution isn't great either as some files can be large.
Per-conflict (between <<<< >>>> in a plain old text editor) is
reasonable.
What would be most ideal is a:
git merge
fix some conflicts, not others
git push
so someone else can work on it kind of solution....
We don't do plaintext email patches, we do typically merge
things via git cli/protocol or via GitHub Pull Request.
Regards,
Eric Curtin
Software Engineer
Ovens Campus,
Cork,
Ireland
Dell EMC
^ permalink raw reply [relevance 2%]
* Re: What's cooking in git.git (Dec 2015, #01; Tue, 1)
@ 2015-12-02 22:11 2% ` Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2015-12-02 22:11 UTC (permalink / raw)
To: Jeff King; +Cc: git
Jeff King <peff@peff.net> writes:
> What's cooking in git.git (Dec 2015, #01; Tue, 1)
> --------------------------------------------------
>
> Here are the topics that have been cooking. Commits prefixed with
> '-' are only in 'pu' (proposed updates) while commits prefixed with
> '+' are in 'next'.
>
> This should by my final whats-cooking before handing things back to
> Junio. Thanks all for review help and for your patience during the past
> few weeks.
I think I managed to get my working area (together with a handful of
new entries in the rerere database and a few merge-fix/ entries) in
sync with what you pushed out well enough that my automated
procedure would recreate the status of various branches you pushed
out exactly.
I haven't caught up with the changes in the component branches,
though, so it may take a few days until I start picking up new
topics from the list traffic.
> * bc/object-id (2015-11-20) 12 commits
> - remote: convert functions to struct object_id
> - Remove get_object_hash.
> - Convert struct object to object_id
> - Add several uses of get_object_hash.
> - object: introduce get_object_hash macro.
> - ref_newer: convert to use struct object_id
> - push_refs_with_export: convert to struct object_id
> - get_remote_heads: convert to struct object_id
> - parse_fetch: convert to use struct object_id
> - add_sought_entry_mem: convert to struct object_id
> - Convert struct ref to use object_id.
> - sha1_file: introduce has_object_file helper.
>
> More transition from "unsigned char[40]" to "struct object_id".
>
> This needed a few merge fixups, but is mostly disentangled from other
> topics.
>
> Will merge to 'next'.
Aside from niggles on titles of a handful of changes in this topic,
I have a bit of concern with this one and dt/refs-backend-pre-vtable
topic (marked as "Will merge to 'master' two cycles from now.",
which I am reading as "two cycles" means 2 x (8-10 week release
cycle), not "two integration cycles by the maintainer, aka two
issues of What's cooking report", which is typically less than a
week).
The merge resolution in 'pu' discards what this topic did to refs.c
because much of the original goes away from there, but does it mean
(remember, I haven't caught up with the contents of the topics yet)
that the merge reverts part of what this topic did, and in an ideal
world, if the other one were more mature when this topic got
started, more use of "unsigned char[40]" would have been migrated to
"struct object_id" in new files the other one introduced? Or
perhaps we would want to go the other way around, i.e. as this topic
conceptually is fairly straight-forward, merge this to 'next' and
then down to 'master' (which would not take two release cycles) and
then redo the other topic on top?
> * mr/ff-refs (2015-11-28) 6 commits
> - builtin/ff-refs.c: mark some file-local variables static
> - ff-refs: Add tests
> - ff-refs: Add documentation
> - ff-refs: add --dry-run and --skip-worktree options
> - ff-refs: update each updatable ref
> - ff-refs: builtin cmd to check and fast forward local refs to their upstream
>
> Specialized command to fast-forward refs to match their upstream.
>
> I remain skeptical that this is necessary or sufficient. Comments
> welcome.
>
> Will hold.
This is another one that needs some evil-merge interaction with
bc/object-id, but I have a feeling that this is not such a good
addition to our workflow elements, so I am not worried too much
about it. I'm inclined to eject this topic (and will welcome if
people come up with an alternative, perhaps based on the "let fetch
do so instead" approach discussed there).
> * ps/rebase-keep-empty (2015-11-24) 2 commits
> - rebase: fix preserving commits with --keep-empty
> - rebase: test broken behavior with --keep-empty
>
> Keep duplicate commits via rebase --keep-empty.
>
> I'm not sure if I agree with this interpretation of the "rebase
> --keep-empty" documentation, but I haven't thought too hard about it.
> Comments welcome.
"--keep-empty" has always been about keeping an originally empty
commit, not a commit that becomes empty because of rebasing
(i.e. what has already been applied to the updated base). The
documentation, if it leads to any other interpretation, needs to be
fixed.
Besides, if "--keep-empty" were to mean "keep redundant ones that
are already in the updated base", the patch must do a lot more,
e.g. stop filtering with git-cherry patch equivalence.
I'm inclined to eject this topic.
> * ls/test-must-fail-sigpipe (2015-11-28) 2 commits
> (merged to 'next' on 2015-12-01 at d374686)
> + add "ok=sigpipe" to test_must_fail and use it to fix flaky tests
> + implement test_might_fail using a refactored test_must_fail
>
> Fix some racy client/server tests by treating SIGPIPE the same as a
> normal non-zero exit.
>
> Will merge to 'master' two cycles from now.
Hmm, perhaps I misread what you meant by "two cycles", as this is
only the test suite and I cannot imagine we would want to be
ultra-safe to cook that for two release cycles, and you did mean two
issues of "What's cooking" report?
If so, I'll have to rethink the comment on bc/object-id I made
earlier...
> * dt/refs-backend-pre-vtable (2015-11-20) 10 commits
> (merged to 'next' on 2015-11-24 at 8fd7293)
> + refs: break out ref conflict checks
> + files_log_ref_write: new function
> + initdb: make safe_create_dir public
> + refs: split filesystem-based refs code into a new file
> + refs/refs-internal.h: new header file
> + refname_is_safe(): improve docstring
> + pack_if_possible_fn(): use ref_type() instead of is_per_worktree_ref()
> + copy_msg(): rename to copy_reflog_msg()
> + verify_refname_available(): new function
> + verify_refname_available(): rename function
>
> Code preparation for pluggable ref backends.
>
> Will merge to 'master' two cycles from now.
... that is, I'd very much prefer bc/object-id redone on top of an
updated codebase that already has dt/refs-backend-pre-vtable in it.
Thanks.
^ permalink raw reply [relevance 2%]
* Re: [PATCH 02/12] treewide: remove unnecessary includes in source files
@ 2023-12-03 13:15 2% ` Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2023-12-03 13:15 UTC (permalink / raw)
To: Elijah Newren via GitGitGadget; +Cc: git, Elijah Newren
"Elijah Newren via GitGitGadget" <gitgitgadget@gmail.com> writes:
> diff --git a/trace2.c b/trace2.c
> index 6dc74dff4c7..d4220af9ae1 100644
> --- a/trace2.c
> +++ b/trace2.c
> @@ -1,12 +1,8 @@
> #include "git-compat-util.h"
> -#include "config.h"
> -#include "json-writer.h"
> -#include "quote.h"
> #include "repository.h"
> #include "run-command.h"
> #include "sigchain.h"
> #include "thread-utils.h"
> -#include "version.h"
> #include "trace.h"
> #include "trace2.h"
> #include "trace2/tr2_cfg.h"
An in-flight topic seem to want to see git_env_bool() that is
declared in parse.h that is pulled in via inclusion of config.h
hence this hunk breaks 'seen'.
> diff --git a/t/helper/test-trace2.c b/t/helper/test-trace2.c
> index d5ca0046c89..a0032ee3964 100644
> --- a/t/helper/test-trace2.c
> +++ b/t/helper/test-trace2.c
> @@ -2,7 +2,6 @@
> #include "strvec.h"
> #include "run-command.h"
> #include "exec-cmd.h"
> -#include "config.h"
> #include "repository.h"
> #include "trace2.h"
An in-flight topic starts using "struct key_value_info" that is
available via the inclusion of "config.h", hence this hunk breaks
the build of 'seen'.
> diff --git a/t/helper/test-fast-rebase.c b/t/helper/test-fast-rebase.c
> index cac20a72b3f..f9472c99143 100644
> --- a/t/helper/test-fast-rebase.c
> +++ b/t/helper/test-fast-rebase.c
> @@ -24,7 +24,6 @@
> #include "read-cache-ll.h"
> #include "refs.h"
> #include "revision.h"
> -#include "sequencer.h"
> #include "setup.h"
> #include "strvec.h"
> #include "tree.h"
I'll register the following evil merge as the merge-fix/ for this
topic.
In addition, t/helper/test-fast-rebase.c that is touched by this
step will simply disappear with the cc/git-replay topic, so it may
not be a bad idea to exclude it from the patchset.
Thanks.
diff --git a/t/helper/test-trace2.c b/t/helper/test-trace2.c
index 16089f04e1..55c06e4269 100644
--- a/t/helper/test-trace2.c
+++ b/t/helper/test-trace2.c
@@ -1,4 +1,5 @@
#include "test-tool.h"
+#include "config-parse.h"
#include "strvec.h"
#include "run-command.h"
#include "exec-cmd.h"
diff --git a/trace2.c b/trace2.c
index 4fa059199c..452428b09b 100644
--- a/trace2.c
+++ b/trace2.c
@@ -1,4 +1,5 @@
#include "git-compat-util.h"
+#include "parse.h"
#include "repository.h"
#include "run-command.h"
#include "sigchain.h"
^ permalink raw reply related [relevance 2%]
* Re: Why would merge fail on a one-line addition?
@ 2006-03-26 1:32 2% ` Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2006-03-26 1:32 UTC (permalink / raw)
To: Marc Singer; +Cc: git
Marc Singer <elf@buici.com> writes:
> One of the unmerged files leaves this trail.
>
> elf@florence ~...git/linux-2.6 > git-ls-files --unmerged
> 100644 6262d449120cdcde5db1b079806dcc0d9b5e6b7c 1 arch/arm/mach-lh7a40x/irq-lpd7a40x.c
> 100644 dcb4e17b941990eabe8992680c9aa9b67afb6fd4 3 arch/arm/mach-lh7a40x/irq-lpd7a40x.c
> Why would git have a problem with this?
Your change and the change in the other branch are conflicting
and git is helping you notice that.
The index has different #1 and #3 with #2 missing. This means
the common ancestor (#1) had it, you (#2) _removed_ it, while
the other branch (#3) modified it. Should it carry forward the
modification (one line addition) made by the other branch and
then remove the file to match yours, or should it remove it to
match yours and ignore what the other branch did?
If you do not want to have that file in the result, record the
path as such and make a commit. Since there is no #2, your
working tree probably do not have that path, so:
$ git update-index --remove arch/arm/mach-lh7a40x/irq-lpa7a40x.c
to resolve the path, resolve other conflicts if you have any and
then commit the result.
However, this _might_ be a case where your line of development
somewhere between the common ancestor and your tip moved that
file somewhere else in which case you may want to do three-way
merge between 6262d4 blob, your tip and dcb4e1 blob _and_ commit
the result at the path you have. I do not know if that is the
case and even if so I do not know where you have the
corresponding file in your tree, but just as an example if you
have it in arch/arm/mach-foo/irq-lpd7a40x.c, you would:
$ cd arch/arm/mach-foo/
$ common=$(git unpack-file 6262d4)
$ his=$(git unpack-file dcb4e1)
$ merge irq-lpd7a40x.c $common $his
$ rm -f $common $his
And then eyeball the result of the merge, fix it up as
necessary, and then:
$ git update-index --remove arch/arm/mach-lh7a40x/irq-lpa7a40x.c
$ git update-index arch/arm/mach-foo/irq-lpd7a40x.c
before committing.
^ permalink raw reply [relevance 2%]
* [PATCH v2 3/8] rebase --merge: fix reflog when continuing
2022-10-12 9:35 2% ` [PATCH v3 " Phillip Wood via GitGitGadget
2022-04-20 9:56 2% ` [PATCH v2 4/8] rebase --merge: fix reflog message after skipping Phillip Wood via GitGitGadget
@ 2022-04-20 9:56 2% ` Phillip Wood via GitGitGadget
2 siblings, 0 replies; 200+ results
From: Phillip Wood via GitGitGadget @ 2022-04-20 9:56 UTC (permalink / raw)
To: git
Cc: Phillip Wood, Christian Couder, Elijah Newren, Phillip Wood,
Phillip Wood
From: Phillip Wood <phillip.wood@dunelm.org.uk>
The reflog message for a conflict resolution committed by "rebase
--continue" looks like
rebase (continue): commit subject line
Unfortunately the reflog message each subsequent pick look like
rebase (continue) (pick): commit subject line
Fix this by setting the reflog message for "rebase --continue" in
sequencer_continue() so it does not affect subsequent commits. This
introduces a memory leak similar to the one leaking GIT_REFLOG_ACTION
in pick_commits(). Both of these will be fixed in a future series that
stops the sequencer calling setenv().
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
---
builtin/rebase.c | 2 --
sequencer.c | 5 +++++
t/t3406-rebase-message.sh | 9 +++++++--
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/builtin/rebase.c b/builtin/rebase.c
index 4832f16e675..cd9a4f3e2f1 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -1247,8 +1247,6 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
int fd;
options.action = "continue";
- set_reflog_action(&options);
-
/* Sanity check */
if (get_oid("HEAD", &head))
die(_("Cannot read HEAD"));
diff --git a/sequencer.c b/sequencer.c
index bdd66b4b67a..3634ad5baa9 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -4777,6 +4777,8 @@ int sequencer_continue(struct repository *r, struct replay_opts *opts)
if (read_populate_opts(opts))
return -1;
if (is_rebase_i(opts)) {
+ char *previous_reflog_action;
+
if ((res = read_populate_todo(r, &todo_list, opts)))
goto release_todo_list;
@@ -4787,10 +4789,13 @@ int sequencer_continue(struct repository *r, struct replay_opts *opts)
unlink(rebase_path_dropped());
}
+ previous_reflog_action = xstrdup(getenv(GIT_REFLOG_ACTION));
+ setenv(GIT_REFLOG_ACTION, reflog_message(opts, "continue", NULL), 1);
if (commit_staged_changes(r, opts, &todo_list)) {
res = -1;
goto release_todo_list;
}
+ setenv(GIT_REFLOG_ACTION, previous_reflog_action, 1);
} else if (!file_exists(get_todo_path(opts)))
return continue_single_pick(r, opts);
else if ((res = read_populate_todo(r, &todo_list, opts)))
diff --git a/t/t3406-rebase-message.sh b/t/t3406-rebase-message.sh
index 5253dd1551d..3ca2fbb0d59 100755
--- a/t/t3406-rebase-message.sh
+++ b/t/t3406-rebase-message.sh
@@ -17,6 +17,7 @@ test_expect_success 'setup' '
git checkout -b conflicts O &&
test_commit P &&
+ test_commit conflict-X fileX &&
test_commit Q &&
git checkout -b topic O &&
@@ -107,13 +108,17 @@ test_reflog () {
GIT_REFLOG_ACTION="$reflog_action" &&
export GIT_REFLOG_ACTION
fi &&
- git rebase $mode main
+ test_must_fail git rebase $mode main &&
+ echo resolved >fileX &&
+ git add fileX &&
+ git rebase --continue
) &&
- git log -g --format=%gs -4 >actual &&
+ git log -g --format=%gs -5 >actual &&
write_reflog_expect <<-EOF &&
${reflog_action:-rebase} (finish): returning to refs/heads/conflicts
${reflog_action:-rebase} (pick): Q
+ ${reflog_action:-rebase} (continue): conflict-X
${reflog_action:-rebase} (pick): P
${reflog_action:-rebase} (start): checkout main
EOF
--
gitgitgadget
^ permalink raw reply related [relevance 2%]
* [PATCHv2] builtin/merge: honor commit-msg hook for merges
2017-09-07 22:04 2% ` [PATCHv3] " Stefan Beller
@ 2017-09-05 23:29 2% ` Stefan Beller
1 sibling, 0 replies; 200+ results
From: Stefan Beller @ 2017-09-05 23:29 UTC (permalink / raw)
To: gitster; +Cc: git, sbeller
Similar to 65969d43d1 (merge: honor prepare-commit-msg hook, 2011-02-14)
merge should also honor the commit-msg hook: When a merge is stopped due
to conflicts or --no-commit, the subsequent commit calls the commit-msg
hook. However, it is not called after a clean merge. Fix this
inconsistency by invoking the hook after clean merges as well.
This change is motivated by Gerrit's commit-msg hook to install a ChangeId
trailer into the commit message. Without such a ChangeId, Gerrit refuses
to accept any commit by default, such that the inconsistency of (not)
running the commit-msg hook between commit and merge leads to confusion
and might block people from getting their work done.
As the githooks man page is very vocal about the possibility of skipping
the commit-msg hook via the --no-verify option, implement the option
in merge, too.
Signed-off-by: Stefan Beller <sbeller@google.com>
---
addressed all but one issues.
Junio writes:
> I didn't check how "merge --continue" is implemented, but we need to
> behave exactly the same way over there, too. Making sure that it is
> a case in t7504 may be a good idea, in addition to the test you
> added.
After inspection of the code I do not think it is a good idea, because
(a) it clutters the test suite with something "obvious" for now,
the call to cmd_commit will be the same as git-commit on the
command line and
(b) piping through --[no-]verify would either introduce irregularities
("Why do we pipe through --no-verify, when --sign-off is more important?")
or miss important options to pipe through:
static int continue_current_merge;
...
OPT_BOOL(0, "continue", &continue_current_merge,
N_("continue the current in-progress merge")),
...
if (continue_current_merge) {
int nargc = 1;
const char *nargv[] = {"commit", NULL};
if (orig_argc != 2)
usage_msg_opt(_("--continue expects no arguments"),
builtin_merge_usage, builtin_merge_options);
/* Invoke 'git commit' */
ret = cmd_commit(nargc, nargv, prefix);
goto done;
}
Thanks,
Stefan
builtin/merge.c | 8 ++++++++
t/t7504-commit-msg-hook.sh | 45 +++++++++++++++++++++++++++++++++++++++++----
2 files changed, 49 insertions(+), 4 deletions(-)
diff --git a/builtin/merge.c b/builtin/merge.c
index 7df3fe3927..780435d7a1 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -73,6 +73,7 @@ static int show_progress = -1;
static int default_to_upstream = 1;
static int signoff;
static const char *sign_commit;
+static int verify_msg = 1;
static struct strategy all_strategy[] = {
{ "recursive", DEFAULT_TWOHEAD | NO_TRIVIAL },
@@ -236,6 +237,7 @@ static struct option builtin_merge_options[] = {
N_("GPG sign commit"), PARSE_OPT_OPTARG, NULL, (intptr_t) "" },
OPT_BOOL(0, "overwrite-ignore", &overwrite_ignore, N_("update ignored files (default)")),
OPT_BOOL(0, "signoff", &signoff, N_("add Signed-off-by:")),
+ OPT_BOOL(0, "verify", &verify_msg, N_("verify commit-msg hook")),
OPT_END()
};
@@ -780,6 +782,12 @@ static void prepare_to_commit(struct commit_list *remoteheads)
if (launch_editor(git_path_merge_msg(), NULL, NULL))
abort_commit(remoteheads, NULL);
}
+
+ if (verify_msg && run_commit_hook(0 < option_edit, get_index_file(),
+ "commit-msg",
+ git_path_merge_msg(), NULL))
+ abort_commit(remoteheads, NULL);
+
read_merge_msg(&msg);
strbuf_stripspace(&msg, 0 < option_edit);
if (!msg.len)
diff --git a/t/t7504-commit-msg-hook.sh b/t/t7504-commit-msg-hook.sh
index 88d4cda299..1cd54af3cc 100755
--- a/t/t7504-commit-msg-hook.sh
+++ b/t/t7504-commit-msg-hook.sh
@@ -101,6 +101,10 @@ cat > "$HOOK" <<EOF
exit 1
EOF
+commit_msg_is () {
+ test "$(git log --pretty=format:%s%b -1)" = "$1"
+}
+
test_expect_success 'with failing hook' '
echo "another" >> file &&
@@ -135,6 +139,32 @@ test_expect_success '--no-verify with failing hook (editor)' '
'
+test_expect_success 'merge fails with failing hook' '
+
+ test_when_finished "git branch -D newbranch" &&
+ test_when_finished "git checkout -f master" &&
+ git checkout --orphan newbranch &&
+ : >file2 &&
+ git add file2 &&
+ git commit --no-verify file2 -m in-side-branch &&
+ test_must_fail git merge --allow-unrelated-histories master &&
+ commit_msg_is "in-side-branch" # HEAD before merge
+
+'
+
+test_expect_success 'merge bypasses failing hook with --no-verify' '
+
+ test_when_finished "git branch -D newbranch" &&
+ test_when_finished "git checkout -f master" &&
+ git checkout --orphan newbranch &&
+ : >file2 &&
+ git add file2 &&
+ git commit --no-verify file2 -m in-side-branch &&
+ git merge --no-verify --allow-unrelated-histories master &&
+ commit_msg_is "Merge branch '\''master'\'' into newbranch"
+'
+
+
chmod -x "$HOOK"
test_expect_success POSIXPERM 'with non-executable hook' '
@@ -178,10 +208,6 @@ exit 0
EOF
chmod +x "$HOOK"
-commit_msg_is () {
- test "$(git log --pretty=format:%s%b -1)" = "$1"
-}
-
test_expect_success 'hook edits commit message' '
echo "additional" >> file &&
@@ -217,7 +243,17 @@ test_expect_success "hook doesn't edit commit message (editor)" '
echo "more plus" > FAKE_MSG &&
GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit --no-verify &&
commit_msg_is "more plus"
+'
+test_expect_success 'hook called in git-merge picks up commit message' '
+ test_when_finished "git branch -D newbranch" &&
+ test_when_finished "git checkout -f master" &&
+ git checkout --orphan newbranch &&
+ : >file2 &&
+ git add file2 &&
+ git commit --no-verify file2 -m in-side-branch &&
+ git merge --allow-unrelated-histories master &&
+ commit_msg_is "new message"
'
# set up fake editor to replace `pick` by `reword`
@@ -237,4 +273,5 @@ test_expect_success 'hook is called for reword during `rebase -i`' '
'
+
test_done
--
2.14.0.rc0.3.g6c2e499285
^ permalink raw reply related [relevance 2%]
* Re: [PATCH v3] merge: fix cache_entry use-after-free
@ 2015-10-15 20:51 2% ` Junio C Hamano
2015-10-16 7:05 2% ` David Turner
0 siblings, 1 reply; 200+ results
From: Junio C Hamano @ 2015-10-15 20:51 UTC (permalink / raw)
To: David Turner; +Cc: René Scharfe, git, Keith McGuigan
David Turner <dturner@twopensource.com> writes:
>> > +static inline void drop_ce_ref(struct cache_entry *ce)
>> > +{
>> > + if (ce != NULL) {
>> > + assert(ce->ref_count >= 0);
>>
>> Shouldn't this be "> 0" to prevent double frees?
>
> No. If the ref_count is 1, then there is still some reference to the
> ce. If it is 0, there is no reference to it, and the next check (< 1)
> will succeed and the ce will get freed.
>
>> > + if (--ce->ref_count < 1) {
>> > + free(ce);
>> > + }
>> > + }
>> > +}
Hmm, but it still feels fuzzy, no? I cannot tell from the above
exchange if a ce with ref_count==0 upon entry to this function is
supposed to have somebody pointing at it, somebody just assigned
NULL (or another pointer) to the last pointer that was pointing at
it, or what else. If the expected calling sequence were:
drop_ce_ref(thing->ce);
thing->ce = NULL;
and the original thing->ce were the last reference to the cache
entry about to be freed, its refcnt is better be 1 not 0. And when
this function decrements refcnt down to 0, the cache entry is freed.
Admittedly, if the original refcnt were 0, with signed refcnt, it
will decrement to -1 and it will be freed, too, but I do not think
that is what was intended---refcnt is initialized to 0 upon creating
an unreferenced cache entry, and set_index_entry() and friends that
store a pointer to anything calls add_ce_ref(), so I read the code
as intending to make "0 means no pointer points at it".
As far as I can tell, the only effect of this assert() that uses >=0
not >0 is to avoid triggering it on this calling sequence:
new_ce = new_cache_entry();
drop_ce_ref(new_ce);
that is, you create because you _might_ use it, and then later
decide not to use it (and the free() part wouldn't have worked
correctly with unsigned refcnt ;-).
By the way, the log message says "During merges, we would previously
free entries that we no longer need in the destination index. But
those entries might also be stored in the dir_entry cache," as if
this issue were present and waiting to trigger for all merges for
all people. Given that Linus does hundreds of merges in a day
during the merge window (and I do several dozens a day), I am quite
surprised that nobody noticed this issue. If there is a more
specific condition that allows this bug to trigger (e.g. "dir-entry
cache is used only under such and such conditions") that the log
message does not talk about to explain why this bug was not seen
widely, it would be a good thing to add. It is very puzzling
otherwise.
^ permalink raw reply [relevance 2%]
* [PATCH 1/2] merge: fix numerus bugs around "trivial merge" area
2008-08-23 19:55 2% ` Junio C Hamano
@ 2008-08-23 19:56 2% ` Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2008-08-23 19:56 UTC (permalink / raw)
To: Miklos Vajna; +Cc: Paolo Bonzini, Jeff King, git
The "trivial merge" codepath wanted to optimize itself by making an
internal call to the read-tree machinery, but it did not read the index
before doing so, and the codepath was never exercised. Incidentally, this
failure to read the index upfront meant that the safety to refuse doing
anything when the index is unmerged did not kick in, either.
These two problem are fixed by using read_cache_unmerged() that does read
the index before checking if it is unmerged at the beginning of
cmd_merge().
The primary logic of the merge, however, had an assumption that the
process never read the index in-core, and write_cache_as_tree() call it
makes from write_tree_trivial() will always read from the on-disk index
the strategies created and write it out as a tree. This assumption is now
broken by the above fix. It now calls discard_cache() before calling
write_tree_trivial() when it wants to write the on-disk index as a tree to
fix this issue.
When multiple strategies are tried, their results are evaluated by reading
the resulting index and inspecting it. The codepath needs to make a call
to read_cache() for each successful strategy, and for that to work, they
need to discard_cache() the one from the previous round.
Also the "trivial merge" forgot that the current commit is one of the
parents of the resulting commit.
This still has breakage in the way it writes out the resulting tree out of
the trivial merge codepath, which is a topic of the next patch. One test
in t7605-merge-resolve.sh exposes this breakage.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
builtin-merge.c | 16 +++++++++-------
t/t3030-merge-recursive.sh | 11 +++++++++++
t/t7600-merge.sh | 9 +++++++++
t/t7605-merge-resolve.sh | 6 ++++--
4 files changed, 33 insertions(+), 9 deletions(-)
diff --git a/builtin-merge.c b/builtin-merge.c
index a201c66..b280444 100644
--- a/builtin-merge.c
+++ b/builtin-merge.c
@@ -564,8 +564,6 @@ static int checkout_fast_forward(unsigned char *head, unsigned char *remote)
struct dir_struct dir;
struct lock_file *lock_file = xcalloc(1, sizeof(struct lock_file));
- if (read_cache_unmerged())
- die("you need to resolve your current index first");
refresh_cache(REFRESH_QUIET);
fd = hold_locked_index(lock_file, 1);
@@ -651,13 +649,15 @@ static void add_strategies(const char *string, unsigned attr)
static int merge_trivial(void)
{
unsigned char result_tree[20], result_commit[20];
- struct commit_list parent;
+ struct commit_list *parent = xmalloc(sizeof(struct commit_list *));
write_tree_trivial(result_tree);
printf("Wonderful.\n");
- parent.item = remoteheads->item;
- parent.next = NULL;
- commit_tree(merge_msg.buf, result_tree, &parent, result_commit);
+ parent->item = lookup_commit(head);
+ parent->next = xmalloc(sizeof(struct commit_list *));
+ parent->next->item = remoteheads->item;
+ parent->next->next = NULL;
+ commit_tree(merge_msg.buf, result_tree, parent, result_commit);
finish(result_commit, "In-index merge");
drop_save();
return 0;
@@ -743,6 +743,7 @@ static int evaluate_result(void)
int cnt = 0;
struct rev_info rev;
+ discard_cache();
if (read_cache() < 0)
die("failed to read the cache");
@@ -776,7 +777,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
struct commit_list **remotes = &remoteheads;
setup_work_tree();
- if (unmerged_cache())
+ if (read_cache_unmerged())
die("You are in the middle of a conflicted merge.");
/*
@@ -1073,6 +1074,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
}
/* Automerge succeeded. */
+ discard_cache();
write_tree_trivial(result_tree);
automerge_was_ok = 1;
break;
diff --git a/t/t3030-merge-recursive.sh b/t/t3030-merge-recursive.sh
index aff3603..f288015 100755
--- a/t/t3030-merge-recursive.sh
+++ b/t/t3030-merge-recursive.sh
@@ -269,6 +269,17 @@ test_expect_success 'merge-recursive result' '
'
+test_expect_success 'fail if the index has unresolved entries' '
+
+ rm -fr [abcd] &&
+ git checkout -f "$c1" &&
+
+ test_must_fail git merge "$c5" &&
+ test_must_fail git merge "$c5" 2> out &&
+ grep "You are in the middle of a conflicted merge" out
+
+'
+
test_expect_success 'merge-recursive remove conflict' '
rm -fr [abcd] &&
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index fee8fb7..dbc90bc 100755
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
@@ -498,4 +498,13 @@ test_expect_success 'merge fast-forward in a dirty tree' '
test_debug 'gitk --all'
+test_expect_success 'in-index merge' '
+ git reset --hard c0 &&
+ git merge --no-ff -s resolve c1 > out &&
+ grep "Wonderful." out &&
+ verify_parents $c0 $c1
+'
+
+test_debug 'gitk --all'
+
test_done
diff --git a/t/t7605-merge-resolve.sh b/t/t7605-merge-resolve.sh
index ee21a10..5c53608 100755
--- a/t/t7605-merge-resolve.sh
+++ b/t/t7605-merge-resolve.sh
@@ -27,7 +27,7 @@ test_expect_success 'setup' '
git tag c3
'
-test_expect_success 'merge c1 to c2' '
+test_expect_failure 'merge c1 to c2' '
git reset --hard c1 &&
git merge -s resolve c2 &&
test "$(git rev-parse c1)" != "$(git rev-parse HEAD)" &&
@@ -36,7 +36,9 @@ test_expect_success 'merge c1 to c2' '
git diff --exit-code &&
test -f c0.c &&
test -f c1.c &&
- test -f c2.c
+ test -f c2.c &&
+ test 3 = $(git ls-tree -r HEAD | wc -l) &&
+ test 3 = $(git ls-files | wc -l)
'
test_expect_success 'merge c2 to c3 (fails)' '
--
1.6.0.51.g078ae
^ permalink raw reply related [relevance 2%]
* merge: fix NULL pointer dereference when merging nothing into void
@ 2016-03-21 19:01 2% ` Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2016-03-21 19:01 UTC (permalink / raw)
To: Jose Ivan B. Vilarouca Filho; +Cc: sunshine, git
When we are on an unborn branch and merging only one foreign parent,
we allow "git merge" to fast-forward to that foreign parent commit.
This codepath incorrectly attempted to dereference the list of
parents that the merge is going to record even when the list is
empty. It must refuse to operate instead when there is no parent.
All other codepaths make sure the list is not empty before they
dereference it, and are safe.
Reported by Jose Ivan B. Vilarouca Filho
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
* So here is what I came up with as a suggestion. The original
check to see if remote_head is empty is simply bogus (an empty
list would to have a single element whose item is NULL), so I
rewrote it to clarify what is going on in this codepath.
builtin/merge.c | 10 +++++-----
t/t7600-merge.sh | 10 ++++++++++
2 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/builtin/merge.c b/builtin/merge.c
index 101ffef..bf2f261 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -1257,12 +1257,12 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
builtin_merge_options);
if (!head_commit) {
- struct commit *remote_head;
/*
* If the merged head is a valid one there is no reason
* to forbid "git merge" into a branch yet to be born.
* We do the same for "git pull".
*/
+ unsigned char *remote_head_sha1;
if (squash)
die(_("Squash commit into empty head not supported yet"));
if (fast_forward == FF_NO)
@@ -1270,13 +1270,13 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
"an empty head"));
remoteheads = collect_parents(head_commit, &head_subsumed,
argc, argv, NULL);
- remote_head = remoteheads->item;
- if (!remote_head)
+ if (!remoteheads)
die(_("%s - not something we can merge"), argv[0]);
if (remoteheads->next)
die(_("Can merge only exactly one commit into empty head"));
- read_empty(remote_head->object.oid.hash, 0);
- update_ref("initial pull", "HEAD", remote_head->object.oid.hash,
+ remote_head_sha1 = remoteheads->item->object.oid.hash;
+ read_empty(remote_head_sha1, 0);
+ update_ref("initial pull", "HEAD", remote_head_sha1,
NULL, 0, UPDATE_REFS_DIE_ON_ERR);
goto done;
}
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index 302e238..9d7952f 100755
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
@@ -725,4 +725,14 @@ test_expect_success 'merge detects mod-256 conflicts (resolve)' '
test_must_fail git merge -s resolve master
'
+test_expect_success 'merge nothing into void' '
+ git init void &&
+ (
+ cd void &&
+ git remote add up .. &&
+ git fetch up &&
+ test_must_fail git merge FETCH_HEAD
+ )
+'
+
test_done
^ permalink raw reply related [relevance 2%]
* [PATCH] merge: honor prepare-commit-msg hook
@ 2011-02-15 1:07 2% Jay Soffian
0 siblings, 0 replies; 200+ results
From: Jay Soffian @ 2011-02-15 1:07 UTC (permalink / raw)
To: git; +Cc: Jay Soffian, Junio C Hamano
When a merge is stopped due to conflicts or --no-commit, the
subsequent commit calls the prepare-commit-msg hook. However,
it is not called after a clean merge. Fix this inconsistency
by invoking the hook after clean merges as well.
Signed-off-by: Jay Soffian <jaysoffian@gmail.com>
---
I sent this out previously as an RFC:
http://thread.gmane.org/gmane.comp.version-control.git/151297
But never prepared a proper patch. Here it is.
builtin/merge.c | 38 ++++++++++++++++++++++++++++-------
t/t7505-prepare-commit-msg-hook.sh | 12 +++++++++++
2 files changed, 42 insertions(+), 8 deletions(-)
diff --git a/builtin/merge.c b/builtin/merge.c
index 42fff38..83389ed 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -795,6 +795,33 @@ static void add_strategies(const char *string, unsigned attr)
}
+static void write_merge_msg(void)
+{
+ int fd = open(git_path("MERGE_MSG"), O_WRONLY | O_CREAT, 0666);
+ if (fd < 0)
+ die_errno("Could not open '%s' for writing",
+ git_path("MERGE_MSG"));
+ if (write_in_full(fd, merge_msg.buf, merge_msg.len) !=
+ merge_msg.len)
+ die_errno("Could not write to '%s'", git_path("MERGE_MSG"));
+ close(fd);
+}
+
+static void read_merge_msg(void)
+{
+ strbuf_reset(&merge_msg);
+ if (strbuf_read_file(&merge_msg, git_path("MERGE_MSG"), 0) < 0)
+ die_errno("Could not read from '%s'", git_path("MERGE_MSG"));
+}
+
+static void run_prepare_commit_msg(void)
+{
+ write_merge_msg();
+ run_hook(get_index_file(), "prepare-commit-msg",
+ git_path("MERGE_MSG"), "merge", NULL, NULL);
+ read_merge_msg();
+}
+
static int merge_trivial(void)
{
unsigned char result_tree[20], result_commit[20];
@@ -806,6 +833,7 @@ static int merge_trivial(void)
parent->next = xmalloc(sizeof(*parent->next));
parent->next->item = remoteheads->item;
parent->next->next = NULL;
+ run_prepare_commit_msg();
commit_tree(merge_msg.buf, result_tree, parent, result_commit, NULL);
finish(result_commit, "In-index merge");
drop_save();
@@ -835,6 +863,7 @@ static int finish_automerge(struct commit_list *common,
}
free_commit_list(remoteheads);
strbuf_addch(&merge_msg, '\n');
+ run_prepare_commit_msg();
commit_tree(merge_msg.buf, result_tree, parents, result_commit, NULL);
strbuf_addf(&buf, "Merge made by %s.", wt_strategy);
finish(result_commit, buf.buf);
@@ -1316,14 +1345,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
die_errno("Could not write to '%s'", git_path("MERGE_HEAD"));
close(fd);
strbuf_addch(&merge_msg, '\n');
- fd = open(git_path("MERGE_MSG"), O_WRONLY | O_CREAT, 0666);
- if (fd < 0)
- die_errno("Could not open '%s' for writing",
- git_path("MERGE_MSG"));
- if (write_in_full(fd, merge_msg.buf, merge_msg.len) !=
- merge_msg.len)
- die_errno("Could not write to '%s'", git_path("MERGE_MSG"));
- close(fd);
+ write_merge_msg();
fd = open(git_path("MERGE_MODE"), O_WRONLY | O_CREAT | O_TRUNC, 0666);
if (fd < 0)
die_errno("Could not open '%s' for writing",
diff --git a/t/t7505-prepare-commit-msg-hook.sh b/t/t7505-prepare-commit-msg-hook.sh
index ff18962..5b4b694 100755
--- a/t/t7505-prepare-commit-msg-hook.sh
+++ b/t/t7505-prepare-commit-msg-hook.sh
@@ -132,6 +132,18 @@ test_expect_success 'with hook (-c)' '
'
+test_expect_success 'with hook (merge)' '
+
+ head=`git rev-parse HEAD` &&
+ git checkout -b other HEAD@{1} &&
+ echo "more" >> file &&
+ git add file &&
+ git commit -m other &&
+ git checkout - &&
+ git merge other &&
+ test "`git log -1 --pretty=format:%s`" = merge
+'
+
cat > "$HOOK" <<'EOF'
#!/bin/sh
exit 1
--
1.7.4.5.g9affb
^ permalink raw reply related [relevance 2%]
* [PATCHv3] builtin/merge: honor commit-msg hook for merges
@ 2017-09-07 22:04 2% ` Stefan Beller
2017-09-05 23:29 2% ` [PATCHv2] " Stefan Beller
1 sibling, 0 replies; 200+ results
From: Stefan Beller @ 2017-09-07 22:04 UTC (permalink / raw)
To: gitster; +Cc: git, sbeller
Similar to 65969d43d1 (merge: honor prepare-commit-msg hook, 2011-02-14)
merge should also honor the commit-msg hook: When a merge is stopped due
to conflicts or --no-commit, the subsequent commit calls the commit-msg
hook. However, it is not called after a clean merge. Fix this
inconsistency by invoking the hook after clean merges as well.
This change is motivated by Gerrit's commit-msg hook to install a ChangeId
trailer into the commit message. Without such a ChangeId, Gerrit refuses
to accept any commit by default, such that the inconsistency of (not)
running the commit-msg hook between commit and merge leads to confusion
and might block people from getting their work done.
As the githooks man page is very vocal about the possibility of skipping
the commit-msg hook via the --no-verify option, implement the option
in merge, too.
'git merge --continue' is currently implemented as calling cmd_commit
with no further arguments. This works for most other merge related options,
such as demonstrated via the --allow-unrelated-histories flag in the
test. The --no-verify option however is not remembered across invocations
of git-merge. Originally the author assumed an alternative in which the
'git merge --continue' command accepts the --no-verify flag, but that
opens up the discussion which flags are allows to the continued merge
command and which must be given in the first invocation.
Signed-off-by: Stefan Beller <sbeller@google.com>
---
> I didn't check how "merge --continue" is implemented, but we need to
> behave exactly the same way over there, too. Making sure that it is
> a case in t7504 may be a good idea, in addition to the test you
> added.
First I understood this as if we'd want to support
'git merge --continue --no-verify' eventually, but by now I think we want
to 'carry over' the meaning from the first invocation of git-merge.
For that I added a test.
Thanks,
Stefan
builtin/merge.c | 8 ++++++
t/t7504-commit-msg-hook.sh | 64 +++++++++++++++++++++++++++++++++++++++++++---
2 files changed, 68 insertions(+), 4 deletions(-)
diff --git a/builtin/merge.c b/builtin/merge.c
index 7df3fe3927..780435d7a1 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -73,6 +73,7 @@ static int show_progress = -1;
static int default_to_upstream = 1;
static int signoff;
static const char *sign_commit;
+static int verify_msg = 1;
static struct strategy all_strategy[] = {
{ "recursive", DEFAULT_TWOHEAD | NO_TRIVIAL },
@@ -236,6 +237,7 @@ static struct option builtin_merge_options[] = {
N_("GPG sign commit"), PARSE_OPT_OPTARG, NULL, (intptr_t) "" },
OPT_BOOL(0, "overwrite-ignore", &overwrite_ignore, N_("update ignored files (default)")),
OPT_BOOL(0, "signoff", &signoff, N_("add Signed-off-by:")),
+ OPT_BOOL(0, "verify", &verify_msg, N_("verify commit-msg hook")),
OPT_END()
};
@@ -780,6 +782,12 @@ static void prepare_to_commit(struct commit_list *remoteheads)
if (launch_editor(git_path_merge_msg(), NULL, NULL))
abort_commit(remoteheads, NULL);
}
+
+ if (verify_msg && run_commit_hook(0 < option_edit, get_index_file(),
+ "commit-msg",
+ git_path_merge_msg(), NULL))
+ abort_commit(remoteheads, NULL);
+
read_merge_msg(&msg);
strbuf_stripspace(&msg, 0 < option_edit);
if (!msg.len)
diff --git a/t/t7504-commit-msg-hook.sh b/t/t7504-commit-msg-hook.sh
index 88d4cda299..302a3a2082 100755
--- a/t/t7504-commit-msg-hook.sh
+++ b/t/t7504-commit-msg-hook.sh
@@ -101,6 +101,10 @@ cat > "$HOOK" <<EOF
exit 1
EOF
+commit_msg_is () {
+ test "$(git log --pretty=format:%s%b -1)" = "$1"
+}
+
test_expect_success 'with failing hook' '
echo "another" >> file &&
@@ -135,6 +139,32 @@ test_expect_success '--no-verify with failing hook (editor)' '
'
+test_expect_success 'merge fails with failing hook' '
+
+ test_when_finished "git branch -D newbranch" &&
+ test_when_finished "git checkout -f master" &&
+ git checkout --orphan newbranch &&
+ : >file2 &&
+ git add file2 &&
+ git commit --no-verify file2 -m in-side-branch &&
+ test_must_fail git merge --allow-unrelated-histories master &&
+ commit_msg_is "in-side-branch" # HEAD before merge
+
+'
+
+test_expect_success 'merge bypasses failing hook with --no-verify' '
+
+ test_when_finished "git branch -D newbranch" &&
+ test_when_finished "git checkout -f master" &&
+ git checkout --orphan newbranch &&
+ : >file2 &&
+ git add file2 &&
+ git commit --no-verify file2 -m in-side-branch &&
+ git merge --no-verify --allow-unrelated-histories master &&
+ commit_msg_is "Merge branch '\''master'\'' into newbranch"
+'
+
+
chmod -x "$HOOK"
test_expect_success POSIXPERM 'with non-executable hook' '
@@ -178,10 +208,6 @@ exit 0
EOF
chmod +x "$HOOK"
-commit_msg_is () {
- test "$(git log --pretty=format:%s%b -1)" = "$1"
-}
-
test_expect_success 'hook edits commit message' '
echo "additional" >> file &&
@@ -217,7 +243,36 @@ test_expect_success "hook doesn't edit commit message (editor)" '
echo "more plus" > FAKE_MSG &&
GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit --no-verify &&
commit_msg_is "more plus"
+'
+test_expect_success 'hook called in git-merge picks up commit message' '
+ test_when_finished "git branch -D newbranch" &&
+ test_when_finished "git checkout -f master" &&
+ git checkout --orphan newbranch &&
+ : >file2 &&
+ git add file2 &&
+ git commit --no-verify file2 -m in-side-branch &&
+ git merge --allow-unrelated-histories master &&
+ commit_msg_is "new message"
+'
+
+test_expect_failure 'merge --continue remembers --no-verify' '
+ test_when_finished "git branch -D newbranch" &&
+ test_when_finished "git checkout -f master" &&
+ git checkout master &&
+ echo a >file2 &&
+ git add file2 &&
+ git commit --no-verify -m "add file2 to master" &&
+ git checkout -b newbranch master^ &&
+ echo b >file2 &&
+ git add file2 &&
+ git commit --no-verify file2 -m in-side-branch &&
+ git merge --no-verify -m not-rewritten-by-hook master &&
+ # resolve conflict:
+ echo c >file2 &&
+ git add file2 &&
+ git merge --continue &&
+ commit_msg_is not-rewritten-by-hook
'
# set up fake editor to replace `pick` by `reword`
@@ -237,4 +292,5 @@ test_expect_success 'hook is called for reword during `rebase -i`' '
'
+
test_done
--
2.14.0.rc0.3.g6c2e499285
^ permalink raw reply related [relevance 2%]
* [PATCH] rebase--merge: fix --skip with two conflicts in a row
@ 2014-06-16 0:01 2% ` brian m. carlson
2014-06-16 20:31 2% ` Junio C Hamano
0 siblings, 1 reply; 200+ results
From: brian m. carlson @ 2014-06-16 0:01 UTC (permalink / raw)
To: git; +Cc: Phillip Susi, Jeff King, Junio C Hamano
If git rebase --merge encountered a conflict, --skip would not work if the
next commit also conflicted. The msgnum file would never be updated with
the new patch number, so no patch would actually be skipped, resulting in an
inescapable loop.
Update the msgnum file's value as the first thing in call_merge. This also
avoids an "Already applied" message when skipping a commit. There is no
visible change for the other contexts in which call_merge is invoked, as the
msgnum file's value remains unchanged in those situations.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
---
git-rebase--merge.sh | 5 +++--
t/t3402-rebase-merge.sh | 15 +++++++++++++++
2 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/git-rebase--merge.sh b/git-rebase--merge.sh
index 6d77b3c..d3fb67d 100644
--- a/git-rebase--merge.sh
+++ b/git-rebase--merge.sh
@@ -53,11 +53,12 @@ continue_merge () {
}
call_merge () {
- cmt="$(cat "$state_dir/cmt.$1")"
+ msgnum="$1"
+ echo "$msgnum" >"$state_dir/msgnum"
+ cmt="$(cat "$state_dir/cmt.$msgnum")"
echo "$cmt" > "$state_dir/current"
hd=$(git rev-parse --verify HEAD)
cmt_name=$(git symbolic-ref HEAD 2> /dev/null || echo HEAD)
- msgnum=$(cat "$state_dir/msgnum")
eval GITHEAD_$cmt='"${cmt_name##refs/heads/}~$(($end - $msgnum))"'
eval GITHEAD_$hd='$onto_name'
export GITHEAD_$cmt GITHEAD_$hd
diff --git a/t/t3402-rebase-merge.sh b/t/t3402-rebase-merge.sh
index be8c1d5..5a27ec9 100755
--- a/t/t3402-rebase-merge.sh
+++ b/t/t3402-rebase-merge.sh
@@ -33,6 +33,7 @@ test_expect_success setup '
tr "[a-z]" "[A-Z]" <original >newfile &&
git add newfile &&
git commit -a -m"side edits further." &&
+ git branch second-side &&
tr "[a-m]" "[A-M]" <original >newfile &&
rm -f original &&
@@ -41,6 +42,7 @@ test_expect_success setup '
git branch test-rebase side &&
git branch test-rebase-pick side &&
git branch test-reference-pick side &&
+ git branch test-conflicts side &&
git checkout -b test-merge side
'
@@ -138,4 +140,17 @@ test_expect_success 'rebase -s funny -Xopt' '
test -f funny.was.run
'
+test_expect_success 'rebase --skip works with two conflicts in a row' '
+ git checkout second-side &&
+ tr "[A-Z]" "[a-z]" <newfile >tmp &&
+ mv tmp newfile &&
+ git commit -a -m"edit conflicting with side" &&
+ tr "[d-f]" "[D-F]" <newfile >tmp &&
+ mv tmp newfile &&
+ git commit -a -m"another edit conflicting with side" &&
+ test_must_fail git rebase --merge test-conflicts &&
+ test_must_fail git rebase --skip &&
+ git rebase --skip
+'
+
test_done
--
2.0.0
^ permalink raw reply related [relevance 2%]
* [PATCH v2 1/4] t6038: make tests fail for the right reason
@ 2020-08-03 18:41 2% ` Elijah Newren via GitGitGadget
0 siblings, 0 replies; 200+ results
From: Elijah Newren via GitGitGadget @ 2020-08-03 18:41 UTC (permalink / raw)
To: git; +Cc: Elijah Newren, Elijah Newren
From: Elijah Newren <newren@gmail.com>
t6038 had a pair of tests that were expected to fail, but weren't
failing for the expected reason. Both were meant to do a merge that
could be done cleanly after renormalization, but were supposed to fail
for lack of renormalization. Unfortunately, both tests had staged
changes, and checkout -m would abort due to the presence of those staged
changes before even attempting a merge.
Fix this first issue by utilizing git-restore instead of git-checkout,
so that the index is left alone and just the working directory gets the
changes we want.
However, there is a second issue with these tests. Technically, they
just wanted to verify that after renormalization, no conflicts would be
present. This could have been checked for by grepping for a lack of
conflict markers, but the test instead tried to compare the working
directory files to an expected result. Unfortunately, the setting of
"text=auto" without setting core.eol to any value meant that the content
of the file (in particular, the line endings) would be
platform-dependent and the tests could only pass on some platforms.
Replace the existing comparison with a call to 'git diff --no-index
--ignore-cr-at-eol' to verify that the contents, other than possible
carriage returns in the file, match the expected results and in
particular that the file has no conflicts from the checkout -m
operation.
Signed-off-by: Elijah Newren <newren@gmail.com>
---
t/t6038-merge-text-auto.sh | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/t/t6038-merge-text-auto.sh b/t/t6038-merge-text-auto.sh
index 5e8d5fa50c..27cea15533 100755
--- a/t/t6038-merge-text-auto.sh
+++ b/t/t6038-merge-text-auto.sh
@@ -168,9 +168,9 @@ test_expect_failure 'checkout -m after setting text=auto' '
git rm -fr . &&
rm -f .gitattributes &&
git reset --hard initial &&
- git checkout a -- . &&
+ git restore --source=a -- . &&
git checkout -m b &&
- compare_files expected file
+ git diff --no-index --ignore-cr-at-eol expected file
'
test_expect_failure 'checkout -m addition of text=auto' '
@@ -183,9 +183,9 @@ test_expect_failure 'checkout -m addition of text=auto' '
git rm -fr . &&
rm -f .gitattributes file &&
git reset --hard initial &&
- git checkout b -- . &&
+ git restore --source=b -- . &&
git checkout -m a &&
- compare_files expected file
+ git diff --no-index --ignore-cr-at-eol expected file
'
test_expect_failure 'cherry-pick patch from after text=auto was added' '
--
gitgitgadget
^ permalink raw reply related [relevance 2%]
* [PATCH 1/4] t6038: make tests fail for the right reason
@ 2020-08-02 6:33 2% ` Elijah Newren via GitGitGadget
1 sibling, 0 replies; 200+ results
From: Elijah Newren via GitGitGadget @ 2020-08-02 6:33 UTC (permalink / raw)
To: git; +Cc: Elijah Newren, Elijah Newren
From: Elijah Newren <newren@gmail.com>
t6038 had a pair of tests that were expected to fail, but weren't
failing for the expected reason. Both were meant to do a merge that
could be done cleanly after renormalization, but were supposed to fail
for lack of renormalization. Unfortunately, both tests has staged
changes, and checkout -m would abort due to the presence of those staged
changes before even attempting a merge.
Fix this first issue by utilizing git-restore instead of git-checkout,
so that the index is left alone and just the working directory gets the
changes we want.
However, there is a second issue with these tests. Technically, they
just wanted to verify that after renormalization, no conflicts would be
present. This could have been checked for by grepping for a lack of
conflict markers, but the test instead tried to compare the working
directory files to an expected result. Unfortunately, the setting of
"text=auto" without setting core.eol to any value meant that the content
of the file (in particular, the line endings) would be
platform-dependent and the tests could only pass on some platforms.
Replace the existing comparison with a call to 'git diff --no-index
--ignore-cr-at-eol' to verify that the contents, other than possible
carriage returns in the file, match the expected results and in
particular that the file has no conflicts from the checkout -m
operation.
Signed-off-by: Elijah Newren <newren@gmail.com>
---
t/t6038-merge-text-auto.sh | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/t/t6038-merge-text-auto.sh b/t/t6038-merge-text-auto.sh
index 5e8d5fa50c..27cea15533 100755
--- a/t/t6038-merge-text-auto.sh
+++ b/t/t6038-merge-text-auto.sh
@@ -168,9 +168,9 @@ test_expect_failure 'checkout -m after setting text=auto' '
git rm -fr . &&
rm -f .gitattributes &&
git reset --hard initial &&
- git checkout a -- . &&
+ git restore --source=a -- . &&
git checkout -m b &&
- compare_files expected file
+ git diff --no-index --ignore-cr-at-eol expected file
'
test_expect_failure 'checkout -m addition of text=auto' '
@@ -183,9 +183,9 @@ test_expect_failure 'checkout -m addition of text=auto' '
git rm -fr . &&
rm -f .gitattributes file &&
git reset --hard initial &&
- git checkout b -- . &&
+ git restore --source=b -- . &&
git checkout -m a &&
- compare_files expected file
+ git diff --no-index --ignore-cr-at-eol expected file
'
test_expect_failure 'cherry-pick patch from after text=auto was added' '
--
gitgitgadget
^ permalink raw reply related [relevance 2%]
* [PATCH] Aggressive three-way merge: fix D/F case
@ 2009-10-12 2:53 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2009-10-12 2:53 UTC (permalink / raw)
To: git
When the ancestor used to have a blob "P", your tree removed it, and the
tree you are merging with also removed it, the agressive three-way cleanly
merges to remove that blob. If the other tree added a new blob "P/Q"
while removing "P", it should also merge cleanly to remove "P" and create
"P/Q" (since neither the ancestor nor your tree could have had it, so it
is a typical "created in one").
The "aggressive" rule is not new anymore. Reword the stale comment.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
* This fixes one problem in the 3-way merge with corrected tree/index
entry order the jc/fix-tree-walk topic exposes.
t/t6035-merge-dir-to-symlink.sh | 2 +-
unpack-trees.c | 13 ++++++++-----
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/t/t6035-merge-dir-to-symlink.sh b/t/t6035-merge-dir-to-symlink.sh
index b9a280e..d1b2287 100755
--- a/t/t6035-merge-dir-to-symlink.sh
+++ b/t/t6035-merge-dir-to-symlink.sh
@@ -74,7 +74,7 @@ test_expect_success 'setup a merge where dir a/b-2 changed to symlink' '
git tag test2
'
-test_expect_failure 'merge should not have conflicts (resolve)' '
+test_expect_success 'merge should not have conflicts (resolve)' '
git reset --hard &&
git checkout baseline^0 &&
git merge -s resolve test2 &&
diff --git a/unpack-trees.c b/unpack-trees.c
index c424bab..ec12341 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -767,7 +767,8 @@ int threeway_merge(struct cache_entry **stages, struct unpack_trees_options *o)
remote = NULL;
}
- /* First, if there's a #16 situation, note that to prevent #13
+ /*
+ * First, if there's a #16 situation, note that to prevent #13
* and #14.
*/
if (!same(remote, head)) {
@@ -781,7 +782,8 @@ int threeway_merge(struct cache_entry **stages, struct unpack_trees_options *o)
}
}
- /* We start with cases where the index is allowed to match
+ /*
+ * We start with cases where the index is allowed to match
* something other than the head: #14(ALT) and #2ALT, where it
* is permitted to match the result instead.
*/
@@ -811,12 +813,13 @@ int threeway_merge(struct cache_entry **stages, struct unpack_trees_options *o)
if (!head && !remote && any_anc_missing)
return 0;
- /* Under the new "aggressive" rule, we resolve mostly trivial
+ /*
+ * Under the "aggressive" rule, we resolve mostly trivial
* cases that we historically had git-merge-one-file resolve.
*/
if (o->aggressive) {
- int head_deleted = !head && !df_conflict_head;
- int remote_deleted = !remote && !df_conflict_remote;
+ int head_deleted = !head;
+ int remote_deleted = !remote;
struct cache_entry *ce = NULL;
if (index)
--
1.6.5.59.g7e3f2
^ permalink raw reply related [relevance 2%]
* [PATCH 2/2] merge: fix memory leaks in cmd_merge()
@ 2022-01-20 7:47 2% ` Elijah Newren via GitGitGadget
2022-01-22 0:05 2% ` Junio C Hamano
0 siblings, 1 reply; 200+ results
From: Elijah Newren via GitGitGadget @ 2022-01-20 7:47 UTC (permalink / raw)
To: git; +Cc: Ævar Arnfjörð Bjarmason, Elijah Newren,
Elijah Newren
From: Elijah Newren <newren@gmail.com>
There were two commit_lists created in cmd_merge() that were only
conditionally free()'d. Add a quick conditional call to
free_commit_list() for each of them at the end of the function.
Testing this commit against t6404 under valgrind shows that this patch
fixes the following two leaks:
16 bytes in 1 blocks are definitely lost in loss record 16 of 126
at 0x484086F: malloc (vg_replace_malloc.c:380)
by 0x69FFEB: do_xmalloc (wrapper.c:41)
by 0x6A0073: xmalloc (wrapper.c:62)
by 0x52A72D: commit_list_insert (commit.c:556)
by 0x47FC93: reduce_parents (merge.c:1114)
by 0x4801EE: collect_parents (merge.c:1214)
by 0x480B56: cmd_merge (merge.c:1465)
by 0x40686E: run_builtin (git.c:464)
by 0x406C51: handle_builtin (git.c:716)
by 0x406E96: run_argv (git.c:783)
by 0x40730A: cmd_main (git.c:914)
by 0x4E7DFA: main (common-main.c:56)
8 (16 direct, 32 indirect) bytes in 1 blocks are definitely lost in \
loss record 61 of 126
at 0x484086F: malloc (vg_replace_malloc.c:380)
by 0x69FFEB: do_xmalloc (wrapper.c:41)
by 0x6A0073: xmalloc (wrapper.c:62)
by 0x52A72D: commit_list_insert (commit.c:556)
by 0x52A8F2: commit_list_insert_by_date (commit.c:620)
by 0x5270AC: get_merge_bases_many_0 (commit-reach.c:413)
by 0x52716C: repo_get_merge_bases (commit-reach.c:438)
by 0x480E5A: cmd_merge (merge.c:1520)
by 0x40686E: run_builtin (git.c:464)
by 0x406C51: handle_builtin (git.c:716)
by 0x406E96: run_argv (git.c:783)
by 0x40730A: cmd_main (git.c:914)
There are still 3 leaks in chdir_notify_register() after this, but
chdir_notify_register() has been brought up on the list before and folks
were not a fan of fixing those, so I'm not touching them.
Signed-off-by: Elijah Newren <newren@gmail.com>
---
builtin/merge.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/builtin/merge.c b/builtin/merge.c
index 74e53cf20a7..bd8fff9b223 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -1273,7 +1273,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
int best_cnt = -1, merge_was_ok = 0, automerge_was_ok = 0;
struct commit_list *common = NULL;
const char *best_strategy = NULL, *wt_strategy = NULL;
- struct commit_list *remoteheads, *p;
+ struct commit_list *remoteheads = NULL, *p;
void *branch_to_free;
int orig_argc = argc;
@@ -1752,6 +1752,10 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
ret = suggest_conflicts();
done:
+ if (!automerge_was_ok) {
+ free_commit_list(common);
+ free_commit_list(remoteheads);
+ }
strbuf_release(&buf);
free(branch_to_free);
return ret;
--
gitgitgadget
^ permalink raw reply related [relevance 2%]
* [PATCH] builtin/merge: honor commit-msg hook for merges
@ 2017-09-05 21:01 2% Stefan Beller
0 siblings, 0 replies; 200+ results
From: Stefan Beller @ 2017-09-05 21:01 UTC (permalink / raw)
To: git; +Cc: Stefan Beller
Similar to 65969d43d1 (merge: honor prepare-commit-msg hook, 2011-02-14)
merge should also honor the commit-msg hook; the reason is the same as
in that commit: When a merge is stopped due to conflicts or --no-commit,
the subsequent commit calls the commit-msg hook. However, it is not
called after a clean merge. Fix this inconsistency by invoking the hook
after clean merges as well.
This change is motivated by Gerrits commit-msg hook to install a change-id
trailer into the commit message. Without such a change id, Gerrit refuses
to accept (merge) commits by default, such that the inconsistency of
(not) running commit-msg hook between commit and merge leads to confusion
and might block people from getting their work done.
Signed-off-by: Stefan Beller <sbeller@google.com>
---
builtin/merge.c | 8 ++++++++
t/t7504-commit-msg-hook.sh | 45 +++++++++++++++++++++++++++++++++++++++++----
2 files changed, 49 insertions(+), 4 deletions(-)
diff --git a/builtin/merge.c b/builtin/merge.c
index 7df3fe3927..087efd560d 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -73,6 +73,7 @@ static int show_progress = -1;
static int default_to_upstream = 1;
static int signoff;
static const char *sign_commit;
+static int no_verify;
static struct strategy all_strategy[] = {
{ "recursive", DEFAULT_TWOHEAD | NO_TRIVIAL },
@@ -236,6 +237,7 @@ static struct option builtin_merge_options[] = {
N_("GPG sign commit"), PARSE_OPT_OPTARG, NULL, (intptr_t) "" },
OPT_BOOL(0, "overwrite-ignore", &overwrite_ignore, N_("update ignored files (default)")),
OPT_BOOL(0, "signoff", &signoff, N_("add Signed-off-by:")),
+ OPT_BOOL(0, "no-verify", &no_verify, N_("bypass pre-commit and commit-msg hooks")),
OPT_END()
};
@@ -780,6 +782,12 @@ static void prepare_to_commit(struct commit_list *remoteheads)
if (launch_editor(git_path_merge_msg(), NULL, NULL))
abort_commit(remoteheads, NULL);
}
+
+ if (!no_verify && run_commit_hook(0 < option_edit, get_index_file(),
+ "commit-msg",
+ git_path_merge_msg(), NULL))
+ abort_commit(remoteheads, NULL);
+
read_merge_msg(&msg);
strbuf_stripspace(&msg, 0 < option_edit);
if (!msg.len)
diff --git a/t/t7504-commit-msg-hook.sh b/t/t7504-commit-msg-hook.sh
index 88d4cda299..1cd54af3cc 100755
--- a/t/t7504-commit-msg-hook.sh
+++ b/t/t7504-commit-msg-hook.sh
@@ -101,6 +101,10 @@ cat > "$HOOK" <<EOF
exit 1
EOF
+commit_msg_is () {
+ test "$(git log --pretty=format:%s%b -1)" = "$1"
+}
+
test_expect_success 'with failing hook' '
echo "another" >> file &&
@@ -135,6 +139,32 @@ test_expect_success '--no-verify with failing hook (editor)' '
'
+test_expect_success 'merge fails with failing hook' '
+
+ test_when_finished "git branch -D newbranch" &&
+ test_when_finished "git checkout -f master" &&
+ git checkout --orphan newbranch &&
+ : >file2 &&
+ git add file2 &&
+ git commit --no-verify file2 -m in-side-branch &&
+ test_must_fail git merge --allow-unrelated-histories master &&
+ commit_msg_is "in-side-branch" # HEAD before merge
+
+'
+
+test_expect_success 'merge bypasses failing hook with --no-verify' '
+
+ test_when_finished "git branch -D newbranch" &&
+ test_when_finished "git checkout -f master" &&
+ git checkout --orphan newbranch &&
+ : >file2 &&
+ git add file2 &&
+ git commit --no-verify file2 -m in-side-branch &&
+ git merge --no-verify --allow-unrelated-histories master &&
+ commit_msg_is "Merge branch '\''master'\'' into newbranch"
+'
+
+
chmod -x "$HOOK"
test_expect_success POSIXPERM 'with non-executable hook' '
@@ -178,10 +208,6 @@ exit 0
EOF
chmod +x "$HOOK"
-commit_msg_is () {
- test "$(git log --pretty=format:%s%b -1)" = "$1"
-}
-
test_expect_success 'hook edits commit message' '
echo "additional" >> file &&
@@ -217,7 +243,17 @@ test_expect_success "hook doesn't edit commit message (editor)" '
echo "more plus" > FAKE_MSG &&
GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit --no-verify &&
commit_msg_is "more plus"
+'
+test_expect_success 'hook called in git-merge picks up commit message' '
+ test_when_finished "git branch -D newbranch" &&
+ test_when_finished "git checkout -f master" &&
+ git checkout --orphan newbranch &&
+ : >file2 &&
+ git add file2 &&
+ git commit --no-verify file2 -m in-side-branch &&
+ git merge --allow-unrelated-histories master &&
+ commit_msg_is "new message"
'
# set up fake editor to replace `pick` by `reword`
@@ -237,4 +273,5 @@ test_expect_success 'hook is called for reword during `rebase -i`' '
'
+
test_done
--
2.14.0.rc0.3.g6c2e499285
^ permalink raw reply related [relevance 2%]
* Re: [RFC] Git rerere and non-conflicting changes during conflict resolution
2017-07-25 20:40 2% ` Junio C Hamano
@ 2017-07-25 20:58 2% ` Jeff King
1 sibling, 0 replies; 200+ results
From: Jeff King @ 2017-07-25 20:58 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Raman Gupta, git
On Tue, Jul 25, 2017 at 01:26:34PM -0700, Junio C Hamano wrote:
> This is not even a limitation but is outside the scope of rerere.
> Let's understand that first.
> [...]
> If we wanted to port the "merge-fix" logic, and I do wish it would
> happen some day, the update belongs to "git merge".
Looks like this crossed with my latest email. Overall I agree with you.
I almost said the same thing about scope initially, but I decided it
doesn't really matter. From the user's perspective there may be a tool X
that replays bits of a previous merge result. And that task can be
subdivided into replaying conflict resolution and replaying merge-fixes.
From the user's perspective, calling X "rerere" would probably be OK[1].
But from an implementation perspective (and to keep the existing
plumbing available and unchanged), it probably makes sense to call it
something else, and have it run both rerere and a new plumbing command
to do the merge-fix work (or call it nothing, and assume that users will
either touch the plumbing directly or will use "git merge" to trigger
both).
So if you want to shut down immediately the idea that this would be
bolted onto rerere, I can support that. There are ways of doing it that
would make sense to combine with rerere (like the "tying fixups to
conflict resolution" sketch I gave in the other email), but I agree they
will end up fundamentally hacky (because of the exact "you may not even
have textual conflicts" I mentioned).
The only part I'd disagree with above is that this belongs to git-merge.
I think it should be its own plumbing tool that merge calls alongside
rerere. ;)
> - Then, it looks up the database to find the keys <A, B> where
> A is in X but not in Y, and B is not in X but in Y.
> These commits are cherry-picked and squashed into the result of
> the above.
I think this is the crux of it. I mentioned in my other email that what
we really want is some way to say "this is roughly the same merge".
The Reintegrate script does it with the topic branch name and an
implicit "merging up to an integration branch".
Not having thought too hard about it yet, this containing relationship
seems like the right direction. I guess you'd do the lookup by computing
the merge-base M of <X,Y> (which we already know anyway), walking M..X
and looking for any entries which mention those commits (in either A or
B slots of the entry), and then similarly narrowing it according to
M..Y.
Hrm. That doesn't quite work, though. Because if your <A,B> are the
merge, then merging a topic to next will get an "A" that is a merge
commit from next. But that commit will never end up in master. What's
causing the conflict is really some "A" that is in the history between
the merge base and "A" (but we don't know which).
So you'd almost have to do an intersection of the left side of "$(git
merge-base A B)..A" with what's in X and Y (with respect to their merge
base). Err, maybe vice versa. But the point is that we're looking for
overlapping set unions, I think, not the presence of particular tips.
> I said A and B in the above are branch names, but in the ideal
> world, they can be commit object names (possibly in the middle of a
> branch), as long as we can reliable update the database's keys every
> time "git rebase" etc. rewrites commits.
What if instead of commit hashes we used patch ids?
There's one trick there, which is that merges don't have a well-defined
commit id. We could use its actual commit id in that case. That would
work OK in practice for a workflow like git.git's, because the merge
commits are never rewritten. But it would fall down if people do mixed
rebases and merges on their topic branches.
> To populate the database, we'd need a reverse.
>
> * When merging branch B into branch A (or the other way around) for
> the first time, "git merge" would do what it currently does.
>
> * The user then concludes the merge to resolve *ONLY* the textual
> conflict, and commit the result. It is important that no
> additional evil merge to correct for semantic conflicts is done
> in this step. Note that if the auto-merge cleanly succeeds, this
> step may not even exist.
>
> * Then the user makes another commit to correct for semantic
> conflicts (aka "merge-fix").
I think it's asking a lot for users to handle the textual conflicts and
semantic ones separately. It would be nice if we could tell them apart
automatically (and I think we can based on what isn't part of the
conflict resolution).
That still ends up with one giant "fixup" commit. But I don't know how
else you'd do it. I could make several commits, but we still don't know
how to attribute them to anything but the mass <A,B> merge. We don't
know which commits were responsible for which fixups (and I wouldn't
want to ask the user to figure it out), so the best we can do is apply
them all.
-Peff
^ permalink raw reply [relevance 2%]
* Re: [PATCH] commit: Add -f, --fixes <commit> option to add Fixes: line
@ 2013-10-28 0:49 2% ` Jim Hill
0 siblings, 0 replies; 200+ results
From: Jim Hill @ 2013-10-28 0:49 UTC (permalink / raw)
To: Josh Triplett, git
Cc: Dan Carpenter, Greg KH, ksummit-2013-discuss, ksummit-attendees,
linux-kernel
On 10/26/13 18:34, Josh Triplett wrote:
> Linux Kernel ... "Fixes:" line ... containing an abbreviated commit hash
<!-- -->
> This helps people (or automated tools) determine how far to backport
I beg pardon if I'm rehearsing an old debate, but it seems to me it
would be better and worthwhile to bring more of git to bear by adding
`reference` links as follows from considering this proposed sequence:
# ...G---B---... history-with-bug-at-B
Gprime=`git commit-tree --reference G`
Bprime=`git commit-tree --reference B -p $Gprime`
# ...G---B---... history-with-bug-at-B
# : : # <-- `:`'s are `reference` links
# G'--B' $Bprime is a mergeable cherry-pick for B
`reference` links have no enforced semantics. Teach all current logic to
ignore them (fetch doesn't fetch through them, fsck doesn't care, etc.).
Elaborating some of the good parts:
* If the author and committer data are left untouched when
`commit-tree`'s tree and message arguments are defaulted, as above, to
the referenced commit's tree and message, the resulting commit is unique.
* Bullet-proof cherry-pick creation becomes easy and idempotent:
git-make-cherry-pick() {
local picked=$1
set -- `git rev-list --parents $picked^!`
shift
local parents
local parent
local p2
for parent; do
p2="$p2 -p `git commit-tree --reference $parent`"
done
git commit-tree --reference $picked $parents`
}
* Which makes the created commit id a fully-implemented _change-id_ for
the referenced commit:
git merge $(git-make-cherry-pick $B)
can be done from anywhere, merge won't have to rely on patch-id's
to detect cherry-picks done this way.
* A bugged commit gets fixed by fixing its reference commit and merging
normally, worry-free:
...G---B ... -F Merge fix X for a bug in B
: : /
G'--B'---X X's commit message is the `Fixes:` equivalent
Bugfix commit X can be safely merged anywhere. Worst case, `git
merge -s ours --no-commit X` and do whatever you would have done otherwise.
`merge` might usefully be updated to warn about merging from a commit
with only a reference parent, I think merging from `G'` would probably
be a mistake.
---
So, this is as far as I've gotten with this, is there reason to think it
should or shouldn't be pursued?
^ permalink raw reply [relevance 2%]
* Re: [PATCH 17/16] config: add core.commentString
@ 2024-03-27 16:13 2% ` Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2024-03-27 16:13 UTC (permalink / raw)
To: Jeff King
Cc: Kristoffer Haugsbakk, Dragan Simic, Manlio Perillo,
René Scharfe, Phillip Wood, git
Jeff King <peff@peff.net> writes:
> Note that you graduated kh/doc-commentchar-is-a-byte, which says "this
> ASCII character" early in the description, which will be incorrect if my
> series is merged.
True. I could tweak this patch to force a conflict
core.commentChar::
core.commentString::
Commands such as `commit` and `tag` that let you edit
- messages consider a line that begins with this character
+ messages consider a line that begins with this string
commented, and removes them after the editor returns
(default '#').
and let the rerere database to remember the resolution (which will
tweak "string" back to "character"). But I'll prepare a merge-fix
before I forget, which is a cleaner approach.
> An alternative to using "$var cannot ..." in the error messages (if we
> don't like the all-lowercase variable name) is to just say "comment
> strings cannot ...". That vaguely covers both cases, and the message
> printed by the config code itself does mention the actual variable name
> that triggered the error.
OK, because the error() return from this function will trigger
another die() in the caller, e.g.
error: core.commentchar must have at least one character
fatal: bad config variable 'core.commentchar' in file '.git/config' at line 6
so we can afford to make the "error" side vague, except that the
"fatal" one is also downcased already, so we are not really solving
anything by making the message vague, I would think. The posted
patch as-is is prefectly fine.
Side note:
I wonder if we would later want to somehow _merge_ these two
error messages, i.e. the lower-level will notice and record the
nature of the problem instead of calling error(), and the caller
will use the recorded information while composing the "fatal"
message to die with. I actually do not know if it is a good
idea to begin with. If we want to do it right, the "record"
part probably cannot be a simple "stringify into strbuf" that
will result in lego message that is harder for i18n folks.
$ git diff refs/merge-fix/jk/core-comment-string^!
diff --git a/Documentation/config/core.txt b/Documentation/config/core.txt
index bd033ab100..bbe869c497 100644
--- a/Documentation/config/core.txt
+++ b/Documentation/config/core.txt
@@ -522,7 +522,7 @@ core.editor::
core.commentChar::
core.commentString::
Commands such as `commit` and `tag` that let you edit
- messages consider a line that begins with this ASCII character
+ messages consider a line that begins with this character
commented, and removes them after the editor returns
(default '#').
+
^ permalink raw reply related [relevance 2%]
* [BUG] "git range-diff" does not know X^! is a valid range
@ 2024-04-02 17:45 2% Junio C Hamano
2024-04-02 20:24 0% ` René Scharfe
0 siblings, 1 reply; 200+ results
From: Junio C Hamano @ 2024-04-02 17:45 UTC (permalink / raw)
To: git
When cherry-picking an existing commit X to a different base, which
may have resulted in conflicts that needed a fix-up, you would want
to be able to compare X~1..X and HEAD~1..HEAD and naturally, we
would expect "range-diff" to have a handy way to allow giving the
command without having to type the overly long branch name X twice.
Individual "diff" for these two ranges are easy to obtain without
repeating X:
$ git diff X^!
$ git diff HEAD^!
The "git range-diff" however does not understand that X^! is a valid
range X~1..X. This command throws an error and ...
$ git range-diff refs/merge-fix/ew/khash-to-khashl^! HEAD^!
fatal: need two commit ranges
... to add insult to injury, it shows the huge "git range-diff -h"
output after that.
Any takers?
^ permalink raw reply [relevance 2%]
* Re: ANNOUNCE: git-integration -- Easily manage integration branches
@ 2013-07-30 17:57 2% ` John Keeping
0 siblings, 0 replies; 200+ results
From: John Keeping @ 2013-07-30 17:57 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
On Tue, Jul 30, 2013 at 09:45:49AM -0700, Junio C Hamano wrote:
> John Keeping <john@keeping.me.uk> writes:
>
> > I wrote this script a few months ago and have been using it pretty much
> > daily since then, so I figure it's time to see if anyone else finds it
> > useful...
> >
> > git-integration [1] is a script to help manage integration branches in
> > Git. By defining a base point and a set of branches to be merged to
> > form the integration branch, git-integration lets you easily rebuild an
> > integration branch when anything in it changes, as well as showing you
> > the status of all of the branches in the integration branch.
> >
> > For example, the instruction sheet for git-integration's "pu" branch
> > recently looked like this:
> >
> > base master
> >
> > merge make-clean
> >
> > Add a "clean" target to the makefile.
> >
> > merge version
> >
> > Support for "--version" option.
> >
> > N.B. this builds on "make-clean".
> >
> > merge skip-option
> >
> > Needs more work to be able to handle "branch not found".
> >
> > This tells git-integration to base the "pu" branch on "master" and merge
> > the "make-clean", "version" and "skip-option" branches in. The comments
> > following the "merge" instructions are added to the commit message for
> > the corresponding merge commit. When I want to rebuild the "pu" branch
> > I simply do:
> >
> > $ git integration --rebuild pu
> >
> > To change the contents of the branch, I either edit the instruction
> > sheet manually:
> >
> > $ git integration --edit pu
> >
> > or quickly add a new branch from the command line:
> >
> > $ git integration --add my-new-branch pu
> >
> > In fact, I can combine these to get the benefit of bash-completion on
> > the branch name and the ability to edit the instruction sheet - when
> > multiple commands are specified, git-integration performs each of them
> > in a sensible order, described in the manpage [2].
> >
> >
> > [1] http://johnkeeping.github.io/git-integration/
> > [2] http://johnkeeping.github.io/git-integration/git-integration.html
>
> Interesting.
>
> Would it help me to replay "evil merges" I previously made and avoid
> necessity to write merge log messages repeatedly?
Currently it does nothing beyond having the ability to continue
automatically if rerere manages to resolve all conflicts (disabled by
default). There is no equivalent of your refs/merge-fix/ feature,
although I think I might add one soon ;-).
Since the commit messages for the merge commits come from the
instruction sheet, it does avoid the need to write them repeatedly - if
you want to change the merge message you can simply update the
instruction sheet and rebuild.
> In short, can I replace my Meta/Reintegrate and Meta/cook with this
> (see Documentation/howto/maintain-git.txt)?
It performs the same basic function as those scripts, but it's quite a
lot simpler and hasn't been designed for the git.git workflow, so I
don't think it's suitable for replacing your existing scripts.
If I were starting from scratch and attempting to implement the git.git
workflow on top of git-integration, I think I would make
whats-cooking.txt a build artifact generated from the instruction sheet
for pu. This would require some new commands to be added to
git-integration's instruction sheet to let it assign sections to
branches, but ought to be possible. I expect there would be some
subtleties though - certainly git-integration's "--status" output does
not handle all of the cases the Meta/cook does, not least because it
only compares against a single base branch.
^ permalink raw reply [relevance 2%]
* Re: [PATCH 21/30] repository: Implement extensions.compatObjectFormat
@ 2023-09-29 18:48 2% ` Junio C Hamano
2023-10-02 0:48 0% ` Eric W. Biederman
0 siblings, 1 reply; 200+ results
From: Junio C Hamano @ 2023-09-29 18:48 UTC (permalink / raw)
To: Eric W. Biederman; +Cc: git, brian m. carlson, Eric W. Biederman
"Eric W. Biederman" <ebiederm@gmail.com> writes:
> Did you have any manual merge conflicts you had to resolve?
> If so it is possible to see the merge result you had?
The only merge-fix I had to apply to make everything compile was
this:
diff --git a/bloom.c b/bloom.c
index ff131893cd..59eb0a0481 100644
--- a/bloom.c
+++ b/bloom.c
@@ -278,7 +278,7 @@ static int has_entries_with_high_bit(struct repository *r, struct tree *t)
struct tree_desc desc;
struct name_entry entry;
- init_tree_desc(&desc, t->buffer, t->size);
+ init_tree_desc(&desc, &t->object.oid, t->buffer, t->size);
while (tree_entry(&desc, &entry)) {
size_t i;
for (i = 0; i < entry.pathlen; i++) {
as one topic changed the function signature while the other topic
added a new callsite.
Everything else was pretty-much auto resolved, I think.
Output from "git show --cc seen" matches my recollection. The above
does appear as an evil merge.
^ permalink raw reply related [relevance 2%]
* Re: Simplify "git reset --hard"
@ 2006-05-15 7:46 2% ` Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2006-05-15 7:46 UTC (permalink / raw)
To: Linus Torvalds; +Cc: git
Junio C Hamano <junkio@cox.net> writes:
> Junio C Hamano <junkio@cox.net> writes:
>
>>> Instead, just pass in "-u" to git-read-tree when we do a hard reset, and
>>> depend on git-read-tree to update the working tree appropriately.
>>
>> Well, this is wrong. Local modifications remain after your
>> version of "git-reset --hard HEAD". which is not what we want
>> from a hard reset.
>
> ... and attempting to paper it over in git-reset.sh is also
> wrong. Keep your "--hard is noop" change in git-reset.sh and
> replace it with this would be the right fix.
-- >8 --
read-tree -u one-way merge fix to check out locally modified paths.
The "-u" flag means "update the working tree files", but to
other types of merges, it also implies "I want to keep my local
changes" -- because they prevent local changes from getting lost
by using verify_uptodate. The one-way merge is different from
other merges in that its purpose is opposite of doing something
else while keeping unrelated local changes. The point of
one-way merge is to nuke local changes. So while it feels
somewhat wrong that this actively loses local changes, it is the
right thing to do.
The earlier one marked old->ce_flags to be updated
unconditionally, but that would cause 18,000 paths to be updated
when you have only a few paths different from the HEAD you are
switching to, which is far worse than what we used to do in
git-reset by hand.
Signed-off-by: Junio C Hamano <junkio@cox.net>
---
* Third time lucky ;-)
diff --git a/read-tree.c b/read-tree.c
index 11157f4..d847c6f 100644
--- a/read-tree.c
+++ b/read-tree.c
@@ -686,6 +698,9 @@ static int oneway_merge(struct cache_ent
if (!a)
return deleted_entry(old, NULL);
if (old && same(old, a)) {
+ struct stat st;
+ if (lstat(old->name, &st) || ce_match_stat(old, &st, 1))
+ old->ce_flags |= htons(CE_UPDATE);
return keep_entry(old);
}
return merged_entry(a, NULL);
^ permalink raw reply related [relevance 2%]
* Re: [PATCH v3 00/32] object-store: lookup_commit
@ 2018-06-29 18:03 2% ` Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2018-06-29 18:03 UTC (permalink / raw)
To: Stefan Beller; +Cc: git
Junio C Hamano <gitster@pobox.com> writes:
> One technique these (not just this) recent efforts seem to be
> forgetting is to introduce "new" names that take a_repo and then
> make the existing one a thin wrapper that calls the new one with
> &the_repo as the argument.
FWIW, here is how I am resolving semantic conflicts that I found so
far while merging this topic to 'pu', which is stored in the
merge-fix/ mechanism so that I can reuse it while rebuilding 'pu'.
-- >8 --
Subject: [PATCH] merge-fix/sb/object-store-lookup
---
builtin/bisect--helper.c | 2 +-
builtin/branch-diff.c | 2 +-
commit-graph.c | 4 ++--
negotiator/default.c | 3 ++-
4 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c
index fc02f889e6..b27f645744 100644
--- a/builtin/bisect--helper.c
+++ b/builtin/bisect--helper.c
@@ -231,7 +231,7 @@ static int bisect_write(const char *state, const char *rev,
goto fail;
}
- commit = lookup_commit_reference(&oid);
+ commit = lookup_commit_reference(the_repository, &oid);
log_commit(fp, "%s", state, commit);
if (!nolog)
diff --git a/builtin/branch-diff.c b/builtin/branch-diff.c
index 8a16352e3a..b8604e3fec 100644
--- a/builtin/branch-diff.c
+++ b/builtin/branch-diff.c
@@ -329,7 +329,7 @@ static void output_pair_header(struct diff_options *diffopt, struct strbuf *buf,
strbuf_addf(buf, " %d: %s", j + 1,
find_unique_abbrev(&b_util->oid, DEFAULT_ABBREV));
- commit = lookup_commit_reference(oid);
+ commit = lookup_commit_reference(the_repository, oid);
if (commit) {
const char *commit_buffer = get_commit_buffer(commit, NULL);
const char *subject;
diff --git a/commit-graph.c b/commit-graph.c
index e4dee03679..41a0133ff7 100644
--- a/commit-graph.c
+++ b/commit-graph.c
@@ -924,7 +924,7 @@ int verify_commit_graph(struct repository *r, struct commit_graph *g)
cur_fanout_pos++;
}
- graph_commit = lookup_commit(&cur_oid);
+ graph_commit = lookup_commit(r, &cur_oid);
if (!parse_commit_in_graph_one(g, graph_commit))
graph_report("failed to parse %s from commit-graph",
oid_to_hex(&cur_oid));
@@ -950,7 +950,7 @@ int verify_commit_graph(struct repository *r, struct commit_graph *g)
hashcpy(cur_oid.hash, g->chunk_oid_lookup + g->hash_len * i);
- graph_commit = lookup_commit(&cur_oid);
+ graph_commit = lookup_commit(r, &cur_oid);
odb_commit = (struct commit *)create_object(r, cur_oid.hash, alloc_commit_node(r));
if (parse_commit_internal(odb_commit, 0, 0)) {
graph_report("failed to parse %s from object database",
diff --git a/negotiator/default.c b/negotiator/default.c
index 382fc77722..d8c92281bb 100644
--- a/negotiator/default.c
+++ b/negotiator/default.c
@@ -38,7 +38,8 @@ static void rev_list_push(struct negotiation_state *ns,
static int clear_marks(const char *refname, const struct object_id *oid,
int flag, void *cb_data)
{
- struct object *o = deref_tag(parse_object(oid), refname, 0);
+ struct object *o = deref_tag(the_repository,
+ parse_object(the_repository, oid), refname, 0);
if (o && o->type == OBJ_COMMIT)
clear_commit_marks((struct commit *)o,
--
2.18.0-129-ge3331758f1
^ permalink raw reply related [relevance 2%]
* Re: [PATCH] builtin-merge: fail properly when we are in the middle of a conflicted merge
@ 2008-08-23 19:55 2% ` Junio C Hamano
2008-08-23 19:56 2% ` [PATCH 1/2] merge: fix numerus bugs around "trivial merge" area Junio C Hamano
0 siblings, 1 reply; 200+ results
From: Junio C Hamano @ 2008-08-23 19:55 UTC (permalink / raw)
To: Miklos Vajna; +Cc: Paolo Bonzini, Jeff King, git
We've exchanged quite a few "here is a better one", "oops, that is not
enough", which is confusing to bystanders. Here is my proposed final
series, meant to be applied to 'maint'.
[1/2] merge: fix numerus bugs around "trivial merge" area
[2/2] unpack_trees(): protect the handcrafted in-core index from read_cache()
^ permalink raw reply [relevance 2%]
* Re: having to pull twice
@ 2008-09-25 23:25 2% ` Miklos Vajna
0 siblings, 0 replies; 200+ results
From: Miklos Vajna @ 2008-09-25 23:25 UTC (permalink / raw)
To: Thomas Rast; +Cc: Shawn O. Pearce, Michael P. Soulier, git
[-- Attachment #1: Type: text/plain, Size: 466 bytes --]
On Thu, Sep 25, 2008 at 09:05:02AM +0200, Thomas Rast <trast@student.ethz.ch> wrote:
> On the other hand, as near as I can tell this is a regression in
> builtin-merge. Miklos, do you know if/how this can be fixed?
I think Junio already fixed this in 446247d (merge: fix numerus bugs
around "trivial merge" area, 2008-08-23), so 1.6.0.1 or 1.6.0.2 should
not have this bug.
Michael, could you please upgrade frm 1.6.0 and confirm your problem
goes away?
Thanks.
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [relevance 2%]
* Re: Sharing merge conflict resolution between multiple developers
2014-08-11 23:29 2% ` Chris Packham
@ 2014-08-12 1:57 2% ` Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2014-08-12 1:57 UTC (permalink / raw)
To: Chris Packham; +Cc: GIT
On Mon, Aug 11, 2014 at 4:29 PM, Chris Packham <judge.packham@gmail.com> wrote:
>> So, the "recording" phase may go something like this:
>> ...
>> git checkout merge-fix/$this-$that
>> git read-tree -m -u HEAD $this
>> git commit -a -m 'merge-fix/$this-$that postimage'
>>
>> The rough idea is "git show merge-fix/$this-$that" will show the
>> "patch" you can apply on top of the conflicted state other people
>> would get by running "git merge $that" while on "$this" branch.
>
> So how would someone else pickup that postimage and use it?
>
> git checkout $this
> git merge $that
> git fetch $remote ':/merge-fix/$this-$that postimage'
> git show ':/merge-fix/$this-$that postimage' | git apply (or patch -p1)
For a simpler case that would work, but because we are not saving
just a patch but two full trees to compare (i.e. merge-fix/$this-$that
is the postimage, its ^1 is the preimage), you should be able to use
the three-way merge in a similar way cherry-pick works. In fact, that
is how rerere replays the recorded resolution, not with a "patch -p1".
^ permalink raw reply [relevance 2%]
* Re: What's cooking in git.git (Mar 2021, #06; Sat, 20)
@ 2021-03-22 18:41 2% ` Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2021-03-22 18:41 UTC (permalink / raw)
To: Matheus Tavares Bernardino; +Cc: git
Matheus Tavares Bernardino <matheus.bernardino@usp.br> writes:
> Hi, Junio
>
> On Sat, Mar 20, 2021 at 6:40 PM Junio C Hamano <gitster@pobox.com> wrote:
>>
>> * mt/parallel-checkout-part-1 (2021-03-18) 9 commits
>> (merged to 'next' on 2021-03-19 at a1bc83ad8e)
>> + entry: add checkout_entry_ca() taking preloaded conv_attrs
>> + entry: move conv_attrs lookup up to checkout_entry()
>> + entry: extract update_ce_after_write() from write_entry()
>> + entry: make fstat_output() and read_blob_entry() public
>> + entry: extract a header file for entry.c functions
>> + convert: add classification for conv_attrs struct
>> + convert: add get_stream_filter_ca() variant
>> + convert: add [async_]convert_to_working_tree_ca() variants
>> + convert: make convert_attrs() and convert structs public
>> (this branch is used by mt/parallel-checkout-part-2.)
>>
>> Preparatory API changes for parallel checkout.
>>
>> Will merge to 'master'.
>
> Sorry for my confusion, but are you going to squash the `#include
> "entry.h"` fix [1] or do you want me to re-roll this series with it?
I was planning to merge that down to 'master' as-is, with exactly
the same merge-fix to deal with the entry.h fallout that we have
been successfully using while merging the topic to 'seen' and
'next', without any need to have an explicit "oops, entry.h needs to
be included these days", but I think you are right---it would be
cleaner to keep the rebased series build by itself.
As we'll be rewinding and rebuilding 'next' soonish, let's kick the
topic out of 'next' when it happens, so that we can replace it (and
the part-2 topic that depends on it) with a reroll.
Thanks.
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (Nov 2009, #02; Sun, 08)
@ 2009-11-09 5:18 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2009-11-09 5:18 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
marked with '.' do not appear in any of the integration branches, but I am
still holding onto them.
In 1.7.0, we plan to correct handful of warts in the interfaces everybody
agrees that they were mistakes. The resulting system may not be strictly
backward compatible. Currently planeed changes are:
* refuse push to update the checked out branch in a non-bare repo by
default
Make "git push" into a repository to update the branch that is checked
out fail by default. You can countermand this default by setting a
configuration variable in the receiving repository.
http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007
* refuse push to delete the current branch by default
Make "git push $there :$killed" to delete the branch that is pointed at
by its HEAD fail by default. You can countermand this default by
setting a configuration variable in the receiving repository.
http://thread.gmane.org/gmane.comp.version-control.git/108862/focus=108936
* git-send-email won't make deep threads by default
Many people said that by default when sending more than 2 patches the
threading git-send-email makes by default is hard to read, and they
prefer the default be one cover letter and each patch as a direct
follow-up to the cover letter. You can countermand this by setting a
configuration variable.
http://article.gmane.org/gmane.comp.version-control.git/109790
* git-status won't be "git-commit --dry-run" anymore
http://thread.gmane.org/gmane.comp.version-control.git/125989/focus=125993
* "git-diff -w --exit-code" will exit success if only differences it
found are whitespace changes that are stripped away from the output.
http://thread.gmane.org/gmane.comp.version-control.git/119731/focus=119751
--------------------------------------------------
[New Topics]
* bw/autoconf-more (2009-11-04) 2 commits
- configure: add settings for gitconfig, editor and pager
- configure: add macro to set arbitrary make variables
* em/commit-claim (2009-11-04) 1 commit
- commit -c/-C/--amend: reset timestamp and authorship to committer with --reset-author
I just picked better bits from both versions.
* jk/maint-format-patch-p-suppress-stat (2009-11-04) 1 commit.
(merged to 'next' on 2009-11-08 at 0943296)
+ format-patch: make "-p" suppress diffstat
(this branch is used by bg/format-patch-doc-update.)
* bg/format-patch-doc-update (2009-11-07) 3 commits.
- format-patch documentation: Fix formatting
- format-patch documentation: Remove diff options that are not useful
- format-patch: Always generate a patch
(this branch uses jk/maint-format-patch-p-suppress-stat.)
* rj/maint-simplify-cygwin-makefile (2009-10-27) 1 commit.
- Makefile: merge two Cygwin configuration sections into one
(this branch is used by rj/cygwin-msvc.)
This is one of the most obviously correct bit from "Compiling on Cygwin
using MSVC fails" topic.
* rj/cygwin-msvc (2009-11-07) 3 commits.
- Add explicit Cygwin check to guard WIN32 header inclusion
- MSVC: Add support for building with NO_MMAP
- Makefile: keep MSVC and Cygwin configuration separate
(this branch uses rj/maint-simplify-cygwin-makefile.)
* vl/maint-openssl-signature-change (2009-10-31) 1 commit.
(merged to 'next' on 2009-10-31 at 0e1ce6b)
+ imap-send.c: fix compiler warnings for OpenSSL 1.0
Prepare ourselves before newer versions of OpenSSL hits more platforms.
* bg/fetch-multi (2009-11-08) 4 commits.
- Re-implement 'git remote update' using 'git fetch'
- Add the configure variable skipFetchAll
- Teach the --multiple option to 'git fetch'
- Teach the --all option to 'git fetch'
* bs/maint-pre-commit-hook-sample (2009-11-05) 1 commit.
(merged to 'next' on 2009-11-06 at d70f646)
+ pre-commit.sample: Diff against the empty tree when HEAD is invalid
* cc/bisect-doc (2009-11-08) 1 commit
- Documentation: add "Fighting regressions with git bisect" article
* jn/add-h-to-all-commands (2009-11-08) 1 commit.
- Show usage string for 'git grep -h'
* pb/maint-gitweb-blob-lineno (2009-11-06) 1 commit.
(merged to 'next' on 2009-11-06 at 27b86ec)
+ gitweb: Fix blob linenr links in pathinfo mode
* sb/tutorial-test (2009-11-06) 4 commits
- t1200: prepare for merging with Fast-forward bikeshedding
- t1200: further modernize test script style
- t1200: Make documentation and test agree
- t1200: cleanup and modernize test style
* pb/gitweb-no-project-list (2009-11-06) 3 commits.
. gitweb: Polish the content tags support
. gitweb: Support for no project list on gitweb front page
. gitweb: Refactor project list routines
I picked these up but didn't queue as Warthog9's comments made certain
amount of sense to me.
--------------------------------------------------
[Stalled]
* tr/filter-branch (2009-10-28) 2 commits.
- filter-branch: nearest-ancestor rewriting outside subdir filter
- filter-branch: stop special-casing $filter_subdir argument
J6t had some comments on this.
* jl/submodule-add-noname (2009-09-22) 1 commit.
- git submodule add: make the <path> parameter optional
Dscho started an interesting discussion regarding the larger workflow in
which the "submodule add" is used. I think the patch itself makes sense
but at the same time it probably makes sense to also take the <path> and
infer the <repository> as Dscho suggested, probably in "git submodule
add", not in "git add" proper, at least initially.
* sr/gfi-options (2009-09-06) 6 commits.
- fast-import: test the new option command
- fast-import: add option command
- fast-import: test the new feature command
- fast-import: add feature command
- fast-import: put marks reading in it's own function
- fast-import: put option parsing code in separate functions
Seems to be moving again soon.
* je/send-email-no-subject (2009-08-05) 1 commit.
(merged to 'next' on 2009-10-11 at 1b99c56)
+ send-email: confirm on empty mail subjects
The existing tests cover the positive case (i.e. as long as the user says
"yes" to the "do you really want to send this message that lacks subject",
the message is sent) of this feature, but the feature itself needs its own
test to verify the negative case (i.e. does it correctly stop if the user
says "no"?)
--------------------------------------------------
[Cooking]
* bg/merge-ff-only (2009-10-29) 1 commit
(merged to 'next' on 2009-10-31 at b6b49aa)
+ Teach 'git merge' and 'git pull' the option --ff-only
* jk/maint-1.6.3-ls-files-i (2009-10-30) 1 commit.
(merged to 'next' on 2009-10-31 at 3a31fcc)
+ ls-files: unbreak "ls-files -i"
* jn/editor-pager (2009-10-30) 8 commits
- Provide a build time default-pager setting
- Provide a build time default-editor setting
- am -i, git-svn: use "git var GIT_PAGER"
- add -i, send-email, svn, p4, etc: use "git var GIT_EDITOR"
- Teach git var about GIT_PAGER
- Teach git var about GIT_EDITOR
- Do not use VISUAL editor on dumb terminals
- Handle more shell metacharacters in editor names
* js/maint-diff-color-words (2009-10-30) 3 commits.
- diff --color-words: bit of clean-up
- diff --color-words -U0: fix the location of hunk headers
- t4034-diff-words: add a test for word diff without context
Fixes a corner case of running --color-words with -U0.
* sc/difftool-p4merge (2009-10-28) 1 commit
(merged to 'next' on 2009-10-31 at 194b5c5)
+ mergetool--lib: add p4merge as a pre-configured mergetool option
* sc/protocol-doc (2009-10-29) 1 commit
- Update packfile transfer protocol documentation
There is the final draft posted, but I haven't picked it up yet.
* sr/vcs-helper (2009-11-06) 12 commits
- Add Python support library for remote helpers
- Basic build infrastructure for Python scripts
- Allow helpers to request the path to the .git directory
- Allow helpers to report in "list" command that the ref is unchanged
- Allow helper to map private ref names into normal names
- Add support for "import" helper command
- Allow specifying the remote helper in the url
- Add a config option for remotes to specify a foreign vcs
- Allow fetch to modify refs
- Use a function to determine whether a remote is valid
- Allow programs to not depend on remotes having urls
- Fix memory leak in helper method for disconnect
Re-rolled series that contains Daniel's and Johan's.
* tr/describe-advice (2009-10-28) 1 commit
(merged to 'next' on 2009-10-31 at 8084850)
+ describe: when failing, tell the user about options that work
* mr/gitweb-snapshot (2009-11-07) 4 commits.
- gitweb: Smarter snapshot names
- gitweb: Document current snapshot rules via new tests
- t/gitweb-lib.sh: Split gitweb output into headers and body
(merged to 'next' on 2009-10-11 at 22ba047)
+ gitweb: check given hash before trying to create snapshot
Replaced commits near the tip with recent updates.
* jp/dirty-describe (2009-10-21) 1 commit.
(merged to 'next' on 2009-10-30 at 19c7fc7)
+ Teach "git describe" --dirty option
* jp/fetch-cull-many-refs (2009-10-25) 2 commits
(merged to 'next' on 2009-11-01 at 1f09ce9)
+ fetch: Speed up fetch of large numbers of refs
+ remote: Make ref_remove_duplicates faster for large numbers of refs
* bg/format-patch-p-noop (2009-11-04) 4 commits.
(merged to 'next' on 2009-11-08 at 6220d55)
+ Revert "format-patch -p is now a no-op" series
(merged to 'next' on 2009-10-30 at e34a3db)
+ format-patch documentation: Fix formatting
+ format-patch documentation: Remove diff options that are not useful
+ format-patch: Make implementation and documentation agree
This is now a no-op; jk/maint-format-patch-p-suppress-stat and
bg/format-patch-doc-update topics will replace this.
* jk/gitignore-anchored (2009-10-26) 1 commit
(merged to 'next' on 2009-10-30 at 9391a93)
+ gitignore: root most patterns at the top-level directory
* jk/maint-add-p-empty (2009-10-27) 1 commit.
(merged to 'next' on 2009-10-30 at 2bd302f)
+ add-interactive: handle deletion of empty files
* jk/maint-push-config (2009-10-25) 1 commit.
(merged to 'next' on 2009-10-30 at 934e3c5)
+ push: always load default config
* lt/revision-bisect (2009-10-27) 1 commit.
(merged to 'next' on 2009-10-30 at 81ee52b)
+ Add '--bisect' revision machinery argument
* jc/pretty-lf (2009-10-04) 1 commit.
- Pretty-format: %[+-]x to tweak inter-item newlines
* rs/pretty-wrap (2009-11-08) 2 commits
(merged to 'next' on 2009-11-08 at 8973fd8)
+ log --format: don't ignore %w() at the start of format string
(merged to 'next' on 2009-10-30 at 403bbfe)
+ Implement wrap format %w() as if it is a mode switch
(this branch uses js/log-rewrap.)
* js/log-rewrap (2009-10-18) 3 commits
(merged to 'next' on 2009-10-30 at 403bbfe)
+ Teach --wrap to only indent without wrapping
+ Add strbuf_add_wrapped_text() to utf8.[ch]
+ print_wrapped_text(): allow hard newlines
(this branch is used by rs/pretty-wrap.)
* sr/blame-incomplete (2009-10-19) 1 commit.
(merged to 'next' on 2009-10-22 at 133e0ce)
+ blame: make sure that the last line ends in an LF
I think this is _good enough_ as-is; although it would be better if we
added some hint to the output for Porcelain implementations, that can be
done as a follow-up fix.
* fc/doc-fast-forward (2009-10-24) 1 commit.
(merged to 'next' on 2009-11-01 at faaad90)
+ Use 'fast-forward' all over the place
* ks/precompute-completion (2009-10-26) 3 commits.
(merged to 'next' on 2009-10-28 at cd5177f)
+ completion: ignore custom merge strategies when pre-generating
(merged to 'next' on 2009-10-22 at f46a28a)
+ bug: precomputed completion includes scripts sources
(merged to 'next' on 2009-10-14 at adf722a)
+ Speedup bash completion loading
* sp/smart-http (2009-11-04) 30 commits
(merged to 'next' on 2009-11-06 at 666837c)
+ http-backend: Test configuration options
+ http-backend: Use http.getanyfile to disable dumb HTTP serving
+ test smart http fetch and push
+ http tests: use /dumb/ URL prefix
+ set httpd port before sourcing lib-httpd
+ t5540-http-push: remove redundant fetches
+ Smart HTTP fetch: gzip requests
+ Smart fetch over HTTP: client side
+ Smart push over HTTP: client side
+ Discover refs via smart HTTP server when available
+ http-backend: more explict LocationMatch
+ http-backend: add example for gitweb on same URL
+ http-backend: use mod_alias instead of mod_rewrite
+ http-backend: reword some documentation
+ http-backend: add GIT_PROJECT_ROOT environment var
+ Smart fetch and push over HTTP: server side
+ Add stateless RPC options to upload-pack, receive-pack
+ Git-aware CGI to provide dumb HTTP transport
+ remote-helpers: return successfully if everything up-to-date
+ Move WebDAV HTTP push under remote-curl
+ remote-helpers: Support custom transport options
+ remote-helpers: Fetch more than one ref in a batch
+ fetch: Allow transport -v -v -v to set verbosity to 3
+ remote-curl: Refactor walker initialization
+ Add multi_ack_detailed capability to fetch-pack/upload-pack
+ Move "get_ack()" back to fetch-pack
+ fetch-pack: Use a strbuf to compose the want list
+ pkt-line: Make packet_read_line easier to debug
+ pkt-line: Add strbuf based functions
+ http-push: fix check condition on http.c::finish_http_pack_request()
v5 plus 3 more fix-up patches, started cooking in 'next'.
* ef/msys-imap (2009-10-22) 9 commits.
(merged to 'next' on 2009-10-31 at 8630603)
+ Windows: use BLK_SHA1 again
+ MSVC: Enable OpenSSL, and translate -lcrypto
+ mingw: enable OpenSSL
+ mingw: wrap SSL_set_(w|r)fd to call _get_osfhandle
+ imap-send: build imap-send on Windows
+ imap-send: fix compilation-error on Windows
+ imap-send: use run-command API for tunneling
+ imap-send: use separate read and write fds
+ imap-send: remove useless uid code
* jc/fix-tree-walk (2009-10-22) 11 commits.
(merged to 'next' on 2009-10-22 at 10c0c8f)
+ Revert failed attempt since 353c5ee
+ read-tree --debug-unpack
(merged to 'next' on 2009-10-11 at 0b058e2)
+ unpack-trees.c: look ahead in the index
+ unpack-trees.c: prepare for looking ahead in the index
+ Aggressive three-way merge: fix D/F case
+ traverse_trees(): handle D/F conflict case sanely
+ more D/F conflict tests
+ tests: move convenience regexp to match object names to test-lib.sh
+ unpack_callback(): use unpack_failed() consistently
+ unpack-trees: typofix
+ diff-lib.c: fix misleading comments on oneway_diff()
This has some stupid bugs and temporarily reverted from 'next' until I can
fix it, but the "temporarily" turned out to be very loooong. Sigh...
* jh/notes (2009-10-09) 22 commits.
- fast-import: Proper notes tree manipulation using the notes API
- Refactor notes concatenation into a flexible interface for combining notes
- Notes API: Allow multiple concurrent notes trees with new struct notes_tree
- Notes API: for_each_note(): Traverse the entire notes tree with a callback
- Notes API: get_note(): Return the note annotating the given object
- Notes API: add_note(): Add note objects to the internal notes tree structure
- Notes API: init_notes(): Initialize the notes tree from the given notes ref
- Notes API: get_commit_notes() -> format_note() + remove the commit restriction
(merged to 'next' on 2009-11-01 at 948327a)
+ Add selftests verifying concatenation of multiple notes for the same commit
+ Refactor notes code to concatenate multiple notes annotating the same object
+ Add selftests verifying that we can parse notes trees with various fanouts
+ Teach the notes lookup code to parse notes trees with various fanout schemes
+ Teach notes code to free its internal data structures on request
+ Add '%N'-format for pretty-printing commit notes
+ Add flags to get_commit_notes() to control the format of the note string
+ t3302-notes-index-expensive: Speed up create_repo()
+ fast-import: Add support for importing commit notes
+ Teach "-m <msg>" and "-F <file>" to "git notes edit"
+ Add an expensive test for git-notes
+ Speed up git notes lookup
+ Add a script to edit/inspect notes
+ Introduce commit notes
* jn/gitweb-blame (2009-09-01) 5 commits.
- gitweb: Minify gitweb.js if JSMIN is defined
- gitweb: Create links leading to 'blame_incremental' using JavaScript
(merged to 'next' on 2009-10-11 at 73c4a83)
+ gitweb: Colorize 'blame_incremental' view during processing
+ gitweb: Incremental blame (using JavaScript)
+ gitweb: Add optional "time to generate page" info in footer
Ajax-y blame.
* nd/sparse (2009-08-20) 19 commits.
- sparse checkout: inhibit empty worktree
- Add tests for sparse checkout
- read-tree: add --no-sparse-checkout to disable sparse checkout support
- unpack-trees(): ignore worktree check outside checkout area
- unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index
- unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout
- unpack-trees.c: generalize verify_* functions
- unpack-trees(): add CE_WT_REMOVE to remove on worktree alone
- Introduce "sparse checkout"
- dir.c: export excluded_1() and add_excludes_from_file_1()
- excluded_1(): support exclude files in index
- unpack-trees(): carry skip-worktree bit over in merged_entry()
- Read .gitignore from index if it is skip-worktree
- Avoid writing to buffer in add_excludes_from_file_1()
- Teach Git to respect skip-worktree bit (writing part)
- Teach Git to respect skip-worktree bit (reading part)
- Introduce "skip-worktree" bit in index, teach Git to get/set this bit
- Add test-index-version
- update-index: refactor mark_valid() in preparation for new options
--------------------------------------------------
[For 1.7.0]
* jc/1.7.0-no-commit-no-ff-2 (2009-10-22) 1 commit.
- git-merge: forbid fast-forward and up-to-date when --no-commit is given
This makes "git merge --no-commit" fail when it results in fast-forward or
up-to-date. I haven't described this at the beginning of this message
yet, as it is not clear if this change is even necessary. Opinions?
* jk/1.7.0-status (2009-09-05) 5 commits.
- docs: note that status configuration affects only long format
(merged to 'next' on 2009-10-11 at 65c8513)
+ commit: support alternate status formats
+ status: add --porcelain output format
+ status: refactor format option parsing
+ status: refactor short-mode printing to its own function
(this branch uses jc/1.7.0-status.)
Gives the --short output format to post 1.7.0 "git commit --dry-run" that
is similar to that of post 1.7.0 "git status".
The tip one is not in 'next' as I have been hoping that somebody may want
to change the code to make it unnecessary, but it does not seem to be
happening, so probably it should also go to 'next'.
* jc/1.7.0-status (2009-09-05) 4 commits.
(merged to 'next' on 2009-10-11 at 9558627)
+ status: typo fix in usage
+ git status: not "commit --dry-run" anymore
+ git stat -s: short status output
+ git stat: the beginning of "status that is not a dry-run of commit"
(this branch is used by jk/1.7.0-status.)
With this, "git status" is no longer "git commit --dry-run".
* jc/1.7.0-send-email-no-thread-default (2009-08-22) 1 commit.
(merged to 'next' on 2009-10-11 at 043acdf)
+ send-email: make --no-chain-reply-to the default
* jc/1.7.0-diff-whitespace-only-status (2009-08-30) 4 commits.
(merged to 'next' on 2009-10-11 at 546c74d)
+ diff.c: fix typoes in comments
+ Make test case number unique
+ diff: Rename QUIET internal option to QUICK
+ diff: change semantics of "ignore whitespace" options
This changes exit code from "git diff --ignore-whitespace" and friends
when there is no actual output. It is a backward incompatible change, but
we could argue that it is a bugfix.
* jc/1.7.0-push-safety (2009-02-09) 2 commits.
(merged to 'next' on 2009-10-11 at 81b8128)
+ Refuse deleting the current branch via push
+ Refuse updating the current branch in a non-bare repository via push
--------------------------------------------------
[I have been too busy to purge these]
* ne/rev-cache (2009-10-19) 7 commits.
. support for commit grafts, slight change to general mechanism
. support for path name caching in rev-cache
. full integration of rev-cache into git, completed test suite
. administrative functions for rev-cache, start of integration into git
. support for non-commit object caching in rev-cache
. basic revision cache system, no integration or features
. man page and technical discussion for rev-cache
The author indicated that there is another round coming. Does not seem to
pass the tests when merged to 'pu', so it has been ejected for now.
* jc/log-tz (2009-03-03) 1 commit.
- Allow --date=local --date=other-format to work as expected
Maybe some people care about this. I dunno.
* jc/mailinfo-remove-brackets (2009-07-15) 1 commit.
- mailinfo: -b option keeps [bracketed] strings that is not a [PATCH] marker
Maybe some people care about this. I dunno.
* jg/log-format-body-indent (2009-09-19) 1 commit.
. git-log --format: Add %B tag with %B(x) option
* db/vcs-helper-rest (2009-10-27) 7 commits.
. Fix memory leak in helper method for disconnect
. Allow helpers to report in "list" command that the ref is unchanged
. Add support for "import" helper command
. Add a config option for remotes to specify a foreign vcs
. Allow programs to not depend on remotes having urls
. Allow fetch to modify refs
. Use a function to determine whether a remote is valid
(this branch is used by jh/cvs-helper.)
* jc/log-stdin (2009-11-03) 1 commit
. Teach --stdin option to "log" family
* jh/cvs-helper (2009-08-18) 8 commits.
. More fixes to the git-remote-cvs installation procedure
. Fix the Makefile-generated path to the git_remote_cvs package in git-remote-cvs
. Add simple selftests of git-remote-cvs functionality
. git-remote-cvs: Remote helper program for CVS repositories
. 2/2: Add Python support library for CVS remote helper
. 1/2: Add Python support library for CVS remote helper
. Basic build infrastructure for Python scripts
. Allow helpers to request marks for fast-import
(this branch uses db/vcs-helper-rest.)
^ permalink raw reply [relevance 2%]
* Re: Premerging topics
@ 2013-04-29 22:19 2% ` Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2013-04-29 22:19 UTC (permalink / raw)
To: Antoine Pelisse; +Cc: Johan Herland, Michael Haggerty, Jeff King, git
Antoine Pelisse <apelisse@gmail.com> writes:
> Should we think about adding some commands for that ?
>
> On the very top of my head (there is certainly more than that):
> - Save such a change: By basically creating a ref to HEAD (HEAD being
> the commit, HEAD^ the fixed merge) with merge-fix/HEAD^^1-HEAD^^2
> - Apply the merge-fix: On top of a merge, find the most recent
> merge-fix for HEAD^1/HEAD^2 (according to what was discussed), and
> squash it.
Yeah, some nasties may live in the details, but these two operations
are needed and probably sufficient as the end-user facing UI.
The "save" step, when done manually, needs to be a two-step process
that saves M and then F separately, but somebody _might_ be able to
come up with a clever idea to let the user jump directly to F
without recording M. If such a triangle (A and B merges to F) can
be recorded as merge-fix/A-B, that would certainly be less error
prone and easier for the users to use. Having said that, in the
presense of possible textual conflicts when creating M, I do not
think of a way that is easily implementable mechanically to
internally sift changes for M and F when replaying it while
resolving a merge between X and Y to produce N and eventually F'.
The "apply" step should be a single step, and it should be easy to
implement mechanically if M and F are recorded separately (but
again, you may be able to re-synthesise M from A and B when you need
to replay the evil merge).
^ permalink raw reply [relevance 2%]
* Re: [RFC] Rebasing merges: a jorney to the ultimate solution (Road Clear)
@ 2018-03-08 8:18 2% ` Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2018-03-08 8:18 UTC (permalink / raw)
To: Johannes Schindelin
Cc: Phillip Wood, Sergey Organov, Igor Djordjevic, phillip.wood,
Git mailing list, Jacob Keller, Johannes Sixt
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
>> Non-textual semantic conflicts are made (in the best case just once)
>> as a separate commit on top of mechanical auto-merge whose focus is
>> predictability (rather than cleverness) done by Git, and then that
>> separate commit is kept outside the history. When replaying these
>> merges to rebuild the 'pu' branch, after resetting the tip to
>> 'master', each topic is merged mechanically, and if such a fix-up
>> commit is present, "cherry-pick --no-commit" applies it and then
>> "commit --amend --no-edit" to adjust the merge. I find it quite
>> valuable to have a separate record of what "evil" non-mechanical
>> adjustment was done, which I know won't be lost in the noise when
>> these merges need to be redone daily or more often.
>
> So essentially, you have something that `git rerere` would have learned,
> but as a commit?
You probably wouldn't be asking that if you read what you cut out
when you quoted above ;-)
There are a collection of cherry-pickable commits in hierarchy under
refs/merge-fix. They are indexed by the branch that will cause
semantic conflicts that do not involve textual conflicts at all (the
important implication of which is that 'rerere' fundamentally will
not trigger to help resolving them) [*1*], and are used to create
evil merge when a corresponding branch is merged to 'pu' (and down).
[Footnote]
*1* One topic adds an extra parameter to read_index_from() that has
been and still is defined in a file and merged to 'pu' first, while
another topic adds a new callsite for the same function in a file
that the former topic does not touch, hence a merge of the latter
topic has no textual conflict to the file with a new callsite, but
still needs adjusting. That sort of think.
^ permalink raw reply [relevance 2%]
* Re: [PATCH 0/6] Fix misuses of "nor"
@ 2014-03-15 8:56 2% ` Duy Nguyen
0 siblings, 0 replies; 200+ results
From: Duy Nguyen @ 2014-03-15 8:56 UTC (permalink / raw)
To: Justin Lebar; +Cc: Git Mailing List, Richard Hansen, Jiang Xin
On Sat, Mar 15, 2014 at 3:41 PM, Justin Lebar <jlebar@google.com> wrote:
> I got annoyed by git's awkward use of "nor" in man pages and in git add -p, so
> I went ahead and audited all uses of "nor" in the tree. One might be able to
> argue that some of the uses I've changed are technically acceptable, but that's
> a pretty low bar to set for ourselves. I aimed to make everything both correct
> and idiomatic.
I guess I'm cc'd because I made a few of those or/nor mistakes. Being
a non-native English speaker I'm not really qualified to review this.
But I suggest that you merge "Fix misuses of "nor" outside comments"
and "Tests: Fix muses of "nor"" into one. Otherwise you break the test
suite at 5/6 (and 6/6 fixes it, but breaking the test suite at any
commit is not very bisect-friendly).
--
Duy
^ permalink raw reply [relevance 2%]
* [PATCH v4 2/2] merge: fix swapped "up to date" message components
@ 2021-05-02 5:14 2% ` Eric Sunshine
0 siblings, 0 replies; 200+ results
From: Eric Sunshine @ 2021-05-02 5:14 UTC (permalink / raw)
To: git; +Cc: Josh Soref, Junio C Hamano, Elijah Newren, Eric Sunshine
From: Josh Soref <jsoref@gmail.com>
The rewrite of git-merge from shell to C in 1c7b76be7d (Build in merge,
2008-07-07) accidentally transformed the message:
Already up-to-date. (nothing to squash)
to:
(nothing to squash)Already up-to-date.
due to reversed printf() arguments. This problem has gone unnoticed
despite being touched over the years by 7f87aff22c (Teach/Fix pull/fetch
-q/-v options, 2008-11-15) and bacec47845 (i18n: git-merge basic
messages, 2011-02-22), and tangentially by bef4830e88 (i18n: merge: mark
messages for translation, 2016-06-17) and 7560f547e6 (treewide: correct
several "up-to-date" to "up to date", 2017-08-23).
Fix it by restoring the message to its intended order. While at it, help
translators out by avoiding "sentence Lego".
[es: rewrote commit message]
Co-authored-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Josh Soref <jsoref@gmail.com>
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
---
builtin/merge.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/builtin/merge.c b/builtin/merge.c
index 3472a0ce3b..eddb8ae70d 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -393,10 +393,14 @@ static void restore_state(const struct object_id *head,
}
/* This is called when no merge was necessary. */
-static void finish_up_to_date(const char *msg)
+static void finish_up_to_date(void)
{
- if (verbosity >= 0)
- printf("%s%s\n", squash ? _(" (nothing to squash)") : "", msg);
+ if (verbosity >= 0) {
+ if (squash)
+ puts(_("Already up to date. (nothing to squash)"));
+ else
+ puts(_("Already up to date."));
+ }
remove_merge_branch_state(the_repository);
}
@@ -1522,7 +1526,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
* If head can reach all the merge then we are up to date.
* but first the most common case of merging one remote.
*/
- finish_up_to_date(_("Already up to date."));
+ finish_up_to_date();
goto done;
} else if (fast_forward != FF_NO && !remoteheads->next &&
!common->next &&
@@ -1610,7 +1614,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
}
}
if (up_to_date) {
- finish_up_to_date(_("Already up to date."));
+ finish_up_to_date();
goto done;
}
}
--
2.31.1.607.g51e8a6a459
^ permalink raw reply related [relevance 2%]
* [PATCH v3 2/7] merge-resolve: abort if index does not match HEAD
@ 2022-07-21 8:16 2% ` Elijah Newren via GitGitGadget
2022-07-21 8:16 2% ` [PATCH v3 3/7] merge: do not abort early if one strategy fails to handle the merge Elijah Newren via GitGitGadget
` (2 subsequent siblings)
3 siblings, 0 replies; 200+ results
From: Elijah Newren via GitGitGadget @ 2022-07-21 8:16 UTC (permalink / raw)
To: git
Cc: ZheNing Hu, Eric Sunshine, Junio C Hamano,
Ævar Arnfjörð Bjarmason, Elijah Newren,
Elijah Newren, Elijah Newren
From: Elijah Newren <newren@gmail.com>
As noted in commit 9822175d2b ("Ensure index matches head before
invoking merge machinery, round N", 2019-08-17), we have had a very
long history of problems with failing to enforce the requirement that
index matches HEAD when starting a merge. One of the commits
referenced in the long tale of issues arising from lax enforcement of
this requirement was commit 55f39cf755 ("merge: fix misleading
pre-merge check documentation", 2018-06-30), which tried to document
the requirement and noted there were some exceptions. As mentioned in
that commit message, the `resolve` strategy was the one strategy that
did not have an explicit index matching HEAD check, and the reason it
didn't was that I wasn't able to discover any cases where the
implementation would fail to catch the problem and abort, and didn't
want to introduce unnecessary performance overhead of adding another
check.
Well, today I discovered a testcase where the implementation does not
catch the problem and so an explicit check is needed. Add a testcase
that previously would have failed, and update git-merge-resolve.sh to
have an explicit check. Note that the code is copied from 3ec62ad9ff
("merge-octopus: abort if index does not match HEAD", 2016-04-09), so
that we reuse the same message and avoid making translators need to
translate some new message.
Signed-off-by: Elijah Newren <newren@gmail.com>
---
builtin/merge.c | 20 ++++++++++++++++++
git-merge-resolve.sh | 10 +++++++++
t/t6424-merge-unrelated-index-changes.sh | 26 ++++++++++++++++++++++++
3 files changed, 56 insertions(+)
diff --git a/builtin/merge.c b/builtin/merge.c
index 23170f2d2a6..13884b8e836 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -1599,6 +1599,26 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
*/
refresh_cache(REFRESH_QUIET);
if (allow_trivial && fast_forward != FF_ONLY) {
+ /*
+ * Must first ensure that index matches HEAD before
+ * attempting a trivial merge.
+ */
+ struct tree *head_tree = get_commit_tree(head_commit);
+ struct strbuf sb = STRBUF_INIT;
+
+ if (repo_index_has_changes(the_repository, head_tree,
+ &sb)) {
+ struct strbuf err = STRBUF_INIT;
+ strbuf_addstr(&err, "error: ");
+ strbuf_addf(&err, _("Your local changes to the following files would be overwritten by merge:\n %s"),
+ sb.buf);
+ strbuf_addch(&err, '\n');
+ fputs(err.buf, stderr);
+ strbuf_release(&err);
+ strbuf_release(&sb);
+ return -1;
+ }
+
/* See if it is really trivial. */
git_committer_info(IDENT_STRICT);
printf(_("Trying really trivial in-index merge...\n"));
diff --git a/git-merge-resolve.sh b/git-merge-resolve.sh
index 343fe7bccd0..77e93121bf8 100755
--- a/git-merge-resolve.sh
+++ b/git-merge-resolve.sh
@@ -5,6 +5,16 @@
#
# Resolve two trees, using enhanced multi-base read-tree.
+. git-sh-setup
+
+# Abort if index does not match HEAD
+if ! git diff-index --quiet --cached HEAD --
+then
+ gettextln "Error: Your local changes to the following files would be overwritten by merge"
+ git diff-index --cached --name-only HEAD -- | sed -e 's/^/ /'
+ exit 2
+fi
+
# The first parameters up to -- are merge bases; the rest are heads.
bases= head= remotes= sep_seen=
for arg
diff --git a/t/t6424-merge-unrelated-index-changes.sh b/t/t6424-merge-unrelated-index-changes.sh
index b6e424a427b..f35d3182b86 100755
--- a/t/t6424-merge-unrelated-index-changes.sh
+++ b/t/t6424-merge-unrelated-index-changes.sh
@@ -114,6 +114,32 @@ test_expect_success 'resolve, non-trivial' '
test_path_is_missing .git/MERGE_HEAD
'
+test_expect_success 'resolve, trivial, related file removed' '
+ git reset --hard &&
+ git checkout B^0 &&
+
+ git rm a &&
+ test_path_is_missing a &&
+
+ test_must_fail git merge -s resolve C^0 &&
+
+ test_path_is_missing a &&
+ test_path_is_missing .git/MERGE_HEAD
+'
+
+test_expect_success 'resolve, non-trivial, related file removed' '
+ git reset --hard &&
+ git checkout B^0 &&
+
+ git rm a &&
+ test_path_is_missing a &&
+
+ test_must_fail git merge -s resolve D^0 &&
+
+ test_path_is_missing a &&
+ test_path_is_missing .git/MERGE_HEAD
+'
+
test_expect_success 'recursive' '
git reset --hard &&
git checkout B^0 &&
--
gitgitgadget
^ permalink raw reply related [relevance 2%]
* [PATCH v4 2/7] merge-resolve: abort if index does not match HEAD
@ 2022-07-22 5:15 2% ` Elijah Newren via GitGitGadget
2022-07-22 5:15 2% ` [PATCH v4 4/7] merge: fix save_state() to work when there are stat-dirty files Elijah Newren via GitGitGadget
` (2 subsequent siblings)
3 siblings, 0 replies; 200+ results
From: Elijah Newren via GitGitGadget @ 2022-07-22 5:15 UTC (permalink / raw)
To: git
Cc: ZheNing Hu, Eric Sunshine, Junio C Hamano, Elijah Newren,
Elijah Newren, Elijah Newren
From: Elijah Newren <newren@gmail.com>
As noted in commit 9822175d2b ("Ensure index matches head before
invoking merge machinery, round N", 2019-08-17), we have had a very
long history of problems with failing to enforce the requirement that
index matches HEAD when starting a merge. One of the commits
referenced in the long tale of issues arising from lax enforcement of
this requirement was commit 55f39cf755 ("merge: fix misleading
pre-merge check documentation", 2018-06-30), which tried to document
the requirement and noted there were some exceptions. As mentioned in
that commit message, the `resolve` strategy was the one strategy that
did not have an explicit index matching HEAD check, and the reason it
didn't was that I wasn't able to discover any cases where the
implementation would fail to catch the problem and abort, and didn't
want to introduce unnecessary performance overhead of adding another
check.
Well, today I discovered a testcase where the implementation does not
catch the problem and so an explicit check is needed. Add a testcase
that previously would have failed, and update git-merge-resolve.sh to
have an explicit check. Note that the code is copied from 3ec62ad9ff
("merge-octopus: abort if index does not match HEAD", 2016-04-09), so
that we reuse the same message and avoid making translators need to
translate some new message.
Signed-off-by: Elijah Newren <newren@gmail.com>
---
builtin/merge.c | 20 ++++++++++++++++++
git-merge-resolve.sh | 10 +++++++++
t/t6424-merge-unrelated-index-changes.sh | 26 ++++++++++++++++++++++++
3 files changed, 56 insertions(+)
diff --git a/builtin/merge.c b/builtin/merge.c
index 23170f2d2a6..13884b8e836 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -1599,6 +1599,26 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
*/
refresh_cache(REFRESH_QUIET);
if (allow_trivial && fast_forward != FF_ONLY) {
+ /*
+ * Must first ensure that index matches HEAD before
+ * attempting a trivial merge.
+ */
+ struct tree *head_tree = get_commit_tree(head_commit);
+ struct strbuf sb = STRBUF_INIT;
+
+ if (repo_index_has_changes(the_repository, head_tree,
+ &sb)) {
+ struct strbuf err = STRBUF_INIT;
+ strbuf_addstr(&err, "error: ");
+ strbuf_addf(&err, _("Your local changes to the following files would be overwritten by merge:\n %s"),
+ sb.buf);
+ strbuf_addch(&err, '\n');
+ fputs(err.buf, stderr);
+ strbuf_release(&err);
+ strbuf_release(&sb);
+ return -1;
+ }
+
/* See if it is really trivial. */
git_committer_info(IDENT_STRICT);
printf(_("Trying really trivial in-index merge...\n"));
diff --git a/git-merge-resolve.sh b/git-merge-resolve.sh
index 343fe7bccd0..77e93121bf8 100755
--- a/git-merge-resolve.sh
+++ b/git-merge-resolve.sh
@@ -5,6 +5,16 @@
#
# Resolve two trees, using enhanced multi-base read-tree.
+. git-sh-setup
+
+# Abort if index does not match HEAD
+if ! git diff-index --quiet --cached HEAD --
+then
+ gettextln "Error: Your local changes to the following files would be overwritten by merge"
+ git diff-index --cached --name-only HEAD -- | sed -e 's/^/ /'
+ exit 2
+fi
+
# The first parameters up to -- are merge bases; the rest are heads.
bases= head= remotes= sep_seen=
for arg
diff --git a/t/t6424-merge-unrelated-index-changes.sh b/t/t6424-merge-unrelated-index-changes.sh
index b6e424a427b..f35d3182b86 100755
--- a/t/t6424-merge-unrelated-index-changes.sh
+++ b/t/t6424-merge-unrelated-index-changes.sh
@@ -114,6 +114,32 @@ test_expect_success 'resolve, non-trivial' '
test_path_is_missing .git/MERGE_HEAD
'
+test_expect_success 'resolve, trivial, related file removed' '
+ git reset --hard &&
+ git checkout B^0 &&
+
+ git rm a &&
+ test_path_is_missing a &&
+
+ test_must_fail git merge -s resolve C^0 &&
+
+ test_path_is_missing a &&
+ test_path_is_missing .git/MERGE_HEAD
+'
+
+test_expect_success 'resolve, non-trivial, related file removed' '
+ git reset --hard &&
+ git checkout B^0 &&
+
+ git rm a &&
+ test_path_is_missing a &&
+
+ test_must_fail git merge -s resolve D^0 &&
+
+ test_path_is_missing a &&
+ test_path_is_missing .git/MERGE_HEAD
+'
+
test_expect_success 'recursive' '
git reset --hard &&
git checkout B^0 &&
--
gitgitgadget
^ permalink raw reply related [relevance 2%]
* [PATCH 1/3] octopus: make merge process simpler to follow
@ 2009-12-12 0:38 2% ` Stephen Boyd
0 siblings, 0 replies; 200+ results
From: Stephen Boyd @ 2009-12-12 0:38 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano, Jari Aalto
Its not very easy to understand what heads are being merged given
the current output of an octopus merge. Fix this by replacing the
sha1 with the (usually) better description in GITHEAD_<SHA1>.
Suggested-by: Jari Aalto <jari.aalto@cante.net>
Signed-off-by: Stephen Boyd <bebarino@gmail.com>
---
Maybe this will work? At least it will replace the sha1 with
whatever is given on the command line.
git-merge-octopus.sh | 9 +++++----
t/t7602-merge-octopus-many.sh | 33 +++++++++++++++++++++++++++++++++
2 files changed, 38 insertions(+), 4 deletions(-)
diff --git a/git-merge-octopus.sh b/git-merge-octopus.sh
index 825c52c..1c8ee0a 100755
--- a/git-merge-octopus.sh
+++ b/git-merge-octopus.sh
@@ -61,12 +61,13 @@ do
exit 2
esac
+ pretty_name="$(eval echo \$GITHEAD_$SHA1)"
common=$(git merge-base --all $SHA1 $MRC) ||
- die "Unable to find common commit with $SHA1"
+ die "Unable to find common commit with $pretty_name"
case "$LF$common$LF" in
*"$LF$SHA1$LF"*)
- echo "Already up-to-date with $SHA1"
+ echo "Already up-to-date with $pretty_name"
continue
;;
esac
@@ -81,7 +82,7 @@ do
# tree as the intermediate result of the merge.
# We still need to count this as part of the parent set.
- echo "Fast-forwarding to: $SHA1"
+ echo "Fast-forwarding to: $pretty_name"
git read-tree -u -m $head $SHA1 || exit
MRC=$SHA1 MRT=$(git write-tree)
continue
@@ -89,7 +90,7 @@ do
NON_FF_MERGE=1
- echo "Trying simple merge with $SHA1"
+ echo "Trying simple merge with $pretty_name"
git read-tree -u -m --aggressive $common $MRT $SHA1 || exit 2
next=$(git write-tree 2>/dev/null)
if test $? -ne 0
diff --git a/t/t7602-merge-octopus-many.sh b/t/t7602-merge-octopus-many.sh
index 01e5415..7377033 100755
--- a/t/t7602-merge-octopus-many.sh
+++ b/t/t7602-merge-octopus-many.sh
@@ -49,4 +49,37 @@ test_expect_success 'merge c1 with c2, c3, c4, ... c29' '
done
'
+cat >expected <<\EOF
+Trying simple merge with c2
+Trying simple merge with c3
+Trying simple merge with c4
+Merge made by octopus.
+ c2.c | 1 +
+ c3.c | 1 +
+ c4.c | 1 +
+ 3 files changed, 3 insertions(+), 0 deletions(-)
+ create mode 100644 c2.c
+ create mode 100644 c3.c
+ create mode 100644 c4.c
+EOF
+
+test_expect_success 'merge output uses pretty names' '
+ git reset --hard c1 &&
+ git merge c2 c3 c4 >actual &&
+ test_cmp actual expected
+'
+
+cat >expected <<\EOF
+Already up-to-date with c4
+Trying simple merge with c5
+Merge made by octopus.
+ c5.c | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+ create mode 100644 c5.c
+EOF
+
+test_expect_success 'merge up-to-date output uses pretty names' '
+ git merge c4 c5 >actual &&
+ test_cmp actual expected
+'
test_done
--
1.6.6.rc1.45.g9aadbb
^ permalink raw reply related [relevance 2%]
* [PATCH] octopus: make merge process simpler to follow
@ 2009-12-15 6:49 2% ` Stephen Boyd
0 siblings, 0 replies; 200+ results
From: Stephen Boyd @ 2009-12-15 6:49 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano, Johannes Sixt, Jari Aalto
Its not very easy to understand what heads are being merged given
the current output of an octopus merge. Fix this by replacing the
sha1 with the (usually) better description in GITHEAD_<SHA1>.
Suggested-by: Jari Aalto <jari.aalto@cante.net>
Signed-off-by: Stephen Boyd <bebarino@gmail.com>
---
Thanks both. Here's a replacement. Let me know if you want a reroll.
git-merge-octopus.sh | 11 +++++++----
t/t7602-merge-octopus-many.sh | 33 +++++++++++++++++++++++++++++++++
2 files changed, 40 insertions(+), 4 deletions(-)
diff --git a/git-merge-octopus.sh b/git-merge-octopus.sh
index 825c52c..417e8fb 100755
--- a/git-merge-octopus.sh
+++ b/git-merge-octopus.sh
@@ -61,12 +61,15 @@ do
exit 2
esac
+ eval pretty_name="\$GITHEAD_$SHA1"
+ : ${pretty_name:=$SHA1}
+
common=$(git merge-base --all $SHA1 $MRC) ||
- die "Unable to find common commit with $SHA1"
+ die "Unable to find common commit with $pretty_name"
case "$LF$common$LF" in
*"$LF$SHA1$LF"*)
- echo "Already up-to-date with $SHA1"
+ echo "Already up-to-date with $pretty_name"
continue
;;
esac
@@ -81,7 +84,7 @@ do
# tree as the intermediate result of the merge.
# We still need to count this as part of the parent set.
- echo "Fast-forwarding to: $SHA1"
+ echo "Fast-forwarding to: $pretty_name"
git read-tree -u -m $head $SHA1 || exit
MRC=$SHA1 MRT=$(git write-tree)
continue
@@ -89,7 +92,7 @@ do
NON_FF_MERGE=1
- echo "Trying simple merge with $SHA1"
+ echo "Trying simple merge with $pretty_name"
git read-tree -u -m --aggressive $common $MRT $SHA1 || exit 2
next=$(git write-tree 2>/dev/null)
if test $? -ne 0
diff --git a/t/t7602-merge-octopus-many.sh b/t/t7602-merge-octopus-many.sh
index 01e5415..7377033 100755
--- a/t/t7602-merge-octopus-many.sh
+++ b/t/t7602-merge-octopus-many.sh
@@ -49,4 +49,37 @@ test_expect_success 'merge c1 with c2, c3, c4, ... c29' '
done
'
+cat >expected <<\EOF
+Trying simple merge with c2
+Trying simple merge with c3
+Trying simple merge with c4
+Merge made by octopus.
+ c2.c | 1 +
+ c3.c | 1 +
+ c4.c | 1 +
+ 3 files changed, 3 insertions(+), 0 deletions(-)
+ create mode 100644 c2.c
+ create mode 100644 c3.c
+ create mode 100644 c4.c
+EOF
+
+test_expect_success 'merge output uses pretty names' '
+ git reset --hard c1 &&
+ git merge c2 c3 c4 >actual &&
+ test_cmp actual expected
+'
+
+cat >expected <<\EOF
+Already up-to-date with c4
+Trying simple merge with c5
+Merge made by octopus.
+ c5.c | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+ create mode 100644 c5.c
+EOF
+
+test_expect_success 'merge up-to-date output uses pretty names' '
+ git merge c4 c5 >actual &&
+ test_cmp actual expected
+'
test_done
--
1.6.6.rc2.5.g49666
^ permalink raw reply related [relevance 2%]
* What's cooking in git.git (Mar 2017, #02; Fri, 3)
@ 2017-03-03 23:26 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2017-03-03 23:26 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'. The ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.
You can find the changes described here in the integration branches
of the repositories listed at
http://git-blame.blogspot.com/p/git-public-repositories.html
--------------------------------------------------
[New Topics]
* ew/markdown-url-in-readme (2017-03-01) 1 commit
(merged to 'next' on 2017-03-03 at 3d35e3a991)
+ README: create HTTP/HTTPS links from URLs in Markdown
Doc update.
Will merge to 'master'.
* jk/add-i-patch-do-prompt (2017-03-02) 1 commit
- add--interactive: fix missing file prompt for patch mode with "-i"
The patch subcommand of "git add -i" was meant to have paths
selection prompt just like other subcommand, unlike "git add -p"
directly jumps to hunk selection. Recently, this was broken and
"add -i" lost the paths selection dialog, but it now has been
fixed.
Will merge to 'next'.
* ax/line-log-range-merge-fix (2017-03-03) 1 commit
- line-log.c: prevent crash during union of too many ranges
The code to parse "git log -L..." command line was buggy when there
are many ranges specified with -L; overrun of the allocated buffer
has been fixed.
Will merge to 'next'.
* js/early-config (2017-03-03) 11 commits
- t1309: test read_early_config()
- read_early_config(): really discover .git/
- read_early_config(): avoid .git/config hack when unneeded
- setup: make read_early_config() reusable
- setup: export the discover_git_directory() function
- SQUASH??? ERROR: trailing statements should be on next line
- setup_git_directory_1(): avoid changing global state
- setup: prepare setup_discovered_git_directory() the root directory
- SQUASH??? ERROR: trailing statements should be on next line
- setup_git_directory(): use is_dir_sep() helper
- t7006: replace dubious test
The start-up sequence of "git" needs to figure out some configured
settings before it finds and set itself up in the location of the
repository and was quite messy due to its "chicken-and-egg" nature.
The code has been restructured.
Will merge to 'next' after squashing niggle-fixes in.
* jt/perf-updates (2017-03-03) 3 commits
- t/perf: add fallback for pre-bin-wrappers versions of git
- t/perf: use $MODERN_GIT for all repo-copying steps
- t/perf: export variable used in other blocks
The t/perf performance test suite was not prepared to test not so
old versions of Git, but now it covers versions of Git that are not
so ancient.
Will merge to 'next'.
* ss/remote-bzr-hg-placeholder-wo-python (2017-03-03) 1 commit
- contrib: git-remote-{bzr,hg} placeholders don't need Python
There is no need for Python only to give a few messages to the
standard error stream, but we somehow did.
Will merge to 'next'.
--------------------------------------------------
[Stalled]
* nd/worktree-move (2017-01-27) 7 commits
. fixup! worktree move: new command
. worktree remove: new command
. worktree move: refuse to move worktrees with submodules
. worktree move: accept destination as directory
. worktree move: new command
. worktree.c: add update_worktree_location()
. worktree.c: add validate_worktree()
"git worktree" learned move and remove subcommands.
Tentatively ejected as it seems to break 'pu' when merged.
* pb/bisect (2017-02-18) 28 commits
- fixup! bisect--helper: `bisect_next_check` & bisect_voc shell function in C
- bisect--helper: remove the dequote in bisect_start()
- bisect--helper: retire `--bisect-auto-next` subcommand
- bisect--helper: retire `--bisect-autostart` subcommand
- bisect--helper: retire `--bisect-write` subcommand
- bisect--helper: `bisect_replay` shell function in C
- bisect--helper: `bisect_log` shell function in C
- bisect--helper: retire `--write-terms` subcommand
- bisect--helper: retire `--check-expected-revs` subcommand
- bisect--helper: `bisect_state` & `bisect_head` shell function in C
- bisect--helper: `bisect_autostart` shell function in C
- bisect--helper: retire `--next-all` subcommand
- bisect--helper: retire `--bisect-clean-state` subcommand
- bisect--helper: `bisect_next` and `bisect_auto_next` shell function in C
- t6030: no cleanup with bad merge base
- bisect--helper: `bisect_start` shell function partially in C
- bisect--helper: `get_terms` & `bisect_terms` shell function in C
- bisect--helper: `bisect_next_check` & bisect_voc shell function in C
- bisect--helper: `check_and_set_terms` shell function in C
- bisect--helper: `bisect_write` shell function in C
- bisect--helper: `is_expected_rev` & `check_expected_revs` shell function in C
- bisect--helper: `bisect_reset` shell function in C
- wrapper: move is_empty_file() and rename it as is_empty_or_missing_file()
- t6030: explicitly test for bisection cleanup
- bisect--helper: `bisect_clean_state` shell function in C
- bisect--helper: `write_terms` shell function in C
- bisect: rewrite `check_term_format` shell function in C
- bisect--helper: use OPT_CMDMODE instead of OPT_BOOL
Move more parts of "git bisect" to C.
Expecting a reroll.
cf. <CAFZEwPPXPPHi8KiEGS9ggzNHDCGhuqMgH9Z8-Pf9GLshg8+LPA@mail.gmail.com>
cf. <CAFZEwPM9RSTGN54dzaw9gO9iZmsYjJ_d1SjUD4EzSDDbmh-XuA@mail.gmail.com>
cf. <CAFZEwPNUXcNY9Qdz=_B7q2kQuaecPzJtTMGdv8YMUPEz2vnp8A@mail.gmail.com>
* ls/filter-process-delayed (2017-01-08) 1 commit
. convert: add "status=delayed" to filter process protocol
Ejected, as does not build when merged to 'pu'.
* sh/grep-tree-obj-tweak-output (2017-01-20) 2 commits
- grep: use '/' delimiter for paths
- grep: only add delimiter if there isn't one already
"git grep", when fed a tree-ish as an input, shows each hit
prefixed with "<tree-ish>:<path>:<lineno>:". As <tree-ish> is
almost always either a commit or a tag that points at a commit, the
early part of the output "<tree-ish>:<path>" can be used as the
name of the blob and given to "git show". When <tree-ish> is a
tree given in the extended SHA-1 syntax (e.g. "<commit>:", or
"<commit>:<dir>"), however, this results in a string that does not
name a blob (e.g. "<commit>::<path>" or "<commit>:<dir>:<path>").
"git grep" has been taught to be a bit more intelligent about these
cases and omit a colon (in the former case) or use slash (in the
latter case) to produce "<commit>:<path>" and
"<commit>:<dir>/<path>" that can be used as the name of a blob.
Expecting a reroll? Is this good enough with known limitations?
* jc/diff-b-m (2015-02-23) 5 commits
. WIPWIP
. WIP: diff-b-m
- diffcore-rename: allow easier debugging
- diffcore-rename.c: add locate_rename_src()
- diffcore-break: allow debugging
"git diff -B -M" produced incorrect patch when the postimage of a
completely rewritten file is similar to the preimage of a removed
file; such a resulting file must not be expressed as a rename from
other place.
The fix in this patch is broken, unfortunately.
Will discard.
--------------------------------------------------
[Cooking]
* jk/interpret-branch-name (2017-03-02) 9 commits
- checkout: restrict @-expansions when finding branch
- strbuf_check_ref_format(): expand only local branches
- branch: restrict @-expansions when deleting
- t3204: test git-branch @-expansion corner cases
- interpret_branch_name: allow callers to restrict expansions
- strbuf_branchname: add docstring
- strbuf_branchname: drop return value
- interpret_branch_name: move docstring to header file
- interpret_branch_name(): handle auto-namelen for @{-1}
"git branch @" created refs/heads/@ as a branch, and in general the
code that handled @{-1} and @{upstream} was a bit too loose in
disambiguating.
Will merge to 'next'.
* jk/sha1dc (2017-03-01) 7 commits
- Put sha1dc on a diet
- sha1dc: avoid 'for' loop initial decl
- sha1dc: resurrect LICENSE file
- sha1dc: avoid c99 declaration-after-statement
- Makefile: add USE_SHA1DC knob
- sha1dc: adjust header includes for git
- add collision-detecting sha1 implementation
Borrow "detect attempt to create collisions" variant of SHA-1
implementation by Marc Stevens (CWI) and Dan Shumow (Microsoft).
Expecting a cleaned-up reroll after discussion settles.
cf. <CA+55aFxTWqsTTiDKo4DBZT-8Z9t80bGMD3uijzKONa_bYEZABQ@mail.gmail.com>
* js/travis-32bit-linux (2017-03-03) 1 commit
- Travis: also test on 32-bit Linux
Add 32-bit Linux variant to the set of platforms to be tested with
Travis CI.
Will merge to 'next'.
* jt/http-base-url-update-upon-redirect (2017-02-28) 1 commit
(merged to 'next' on 2017-03-03 at 5225bd3ef8)
+ http: attempt updating base URL only if no error
When a redirected http transport gets an error during the
redirected request, we ignored the error we got from the server,
and ended up giving a not-so-useful error message.
Will merge to 'master'.
* jt/mark-tree-uninteresting-for-uninteresting-commit (2017-02-28) 3 commits
- upload-pack: compute blob reachability correctly
- revision: exclude trees/blobs given commit
- revision: unify {tree,blob}_objects in rev_info
The revision/object traversal machinery did not mark all tree and
blob objects that are contained in an uninteresting commit as
uninteresting, because that is quite costly. Instead, it only
marked those that are contained in an uninteresting boundary commit
as uninteresting.
cf. <20170228215937.yd4juycjf7y3vish@sigill.intra.peff.net>
* ps/docs-diffcore (2017-02-28) 2 commits
(merged to 'next' on 2017-03-03 at 9ca5691de2)
+ docs/diffcore: unquote "Complete Rewrites" in headers
+ docs/diffcore: fix grammar in diffcore-rename header
Doc update.
Will merge to 'master'.
* rj/remove-unused-mktemp (2017-02-28) 2 commits
(merged to 'next' on 2017-03-03 at 4512f0c5ab)
+ wrapper.c: remove unused gitmkstemps() function
+ wrapper.c: remove unused git_mkstemp() function
Code cleanup.
Will merge to 'master'.
* sb/submodule-init-url-selection (2017-02-28) 1 commit
(merged to 'next' on 2017-03-03 at 847d1f9a91)
+ submodule init: warn about falling back to a local path
Give a warning when "git submodule init" decides that the submodule
in the working tree is its upstream, as it is not a very common
setup.
Will merge to 'master'.
* jc/diff-populate-filespec-size-only-fix (2017-03-02) 1 commit
- diff: do not short-cut CHECK_SIZE_ONLY check in diff_populate_filespec()
"git diff --quiet" relies on the size field in diff_filespec to be
correctly populated, but diff_populate_filespec() helper function
made an incorrect short-cut when asked only to populate the size
field for paths that need to go through convert_to_git() (e.g. CRLF
conversion).
Will merge to 'next'.
* nd/conditional-config-include (2017-03-03) 5 commits
- SQUASH??? cond config include test
- SQUASH???
- config: add conditional include
- config.txt: reflow the second include.path paragraph
- config.txt: clarify multiple key values in include.path
The configuration file learned a new "includeIf.<condition>.path"
that includes the contents of the given path only when the
condition holds. This allows you to say "include this work-related
bit only in the repositories under my ~/work/ directory".
Will merge to 'next' after squashing niggle-fixes in.
* rs/log-email-subject (2017-03-01) 2 commits
(merged to 'next' on 2017-03-03 at a2ecc84866)
+ pretty: use fmt_output_email_subject()
+ log-tree: factor out fmt_output_email_subject()
Code clean-up.
Will merge to 'master'.
* cc/split-index-config (2017-03-01) 22 commits
- Documentation/git-update-index: explain splitIndex.*
- Documentation/config: add splitIndex.sharedIndexExpire
- read-cache: use freshen_shared_index() in read_index_from()
- read-cache: refactor read_index_from()
- t1700: test shared index file expiration
- read-cache: unlink old sharedindex files
- config: add git_config_get_expiry() from gc.c
- read-cache: touch shared index files when used
- sha1_file: make check_and_freshen_file() non static
- Documentation/config: add splitIndex.maxPercentChange
- t1700: add tests for splitIndex.maxPercentChange
- read-cache: regenerate shared index if necessary
- config: add git_config_get_max_percent_split_change()
- Documentation/git-update-index: talk about core.splitIndex config var
- Documentation/config: add information for core.splitIndex
- t1700: add tests for core.splitIndex
- update-index: warn in case of split-index incoherency
- read-cache: add and then use tweak_split_index()
- split-index: add {add,remove}_split_index() functions
- config: add git_config_get_split_index()
- t1700: change here document style
- config: mark an error message up for translation
The experimental "split index" feature has gained a few
configuration variables to make it easier to use.
I think this is almost ready for 'next'.
* dp/filter-branch-prune-empty (2017-03-03) 4 commits
- p7000: add test for filter-branch with --prune-empty
- filter-branch: fix --prune-empty on parentless commits
- t7003: ensure --prune-empty removes entire branch when applicable
- t7003: ensure --prune-empty can prune root commit
"git filter-branch --prune-empty" drops a single-parent commit that
becomes a no-op, but did not drop a root commit whose tree is empty.
Will merge to 'next'.
* jc/config-case-cmdline-take-2 (2017-02-23) 2 commits
(merged to 'next' on 2017-03-01 at 2e9920eeeb)
+ config: use git_config_parse_key() in git_config_parse_parameter()
+ config: move a few helper functions up
The code to parse "git -c VAR=VAL cmd" and set configuration
variable for the duration of cmd had two small bugs, which have
been fixed.
Will merge to 'master'.
This supersedes jc/config-case-cmdline topic that has been discarded.
* ab/cond-skip-tests (2017-03-01) 3 commits
- gitweb tests: skip tests when we don't have Time::HiRes
- gitweb tests: change confusing "skip_all" phrasing
- cvs tests: skip tests that call "cvs commit" when running as root
A few tests were run conditionally under (rare) conditions where
they cannot be run (like running cvs tests under 'root' account).
Will merge to 'next'.
* jk/interop-test (2017-02-27) 2 commits
- t/interop: add test of old clients against modern git-daemon
- t: add an interoperability test harness
Picking two versions of Git and running tests to make sure the
older one and the newer one interoperate happily has now become
possible.
Needs review.
* jk/parse-config-key-cleanup (2017-02-24) 3 commits
(merged to 'next' on 2017-03-01 at e531d8d3a9)
+ parse_hide_refs_config: tell parse_config_key we don't want a subsection
+ parse_config_key: allow matching single-level config
+ parse_config_key: use skip_prefix instead of starts_with
(this branch uses sb/parse-hide-refs-config-cleanup.)
The "parse_config_key()" API function has been cleaned up.
Will merge to 'master'.
* jk/t6300-cleanup (2017-02-27) 1 commit
(merged to 'next' on 2017-03-02 at 3087521bea)
+ t6300: avoid creating refs/heads/HEAD
A test that creates a confusing branch whose name is HEAD has been
corrected not to do so.
Will merge to 'master'.
* rs/commit-parsing-optim (2017-02-27) 2 commits
(merged to 'next' on 2017-03-02 at 22239f35df)
+ commit: don't check for space twice when looking for header
+ commit: be more precise when searching for headers
The code that parses header fields in the commit object has been
updated for (micro)performance and code hygiene.
Will merge to 'master'.
* rs/sha1-file-plug-fallback-base-leak (2017-02-27) 1 commit
(merged to 'next' on 2017-03-02 at 03344b1119)
+ sha1_file: release fallback base's memory in unpack_entry()
A leak in a codepath to read from a packed object in (rare) cases
has been plugged.
Will merge to 'master'.
* rs/strbuf-add-real-path (2017-02-27) 2 commits
(merged to 'next' on 2017-03-02 at 69191becd6)
+ strbuf: add strbuf_add_real_path()
+ cocci: use ALLOC_ARRAY
An helper function to make it easier to append the result from
real_path() to a strbuf has been added.
Will merge to 'master'.
* sb/parse-hide-refs-config-cleanup (2017-02-24) 1 commit
(merged to 'next' on 2017-03-01 at fd722ba039)
+ refs: parse_hide_refs_config to use parse_config_key
(this branch is used by jk/parse-config-key-cleanup.)
Code clean-up.
Will merge to 'master'.
* sg/clone-refspec-from-command-line-config (2017-02-27) 1 commit
- clone: respect configured fetch respecs during initial fetch
Needs review.
cf. <20170227211217.73gydlxb2qu2sp3m@sigill.intra.peff.net>
* sk/dash-is-previous (2017-03-01) 5 commits
- revert.c: delegate handling of "-" shorthand to setup_revisions
- sha1_name.c: teach get_sha1_1 "-" shorthand for "@{-1}"
- revision.c: args starting with "-" might be a revision
- revision.c: swap if/else blocks
- revision.c: do not update argv with unknown option
A dash "-" can be written to mean "the branch that was previously
checked out" in more places.
Needs review.
cf. <1488007487-12965-1-git-send-email-kannan.siddharth12@gmail.com>
* jh/send-email-one-cc (2017-02-27) 1 commit
(merged to 'next' on 2017-03-02 at 32c0e6ad88)
+ send-email: only allow one address per body tag
"Cc:" on the trailer part does not have to conform to RFC strictly,
unlike in the e-mail header. "git send-email" has been updated to
ignore anything after '>' when picking addresses, to allow non-address
cruft like " # stable 4.4" after the address.
Will merge to 'master'.
* jk/http-auth (2017-02-27) 2 commits
(merged to 'next' on 2017-03-02 at 87f81b4395)
+ http: add an "auto" mode for http.emptyauth
+ http: restrict auth methods to what the server advertises
Reduce authentication round-trip over HTTP when the server supports
just a single authentication method.
Will merge to 'master'.
* jk/ident-empty (2017-02-23) 4 commits
(merged to 'next' on 2017-03-01 at ff80031ce6)
+ ident: do not ignore empty config name/email
+ ident: reject all-crud ident name
+ ident: handle NULL email when complaining of empty name
+ ident: mark error messages for translation
user.email that consists of only cruft chars should consistently
error out, but didn't.
Will merge to 'master'.
* jt/upload-pack-error-report (2017-02-23) 1 commit
(merged to 'next' on 2017-03-01 at aea583dbe5)
+ upload-pack: report "not our ref" to client
"git upload-pack", which is a counter-part of "git fetch", did not
report a request for a ref that was not advertised as invalid.
This is generally not a problem (because "git fetch" will stop
before making such a request), but is the right thing to do.
Will merge to 'master'.
* ah/doc-ls-files-quotepath (2017-03-02) 1 commit
- Documentation: improve description for core.quotePath
Documentation for "git ls-files" did not refer to core.quotePath
Will merge to 'next'.
* jh/memihash-opt (2017-02-17) 5 commits
- name-hash: remember previous dir_entry during lazy_init_name_hash
- name-hash: specify initial size for istate.dir_hash table
- name-hash: precompute hash values during preload-index
- hashmap: allow memihash computation to be continued
- name-hash: eliminate duplicate memihash call
Expecting an update for perf.
cf. <MWHPR03MB29581B0EDDEDCA7D51EC396F8A280@MWHPR03MB2958.namprd03.prod.outlook.com>
* nd/prune-in-worktree (2017-02-19) 15 commits
. rev-list: expose and document --single-worktree
. revision.c: --reflog add HEAD reflog from all worktrees
. files-backend: make reflog iterator go through per-worktree reflog
. refs: add refs_for_each_reflog[_ent]()
. revision.c: --all adds HEAD from all worktrees
. refs: remove dead for_each_*_submodule()
. revision.c: use refs_for_each*() instead of for_each_*_submodule()
. refs: add a refs_for_each_in() and friends
. refs: add refs_for_each_ref()
. refs: add refs_head_ref()
. refs: add refs_read_ref[_full]()
. refs: move submodule slash stripping code to get_submodule_ref_store
. revision.c: --indexed-objects add objects from all worktrees
. revision.c: refactor add_index_objects_to_pending()
. revision.h: new flag in struct rev_info wrt. worktree-related refs
(this branch uses nd/worktree-kill-parse-ref; is tangled with nd/files-backend-git-dir.)
"git gc" and friends when multiple worktrees are used off of a
single repository did not consider the index and per-worktree refs
of other worktrees as the root for reachability traversal, making
objects that are in use only in other worktrees to be subject to
garbage collection.
* mm/fetch-show-error-message-on-unadvertised-object (2017-03-02) 3 commits
- fetch-pack: add specific error for fetching an unadvertised object
- fetch_refs_via_pack: call report_unmatched_refs
- fetch-pack: move code to report unmatched refs to a function
"git fetch" that requests a commit by object name, when the other
side does not allow such an request, failed without much
explanation.
Will merge to 'next'.
* nd/worktree-kill-parse-ref (2017-02-19) 22 commits
. refs: kill set_worktree_head_symref()
. refs: add refs_create_symref()
. worktree.c: kill parse_ref() in favor of refs_resolve_ref_unsafe()
. refs.c: add refs_resolve_ref_unsafe()
. refs: introduce get_worktree_ref_store()
. refs: rename get_ref_store() to get_submodule_ref_store() and make it public
. files-backend: remove submodule_allowed from files_downcast()
. refs: move submodule code out of files-backend.c
. path.c: move some code out of strbuf_git_path_submodule()
. refs.c: make get_main_ref_store() public and use it
. refs.c: kill register_ref_store(), add register_submodule_ref_store()
. refs.c: flatten get_ref_store() a bit
. refs: rename lookup_ref_store() to lookup_submodule_ref_store()
. refs.c: introduce get_main_ref_store()
. files-backend: remove the use of git_path()
. refs.c: share is_per_worktree_ref() to files-backend.c
. files-backend: replace *git_path*() with files_path()
. files-backend: add files_path()
. files-backend: convert git_path() to strbuf_git_path()
. refs-internal.c: make files_log_ref_write() static
. Merge branch 'mh/ref-remove-empty-directory' into nd/files-backend-git-dir
. Merge branch 'mh/submodule-hash' into nd/files-backend-git-dir
(this branch is used by nd/prune-in-worktree; is tangled with nd/files-backend-git-dir.)
(hopefully) a beginning of safer "git worktree" that is resistant
to "gc".
Waiting for nd/files-backend-git-dir to settle.
* nd/files-backend-git-dir (2017-02-22) 26 commits
. t1406: new tests for submodule ref store
. t1405: some basic tests on main ref store
. t/helper: add test-ref-store to test ref-store functions
. refs: delete pack_refs() in favor of refs_pack_refs()
. files-backend: avoid ref api targetting main ref store
. refs: new transaction related ref-store api
. refs: add new ref-store api
. refs: rename get_ref_store() to get_submodule_ref_store() and make it public
. files-backend: replace submodule_allowed check in files_downcast()
. refs: move submodule code out of files-backend.c
. path.c: move some code out of strbuf_git_path_submodule()
. refs.c: make get_main_ref_store() public and use it
. refs.c: kill register_ref_store(), add register_submodule_ref_store()
. refs.c: flatten get_ref_store() a bit
. refs: rename lookup_ref_store() to lookup_submodule_ref_store()
. refs.c: introduce get_main_ref_store()
. files-backend: remove the use of git_path()
. files-backend: add and use files_refname_path()
. files-backend: add and use files_reflog_path()
. files-backend: move "logs/" out of TMP_RENAMED_LOG
. files-backend: convert git_path() to strbuf_git_path()
. files-backend: add and use files_packed_refs_path()
. files-backend: make files_log_ref_write() static
. refs.h: add forward declaration for structs used in this file
. Merge branch 'mh/ref-remove-empty-directory' into nd/files-backend-git-dir
. Merge branch 'mh/submodule-hash' into nd/files-backend-git-dir
(this branch is tangled with nd/prune-in-worktree and nd/worktree-kill-parse-ref.)
The "submodule" specific field in the ref_store structure is
replaced with a more generic "gitdir" that can later be used also
when dealing with ref_store that represents the set of refs visible
from the other worktrees.
* sb/checkout-recurse-submodules (2017-02-23) 15 commits
- builtin/checkout: add --recurse-submodules switch
- entry.c: update submodules when interesting
- read-cache, remove_marked_cache_entries: wipe selected submodules.
- unpack-trees: check if we can perform the operation for submodules
- unpack-trees: pass old oid to verify_clean_submodule
- update submodules: add submodule_move_head
- update submodules: move up prepare_submodule_repo_env
- submodules: introduce check to see whether to touch a submodule
- update submodules: add a config option to determine if submodules are updated
- update submodules: add submodule config parsing
- connect_work_tree_and_git_dir: safely create leading directories
- make is_submodule_populated gently
- lib-submodule-update.sh: define tests for recursing into submodules
- lib-submodule-update.sh: do not use ./. as submodule remote
- lib-submodule-update.sh: reorder create_lib_submodule_repo
"git checkout" is taught --recurse-submodules option.
Reroll exists, but it appears it still needs minor work on top.
cf. <20170302004759.27852-1-sbeller@google.com>
* tg/stash-push (2017-02-28) 6 commits
(merged to 'next' on 2017-03-03 at b50fda0389)
+ stash: allow pathspecs in the no verb form
+ stash: use stash_push for no verb form
+ stash: teach 'push' (and 'create_stash') to honor pathspec
+ stash: refactor stash_create
+ stash: add test for the create command line arguments
+ stash: introduce push verb
Allow "git stash" to take pathspec so that the local changes can be
stashed away only partially.
Will merge to 'master'.
* bc/object-id (2017-02-22) 19 commits
- wt-status: convert to struct object_id
- builtin/merge-base: convert to struct object_id
- Convert object iteration callbacks to struct object_id
- sha1_file: introduce an nth_packed_object_oid function
- refs: simplify parsing of reflog entries
- refs: convert each_reflog_ent_fn to struct object_id
- reflog-walk: convert struct reflog_info to struct object_id
- builtin/replace: convert to struct object_id
- Convert remaining callers of resolve_refdup to object_id
- builtin/merge: convert to struct object_id
- builtin/clone: convert to struct object_id
- builtin/branch: convert to struct object_id
- builtin/grep: convert to struct object_id
- builtin/fmt-merge-message: convert to struct object_id
- builtin/fast-export: convert to struct object_id
- builtin/describe: convert to struct object_id
- builtin/diff-tree: convert to struct object_id
- builtin/commit: convert to struct object_id
- hex: introduce parse_oid_hex
"uchar [40]" to "struct object_id" conversion continues.
Now at v5.
cf. <20170221234737.894681-1-sandals@crustytoothpaste.net>
* jh/mingw-openssl-sha1 (2017-02-09) 1 commit
- mingw: use OpenSSL's SHA-1 routines
Windows port wants to use OpenSSL's implementation of SHA-1
routines, so let them.
Will merge to 'next'.
* sg/completion-refs-speedup (2017-02-13) 13 commits
- squash! completion: fill COMPREPLY directly when completing refs
- completion: fill COMPREPLY directly when completing refs
- completion: list only matching symbolic and pseudorefs when completing refs
- completion: let 'for-each-ref' sort remote branches for 'checkout' DWIMery
- completion: let 'for-each-ref' filter remote branches for 'checkout' DWIMery
- completion: let 'for-each-ref' strip the remote name from remote branches
- completion: let 'for-each-ref' and 'ls-remote' filter matching refs
- completion: don't disambiguate short refs
- completion: don't disambiguate tags and branches
- completion: support excluding full refs
- completion: support completing full refs after '--option=refs/<TAB>'
- completion: wrap __git_refs() for better option parsing
- completion: remove redundant __gitcomp_nl() options from _git_commit()
The refs completion for large number of refs has been sped up,
partly by giving up disambiguating ambiguous refs and partly by
eliminating most of the shell processing between 'git for-each-ref'
and 'ls-remote' and Bash's completion facility.
What's the donness of this topic?
* jk/no-looking-at-dotgit-outside-repo-final (2016-10-26) 1 commit
(merged to 'next' on 2017-02-27 at 7373a1b73d)
+ setup_git_env: avoid blind fall-back to ".git"
This is the endgame of the topic to avoid blindly falling back to
".git" when the setup sequence said we are _not_ in Git repository.
A corner case that happens to work right now may be broken by a
call to die("BUG").
Will cook in 'next'.
* jc/merge-drop-old-syntax (2015-04-29) 1 commit
(merged to 'next' on 2017-02-27 at 2c0f5f73d8)
+ merge: drop 'git merge <message> HEAD <commit>' syntax
Stop supporting "git merge <message> HEAD <commit>" syntax that has
been deprecated since October 2007, and issues a deprecation
warning message since v2.5.0.
Will cook in 'next'.
* jc/bundle (2016-03-03) 6 commits
- index-pack: --clone-bundle option
- Merge branch 'jc/index-pack' into jc/bundle
- bundle v3: the beginning
- bundle: keep a copy of bundle file name in the in-core bundle header
- bundle: plug resource leak
- bundle doc: 'verify' is not about verifying the bundle
The beginning of "split bundle", which could be one of the
ingredients to allow "git clone" traffic off of the core server
network to CDN.
--------------------------------------------------
[Discarded]
* jk/auto-namelen-in-interpret-branch-name (2017-02-27) 1 commit
. interpret_branch_name(): handle auto-namelen for @{-1}
A small bug in the code that parses @{...} has been fixed.
This is now a part of jk/interpret-branch-name topic.
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (Oct 2009, #04; Wed, 21)
@ 2009-10-22 6:52 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2009-10-22 6:52 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
marked with '.' do not appear in any of the integration branches, but I am
still holding onto them.
In 1.7.0, we plan to correct handful of warts in the interfaces everybody
agrees that they were mistakes. The resulting system may not be strictly
backward compatible. Currently planeed changes are:
* refuse push to update the checked out branch in a non-bare repo by
default
Make "git push" into a repository to update the branch that is checked
out fail by default. You can countermand this default by setting a
configuration variable in the receiving repository.
http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007
* refuse push to delete the current branch by default
Make "git push $there :$killed" to delete the branch that is pointed at
by its HEAD fail by default. You can countermand this default by
setting a configuration variable in the receiving repository.
http://thread.gmane.org/gmane.comp.version-control.git/108862/focus=108936
* git-send-email won't make deep threads by default
Many people said that by default when sending more than 2 patches the
threading git-send-email makes by default is hard to read, and they
prefer the default be one cover letter and each patch as a direct
follow-up to the cover letter. You can countermand this by setting a
configuration variable.
http://article.gmane.org/gmane.comp.version-control.git/109790
* git-status won't be "git-commit --dry-run" anymore
http://thread.gmane.org/gmane.comp.version-control.git/125989/focus=125993
* "git-diff -w --exit-code" will exit success if only differences it
found are whitespace changes that are stripped away from the output.
http://thread.gmane.org/gmane.comp.version-control.git/119731/focus=119751
--------------------------------------------------
[Graduated to "master"]
* gb/maint-gitweb-esc-param (2009-10-13) 1 commit.
(merged to 'next' on 2009-10-14 at 105f997)
+ gitweb: fix esc_param
(this branch is used by sb/gitweb-link-author.)
--------------------------------------------------
[New Topics]
* vl/git-gui (2009-10-16) 1 commit.
- git-gui: adjust the minimum height of diff pane for shorter screen height
Shawn?
* cb/doc-fetch-pull-merge (2009-10-21) 1 commit.
(merged to 'next' on 2009-10-21 at 1d9190d)
+ modernize fetch/merge/pull examples
* ja/fetch-doc (2009-10-21) 1 commit.
(merged to 'next' on 2009-10-21 at bf09f62)
+ Documentation/fetch-options.txt: order options alphabetically
Helps 'git-fetch.{1,html}' without helping 'git-pull.{1,html}'.
* jc/1.7.0-no-commit-no-ff-2 (2009-10-21) 1 commit.
- git-merge: forbid fast-forward and up-to-date when --no-commit is given
This makes "git merge --no-commit" fail when it results in fast-forward or
up-to-date. I haven't described this at the beginning of this message
yet, as it is not clear if this is even necessary, but since I already
wrote it and many people seem to be interested in UI and behaviour
warts,...
Some tests expect the traditional behaviour of silently ignoring --no-commit
upon fast-forward, and tonight's 'pu' does not pass them.
* jc/1.7.0-no-commit-no-ff (2009-10-21) 1 commit.
. git-merge: imply --no-ff when --no-commit is given
This is an alternative patch to the same issue.
* jc/fsck-default-full (2009-10-20) 1 commit
(merged to 'next' on 2009-10-21 at 1375192)
+ fsck: default to "git fsck --full"
Should be safe enough to be in 'master' soon.
* jc/maint-fix-unpack-zlib-check (2009-10-21) 1 commit.
- Fix incorrect error check while reading deflated pack data
This is the final round from 2009-10-21, not my earlier botched attempts.
* jc/receive-pack-auto (2009-10-20) 2 commits.
(merged to 'next' on 2009-10-21 at fef13ef)
+ receive-pack: run "gc --auto --quiet" and optionally "update-server-info"
+ gc --auto --quiet: make the notice a bit less verboase
* jp/dirty-describe (2009-10-21) 1 commit.
- Teach "git describe" --dirty option
Ack?
* tr/filter-branch (2009-10-21) 2 commits.
- filter-branch: nearest-ancestor rewriting outside subdir filter
- filter-branch: stop special-casing $filter_subdir argument
J6t already has some comments on this.
* tr/maint-roff-quote (2009-10-21) 2 commits.
- Document GNU_ROFF in Makefile
- Quote ' as \(aq in manpages
The doc may need to be clarified a bit more.
* bg/clone-doc (2009-10-20) 1 commit.
(merged to 'next' on 2009-10-21 at 3016736)
+ git-clone.txt: Fix grammar and formatting
Should be correct enough to be in 'master' soon.
* iv/tar-lzma-xz (2009-10-20) 1 commit.
(merged to 'next' on 2009-10-21 at cb0df8a)
+ import-tars: Add support for tarballs compressed with lzma, xz
Should be safe enough to be in 'master' soon.
* rs/pretty-wrap (2009-10-17) 1 commit
- Implement wrap format %w() as if it is a mode switch
(this branch uses js/log-rewrap; is related to jc/strbuf-nested-expand.)
When it comes to design issues to keep unnecessary complexity out, I tend
to trust R辿ne (and Nico) a lot more than I trust myself. Tonight's 'pu'
queues this series instead of my "nested" one.
* sr/blame-incomplete (2009-10-19) 1 commit.
- blame: make sure that the last line ends in an LF
I think this is _good enough_ as-is; although it would be better if we
added some hint to the output for Porcelain implementations, that can be
done as a follow-up fix.
--------------------------------------------------
[Stalled]
* mr/gitweb-snapshot (2009-09-26) 2 commits.
- gitweb: append short hash ids to snapshot files
(merged to 'next' on 2009-10-11 at 22ba047)
+ gitweb: check given hash before trying to create snapshot
I lost track of the discussion around the tip commit. The bottom one may
better go to 'master' regardless.
* db/vcs-helper-rest (2009-09-03) 6 commits.
- Allow helpers to report in "list" command that the ref is unchanged
- Add support for "import" helper command
- Add a config option for remotes to specify a foreign vcs
- Allow programs to not depend on remotes having urls
- Allow fetch to modify refs
- Use a function to determine whether a remote is valid
(this branch is used by jh/cvs-helper.)
This holds the remainder of the db/vcs-helper topic that has already
merged in 1.6.5. If people want to replace this with improvements it
would be a good time to do so.
* jl/submodule-add-noname (2009-09-22) 1 commit.
- git submodule add: make the <path> parameter optional
Dscho started an interesting discussion regarding the larger workflow in
which the "submodule add" is used. I think the patch itself makes sense
but at the same time it probably makes sense to also take the <path> and
infer the <repository> as Dscho suggested, probably in "git submodule
add", not in "git add" proper, at least initially.
* sr/gfi-options (2009-09-06) 6 commits.
- fast-import: test the new option command
- fast-import: add option command
- fast-import: test the new feature command
- fast-import: add feature command
- fast-import: put marks reading in it's own function
- fast-import: put option parsing code in separate functions
* je/send-email-no-subject (2009-08-05) 1 commit.
(merged to 'next' on 2009-10-11 at 1b99c56)
+ send-email: confirm on empty mail subjects
The existing tests cover the positive case (i.e. as long as the user says
"yes" to the "do you really want to send this message that lacks subject",
the message is sent) of this feature, but the feature itself needs its own
test to verify the negative case (i.e. does it correctly stop if the user
says "no"?)
* jh/cvs-helper (2009-08-18) 8 commits.
. More fixes to the git-remote-cvs installation procedure
. Fix the Makefile-generated path to the git_remote_cvs package in git-remote-cvs
. Add simple selftests of git-remote-cvs functionality
. git-remote-cvs: Remote helper program for CVS repositories
. 2/2: Add Python support library for CVS remote helper
. 1/2: Add Python support library for CVS remote helper
. Basic build infrastructure for Python scripts
. Allow helpers to request marks for fast-import
(this branch uses db/vcs-helper-rest.)
* jc/strbuf-nested-expand (2009-10-18) 3 commits
. Teach --wrap to only indent without wrapping
. Add %[wrap(width,in1,in2)<<any-string>>%] implementation
. strbuf_nested_expand(): allow expansion to interrupt in the middle
(this branch uses js/log-rewrap; is related to rs/pretty-wrap.)
Ejected from 'pu' to let rs/pretty-wrap in as described above.
--------------------------------------------------
[Cooking]
* ne/rev-cache (2009-10-19) 7 commits.
- support for commit grafts, slight change to general mechanism
- support for path name caching in rev-cache
- full integration of rev-cache into git, completed test suite
- administrative functions for rev-cache, start of integration into git
- support for non-commit object caching in rev-cache
- basic revision cache system, no integration or features
- man page and technical discussion for rev-cache
Still unstable? Has an extra test squashed in; tonight's 'pu' does not
pass tests.
* ak/bisect-reset-to-switch (2009-10-13) 1 commit.
- bisect reset: Allow resetting to any commit, not just a branch
Soon in 'next'.
* fc/doc-fast-forward (2009-10-11) 1 commit.
- user-manual: use 'fast-forward'
* jc/maint-1.6.3-graft-trailing-space (2009-10-14) 1 commit.
- info/grafts: allow trailing whitespaces at the end of line
Soon in 'next'.
* jk/maint-cvsimport-pathname (2009-10-19) 1 commit.
(merged to 'next' on 2009-10-19 at 77824f2)
+ cvsimport: fix relative argument filenames
Should be safe enough to be in 'master' soon.
* jn/show-normalized-refs (2009-10-12) 3 commits.
- check-ref-format: simplify --print implementation
- git check-ref-format --print
- Add tests for git check-ref-format
This was for helping Porcelains like git-gui to sanely cope with user
input that has redundant // in refnames. Are potential users happy with
the series? I think this is ready for 'next'.
* sb/gitweb-link-author (2009-10-15) 1 commit
- gitweb: linkify author/committer names with search
Soon in 'next'.
* jc/checkout-auto-track (2009-10-18) 3 commits
- git checkout --no-guess
- DWIM "git checkout frotz" to "git checkout -b frotz origin/frotz"
- check_filename(): make verify_filename() callable without dying
The final shape of this series ended up to be more or less exactly what
Dscho hinted he wanted to have in one of the discussion. Is everybody
happy with this kind of new user-friendliness? I think it is safe enough
to be queued to 'next'.
* tr/stash-format (2009-10-19) 5 commits
- stash list: drop the default limit of 10 stashes
- stash list: use new %g formats instead of sed
- Introduce new pretty formats %g[sdD] for reflog information
- reflog-walk: refactor the branch@{num} formatting
- Refactor pretty_print_commit arguments into a struct
Soon in 'next'.
* ks/precompute-completion (2009-10-05) 1 commit.
(merged to 'next' on 2009-10-14 at adf722a)
+ Speedup bash completion loading
Are people happy with this?
* sp/smart-http (2009-10-14) 17 commits
- Smart HTTP fetch: gzip requests
- Smart fetch over HTTP: client side
- Smart push over HTTP: client side
- Discover refs via smart HTTP server when available
- Smart fetch and push over HTTP: server side
- Add stateless RPC options to upload-pack, receive-pack
- Git-aware CGI to provide dumb HTTP transport
- Move WebDAV HTTP push under remote-curl
- remote-helpers: Support custom transport options
- remote-helpers: Fetch more than one ref in a batch
- fetch: Allow transport -v -v -v to set verbosity to 3
- remote-curl: Refactor walker initialization
- Add multi_ack_detailed capability to fetch-pack/upload-pack
- Move "get_ack()" back to fetch-pack
- fetch-pack: Use a strbuf to compose the want list
- pkt-line: Make packet_read_line easier to debug
- pkt-line: Add strbuf based functions
What's the doneness of this series?
* ef/msys-imap (2009-10-21) 8 commits.
- MSVC: Enable OpenSSL, and translate -lcrypto
- mingw: enable OpenSSL
- mingw: wrap SSL_set_(w|r)fd to call _get_osfhandle
- imap-send: build imap-send on Windows
- imap-send: fix compilation-error on Windows
- imap-send: use run-command API for tunneling
- imap-send: use separate read and write fds
- imap-send: remove useless uid code
Another re-roll. Waiting for an Ack from MSVC folks but otherwise it is
ready for 'next', I think.
* jc/pretty-lf (2009-10-04) 1 commit.
- Pretty-format: %[+-]x to tweak inter-item newlines
* js/log-rewrap (2008-11-10) 2 commits
- Add strbuf_add_wrapped_text() to utf8.[ch]
- print_wrapped_text(): allow hard newlines
(this branch is used by jc/strbuf-nested-expand and rs/pretty-wrap.)
Soon in 'next'; regardless of how wrapping is exposed to --pretty=format,
this code will be used, and it seems to be leak-free and reasonably done.
We _might_ want to cherry-pick the tip of jc/strbuf-nested-expand to this
series, though.
* js/diff-verbose-submodule (2009-10-14) 2 commits.
- add tests for git diff --submodule-summary
- Add the --submodule option to the diff option family
I should retitle and fix some comments in the tip commit (the tests have
already been adjusted to use the real option name), but otherwise I think
this is ready for 'next'.
* jc/fix-tree-walk (2009-09-14) 10 commits.
- read-tree --debug-unpack
(merged to 'next' on 2009-10-11 at 0b058e2)
+ unpack-trees.c: look ahead in the index
+ unpack-trees.c: prepare for looking ahead in the index
+ Aggressive three-way merge: fix D/F case
+ traverse_trees(): handle D/F conflict case sanely
+ more D/F conflict tests
+ tests: move convenience regexp to match object names to test-lib.sh
+ unpack_callback(): use unpack_failed() consistently
+ unpack-trees: typofix
+ diff-lib.c: fix misleading comments on oneway_diff()
This is my replacement for Linus's lt/maint-traverse-trees-fix patch. It
is not so much as a counter-proposal; I originally thought it might make
sense to walk the index and drive the walker to return the entries from
trees to match entries from the index, but I ended up doing pretty much
what Linus outlined --- walk the trees, and have the index walker follow
it. It turned out that the index side also needed some hairy look-ahead,
This includes the fix to aggressive mode of three-way merge used by the
resolve strategy.
* jh/notes (2009-10-09) 22 commits.
- fast-import: Proper notes tree manipulation using the notes API
- Refactor notes concatenation into a flexible interface for combining notes
- Notes API: Allow multiple concurrent notes trees with new struct notes_tree
- Notes API: for_each_note(): Traverse the entire notes tree with a callback
- Notes API: get_note(): Return the note annotating the given object
- Notes API: add_note(): Add note objects to the internal notes tree structure
- Notes API: init_notes(): Initialize the notes tree from the given notes ref
- Notes API: get_commit_notes() -> format_note() + remove the commit restriction
- Add selftests verifying concatenation of multiple notes for the same commit
- Refactor notes code to concatenate multiple notes annotating the same object
- Add selftests verifying that we can parse notes trees with various fanouts
- Teach the notes lookup code to parse notes trees with various fanout schemes
- Teach notes code to free its internal data structures on request
- Add '%N'-format for pretty-printing commit notes
- Add flags to get_commit_notes() to control the format of the note string
- t3302-notes-index-expensive: Speed up create_repo()
- fast-import: Add support for importing commit notes
- Teach "-m <msg>" and "-F <file>" to "git notes edit"
- Add an expensive test for git-notes
- Speed up git notes lookup
- Add a script to edit/inspect notes
- Introduce commit notes
Rebased so that it does not pull in anything else. Presumably it is ready
for next?
* jn/gitweb-blame (2009-09-01) 5 commits.
- gitweb: Minify gitweb.js if JSMIN is defined
- gitweb: Create links leading to 'blame_incremental' using JavaScript
(merged to 'next' on 2009-10-11 at 73c4a83)
+ gitweb: Colorize 'blame_incremental' view during processing
+ gitweb: Incremental blame (using JavaScript)
+ gitweb: Add optional "time to generate page" info in footer
Ajax-y blame. Probably the first three should go to 'master' by now?
* nd/sparse (2009-08-20) 19 commits.
- sparse checkout: inhibit empty worktree
- Add tests for sparse checkout
- read-tree: add --no-sparse-checkout to disable sparse checkout support
- unpack-trees(): ignore worktree check outside checkout area
- unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index
- unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout
- unpack-trees.c: generalize verify_* functions
- unpack-trees(): add CE_WT_REMOVE to remove on worktree alone
- Introduce "sparse checkout"
- dir.c: export excluded_1() and add_excludes_from_file_1()
- excluded_1(): support exclude files in index
- unpack-trees(): carry skip-worktree bit over in merged_entry()
- Read .gitignore from index if it is skip-worktree
- Avoid writing to buffer in add_excludes_from_file_1()
- Teach Git to respect skip-worktree bit (writing part)
- Teach Git to respect skip-worktree bit (reading part)
- Introduce "skip-worktree" bit in index, teach Git to get/set this bit
- Add test-index-version
- update-index: refactor mark_valid() in preparation for new options
--------------------------------------------------
[For 1.7.0]
* jk/1.7.0-status (2009-09-05) 5 commits.
- docs: note that status configuration affects only long format
(merged to 'next' on 2009-10-11 at 65c8513)
+ commit: support alternate status formats
+ status: add --porcelain output format
+ status: refactor format option parsing
+ status: refactor short-mode printing to its own function
(this branch uses jc/1.7.0-status.)
Gives the --short output format to post 1.7.0 "git commit --dry-run" that
is similar to that of post 1.7.0 "git status".
* jc/1.7.0-status (2009-09-05) 4 commits.
(merged to 'next' on 2009-10-11 at 9558627)
+ status: typo fix in usage
+ git status: not "commit --dry-run" anymore
+ git stat -s: short status output
+ git stat: the beginning of "status that is not a dry-run of commit"
(this branch is used by jk/1.7.0-status.)
With this, "git status" is no longer "git commit --dry-run".
* jc/1.7.0-send-email-no-thread-default (2009-08-22) 1 commit.
(merged to 'next' on 2009-10-11 at 043acdf)
+ send-email: make --no-chain-reply-to the default
* jc/1.7.0-diff-whitespace-only-status (2009-08-30) 4 commits.
(merged to 'next' on 2009-10-11 at 546c74d)
+ diff.c: fix typoes in comments
+ Make test case number unique
+ diff: Rename QUIET internal option to QUICK
+ diff: change semantics of "ignore whitespace" options
This changes exit code from "git diff --ignore-whitespace" and friends
when there is no actual output. It is a backward incompatible change, but
we could argue that it is a bugfix.
* jc/1.7.0-push-safety (2009-02-09) 2 commits.
(merged to 'next' on 2009-10-11 at 81b8128)
+ Refuse deleting the current branch via push
+ Refuse updating the current branch in a non-bare repository via push
--------------------------------------------------
[I have been too busy to purge these]
* jc/log-tz (2009-03-03) 1 commit.
- Allow --date=local --date=other-format to work as expected
Maybe some people care about this. I dunno.
* jc/mailinfo-remove-brackets (2009-07-15) 1 commit.
- mailinfo: -b option keeps [bracketed] strings that is not a [PATCH] marker
Maybe some people care about this. I dunno.
* jg/log-format-body-indent (2009-09-19) 1 commit.
. git-log --format: Add %B tag with %B(x) option
^ permalink raw reply [relevance 2%]
* Re: [PATCH v4 0/9] propose config-based hooks
@ 2020-09-09 21:04 2% ` Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2020-09-09 21:04 UTC (permalink / raw)
To: Emily Shaffer
Cc: git, Jeff King, James Ramsay, Jonathan Nieder, brian m. carlson,
Ævar Arnfjörð Bjarmason, Phillip Wood,
Josh Steadmon, Johannes Schindelin
Emily Shaffer <emilyshaffer@google.com> writes:
> Since v3, the biggest change is the conversion of commit hooks to use the new
> hook machinery. The first change ("commit: use config-based hooks") is the
> important part; the second change ("run_commit_hook: take strvec instead of varargs")
> is probably subjective, but I thought it was a decent tech debt reduction.
>
> I wanted to send this reroll quickly since I had promised it in standup last
> week, but I've got pretty good progress locally on the patch for configuring
> "hook.runHookDir"; I'm planning to send that soon, probably this week.
I've had the attached merge-fix patch as a way to adjust argv_array
to strvec transition [*1*], but now *most* but not all parts of this
series have been migrated to the strvec API, you should apply some
parts in the merge-fix patch to your copy. I think the changes in
the old "merge-fix" patch to *.c and *.h are already in your series
that has been rebased on a newer 'master' that has strvec, but
documentation and possibly in-code comments may need to be adjusted.
Another way to sanity check the result would be to run this:
$ git diff master..es/config-hooks | grep -i argv.array
Thanks.
[Footnote]
*1* The way I work with a topic that causes conflicts with other
topics is to merge a new version of topic and letting the rerere
records I created while resolving the conflicts with the
previous round. After textual conflicts are thusly resolved, if
there are further changes that do not cause textual conflict
that are necessary, they are written in the form of a
"merge-fix" patch like the attached.
-- >8 --
Documentation/technical/api-parse-options.txt | 4 ++--
Documentation/technical/config-based-hooks.txt | 4 ++--
builtin/hook.c | 16 ++++++++--------
hook.c | 6 +++---
hook.h | 4 ++--
parse-options-cb.c | 8 ++++----
parse-options.h | 6 +++---
7 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/Documentation/technical/api-parse-options.txt b/Documentation/technical/api-parse-options.txt
index b4f1fc4a1a..679bd98629 100644
--- a/Documentation/technical/api-parse-options.txt
+++ b/Documentation/technical/api-parse-options.txt
@@ -173,9 +173,9 @@ There are some macros to easily define options:
The string argument is stored as an element in `string_list`.
Use of `--no-option` will clear the list of preceding values.
-`OPT_ARGV_ARRAY(short, long, &struct argv_array, arg_str, description)`::
+`OPT_STRVEC(short, long, &struct strvec, arg_str, description)`::
Introduce an option with a string argument.
- The string argument is stored as an element in `argv_array`.
+ The string argument is stored as an element in `strvec`.
Use of `--no-option` will clear the list of preceding values.
`OPT_INTEGER(short, long, &int_var, description)`::
diff --git a/Documentation/technical/config-based-hooks.txt b/Documentation/technical/config-based-hooks.txt
index c6e762b192..4443f70ded 100644
--- a/Documentation/technical/config-based-hooks.txt
+++ b/Documentation/technical/config-based-hooks.txt
@@ -106,10 +106,10 @@ a concise config afterwards. It may take a form similar to `git rebase
`hook.c` and `hook.h` are responsible for interacting with the config files. In
the case when the code generating a hook event doesn't have special concerns
about how to run the hooks, the hook library will provide a basic API to call
-all hooks in config order with an `argv_array` provided by the code which
+all hooks in config order with an `strvec` provided by the code which
generates the hook event:
-*`int run_hooks(const char *hookname, struct argv_array *args)`*
+*`int run_hooks(const char *hookname, struct strvec *args)`*
This call includes the hook command provided by `run-command.h:find_hook()`;
eventually, this legacy hook will be gated by a config `hook.runHookDir`. The
diff --git a/builtin/hook.c b/builtin/hook.c
index cd61fad5fb..debcb5a77a 100644
--- a/builtin/hook.c
+++ b/builtin/hook.c
@@ -5,7 +5,7 @@
#include "hook.h"
#include "parse-options.h"
#include "strbuf.h"
-#include "argv-array.h"
+#include "strvec.h"
static const char * const builtin_hook_usage[] = {
N_("git hook list <hookname>"),
@@ -67,14 +67,14 @@ static int list(int argc, const char **argv, const char *prefix)
static int run(int argc, const char **argv, const char *prefix)
{
struct strbuf hookname = STRBUF_INIT;
- struct argv_array env_argv = ARGV_ARRAY_INIT;
- struct argv_array arg_argv = ARGV_ARRAY_INIT;
+ struct strvec env_argv = STRVEC_INIT;
+ struct strvec arg_argv = STRVEC_INIT;
struct option run_options[] = {
- OPT_ARGV_ARRAY('e', "env", &env_argv, N_("var"),
- N_("environment variables for hook to use")),
- OPT_ARGV_ARRAY('a', "arg", &arg_argv, N_("args"),
- N_("argument to pass to hook")),
+ OPT_STRVEC('e', "env", &env_argv, N_("var"),
+ N_("environment variables for hook to use")),
+ OPT_STRVEC('a', "arg", &arg_argv, N_("args"),
+ N_("argument to pass to hook")),
OPT_END(),
};
@@ -87,7 +87,7 @@ static int run(int argc, const char **argv, const char *prefix)
strbuf_addstr(&hookname, argv[0]);
- return run_hooks(env_argv.argv, &hookname, &arg_argv);
+ return run_hooks(env_argv.v, &hookname, &arg_argv);
}
int cmd_hook(int argc, const char **argv, const char *prefix)
diff --git a/hook.c b/hook.c
index 902e213173..40d319adb1 100644
--- a/hook.c
+++ b/hook.c
@@ -98,7 +98,7 @@ struct list_head* hook_list(const struct strbuf* hookname)
}
int run_hooks(const char *const *env, const struct strbuf *hookname,
- const struct argv_array *args)
+ const struct strvec *args)
{
struct list_head *to_run, *pos = NULL, *tmp = NULL;
int rc = 0;
@@ -110,14 +110,14 @@ int run_hooks(const char *const *env, const struct strbuf *hookname,
struct hook *hook = list_entry(pos, struct hook, list);
/* add command */
- argv_array_push(&hook_proc.args, hook->command.buf);
+ strvec_push(&hook_proc.args, hook->command.buf);
/*
* add passed-in argv, without expanding - let the user get back
* exactly what they put in
*/
if (args)
- argv_array_pushv(&hook_proc.args, args->argv);
+ strvec_pushv(&hook_proc.args, args->v);
hook_proc.env = env;
hook_proc.no_stdin = 1;
diff --git a/hook.h b/hook.h
index cf598d6ccb..d020788a6b 100644
--- a/hook.h
+++ b/hook.h
@@ -1,7 +1,7 @@
#include "config.h"
#include "list.h"
#include "strbuf.h"
-#include "argv-array.h"
+#include "strvec.h"
struct hook
{
@@ -12,7 +12,7 @@ struct hook
struct list_head* hook_list(const struct strbuf *hookname);
int run_hooks(const char *const *env, const struct strbuf *hookname,
- const struct argv_array *args);
+ const struct strvec *args);
void free_hook(struct hook *ptr);
void clear_hook_list(void);
diff --git a/parse-options-cb.c b/parse-options-cb.c
index 4f993cd734..d2b8b7b98a 100644
--- a/parse-options-cb.c
+++ b/parse-options-cb.c
@@ -205,19 +205,19 @@ int parse_opt_string_list(const struct option *opt, const char *arg, int unset)
return 0;
}
-int parse_opt_argv_array(const struct option *opt, const char *arg, int unset)
+int parse_opt_strvec(const struct option *opt, const char *arg, int unset)
{
- struct argv_array *v = opt->value;
+ struct strvec *v = opt->value;
if (unset) {
- argv_array_clear(v);
+ strvec_clear(v);
return 0;
}
if (!arg)
return -1;
- argv_array_push(v, arg);
+ strvec_push(v, arg);
return 0;
}
diff --git a/parse-options.h b/parse-options.h
index e2e2de75c8..177259488b 100644
--- a/parse-options.h
+++ b/parse-options.h
@@ -177,9 +177,9 @@ struct option {
#define OPT_STRING_LIST(s, l, v, a, h) \
{ OPTION_CALLBACK, (s), (l), (v), (a), \
(h), 0, &parse_opt_string_list }
-#define OPT_ARGV_ARRAY(s, l, v, a, h) \
+#define OPT_STRVEC(s, l, v, a, h) \
{ OPTION_CALLBACK, (s), (l), (v), (a), \
- (h), 0, &parse_opt_argv_array }
+ (h), 0, &parse_opt_strvec }
#define OPT_UYN(s, l, v, h) { OPTION_CALLBACK, (s), (l), (v), NULL, \
(h), PARSE_OPT_NOARG, &parse_opt_tertiary }
#define OPT_EXPIRY_DATE(s, l, v, h) \
@@ -299,7 +299,7 @@ int parse_opt_commits(const struct option *, const char *, int);
int parse_opt_commit(const struct option *, const char *, int);
int parse_opt_tertiary(const struct option *, const char *, int);
int parse_opt_string_list(const struct option *, const char *, int);
-int parse_opt_argv_array(const struct option *, const char *, int);
+int parse_opt_strvec(const struct option *, const char *, int);
int parse_opt_noop_cb(const struct option *, const char *, int);
enum parse_opt_result parse_opt_unknown_cb(struct parse_opt_ctx_t *ctx,
const struct option *,
--
2.28.0-558-g7a0184fd7b
^ permalink raw reply related [relevance 2%]
* [PATCH 14/17] sequencer.c: fix sequencer_continue() leak
@ 2022-11-03 17:06 2% ` Ævar Arnfjörð Bjarmason
0 siblings, 0 replies; 200+ results
From: Ævar Arnfjörð Bjarmason @ 2022-11-03 17:06 UTC (permalink / raw)
To: git
Cc: Junio C Hamano, Phillip Wood, Jeff King, Derrick Stolee,
Elijah Newren, Ævar Arnfjörð Bjarmason
Fix a leak in the recent da1d63363f1 (rebase --merge: fix reflog when
continuing, 2022-10-12), per [1] the author was under the impression
that by calling "setenv()" the C library took possession of the
string, but we need to free() it.
As [1] also notes there's upcoming changes to do some larger rewrite
of these codepaths in sequencer.c, but let's first do this much
smaller and isolated leak fix.
1. https://lore.kernel.org/git/86699708-d631-fb49-482c-af27204a3570@dunelm.org.uk/
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
sequencer.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/sequencer.c b/sequencer.c
index 14ca0af2ade..3095d0d2b3b 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -5069,10 +5069,12 @@ int sequencer_continue(struct repository *r, struct replay_opts *opts)
previous_reflog_action = xstrdup(getenv(GIT_REFLOG_ACTION));
setenv(GIT_REFLOG_ACTION, reflog_message(opts, "continue", NULL), 1);
if (commit_staged_changes(r, opts, &todo_list)) {
+ free(previous_reflog_action);
res = -1;
goto release_todo_list;
}
setenv(GIT_REFLOG_ACTION, previous_reflog_action, 1);
+ free(previous_reflog_action);
} else if (!file_exists(get_todo_path(opts)))
return continue_single_pick(r, opts);
else if ((res = read_populate_todo(r, &todo_list, opts)))
--
2.38.0.1451.g86b35f4140a
^ permalink raw reply related [relevance 2%]
* What's cooking in git.git (Nov 2009, #01; Wed, 04)
@ 2009-11-05 5:41 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2009-11-05 5:41 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
marked with '.' do not appear in any of the integration branches, but I am
still holding onto them.
In 1.7.0, we plan to correct handful of warts in the interfaces everybody
agrees that they were mistakes. The resulting system may not be strictly
backward compatible. Currently planeed changes are:
* refuse push to update the checked out branch in a non-bare repo by
default
Make "git push" into a repository to update the branch that is checked
out fail by default. You can countermand this default by setting a
configuration variable in the receiving repository.
http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007
* refuse push to delete the current branch by default
Make "git push $there :$killed" to delete the branch that is pointed at
by its HEAD fail by default. You can countermand this default by
setting a configuration variable in the receiving repository.
http://thread.gmane.org/gmane.comp.version-control.git/108862/focus=108936
* git-send-email won't make deep threads by default
Many people said that by default when sending more than 2 patches the
threading git-send-email makes by default is hard to read, and they
prefer the default be one cover letter and each patch as a direct
follow-up to the cover letter. You can countermand this by setting a
configuration variable.
http://article.gmane.org/gmane.comp.version-control.git/109790
* git-status won't be "git-commit --dry-run" anymore
http://thread.gmane.org/gmane.comp.version-control.git/125989/focus=125993
* "git-diff -w --exit-code" will exit success if only differences it
found are whitespace changes that are stripped away from the output.
http://thread.gmane.org/gmane.comp.version-control.git/119731/focus=119751
--------------------------------------------------
[New Topics]
* bw/autoconf-more (2009-11-04) 2 commits
- configure: add settings for gitconfig, editor and pager
- configure: add macro to set arbitrary make variables
* em/commit-claim (2009-11-04) 1 commit
- commit -c/-C/--amend: reset timestamp and authorship to committer with --reset-author
I just picked better bits from both versions.
* jk/maint-format-patch-p-suppress-stat (2009-11-04) 2 commits.
- format-patch: make "-p" suppress diffstat
- Revert "format-patch -p is now a no-op" series
(this branch uses bg/format-patch-p-noop.)
This corrects a mistake made soon after 1.6.0.
* rj/maint-simplify-cygwin-makefile (2009-10-27) 1 commit.
- Makefile: merge two Cygwin configuration sections into one
This is one of the most obviously correct bit from "Compiling on Cygwin
using MSVC fails" topic I didn't really look at. If J6t is Ok with the
series, I don't mind queueing the whole thing myself.
* vl/maint-openssl-signature-change (2009-10-31) 1 commit.
(merged to 'next' on 2009-10-31 at 0e1ce6b)
+ imap-send.c: fix compiler warnings for OpenSSL 1.0
Prepare ourselves before newer versions of OpenSSL hits more platforms.
--------------------------------------------------
[Stalled]
* tr/filter-branch (2009-10-28) 2 commits.
- filter-branch: nearest-ancestor rewriting outside subdir filter
- filter-branch: stop special-casing $filter_subdir argument
J6t had some comments on this.
* ne/rev-cache (2009-10-19) 7 commits.
- support for commit grafts, slight change to general mechanism
- support for path name caching in rev-cache
- full integration of rev-cache into git, completed test suite
- administrative functions for rev-cache, start of integration into git
- support for non-commit object caching in rev-cache
- basic revision cache system, no integration or features
- man page and technical discussion for rev-cache
The author indicated that there is another round coming. Does not seem to
pass the tests when merged to 'pu'.
* jl/submodule-add-noname (2009-09-22) 1 commit.
- git submodule add: make the <path> parameter optional
Dscho started an interesting discussion regarding the larger workflow in
which the "submodule add" is used. I think the patch itself makes sense
but at the same time it probably makes sense to also take the <path> and
infer the <repository> as Dscho suggested, probably in "git submodule
add", not in "git add" proper, at least initially.
* sr/gfi-options (2009-09-06) 6 commits.
- fast-import: test the new option command
- fast-import: add option command
- fast-import: test the new feature command
- fast-import: add feature command
- fast-import: put marks reading in it's own function
- fast-import: put option parsing code in separate functions
Seems to be moving again soon.
* je/send-email-no-subject (2009-08-05) 1 commit.
(merged to 'next' on 2009-10-11 at 1b99c56)
+ send-email: confirm on empty mail subjects
The existing tests cover the positive case (i.e. as long as the user says
"yes" to the "do you really want to send this message that lacks subject",
the message is sent) of this feature, but the feature itself needs its own
test to verify the negative case (i.e. does it correctly stop if the user
says "no"?)
--------------------------------------------------
[Cooking]
* bg/merge-ff-only (2009-10-29) 1 commit
(merged to 'next' on 2009-10-31 at b6b49aa)
+ Teach 'git merge' and 'git pull' the option --ff-only
* jk/maint-1.6.3-ls-files-i (2009-10-30) 1 commit.
(merged to 'next' on 2009-10-31 at 3a31fcc)
+ ls-files: unbreak "ls-files -i"
* jn/editor-pager (2009-10-30) 8 commits
- Provide a build time default-pager setting
- Provide a build time default-editor setting
- am -i, git-svn: use "git var GIT_PAGER"
- add -i, send-email, svn, p4, etc: use "git var GIT_EDITOR"
- Teach git var about GIT_PAGER
- Teach git var about GIT_EDITOR
- Do not use VISUAL editor on dumb terminals
- Handle more shell metacharacters in editor names
* js/maint-diff-color-words (2009-10-30) 3 commits.
- diff --color-words: bit of clean-up
- diff --color-words -U0: fix the location of hunk headers
- t4034-diff-words: add a test for word diff without context
Fixes a corner case of running --color-words with -U0.
* sc/difftool-p4merge (2009-10-28) 1 commit
(merged to 'next' on 2009-10-31 at 194b5c5)
+ mergetool--lib: add p4merge as a pre-configured mergetool option
* sc/protocol-doc (2009-10-29) 1 commit
- Update packfile transfer protocol documentation
There is the final draft posted, but I haven't picked it up yet.
* sr/vcs-helper (2009-11-04) 13 commits
- Add Python support library for remote helpers
- Basic build infrastructure for Python scripts
- Allow helpers to request the path to the .git directory
- Allow helpers to report in "list" command that the ref is unchanged
- Honour the refspec when updating refs after import
- Write local refs written by the "import" helper command only once
- Add support for "import" helper command
- Allow specifying the remote helper in the url
- Add a config option for remotes to specify a foreign vcs
- Allow fetch to modify refs
- Use a function to determine whether a remote is valid
- Allow programs to not depend on remotes having urls
- Fix memory leak in helper method for disconnect
Supposed to replace db/vcs-helper-rest. Still does not pass tests in
'pu'.
* tr/describe-advice (2009-10-28) 1 commit
(merged to 'next' on 2009-10-31 at 8084850)
+ describe: when failing, tell the user about options that work
* mr/gitweb-snapshot (2009-10-29) 3 commits.
- gitweb: Smarter snapshot names
- t/gitweb-lib.sh: Split gitweb output into headers and body
(merged to 'next' on 2009-10-11 at 22ba047)
+ gitweb: check given hash before trying to create snapshot
Replaced the tip with Jakub's updates.
* jp/dirty-describe (2009-10-21) 1 commit.
(merged to 'next' on 2009-10-30 at 19c7fc7)
+ Teach "git describe" --dirty option
* jp/fetch-cull-many-refs (2009-10-25) 2 commits
(merged to 'next' on 2009-11-01 at 1f09ce9)
+ fetch: Speed up fetch of large numbers of refs
+ remote: Make ref_remove_duplicates faster for large numbers of refs
* bg/format-patch-p-noop (2009-10-25) 3 commits.
(merged to 'next' on 2009-10-30 at e34a3db)
+ format-patch documentation: Fix formatting
+ format-patch documentation: Remove diff options that are not useful
+ format-patch: Make implementation and documentation agree
(this branch is used by jk/maint-format-patch-p-suppress-stat.)
Will revert from 'next' by merging Peff's fix.
* jk/gitignore-anchored (2009-10-26) 1 commit
(merged to 'next' on 2009-10-30 at 9391a93)
+ gitignore: root most patterns at the top-level directory
* jk/maint-add-p-empty (2009-10-27) 1 commit.
(merged to 'next' on 2009-10-30 at 2bd302f)
+ add-interactive: handle deletion of empty files
* jk/maint-push-config (2009-10-25) 1 commit.
(merged to 'next' on 2009-10-30 at 934e3c5)
+ push: always load default config
* lt/revision-bisect (2009-10-27) 1 commit.
(merged to 'next' on 2009-10-30 at 81ee52b)
+ Add '--bisect' revision machinery argument
* jc/pretty-lf (2009-10-04) 1 commit.
- Pretty-format: %[+-]x to tweak inter-item newlines
* rs/pretty-wrap (2009-10-17) 1 commit
(merged to 'next' on 2009-10-30 at 403bbfe)
+ Implement wrap format %w() as if it is a mode switch
(this branch uses js/log-rewrap.)
* js/log-rewrap (2009-10-18) 3 commits
(merged to 'next' on 2009-10-30 at 403bbfe)
+ Teach --wrap to only indent without wrapping
+ Add strbuf_add_wrapped_text() to utf8.[ch]
+ print_wrapped_text(): allow hard newlines
(this branch is used by rs/pretty-wrap.)
* sr/blame-incomplete (2009-10-19) 1 commit.
(merged to 'next' on 2009-10-22 at 133e0ce)
+ blame: make sure that the last line ends in an LF
I think this is _good enough_ as-is; although it would be better if we
added some hint to the output for Porcelain implementations, that can be
done as a follow-up fix.
* fc/doc-fast-forward (2009-10-24) 1 commit.
(merged to 'next' on 2009-11-01 at faaad90)
+ Use 'fast-forward' all over the place
* ks/precompute-completion (2009-10-26) 3 commits.
(merged to 'next' on 2009-10-28 at cd5177f)
+ completion: ignore custom merge strategies when pre-generating
(merged to 'next' on 2009-10-22 at f46a28a)
+ bug: precomputed completion includes scripts sources
(merged to 'next' on 2009-10-14 at adf722a)
+ Speedup bash completion loading
* sp/smart-http (2009-11-04) 30 commits
- http-backend: Test configuration options
- http-backend: Use http.getanyfile to disable dumb HTTP serving
- test smart http fetch and push
- http tests: use /dumb/ URL prefix
- set httpd port before sourcing lib-httpd
- t5540-http-push: remove redundant fetches
- Smart HTTP fetch: gzip requests
- Smart fetch over HTTP: client side
- Smart push over HTTP: client side
- Discover refs via smart HTTP server when available
- http-backend: more explict LocationMatch
- http-backend: add example for gitweb on same URL
- http-backend: use mod_alias instead of mod_rewrite
- http-backend: reword some documentation
- http-backend: add GIT_PROJECT_ROOT environment var
- Smart fetch and push over HTTP: server side
- Add stateless RPC options to upload-pack, receive-pack
- Git-aware CGI to provide dumb HTTP transport
- remote-helpers: return successfully if everything up-to-date
- Move WebDAV HTTP push under remote-curl
- remote-helpers: Support custom transport options
- remote-helpers: Fetch more than one ref in a batch
- fetch: Allow transport -v -v -v to set verbosity to 3
- remote-curl: Refactor walker initialization
- Add multi_ack_detailed capability to fetch-pack/upload-pack
- Move "get_ack()" back to fetch-pack
- fetch-pack: Use a strbuf to compose the want list
- pkt-line: Make packet_read_line easier to debug
- pkt-line: Add strbuf based functions
- http-push: fix check condition on http.c::finish_http_pack_request()
v5 plus 3 more fix-up patches from today.
* ef/msys-imap (2009-10-22) 9 commits.
(merged to 'next' on 2009-10-31 at 8630603)
+ Windows: use BLK_SHA1 again
+ MSVC: Enable OpenSSL, and translate -lcrypto
+ mingw: enable OpenSSL
+ mingw: wrap SSL_set_(w|r)fd to call _get_osfhandle
+ imap-send: build imap-send on Windows
+ imap-send: fix compilation-error on Windows
+ imap-send: use run-command API for tunneling
+ imap-send: use separate read and write fds
+ imap-send: remove useless uid code
* jc/fix-tree-walk (2009-10-22) 11 commits.
(merged to 'next' on 2009-10-22 at 10c0c8f)
+ Revert failed attempt since 353c5ee
+ read-tree --debug-unpack
(merged to 'next' on 2009-10-11 at 0b058e2)
+ unpack-trees.c: look ahead in the index
+ unpack-trees.c: prepare for looking ahead in the index
+ Aggressive three-way merge: fix D/F case
+ traverse_trees(): handle D/F conflict case sanely
+ more D/F conflict tests
+ tests: move convenience regexp to match object names to test-lib.sh
+ unpack_callback(): use unpack_failed() consistently
+ unpack-trees: typofix
+ diff-lib.c: fix misleading comments on oneway_diff()
This has some stupid bugs and temporarily reverted from 'next' until I can
fix it, but the "temporarily" turned out to be very loooong. Sigh...
* jh/notes (2009-10-09) 22 commits.
- fast-import: Proper notes tree manipulation using the notes API
- Refactor notes concatenation into a flexible interface for combining notes
- Notes API: Allow multiple concurrent notes trees with new struct notes_tree
- Notes API: for_each_note(): Traverse the entire notes tree with a callback
- Notes API: get_note(): Return the note annotating the given object
- Notes API: add_note(): Add note objects to the internal notes tree structure
- Notes API: init_notes(): Initialize the notes tree from the given notes ref
- Notes API: get_commit_notes() -> format_note() + remove the commit restriction
(merged to 'next' on 2009-11-01 at 948327a)
+ Add selftests verifying concatenation of multiple notes for the same commit
+ Refactor notes code to concatenate multiple notes annotating the same object
+ Add selftests verifying that we can parse notes trees with various fanouts
+ Teach the notes lookup code to parse notes trees with various fanout schemes
+ Teach notes code to free its internal data structures on request
+ Add '%N'-format for pretty-printing commit notes
+ Add flags to get_commit_notes() to control the format of the note string
+ t3302-notes-index-expensive: Speed up create_repo()
+ fast-import: Add support for importing commit notes
+ Teach "-m <msg>" and "-F <file>" to "git notes edit"
+ Add an expensive test for git-notes
+ Speed up git notes lookup
+ Add a script to edit/inspect notes
+ Introduce commit notes
* jn/gitweb-blame (2009-09-01) 5 commits.
- gitweb: Minify gitweb.js if JSMIN is defined
- gitweb: Create links leading to 'blame_incremental' using JavaScript
(merged to 'next' on 2009-10-11 at 73c4a83)
+ gitweb: Colorize 'blame_incremental' view during processing
+ gitweb: Incremental blame (using JavaScript)
+ gitweb: Add optional "time to generate page" info in footer
Ajax-y blame.
* nd/sparse (2009-08-20) 19 commits.
- sparse checkout: inhibit empty worktree
- Add tests for sparse checkout
- read-tree: add --no-sparse-checkout to disable sparse checkout support
- unpack-trees(): ignore worktree check outside checkout area
- unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index
- unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout
- unpack-trees.c: generalize verify_* functions
- unpack-trees(): add CE_WT_REMOVE to remove on worktree alone
- Introduce "sparse checkout"
- dir.c: export excluded_1() and add_excludes_from_file_1()
- excluded_1(): support exclude files in index
- unpack-trees(): carry skip-worktree bit over in merged_entry()
- Read .gitignore from index if it is skip-worktree
- Avoid writing to buffer in add_excludes_from_file_1()
- Teach Git to respect skip-worktree bit (writing part)
- Teach Git to respect skip-worktree bit (reading part)
- Introduce "skip-worktree" bit in index, teach Git to get/set this bit
- Add test-index-version
- update-index: refactor mark_valid() in preparation for new options
--------------------------------------------------
[For 1.7.0]
* jc/1.7.0-no-commit-no-ff-2 (2009-10-22) 1 commit.
- git-merge: forbid fast-forward and up-to-date when --no-commit is given
This makes "git merge --no-commit" fail when it results in fast-forward or
up-to-date. I haven't described this at the beginning of this message
yet, as it is not clear if this change is even necessary. Opinions?
* jk/1.7.0-status (2009-09-05) 5 commits.
- docs: note that status configuration affects only long format
(merged to 'next' on 2009-10-11 at 65c8513)
+ commit: support alternate status formats
+ status: add --porcelain output format
+ status: refactor format option parsing
+ status: refactor short-mode printing to its own function
(this branch uses jc/1.7.0-status.)
Gives the --short output format to post 1.7.0 "git commit --dry-run" that
is similar to that of post 1.7.0 "git status".
The tip one is not in 'next' as I have been hoping that somebody may want
to change the code to make it unnecessary, but it does not seem to be
happening, so probably it should also go to 'next'.
* jc/1.7.0-status (2009-09-05) 4 commits.
(merged to 'next' on 2009-10-11 at 9558627)
+ status: typo fix in usage
+ git status: not "commit --dry-run" anymore
+ git stat -s: short status output
+ git stat: the beginning of "status that is not a dry-run of commit"
(this branch is used by jk/1.7.0-status.)
With this, "git status" is no longer "git commit --dry-run".
* jc/1.7.0-send-email-no-thread-default (2009-08-22) 1 commit.
(merged to 'next' on 2009-10-11 at 043acdf)
+ send-email: make --no-chain-reply-to the default
* jc/1.7.0-diff-whitespace-only-status (2009-08-30) 4 commits.
(merged to 'next' on 2009-10-11 at 546c74d)
+ diff.c: fix typoes in comments
+ Make test case number unique
+ diff: Rename QUIET internal option to QUICK
+ diff: change semantics of "ignore whitespace" options
This changes exit code from "git diff --ignore-whitespace" and friends
when there is no actual output. It is a backward incompatible change, but
we could argue that it is a bugfix.
* jc/1.7.0-push-safety (2009-02-09) 2 commits.
(merged to 'next' on 2009-10-11 at 81b8128)
+ Refuse deleting the current branch via push
+ Refuse updating the current branch in a non-bare repository via push
--------------------------------------------------
[I have been too busy to purge these]
* jc/log-tz (2009-03-03) 1 commit.
- Allow --date=local --date=other-format to work as expected
Maybe some people care about this. I dunno.
* jc/mailinfo-remove-brackets (2009-07-15) 1 commit.
- mailinfo: -b option keeps [bracketed] strings that is not a [PATCH] marker
Maybe some people care about this. I dunno.
* jg/log-format-body-indent (2009-09-19) 1 commit.
. git-log --format: Add %B tag with %B(x) option
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (Nov 2009, #03; Sun, 15)
@ 2009-11-15 10:23 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2009-11-15 10:23 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
marked with '.' do not appear in any of the integration branches, but I am
still holding onto them.
In 1.7.0, we plan to correct handful of warts in the interfaces everybody
agrees that they were mistakes. The resulting system may not be strictly
backward compatible. Currently planned changes are:
* refuse push to update the checked out branch in a non-bare repo by
default
Make "git push" into a repository to update the branch that is checked
out fail by default. You can countermand this default by setting a
configuration variable in the receiving repository.
http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007
* refuse push to delete the current branch by default
Make "git push $there :$killed" to delete the branch that is pointed at
by its HEAD fail by default. You can countermand this default by
setting a configuration variable in the receiving repository.
http://thread.gmane.org/gmane.comp.version-control.git/108862/focus=108936
* git-send-email won't make deep threads by default
Many people said that by default when sending more than 2 patches the
threading git-send-email makes by default is hard to read, and they
prefer the default be one cover letter and each patch as a direct
follow-up to the cover letter. You can countermand this by setting a
configuration variable.
http://article.gmane.org/gmane.comp.version-control.git/109790
* git-status won't be "git-commit --dry-run" anymore
http://thread.gmane.org/gmane.comp.version-control.git/125989/focus=125993
* "git-diff -w --exit-code" will exit success if only differences it
found are whitespace changes that are stripped away from the output.
http://thread.gmane.org/gmane.comp.version-control.git/119731/focus=119751
I wasn't fully functioning for the past few days, so this round we have
only added new topics and new patches to existing ones, without changing
the status of individual topics very much.
--------------------------------------------------
[Graduated to "master"]
* jk/maint-format-patch-p-suppress-stat (2009-11-04) 1 commit.
(merged to 'next' on 2009-11-08 at 0943296)
+ format-patch: make "-p" suppress diffstat
(this branch is used by bg/format-patch-doc-update.)
* vl/maint-openssl-signature-change (2009-10-31) 1 commit.
(merged to 'next' on 2009-10-31 at 0e1ce6b)
+ imap-send.c: fix compiler warnings for OpenSSL 1.0
Prepare ourselves before newer versions of OpenSSL hits more platforms.
* pb/maint-gitweb-blob-lineno (2009-11-06) 1 commit.
(merged to 'next' on 2009-11-06 at 27b86ec)
+ gitweb: Fix blob linenr links in pathinfo mode
* bg/merge-ff-only (2009-10-29) 1 commit
(merged to 'next' on 2009-10-31 at b6b49aa)
+ Teach 'git merge' and 'git pull' the option --ff-only
* jk/maint-1.6.3-ls-files-i (2009-10-30) 1 commit.
(merged to 'next' on 2009-10-31 at 3a31fcc)
+ ls-files: unbreak "ls-files -i"
* tr/describe-advice (2009-10-28) 1 commit
(merged to 'next' on 2009-10-31 at 8084850)
+ describe: when failing, tell the user about options that work
* jp/dirty-describe (2009-10-21) 1 commit.
(merged to 'next' on 2009-10-30 at 19c7fc7)
+ Teach "git describe" --dirty option
* jk/gitignore-anchored (2009-10-26) 1 commit
(merged to 'next' on 2009-10-30 at 9391a93)
+ gitignore: root most patterns at the top-level directory
* jk/maint-push-config (2009-10-25) 1 commit.
(merged to 'next' on 2009-10-30 at 934e3c5)
+ push: always load default config
* sr/blame-incomplete (2009-10-19) 1 commit.
(merged to 'next' on 2009-10-22 at 133e0ce)
+ blame: make sure that the last line ends in an LF
I think this is _good enough_ as-is; although it would be better if we
added some hint to the output for Porcelain implementations, that can be
done as a follow-up fix.
--------------------------------------------------
[New Topics]
* jn/help-everywhere (2009-11-09) 21 commits
- diff --no-index: make the usage string less scary
- merge-{recursive,subtree}: use usagef() to print usage
- Introduce usagef() that takes a printf-style format
- Let 'git <command> -h' show usage without a git dir
- Show usage string for 'git http-push -h'
- Let 'git http-fetch -h' show usage outside any git repository
- Show usage string for 'git stripspace -h'
- Show usage string for 'git unpack-file -h'
- Show usage string for 'git show-index -h'
- Show usage string for 'git rev-parse -h'
- Show usage string for 'git merge-one-file -h'
- Show usage string for 'git mailsplit -h'
- Show usage string for 'git imap-send -h'
- Show usage string for 'git get-tar-commit-id -h'
- Show usage string for 'git fast-import -h'
- Show usage string for 'git check-ref-format -h'
- Show usage string for 'git show-ref -h'
- Show usage string for 'git merge-ours -h'
- Show usage string for 'git commit-tree -h'
- Show usage string for 'git cherry -h'
- Show usage string for 'git grep -h'
(this branch uses jn/maint-http-fetch-mingw and jn/remove-fetch--tool.)
There were unrelated but still worthy fixes, so I reordered some of them;
also the "usage()" change is different from the one that was posted (see
my comment in $gmane/132592).
* jn/maint-http-fetch-mingw (2009-11-09) 1 commit.
- http-fetch: add missing initialization of argv0_path
(this branch is used by jn/help-everywhere.)
* jn/remove-fetch--tool (2009-11-09) 1 commit
- Retire fetch--tool helper to contrib/examples
(this branch is used by jn/help-everywhere.)
These two were originally part of the "help-everywhere" topic but
they can stand on their own.
* jc/log-stdin (2009-11-03) 1 commit
- Teach --stdin option to "log" family
This is not signed-off (see $gmane/131971 for list of things you can do to
help advancing this topic).
* jn/gitweb-log-history (2009-11-13) 3 commits
- gitweb: Make 'history' view (re)use git_log_generic()
- gitweb: Refactor common parts of 'log' and 'shortlog' views
- gitweb: Refactor 'log' action generation, adding git_log_body()
* jn/rfc-pull-rebase-error-message (2009-11-12) 1 commit
- git-pull.sh --rebase: overhaul error handling when no candidates are found
* np/maint-sideband-favor-status (2009-11-11) 1 commit.
- give priority to progress messages
This looked obviously correct but I wasn't fully up to speed after being
ill for a few days, so it is queued in 'pu' with everything else.
* rg/doc-workflow (2009-11-14) 2 commits.
- Corrections to release management section in gitworkflows.txt
- Add branch management for releases to gitworkflows
* sb/ls-tree-parseopt (2009-11-13) 2 commits.
- ls-tree: migrate to parse-options
- t3101: test more ls-tree options
* tz/maint-rpm (2009-11-11) 1 commit.
- Makefile: Ensure rpm packages can be read by older rpm versions
--------------------------------------------------
[Stalled]
* jl/submodule-add-noname (2009-09-22) 1 commit.
- git submodule add: make the <path> parameter optional
Dscho started an interesting discussion regarding the larger workflow in
which the "submodule add" is used. I think the patch itself makes sense
but at the same time it probably makes sense to also take the <path> and
infer the <repository> as Dscho suggested, probably in "git submodule
add", not in "git add" proper, at least initially.
Any objections against merging this to 'next'?
* jc/fix-tree-walk (2009-10-22) 11 commits.
(merged to 'next' on 2009-10-22 at 10c0c8f)
+ Revert failed attempt since 353c5ee
+ read-tree --debug-unpack
(merged to 'next' on 2009-10-11 at 0b058e2)
+ unpack-trees.c: look ahead in the index
+ unpack-trees.c: prepare for looking ahead in the index
+ Aggressive three-way merge: fix D/F case
+ traverse_trees(): handle D/F conflict case sanely
+ more D/F conflict tests
+ tests: move convenience regexp to match object names to test-lib.sh
+ unpack_callback(): use unpack_failed() consistently
+ unpack-trees: typofix
+ diff-lib.c: fix misleading comments on oneway_diff()
This has some stupid bugs and temporarily reverted from 'next' until I can
fix it, but the "temporarily" turned out to be very loooong. Sigh...
* jh/notes (2009-10-09) 22 commits.
- fast-import: Proper notes tree manipulation using the notes API
- Refactor notes concatenation into a flexible interface for combining notes
- Notes API: Allow multiple concurrent notes trees with new struct notes_tree
- Notes API: for_each_note(): Traverse the entire notes tree with a callback
- Notes API: get_note(): Return the note annotating the given object
- Notes API: add_note(): Add note objects to the internal notes tree structure
- Notes API: init_notes(): Initialize the notes tree from the given notes ref
- Notes API: get_commit_notes() -> format_note() + remove the commit restriction
(merged to 'next' on 2009-11-01 at 948327a)
+ Add selftests verifying concatenation of multiple notes for the same commit
+ Refactor notes code to concatenate multiple notes annotating the same object
+ Add selftests verifying that we can parse notes trees with various fanouts
+ Teach the notes lookup code to parse notes trees with various fanout schemes
+ Teach notes code to free its internal data structures on request
+ Add '%N'-format for pretty-printing commit notes
+ Add flags to get_commit_notes() to control the format of the note string
+ t3302-notes-index-expensive: Speed up create_repo()
+ fast-import: Add support for importing commit notes
+ Teach "-m <msg>" and "-F <file>" to "git notes edit"
+ Add an expensive test for git-notes
+ Speed up git notes lookup
+ Add a script to edit/inspect notes
+ Introduce commit notes
I somehow thought that the later API part was waiting for updates but
nothing seems to be happening.
* jn/gitweb-blame (2009-09-01) 5 commits.
- gitweb: Minify gitweb.js if JSMIN is defined
- gitweb: Create links leading to 'blame_incremental' using JavaScript
(merged to 'next' on 2009-10-11 at 73c4a83)
+ gitweb: Colorize 'blame_incremental' view during processing
+ gitweb: Incremental blame (using JavaScript)
+ gitweb: Add optional "time to generate page" info in footer
Ajax-y blame. Any progress or RFH?
* sr/gfi-options (2009-09-06) 6 commits.
- fast-import: test the new option command
- fast-import: add option command
- fast-import: test the new feature command
- fast-import: add feature command
- fast-import: put marks reading in it's own function
- fast-import: put option parsing code in separate functions
It seemed to be moving again soon, but nothing has happened yet...
* je/send-email-no-subject (2009-08-05) 1 commit.
(merged to 'next' on 2009-10-11 at 1b99c56)
+ send-email: confirm on empty mail subjects
The existing tests cover the positive case (i.e. as long as the user says
"yes" to the "do you really want to send this message that lacks subject",
the message is sent) of this feature, but the feature itself needs its own
test to verify the negative case (i.e. does it correctly stop if the user
says "no"?)
--------------------------------------------------
[Cooking]
* sc/protocol-doc (2009-11-03) 1 commit.
- Update packfile transfer protocol documentation
* tr/filter-branch (2009-11-10) 2 commits.
- filter-branch: nearest-ancestor rewriting outside subdir filter
- filter-branch: stop special-casing $filter_subdir argument
Updated again. Looked sane, except that the option might not be
necessary. But that can be fixed while in 'next', so unless anybody
sees further issues, I'll move this to 'next' soon.
* em/commit-claim (2009-11-04) 1 commit
- commit -c/-C/--amend: reset timestamp and authorship to committer with --reset-author
I just picked better bits from both versions, but this needs to be
rethought.
* bg/format-patch-doc-update (2009-11-07) 4 commits
- format-patch: Add "--no-stat" as a synonym for "-p"
- format-patch documentation: Fix formatting
- format-patch documentation: Remove diff options that are not useful
- format-patch: Always generate a patch
Looked sensible, even though this may want to wait for 1.7.0. We'll see
when we merge this to 'next'. I tweaked the --no-stat patch with noneg
bit; please check for sanity.
* rj/maint-simplify-cygwin-makefile (2009-10-27) 1 commit.
- Makefile: merge two Cygwin configuration sections into one
(this branch is used by rj/cygwin-msvc.)
This is one of the most obviously correct bit from "Compiling on Cygwin
using MSVC fails" topic.
* rj/cygwin-msvc (2009-11-09) 3 commits.
- Add explicit Cygwin check to guard WIN32 header inclusion
- MSVC: Add support for building with NO_MMAP
- Makefile: keep MSVC and Cygwin configuration separate
(this branch uses rj/maint-simplify-cygwin-makefile.)
I think J6t was not happy with the tip one.
* bg/fetch-multi (2009-11-10) 9 commits
- Re-implement 'git remote update' using 'git fetch'
- builtin-fetch: add --dry-run option
- builtin-fetch: add --prune option
- teach warn_dangling_symref to take a FILE argument
- remote: refactor some logic into get_stale_heads()
- Add missing test for 'git remote update --prune'
- Add the configuration option skipFetchAll
- Teach the --multiple option to 'git fetch'
- Teach the --all option to 'git fetch'
This series from Björn Gustavsson contains 4 patches from Jay Soffian as
well. I haven't looked at the code very closely yet.
* bs/maint-pre-commit-hook-sample (2009-11-05) 1 commit.
(merged to 'next' on 2009-11-06 at d70f646)
+ pre-commit.sample: Diff against the empty tree when HEAD is invalid
Looked Ok.
* cc/bisect-doc (2009-11-08) 1 commit
- Documentation: add "Fighting regressions with git bisect" article
Any comments? Should it go to Documentation/technical instead?
* sb/tutorial-test (2009-11-06) 4 commits
- t1200: prepare for merging with Fast-forward bikeshedding
- t1200: further modernize test script style
- t1200: Make documentation and test agree
- t1200: cleanup and modernize test style
Ready for 'next', I think.
* jn/editor-pager (2009-10-30) 9 commits
- Provide a build time default-pager setting
- Provide a build time default-editor setting
- am -i, git-svn: use "git var GIT_PAGER"
- add -i, send-email, svn, p4, etc: use "git var GIT_EDITOR"
- Teach git var about GIT_PAGER
- Teach git var about GIT_EDITOR
- Suppress warnings from "git var -l"
- Do not use VISUAL editor on dumb terminals
- Handle more shell metacharacters in editor names
* bw/autoconf-more (2009-11-04) 2 commits
- configure: add settings for gitconfig, editor and pager
- configure: add macro to set arbitrary make variables
This will follow jn/editor-pager series.
* js/maint-diff-color-words (2009-10-30) 3 commits.
(merged to 'next' on 2009-11-10 at 5619714)
+ diff --color-words: bit of clean-up
+ diff --color-words -U0: fix the location of hunk headers
+ t4034-diff-words: add a test for word diff without context
Fixes a corner case of running --color-words with -U0.
* sc/difftool-p4merge (2009-10-28) 1 commit
(merged to 'next' on 2009-10-31 at 194b5c5)
+ mergetool--lib: add p4merge as a pre-configured mergetool option
I do not do p4 nor use difftool, so it's much easier for me to merge this
to 'master' and wait for anybody to scream if there is breakage. I'll do
so, unless I hear objections in a few days.
* sr/vcs-helper (2009-11-06) 12 commits
- Add Python support library for remote helpers
- Basic build infrastructure for Python scripts
- Allow helpers to request the path to the .git directory
- Allow helpers to report in "list" command that the ref is unchanged
- Allow helper to map private ref names into normal names
- Add support for "import" helper command
- Allow specifying the remote helper in the url
- Add a config option for remotes to specify a foreign vcs
- Allow fetch to modify refs
- Use a function to determine whether a remote is valid
- Allow programs to not depend on remotes having urls
- Fix memory leak in helper method for disconnect
Re-rolled series that contains Daniel's and Johan's.
Any comments? Is everybody happy?
* mr/gitweb-snapshot (2009-11-07) 4 commits.
- gitweb: Smarter snapshot names
- gitweb: Document current snapshot rules via new tests
- t/gitweb-lib.sh: Split gitweb output into headers and body
(merged to 'next' on 2009-10-11 at 22ba047)
+ gitweb: check given hash before trying to create snapshot
Replaced commits near the tip with recent updates.
* jp/fetch-cull-many-refs (2009-11-13) 3 commits
(merged to 'next' on 2009-11-15 at db0f967)
+ remote: fix use-after-free error detected by glibc in ref_remove_duplicates
(merged to 'next' on 2009-11-01 at 1f09ce9)
+ fetch: Speed up fetch of large numbers of refs
+ remote: Make ref_remove_duplicates faster for large numbers of refs
Soon in 'master'.
* jk/maint-add-p-empty (2009-10-27) 1 commit.
(merged to 'next' on 2009-10-30 at 2bd302f)
+ add-interactive: handle deletion of empty files
Soon in 'master'.
* lt/revision-bisect (2009-10-27) 1 commit.
(merged to 'next' on 2009-10-30 at 81ee52b)
+ Add '--bisect' revision machinery argument
Soon in 'master'.
* jc/pretty-lf (2009-10-04) 1 commit.
- Pretty-format: %[+-]x to tweak inter-item newlines
* rs/pretty-wrap (2009-11-08) 2 commits
(merged to 'next' on 2009-11-08 at 8973fd8)
+ log --format: don't ignore %w() at the start of format string
(merged to 'next' on 2009-10-30 at 403bbfe)
+ Implement wrap format %w() as if it is a mode switch
(this branch uses js/log-rewrap.)
Soon in 'master'.
* js/log-rewrap (2009-10-18) 3 commits
(merged to 'next' on 2009-10-30 at 403bbfe)
+ Teach --wrap to only indent without wrapping
+ Add strbuf_add_wrapped_text() to utf8.[ch]
+ print_wrapped_text(): allow hard newlines
(this branch is used by rs/pretty-wrap.)
Soon in 'master'.
* fc/doc-fast-forward (2009-10-24) 1 commit.
(merged to 'next' on 2009-11-01 at faaad90)
+ Use 'fast-forward' all over the place
Soon in 'master'; carrying this in 'next' for too long is turning out to
be quite painful.
* ks/precompute-completion (2009-10-26) 3 commits.
(merged to 'next' on 2009-10-28 at cd5177f)
+ completion: ignore custom merge strategies when pre-generating
(merged to 'next' on 2009-10-22 at f46a28a)
+ bug: precomputed completion includes scripts sources
(merged to 'next' on 2009-10-14 at adf722a)
+ Speedup bash completion loading
I didn't follow the discussion from the past few days closely, but I am
getting an impression that the consensus is we shouldn't precompute, so I
may have to revert this and replace with what's cooking on the list when
it stabilizes.
* sp/smart-http (2009-11-11) 35 commits
(merged to 'next' on 2009-11-15 at 2a326b2)
+ http-backend: Fix bad treatment of uintmax_t in Content-Length
+ t5551-http-fetch: Work around broken Accept header in libcurl
+ t5551-http-fetch: Work around some libcurl versions
+ http-backend: Protect GIT_PROJECT_ROOT from /../ requests
+ Git-aware CGI to provide dumb HTTP transport
(merged to 'next' on 2009-11-06 at 666837c)
+ http-backend: Test configuration options
+ http-backend: Use http.getanyfile to disable dumb HTTP serving
+ test smart http fetch and push
+ http tests: use /dumb/ URL prefix
+ set httpd port before sourcing lib-httpd
+ t5540-http-push: remove redundant fetches
+ Smart HTTP fetch: gzip requests
+ Smart fetch over HTTP: client side
+ Smart push over HTTP: client side
+ Discover refs via smart HTTP server when available
+ http-backend: more explict LocationMatch
+ http-backend: add example for gitweb on same URL
+ http-backend: use mod_alias instead of mod_rewrite
+ http-backend: reword some documentation
+ http-backend: add GIT_PROJECT_ROOT environment var
+ Smart fetch and push over HTTP: server side
+ Add stateless RPC options to upload-pack, receive-pack
+ Git-aware CGI to provide dumb HTTP transport
+ remote-helpers: return successfully if everything up-to-date
+ Move WebDAV HTTP push under remote-curl
+ remote-helpers: Support custom transport options
+ remote-helpers: Fetch more than one ref in a batch
+ fetch: Allow transport -v -v -v to set verbosity to 3
+ remote-curl: Refactor walker initialization
+ Add multi_ack_detailed capability to fetch-pack/upload-pack
+ Move "get_ack()" back to fetch-pack
+ fetch-pack: Use a strbuf to compose the want list
+ pkt-line: Make packet_read_line easier to debug
+ pkt-line: Add strbuf based functions
+ http-push: fix check condition on http.c::finish_http_pack_request()
* ef/msys-imap (2009-10-22) 9 commits.
(merged to 'next' on 2009-10-31 at 8630603)
+ Windows: use BLK_SHA1 again
+ MSVC: Enable OpenSSL, and translate -lcrypto
+ mingw: enable OpenSSL
+ mingw: wrap SSL_set_(w|r)fd to call _get_osfhandle
+ imap-send: build imap-send on Windows
+ imap-send: fix compilation-error on Windows
+ imap-send: use run-command API for tunneling
+ imap-send: use separate read and write fds
+ imap-send: remove useless uid code
Soon in 'master', unless I hear objections from msys folks or imap-send
users.
* nd/sparse (2009-08-20) 19 commits.
- sparse checkout: inhibit empty worktree
- Add tests for sparse checkout
- read-tree: add --no-sparse-checkout to disable sparse checkout support
- unpack-trees(): ignore worktree check outside checkout area
- unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index
- unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout
- unpack-trees.c: generalize verify_* functions
- unpack-trees(): add CE_WT_REMOVE to remove on worktree alone
- Introduce "sparse checkout"
- dir.c: export excluded_1() and add_excludes_from_file_1()
- excluded_1(): support exclude files in index
- unpack-trees(): carry skip-worktree bit over in merged_entry()
- Read .gitignore from index if it is skip-worktree
- Avoid writing to buffer in add_excludes_from_file_1()
- Teach Git to respect skip-worktree bit (writing part)
- Teach Git to respect skip-worktree bit (reading part)
- Introduce "skip-worktree" bit in index, teach Git to get/set this bit
- Add test-index-version
- update-index: refactor mark_valid() in preparation for new options
The latest update I didn't look at very closely but I had an impression
that it was touching very generic codepath that would affect non sparse
cases, iow the patch looked very scary (the entire series already is).
--------------------------------------------------
[For 1.7.0]
* jc/1.7.0-no-commit-no-ff-2 (2009-10-22) 1 commit.
- git-merge: forbid fast-forward and up-to-date when --no-commit is given
This makes "git merge --no-commit" fail when it results in fast-forward or
up-to-date. I haven't described this at the beginning of this message
yet, as it is not clear if this change is even necessary. Opinions?
* jk/1.7.0-status (2009-09-05) 5 commits.
- docs: note that status configuration affects only long format
(merged to 'next' on 2009-10-11 at 65c8513)
+ commit: support alternate status formats
+ status: add --porcelain output format
+ status: refactor format option parsing
+ status: refactor short-mode printing to its own function
(this branch uses jc/1.7.0-status.)
Gives the --short output format to post 1.7.0 "git commit --dry-run" that
is similar to that of post 1.7.0 "git status".
The tip one is not in 'next' as I have been hoping that somebody may want
to change the code to make it unnecessary, but it does not seem to be
happening, so probably it should also go to 'next'.
* jc/1.7.0-status (2009-09-05) 4 commits.
(merged to 'next' on 2009-10-11 at 9558627)
+ status: typo fix in usage
+ git status: not "commit --dry-run" anymore
+ git stat -s: short status output
+ git stat: the beginning of "status that is not a dry-run of commit"
(this branch is used by jk/1.7.0-status.)
With this, "git status" is no longer "git commit --dry-run".
* jc/1.7.0-send-email-no-thread-default (2009-08-22) 1 commit.
(merged to 'next' on 2009-10-11 at 043acdf)
+ send-email: make --no-chain-reply-to the default
* jc/1.7.0-diff-whitespace-only-status (2009-08-30) 4 commits.
(merged to 'next' on 2009-10-11 at 546c74d)
+ diff.c: fix typoes in comments
+ Make test case number unique
+ diff: Rename QUIET internal option to QUICK
+ diff: change semantics of "ignore whitespace" options
This changes exit code from "git diff --ignore-whitespace" and friends
when there is no actual output. It is a backward incompatible change, but
we could argue that it is a bugfix.
* jc/1.7.0-push-safety (2009-02-09) 2 commits.
(merged to 'next' on 2009-10-11 at 81b8128)
+ Refuse deleting the current branch via push
+ Refuse updating the current branch in a non-bare repository via push
--------------------------------------------------
[I have been too busy to purge these]
* ne/rev-cache (2009-10-19) 7 commits.
. support for commit grafts, slight change to general mechanism
. support for path name caching in rev-cache
. full integration of rev-cache into git, completed test suite
. administrative functions for rev-cache, start of integration into git
. support for non-commit object caching in rev-cache
. basic revision cache system, no integration or features
. man page and technical discussion for rev-cache
The author indicated that there is another round coming. Does not seem to
pass the tests when merged to 'pu', so it has been ejected for now.
* jc/log-tz (2009-03-03) 1 commit.
- Allow --date=local --date=other-format to work as expected
Maybe some people care about this. I dunno.
* jc/mailinfo-remove-brackets (2009-07-15) 1 commit.
- mailinfo: -b option keeps [bracketed] strings that is not a [PATCH] marker
Maybe some people care about this. I dunno.
* pb/gitweb-no-project-list (2009-11-06) 3 commits.
. gitweb: Polish the content tags support
. gitweb: Support for no project list on gitweb front page
. gitweb: Refactor project list routines
I picked these up but didn't queue as Warthog9's comments made certain
amount of sense to me.
^ permalink raw reply [relevance 2%]
* [PATCH v5 2/8] merge-resolve: abort if index does not match HEAD
@ 2022-07-23 1:53 2% ` Elijah Newren via GitGitGadget
2022-07-23 1:53 2% ` [PATCH v5 4/8] merge: do not abort early if one strategy fails to handle the merge Elijah Newren via GitGitGadget
2022-07-23 1:53 2% ` [PATCH v5 5/8] merge: fix save_state() to work when there are stat-dirty files Elijah Newren via GitGitGadget
2 siblings, 0 replies; 200+ results
From: Elijah Newren via GitGitGadget @ 2022-07-23 1:53 UTC (permalink / raw)
To: git
Cc: ZheNing Hu, Eric Sunshine, Junio C Hamano, Elijah Newren,
Ævar Arnfjörð Bjarmason, Elijah Newren,
Elijah Newren
From: Elijah Newren <newren@gmail.com>
As noted in commit 9822175d2b ("Ensure index matches head before
invoking merge machinery, round N", 2019-08-17), we have had a very
long history of problems with failing to enforce the requirement that
index matches HEAD when starting a merge. One of the commits
referenced in the long tale of issues arising from lax enforcement of
this requirement was commit 55f39cf755 ("merge: fix misleading
pre-merge check documentation", 2018-06-30), which tried to document
the requirement and noted there were some exceptions. As mentioned in
that commit message, the `resolve` strategy was the one strategy that
did not have an explicit index matching HEAD check, and the reason it
didn't was that I wasn't able to discover any cases where the
implementation would fail to catch the problem and abort, and didn't
want to introduce unnecessary performance overhead of adding another
check.
Well, today I discovered a testcase where the implementation does not
catch the problem and so an explicit check is needed. Add a testcase
that previously would have failed, and update git-merge-resolve.sh to
have an explicit check. Note that the code is copied from 3ec62ad9ff
("merge-octopus: abort if index does not match HEAD", 2016-04-09), so
that we reuse the same message and avoid making translators need to
translate some new message.
Signed-off-by: Elijah Newren <newren@gmail.com>
---
git-merge-resolve.sh | 10 ++++++++++
t/t6424-merge-unrelated-index-changes.sh | 13 +++++++++++++
2 files changed, 23 insertions(+)
diff --git a/git-merge-resolve.sh b/git-merge-resolve.sh
index 343fe7bccd0..77e93121bf8 100755
--- a/git-merge-resolve.sh
+++ b/git-merge-resolve.sh
@@ -5,6 +5,16 @@
#
# Resolve two trees, using enhanced multi-base read-tree.
+. git-sh-setup
+
+# Abort if index does not match HEAD
+if ! git diff-index --quiet --cached HEAD --
+then
+ gettextln "Error: Your local changes to the following files would be overwritten by merge"
+ git diff-index --cached --name-only HEAD -- | sed -e 's/^/ /'
+ exit 2
+fi
+
# The first parameters up to -- are merge bases; the rest are heads.
bases= head= remotes= sep_seen=
for arg
diff --git a/t/t6424-merge-unrelated-index-changes.sh b/t/t6424-merge-unrelated-index-changes.sh
index b6e424a427b..eabe6bda832 100755
--- a/t/t6424-merge-unrelated-index-changes.sh
+++ b/t/t6424-merge-unrelated-index-changes.sh
@@ -114,6 +114,19 @@ test_expect_success 'resolve, non-trivial' '
test_path_is_missing .git/MERGE_HEAD
'
+test_expect_success 'resolve, non-trivial, related file removed' '
+ git reset --hard &&
+ git checkout B^0 &&
+
+ git rm a &&
+ test_path_is_missing a &&
+
+ test_must_fail git merge -s resolve D^0 &&
+
+ test_path_is_missing a &&
+ test_path_is_missing .git/MERGE_HEAD
+'
+
test_expect_success 'recursive' '
git reset --hard &&
git checkout B^0 &&
--
gitgitgadget
^ permalink raw reply related [relevance 2%]
* What's cooking in git.git (Nov 2009, #04; Tue, 17)
@ 2009-11-18 7:53 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2009-11-18 7:53 UTC (permalink / raw)
To: git
I'd like to tag 1.6.6-rc0 this coming weekend with most topics on 'next'
(and some from 'pu'), so that we can do the final 1.6.6 before the end of
the year.
It is likely that I'll be offline for most of the day tomorrow, even
though it will be my git Wednesday.
-- >8 --
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
marked with '.' do not appear in any of the integration branches, but I am
still holding onto them.
In 1.7.0, we plan to correct handful of warts in the interfaces everybody
agrees that they were mistakes. The resulting system may not be strictly
backward compatible. Currently planned changes are:
* refuse push to update the checked out branch in a non-bare repo by
default
Make "git push" into a repository to update the branch that is checked
out fail by default. You can countermand this default by setting a
configuration variable in the receiving repository.
http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007
* refuse push to delete the current branch by default
Make "git push $there :$killed" to delete the branch that is pointed at
by its HEAD fail by default. You can countermand this default by
setting a configuration variable in the receiving repository.
http://thread.gmane.org/gmane.comp.version-control.git/108862/focus=108936
* git-send-email won't make deep threads by default
Many people said that by default when sending more than 2 patches the
threading git-send-email makes by default is hard to read, and they
prefer the default be one cover letter and each patch as a direct
follow-up to the cover letter. You can countermand this by setting a
configuration variable.
http://article.gmane.org/gmane.comp.version-control.git/109790
* git-status won't be "git-commit --dry-run" anymore
http://thread.gmane.org/gmane.comp.version-control.git/125989/focus=125993
* "git-diff -w --exit-code" will exit success if only differences it
found are whitespace changes that are stripped away from the output.
http://thread.gmane.org/gmane.comp.version-control.git/119731/focus=119751
I wasn't fully functioning for the past few days, so this round we have
only added new topics and new patches to existing ones, without changing
the status of individual topics very much.
--------------------------------------------------
[Graduated to "master"]
* bs/maint-pre-commit-hook-sample (2009-11-05) 1 commit.
(merged to 'next' on 2009-11-06 at d70f646)
+ pre-commit.sample: Diff against the empty tree when HEAD is invalid
* js/maint-diff-color-words (2009-10-30) 3 commits.
(merged to 'next' on 2009-11-10 at 5619714)
+ diff --color-words: bit of clean-up
+ diff --color-words -U0: fix the location of hunk headers
+ t4034-diff-words: add a test for word diff without context
Fixes a corner case of running --color-words with -U0.
* sc/difftool-p4merge (2009-10-28) 1 commit
(merged to 'next' on 2009-10-31 at 194b5c5)
+ mergetool--lib: add p4merge as a pre-configured mergetool option
I do not do p4 nor use difftool, so it's much easier for me to merge this
to 'master' and wait for anybody to scream if there is breakage.
* jk/maint-add-p-empty (2009-10-27) 1 commit.
(merged to 'next' on 2009-10-30 at 2bd302f)
+ add-interactive: handle deletion of empty files
* lt/revision-bisect (2009-10-27) 1 commit.
(merged to 'next' on 2009-10-30 at 81ee52b)
+ Add '--bisect' revision machinery argument
* rs/pretty-wrap (2009-11-08) 2 commits
(merged to 'next' on 2009-11-08 at 8973fd8)
+ log --format: don't ignore %w() at the start of format string
(merged to 'next' on 2009-10-30 at 403bbfe)
+ Implement wrap format %w() as if it is a mode switch
(this branch uses js/log-rewrap.)
* js/log-rewrap (2009-10-18) 3 commits
(merged to 'next' on 2009-10-30 at 403bbfe)
+ Teach --wrap to only indent without wrapping
+ Add strbuf_add_wrapped_text() to utf8.[ch]
+ print_wrapped_text(): allow hard newlines
(this branch is used by rs/pretty-wrap.)
* fc/doc-fast-forward (2009-10-24) 1 commit.
(merged to 'next' on 2009-11-01 at faaad90)
+ Use 'fast-forward' all over the place
* tz/maint-rpm (2009-11-11) 1 commit.
+ Makefile: Ensure rpm packages can be read by older rpm versions
* np/maint-sideband-favor-status (2009-11-11) 1 commit.
(merged to 'next' on 2009-11-15 at 3ecd874)
+ give priority to progress messages
* sb/tutorial-test (2009-11-06) 4 commits
(merged to 'next' on 2009-11-15 at 5c82651)
+ t1200: prepare for merging with Fast-forward bikeshedding
+ t1200: further modernize test script style
+ t1200: Make documentation and test agree
+ t1200: cleanup and modernize test style
* ef/msys-imap (2009-10-22) 9 commits.
(merged to 'next' on 2009-10-31 at 8630603)
+ Windows: use BLK_SHA1 again
+ MSVC: Enable OpenSSL, and translate -lcrypto
+ mingw: enable OpenSSL
+ mingw: wrap SSL_set_(w|r)fd to call _get_osfhandle
+ imap-send: build imap-send on Windows
+ imap-send: fix compilation-error on Windows
+ imap-send: use run-command API for tunneling
+ imap-send: use separate read and write fds
+ imap-send: remove useless uid code
--------------------------------------------------
[New Topics]
* jn/faster-completion-startup (2009-11-17) 1 commit.
- Speed up bash completion loading
* th/maint-remote-update-help-string (2009-11-15) 1 commit.
- Update 'git remote update' usage string to match man page.
* tr/maint-merge-ours-clarification (2009-11-15) 3 commits.
- rebase: refuse to rebase with -s ours
(merged to 'next' on 2009-11-17 at 3291125)
+ rebase docs: clarify --merge and --strategy
+ Documentation: clarify 'ours' merge strategy
* tc/format-attribute (2009-11-14) 1 commit
- Check the format of more printf-type functions
* jk/maint-break-rename-reduce-memory (2009-11-16) 2 commits.
(merged to 'next' on 2009-11-16 at 5b5a93f)
+ diffcore-break: save cnt_data for other phases
+ diffcore-break: free filespec data as we go
* bc/grep-i-F (2009-11-06) 1 commit.
(merged to 'next' on 2009-11-17 at a9b138c)
+ grep: Allow case insensitive search of fixed-strings
* mm/config-pathname-tilde-expand (2009-11-17) 1 commit.
(merged to 'next' on 2009-11-17 at 7ba213d)
+ Expand ~ and ~user in core.excludesfile, commit.template
* pb/maint-use-custom-perl (2009-11-17) 1 commit.
(merged to 'next' on 2009-11-17 at 1ee8d46)
+ Make sure $PERL_PATH is defined when the test suite is run.
* th/remote-usage (2009-11-16) 1 commit.
- git remote: Separate usage strings for subcommands
* mo/maint-crlf-doc (2009-11-14) 1 commit.
(merged to 'next' on 2009-11-17 at abd9133)
+ core.autocrlf documentation: mention the crlf attribute
--------------------------------------------------
[Stalled]
* rj/cygwin-msvc (2009-11-09) 3 commits.
- Add explicit Cygwin check to guard WIN32 header inclusion
- MSVC: Add support for building with NO_MMAP
- Makefile: keep MSVC and Cygwin configuration separate
(this branch uses rj/maint-simplify-cygwin-makefile.)
I think J6t was not happy with the tip one.
* jc/fix-tree-walk (2009-10-22) 11 commits.
(merged to 'next' on 2009-10-22 at 10c0c8f)
+ Revert failed attempt since 353c5ee
+ read-tree --debug-unpack
(merged to 'next' on 2009-10-11 at 0b058e2)
+ unpack-trees.c: look ahead in the index
+ unpack-trees.c: prepare for looking ahead in the index
+ Aggressive three-way merge: fix D/F case
+ traverse_trees(): handle D/F conflict case sanely
+ more D/F conflict tests
+ tests: move convenience regexp to match object names to test-lib.sh
+ unpack_callback(): use unpack_failed() consistently
+ unpack-trees: typofix
+ diff-lib.c: fix misleading comments on oneway_diff()
This has some stupid bugs and temporarily reverted from 'next' until I can
fix it, but the "temporarily" turned out to be very loooong. Sigh...
* jh/notes (2009-10-09) 22 commits.
- fast-import: Proper notes tree manipulation using the notes API
- Refactor notes concatenation into a flexible interface for combining notes
- Notes API: Allow multiple concurrent notes trees with new struct notes_tree
- Notes API: for_each_note(): Traverse the entire notes tree with a callback
- Notes API: get_note(): Return the note annotating the given object
- Notes API: add_note(): Add note objects to the internal notes tree structure
- Notes API: init_notes(): Initialize the notes tree from the given notes ref
- Notes API: get_commit_notes() -> format_note() + remove the commit restriction
(merged to 'next' on 2009-11-01 at 948327a)
+ Add selftests verifying concatenation of multiple notes for the same commit
+ Refactor notes code to concatenate multiple notes annotating the same object
+ Add selftests verifying that we can parse notes trees with various fanouts
+ Teach the notes lookup code to parse notes trees with various fanout schemes
+ Teach notes code to free its internal data structures on request
+ Add '%N'-format for pretty-printing commit notes
+ Add flags to get_commit_notes() to control the format of the note string
+ t3302-notes-index-expensive: Speed up create_repo()
+ fast-import: Add support for importing commit notes
+ Teach "-m <msg>" and "-F <file>" to "git notes edit"
+ Add an expensive test for git-notes
+ Speed up git notes lookup
+ Add a script to edit/inspect notes
+ Introduce commit notes
I somehow thought that the later API part was waiting for updates but
nothing seems to be happening.
* jn/gitweb-blame (2009-09-01) 5 commits.
- gitweb: Minify gitweb.js if JSMIN is defined
- gitweb: Create links leading to 'blame_incremental' using JavaScript
(merged to 'next' on 2009-10-11 at 73c4a83)
+ gitweb: Colorize 'blame_incremental' view during processing
+ gitweb: Incremental blame (using JavaScript)
+ gitweb: Add optional "time to generate page" info in footer
Ajax-y blame. Any progress or RFH?
* sr/gfi-options (2009-09-06) 6 commits.
- fast-import: test the new option command
- fast-import: add option command
- fast-import: test the new feature command
- fast-import: add feature command
- fast-import: put marks reading in it's own function
- fast-import: put option parsing code in separate functions
It seemed to be moving again soon, but nothing has happened yet...
* je/send-email-no-subject (2009-08-05) 1 commit.
(merged to 'next' on 2009-10-11 at 1b99c56)
+ send-email: confirm on empty mail subjects
The existing tests cover the positive case (i.e. as long as the user says
"yes" to the "do you really want to send this message that lacks subject",
the message is sent) of this feature, but the feature itself needs its own
test to verify the negative case (i.e. does it correctly stop if the user
says "no"?)
--------------------------------------------------
[Cooking]
* jp/fetch-cull-many-refs (2009-11-13) 3 commits
(merged to 'next' on 2009-11-15 at db0f967)
+ remote: fix use-after-free error detected by glibc in ref_remove_duplicates
(merged to 'next' on 2009-11-01 at 1f09ce9)
+ fetch: Speed up fetch of large numbers of refs
+ remote: Make ref_remove_duplicates faster for large numbers of refs
Soon in 'master'.
* jn/help-everywhere (2009-11-09) 21 commits
(merged to 'next' on 2009-11-17 at 3a2dffe)
+ diff --no-index: make the usage string less scary
+ merge-{recursive,subtree}: use usagef() to print usage
+ Introduce usagef() that takes a printf-style format
+ Let 'git <command> -h' show usage without a git dir
+ Show usage string for 'git http-push -h'
+ Let 'git http-fetch -h' show usage outside any git repository
+ Show usage string for 'git stripspace -h'
+ Show usage string for 'git unpack-file -h'
+ Show usage string for 'git show-index -h'
+ Show usage string for 'git rev-parse -h'
+ Show usage string for 'git merge-one-file -h'
+ Show usage string for 'git mailsplit -h'
+ Show usage string for 'git imap-send -h'
+ Show usage string for 'git get-tar-commit-id -h'
+ Show usage string for 'git fast-import -h'
+ Show usage string for 'git check-ref-format -h'
+ Show usage string for 'git show-ref -h'
+ Show usage string for 'git merge-ours -h'
+ Show usage string for 'git commit-tree -h'
+ Show usage string for 'git cherry -h'
+ Show usage string for 'git grep -h'
(this branch uses jn/maint-http-fetch-mingw and jn/remove-fetch--tool.)
There were unrelated but still worthy fixes, so I reordered some of them;
also the "usage()" change is different from the one that was posted (see
my comment in $gmane/132592).
* jn/maint-http-fetch-mingw (2009-11-09) 1 commit.
(merged to 'next' on 2009-11-17 at cd35125)
+ http-fetch: add missing initialization of argv0_path
(this branch is used by jn/help-everywhere.)
* jn/remove-fetch--tool (2009-11-09) 1 commit
(merged to 'next' on 2009-11-17 at 72f6c3b)
+ Retire fetch--tool helper to contrib/examples
(this branch is used by jn/help-everywhere.)
These two were originally part of the "help-everywhere" topic but
they can stand on their own.
* jc/log-stdin (2009-11-03) 1 commit
- Teach --stdin option to "log" family
This is not signed-off (see $gmane/131971 for list of things you can do to
help advancing this topic).
* jn/gitweb-log-history (2009-11-13) 3 commits
(merged to 'next' on 2009-11-17 at d225f7d)
+ gitweb: Make 'history' view (re)use git_log_generic()
+ gitweb: Refactor common parts of 'log' and 'shortlog' views
+ gitweb: Refactor 'log' action generation, adding git_log_body()
* jn/rfc-pull-rebase-error-message (2009-11-12) 1 commit
- git-pull.sh --rebase: overhaul error handling when no candidates are found
I heard this needs at least retitling among other changes?
* rg/doc-workflow (2009-11-17) 4 commits.
- [Further RFC updates from Raman]
- [An RFC fix-up to further reword release section]
- Corrections to release management section in gitworkflows.txt
- Add branch management for releases to gitworkflows
The top three patches are meant to be squashed into the first one.
* sb/ls-tree-parseopt (2009-11-13) 2 commits.
(merged to 'next' on 2009-11-17 at c383204)
+ ls-tree: migrate to parse-options
+ t3101: test more ls-tree options
* jl/submodule-add-noname (2009-09-22) 1 commit.
(merged to 'next' on 2009-11-15 at 3a77d01)
+ git submodule add: make the <path> parameter optional
Dscho started an interesting discussion regarding the larger workflow in
which the "submodule add" is used. I think the patch itself makes sense
but at the same time it probably makes sense to also take the <path> and
infer the <repository> as Dscho suggested, probably in "git submodule
add", not in "git add" proper, at least initially.
* sc/protocol-doc (2009-11-03) 1 commit.
(merged to 'next' on 2009-11-15 at 32d6de8)
+ Update packfile transfer protocol documentation
* tr/filter-branch (2009-11-10) 2 commits.
(merged to 'next' on 2009-11-15 at 79c6a1d)
+ filter-branch: nearest-ancestor rewriting outside subdir filter
+ filter-branch: stop special-casing $filter_subdir argument
Updated again. Looked sane, except that the option might not be
necessary, but that can be fixed while in 'next'.
* em/commit-claim (2009-11-04) 1 commit
- commit -c/-C/--amend: reset timestamp and authorship to committer with --reset-author
I just picked better bits from both versions, but this needs to be
rethought.
* bg/format-patch-doc-update (2009-11-07) 4 commits.
(merged to 'next' on 2009-11-17 at 68b9056)
+ format-patch: Add "--no-stat" as a synonym for "-p"
+ format-patch documentation: Fix formatting
+ format-patch documentation: Remove diff options that are not useful
+ format-patch: Always generate a patch
Looked sensible, even though this may want to wait for 1.7.0. We'll see.
* rj/maint-simplify-cygwin-makefile (2009-10-27) 1 commit.
- Makefile: merge two Cygwin configuration sections into one
(this branch is used by rj/cygwin-msvc.)
This is one of the most obviously correct bit from "Compiling on Cygwin
using MSVC fails" topic.
* bg/fetch-multi (2009-11-10) 9 commits.
- Re-implement 'git remote update' using 'git fetch'
- builtin-fetch: add --dry-run option
- builtin-fetch: add --prune option
- teach warn_dangling_symref to take a FILE argument
- remote: refactor some logic into get_stale_heads()
- Add missing test for 'git remote update --prune'
- Add the configuration option skipFetchAll
- Teach the --multiple option to 'git fetch'
- Teach the --all option to 'git fetch'
* cc/bisect-doc (2009-11-08) 1 commit
- Documentation: add "Fighting regressions with git bisect" article
Any comments? Should it go to Documentation/technical instead?
* jn/editor-pager (2009-10-30) 9 commits
(merged to 'next' on 2009-11-15 at 7f3e3ae)
+ Provide a build time default-pager setting
+ Provide a build time default-editor setting
+ am -i, git-svn: use "git var GIT_PAGER"
+ add -i, send-email, svn, p4, etc: use "git var GIT_EDITOR"
+ Teach git var about GIT_PAGER
+ Teach git var about GIT_EDITOR
+ Suppress warnings from "git var -l"
+ Do not use VISUAL editor on dumb terminals
+ Handle more shell metacharacters in editor names
* bw/autoconf-more (2009-11-04) 2 commits
(merged to 'next' on 2009-11-15 at e86a8c9)
+ configure: add settings for gitconfig, editor and pager
+ configure: add macro to set arbitrary make variables
This will follow jn/editor-pager series.
* sr/vcs-helper (2009-11-18) 12 commits
- Add Python support library for remote helpers
- Basic build infrastructure for Python scripts
- Allow helpers to report in "list" command that the ref is unchanged
- Fix various memory leaks in transport-helper.c
- Allow helper to map private ref names into normal names
- Add support for "import" helper command
- Allow specifying the remote helper in the url
- Add a config option for remotes to specify a foreign vcs
- Allow fetch to modify refs
- Use a function to determine whether a remote is valid
- Allow programs to not depend on remotes having urls
- Fix memory leak in helper method for disconnect
Replaced again.
* mr/gitweb-snapshot (2009-11-07) 4 commits.
- gitweb: Smarter snapshot names
- gitweb: Document current snapshot rules via new tests
- t/gitweb-lib.sh: Split gitweb output into headers and body
(merged to 'next' on 2009-10-11 at 22ba047)
+ gitweb: check given hash before trying to create snapshot
Replaced commits near the tip with recent updates.
* jc/pretty-lf (2009-10-04) 1 commit.
- Pretty-format: %[+-]x to tweak inter-item newlines
* ks/precompute-completion (2009-11-15) 4 commits.
(merged to 'next' on 2009-11-15 at 23cdb96)
+ Revert ks/precompute-completion series
(merged to 'next' on 2009-10-28 at cd5177f)
+ completion: ignore custom merge strategies when pre-generating
(merged to 'next' on 2009-10-22 at f46a28a)
+ bug: precomputed completion includes scripts sources
(merged to 'next' on 2009-10-14 at adf722a)
+ Speedup bash completion loading
Reverted out of 'next', to be replaced with jn/faster-completion-startup
topic.
* sp/smart-http (2009-11-14) 37 commits
(merged to 'next' on 2009-11-17 at 11067eb)
+ http-backend: Let gcc check the format of more printf-type functions.
+ http-backend: Fix access beyond end of string.
(merged to 'next' on 2009-11-15 at 2a326b2)
+ http-backend: Fix bad treatment of uintmax_t in Content-Length
+ t5551-http-fetch: Work around broken Accept header in libcurl
+ t5551-http-fetch: Work around some libcurl versions
+ http-backend: Protect GIT_PROJECT_ROOT from /../ requests
+ Git-aware CGI to provide dumb HTTP transport
(merged to 'next' on 2009-11-06 at 666837c)
+ http-backend: Test configuration options
+ http-backend: Use http.getanyfile to disable dumb HTTP serving
+ test smart http fetch and push
+ http tests: use /dumb/ URL prefix
+ set httpd port before sourcing lib-httpd
+ t5540-http-push: remove redundant fetches
+ Smart HTTP fetch: gzip requests
+ Smart fetch over HTTP: client side
+ Smart push over HTTP: client side
+ Discover refs via smart HTTP server when available
+ http-backend: more explict LocationMatch
+ http-backend: add example for gitweb on same URL
+ http-backend: use mod_alias instead of mod_rewrite
+ http-backend: reword some documentation
+ http-backend: add GIT_PROJECT_ROOT environment var
+ Smart fetch and push over HTTP: server side
+ Add stateless RPC options to upload-pack, receive-pack
+ Git-aware CGI to provide dumb HTTP transport
+ remote-helpers: return successfully if everything up-to-date
+ Move WebDAV HTTP push under remote-curl
+ remote-helpers: Support custom transport options
+ remote-helpers: Fetch more than one ref in a batch
+ fetch: Allow transport -v -v -v to set verbosity to 3
+ remote-curl: Refactor walker initialization
+ Add multi_ack_detailed capability to fetch-pack/upload-pack
+ Move "get_ack()" back to fetch-pack
+ fetch-pack: Use a strbuf to compose the want list
+ pkt-line: Make packet_read_line easier to debug
+ pkt-line: Add strbuf based functions
+ http-push: fix check condition on http.c::finish_http_pack_request()
* nd/sparse (2009-08-20) 19 commits.
- sparse checkout: inhibit empty worktree
- Add tests for sparse checkout
- read-tree: add --no-sparse-checkout to disable sparse checkout support
- unpack-trees(): ignore worktree check outside checkout area
- unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index
- unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout
- unpack-trees.c: generalize verify_* functions
- unpack-trees(): add CE_WT_REMOVE to remove on worktree alone
- Introduce "sparse checkout"
- dir.c: export excluded_1() and add_excludes_from_file_1()
- excluded_1(): support exclude files in index
- unpack-trees(): carry skip-worktree bit over in merged_entry()
- Read .gitignore from index if it is skip-worktree
- Avoid writing to buffer in add_excludes_from_file_1()
- Teach Git to respect skip-worktree bit (writing part)
- Teach Git to respect skip-worktree bit (reading part)
- Introduce "skip-worktree" bit in index, teach Git to get/set this bit
- Add test-index-version
- update-index: refactor mark_valid() in preparation for new options
The latest update I didn't look at very closely but I had an impression
that it was touching very generic codepath that would affect non sparse
cases, iow the patch looked very scary (the entire series already is).
--------------------------------------------------
[For 1.7.0]
* jc/1.7.0-no-commit-no-ff-2 (2009-10-22) 1 commit.
- git-merge: forbid fast-forward and up-to-date when --no-commit is given
This makes "git merge --no-commit" fail when it results in fast-forward or
up-to-date. I haven't described this at the beginning of this message
yet, as it is not clear if this change is even necessary. Opinions?
* jk/1.7.0-status (2009-09-05) 5 commits.
- docs: note that status configuration affects only long format
(merged to 'next' on 2009-10-11 at 65c8513)
+ commit: support alternate status formats
+ status: add --porcelain output format
+ status: refactor format option parsing
+ status: refactor short-mode printing to its own function
(this branch uses jc/1.7.0-status.)
Gives the --short output format to post 1.7.0 "git commit --dry-run" that
is similar to that of post 1.7.0 "git status".
The tip one is not in 'next' as I have been hoping that somebody may want
to change the code to make it unnecessary, but it does not seem to be
happening, so probably it should also go to 'next'.
* jc/1.7.0-status (2009-09-05) 4 commits.
(merged to 'next' on 2009-10-11 at 9558627)
+ status: typo fix in usage
+ git status: not "commit --dry-run" anymore
+ git stat -s: short status output
+ git stat: the beginning of "status that is not a dry-run of commit"
(this branch is used by jk/1.7.0-status.)
With this, "git status" is no longer "git commit --dry-run".
* jc/1.7.0-send-email-no-thread-default (2009-08-22) 1 commit.
(merged to 'next' on 2009-10-11 at 043acdf)
+ send-email: make --no-chain-reply-to the default
* jc/1.7.0-diff-whitespace-only-status (2009-08-30) 4 commits.
(merged to 'next' on 2009-10-11 at 546c74d)
+ diff.c: fix typoes in comments
+ Make test case number unique
+ diff: Rename QUIET internal option to QUICK
+ diff: change semantics of "ignore whitespace" options
This changes exit code from "git diff --ignore-whitespace" and friends
when there is no actual output. It is a backward incompatible change, but
we could argue that it is a bugfix.
* jc/1.7.0-push-safety (2009-02-09) 2 commits.
(merged to 'next' on 2009-10-11 at 81b8128)
+ Refuse deleting the current branch via push
+ Refuse updating the current branch in a non-bare repository via push
--------------------------------------------------
[I have been too busy to purge these]
* ne/rev-cache (2009-10-19) 7 commits.
. support for commit grafts, slight change to general mechanism
. support for path name caching in rev-cache
. full integration of rev-cache into git, completed test suite
. administrative functions for rev-cache, start of integration into git
. support for non-commit object caching in rev-cache
. basic revision cache system, no integration or features
. man page and technical discussion for rev-cache
The author indicated that there is another round coming. Does not seem to
pass the tests when merged to 'pu', so it has been ejected for now.
* jc/log-tz (2009-03-03) 1 commit.
- Allow --date=local --date=other-format to work as expected
Maybe some people care about this. I dunno.
* jc/mailinfo-remove-brackets (2009-07-15) 1 commit.
- mailinfo: -b option keeps [bracketed] strings that is not a [PATCH] marker
Maybe some people care about this. I dunno.
* pb/gitweb-no-project-list (2009-11-06) 3 commits.
. gitweb: Polish the content tags support
. gitweb: Support for no project list on gitweb front page
. gitweb: Refactor project list routines
I picked these up but didn't queue as Warthog9's comments made certain
amount of sense to me.
^ permalink raw reply [relevance 2%]
* Re: git rebase -p doesn't understand -X
@ 2011-04-20 23:40 2% ` Jonathan Nieder
0 siblings, 0 replies; 200+ results
From: Jonathan Nieder @ 2011-04-20 23:40 UTC (permalink / raw)
To: Martin von Zweigbergk; +Cc: Marius Storm-Olsen, git, Johannes Schindelin
Hi Martin,
Martin von Zweigbergk wrote:
> Interactive rebase uses cherry-pick internally. Jonathan added support
> for -X to that command not too long ago (in commit 67ac1e1, late last
> year), so it should be pretty straight-forward to add support for what
> you want. Maybe I'll do that in a few weeks when I get back from
> vacation.
That would be excellent.
> A related topic is _when_ to use the strategy (and strategy options).
I agree with your analysis. In particular:
> Example:
>
> X
> \
> A---M---B
> /
> ---o---O---P---Q
>
> When the current HEAD is "B", "git rebase -i -p --onto Q O" will yield
>
> X
> \
> ---o---O---P---Q---A'---M'---B'
I have a vague feeling that honoring --strategy and --strategy-option
would be confusing here. The merge used in cherry-picking A does not
have much to do with the merge used to reincorporate changes from X.
Well, that is my intuition, but most of the examples I can think of
lead to the opposite conclusion! If I use -Xrenormalize, because P
changed the line-ending style, then I will want the same option when
merging X on top. Similarly, if I use -Xsubtree=src, because Q moved
all existing files in the source tree under src/, then with luck the
same trick will work when replaying the merge of X.
Luckily there is an exception to prove the intuition ok. If X was the
first parent of M and I am using -Xours to sloppily favor upstream's
decisions when rebasing my history on top of it, using -Xours to favor
choices from X (which is my own) would be just plain wrong. (Phew.)
> C---D
> / \
> A---B---M
> /
> ---o---O---P---Q
>
> which would yield
>
> C'---D'
> / \
> ---o---O---P---Q---A'---B'---M'
Likewise in this case.
> A more advanced solution would be recreate the merge using rerere.
[...]
Here's a vague and probably wrong idea about another way to re-create
merges.
When cherry-picking a patch (A, say), we run a three-way merge, with
A^ as merge base, A as "their" change, and the new parent for A (= Q)
as "our" change.
Maybe the same trick could work for re-creating merges. In your first
example, run a three-way merge with M^ (= A) as merge base, M as
"their" change, and the new parent for M (= A') as "our" change. That
only works in such a straightforward way if only one of M's parents
was rewritten, though. More generally it could be possible to run a
sequence of three-way merges:
base=M^1, theirs=M, ours=(M^1)' => call the result "m_1"
base=M^2, theirs=m_1, ours=(M^2)' => call the result "m_2"
...
At this point it gets ugly enough that just redoing the merge might be
simpler.
The main problem with rerere is that it can make mistakes. In the
long run, I wonder if rebase could learn to take into account
something more explicit like Junio's merge-fix mechanism (see
origin/todo:Reintegrate).
Thanks; that was interesting.
Jonathan
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (Oct 2009, #02; Sun, 11)
@ 2009-10-12 3:18 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2009-10-12 3:18 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
marked with '.' do not appear in any of the integration branches, but I am
still holding onto them.
In 1.7.0, we plan to correct handful of warts in the interfaces everybody
agrees that they were mistakes. The resulting system may not be strictly
backward compatible. Currently planeed changes are:
* refuse push to update the checked out branch in a non-bare repo by
default
Make "git push" into a repository to update the branch that is checked
out fail by default. You can countermand this default by setting a
configuration variable in the receiving repository.
http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007
* refuse push to delete the current branch by default
Make "git push $there :$killed" to delete the branch that is pointed at
by its HEAD fail by default. You can countermand this default by
setting a configuration variable in the receiving repository.
http://thread.gmane.org/gmane.comp.version-control.git/108862/focus=108936
* git-send-email won't make deep threads by default
Many people said that by default when sending more than 2 patches the
threading git-send-email makes by default is hard to read, and they
prefer the default be one cover letter and each patch as a direct
follow-up to the cover letter. You can countermand this by setting a
configuration variable.
http://article.gmane.org/gmane.comp.version-control.git/109790
* git-status won't be "git-commit --dry-run" anymore
http://thread.gmane.org/gmane.comp.version-control.git/125989/focus=125993
* "git-diff -w --exit-code" will exit success if only differences it
found are whitespace changes that are stripped away from the output.
http://thread.gmane.org/gmane.comp.version-control.git/119731/focus=119751
As a post-release ritual, I've rebuilt 'next' on top of 'master'.
--------------------------------------------------
[Graduated to "master"]
* ch/am-header (2009-09-25) 2 commits
(merged to 'next' on 2009-09-25 at f86e197)
+ git-am: force egrep to use correct characters set
+ git-am: fixed patch_format detection according to RFC2822
* ef/msvc-noreturn (2009-09-30) 2 commits
(merged to 'next' on 2009-10-07 at 66137a0)
+ add NORETURN_PTR for function pointers
+ increase portability of NORETURN declarations
jk: This is the latest round and I think should be ready for at least
'next' (maybe even 'master' as it is really about the build and not about
functionality).
* fc/mutt-alias (2009-09-30) 1 commit
(merged to 'next' on 2009-10-07 at df7ac20)
+ send-email: fix mutt regex for grouped aliases
jk: Latest round that addressed comments. Ready for 'next' if not
'master'.
* jk/reflog-date (2009-09-24) 1 commit
(merged to 'next' on 2009-09-29 at 43d444a)
+ improve reflog date/number heuristic
--------------------------------------------------
[New Topics]
* jp/maint-send-email-fold (2009-10-08) 1 commit.
- git-send-email.perl: fold multiple entry "Cc:" and multiple single line "RCPT TO:"s
* ks/precompute-completion (2009-10-05) 1 commit.
- Speedup bash completion loading
* pv/maint-add-p-no-exclude (2009-10-10) 1 commit.
(merged to 'next' on 2009-10-11 at 0ff2e96)
+ git-add--interactive: never skip files included in index
* sp/smart-http (2009-10-08) 4 commits.
- Smart fetch and push over HTTP: server side
- Add smart-http options to upload-pack, receive-pack
- Git-aware CGI to provide dumb HTTP transport
- Document the HTTP transport protocol
--------------------------------------------------
[Stalled]
* sr/gfi-options (2009-09-06) 6 commits.
- fast-import: test the new option command
- fast-import: add option command
- fast-import: test the new feature command
- fast-import: add feature command
- fast-import: put marks reading in it's own function
- fast-import: put option parsing code in separate functions
Ejected from 'next' as fast-import folks still seem to be discussing with
how to proceed.
* je/send-email-no-subject (2009-08-05) 1 commit.
(merged to 'next' on 2009-10-11 at 1b99c56)
+ send-email: confirm on empty mail subjects
The existing tests cover the positive case (i.e. as long as the user says
"yes" to the "do you really want to send this message that lacks subject",
the message is sent) of this feature, but the feature itself needs its own
test to verify the negative case (i.e. does it correctly stop if the user
says "no"?)
* jh/cvs-helper (2009-08-18) 8 commits.
- More fixes to the git-remote-cvs installation procedure
- Fix the Makefile-generated path to the git_remote_cvs package in git-remote-cvs
- Add simple selftests of git-remote-cvs functionality
- git-remote-cvs: Remote helper program for CVS repositories
- 2/2: Add Python support library for CVS remote helper
- 1/2: Add Python support library for CVS remote helper
- Basic build infrastructure for Python scripts
- Allow helpers to request marks for fast-import
(this branch uses db/vcs-helper-rest.)
Builds on db/vcs-helper. There is a re-roll planned.
* ne/rev-cache (2009-09-07) 7 commits.
. support for commit grafts, slight change to general mechanism
. support for path name caching in rev-cache
. full integration of rev-cache into git, completed test suite
. administrative functions for rev-cache, start of integration into git
. support for non-commit object caching in rev-cache
. basic revision cache system, no integration or features
. man page and technical discussion for rev-cache
This seems to break at least t6001 when merged to 'pu'.
--------------------------------------------------
[Cooking]
* dk/blame-el (2009-09-29) 1 commit.
- git-blame.el: Change how blame information is shown.
Soon in 'next'.
* ef/msys-imap (2009-10-09) 8 commits.
- MSVC: Enable OpenSSL, and translate -lcrypto
- mingw: enable OpenSSL
- mingw: wrap SSL_set_(w|r)fd to call _get_osfhandle
- imap-send: build imap-send on Windows
- imap-send: fix compilation-error on Windows
- imap-send: use run-command API for tunneling
- imap-send: use separate read and write fds
- imap-send: remove useless uid code
* jn/gitweb-patch (2009-10-09) 1 commit.
- gitweb: Do not show 'patch' link for merge commits
Soon in 'next'
* mr/gitweb-snapshot (2009-09-26) 2 commits.
- gitweb: append short hash ids to snapshot files
(merged to 'next' on 2009-10-11 at 22ba047)
+ gitweb: check given hash before trying to create snapshot
* mr/instaweb-cgid (2009-09-26) 1 commit.
(merged to 'next' on 2009-10-11 at 99bcfaf)
+ instaweb: support mod_cgid for apache2
* tf/doc-pt-br (2009-09-23) 1 commit.
- Documentation: update pt-BR
The current AsciiDoc may barf on NOME and SINOPSE, as pt_BR language
definition is not widely distributed yet (it just hit the development
tree). Need to revert these headings (or change the length of the section
underlines to match the length of translated names).
* jc/pretty-lf (2009-10-04) 1 commit.
- Pretty-format: %[+-]x to tweak inter-item newlines
I am not happy with this one yet. I am contemplating to introduce a new
syntax "%[magic(param)<anything>%]" to generalize expressions of this and
line wrapping features in an extensible way.
* js/log-rewrap (2008-11-10) 3 commits.
. Add "%w" to pretty formats, which rewraps the commit message
- Add strbuf_add_wrapped_text() to utf8.[ch]
- print_wrapped_text(): allow hard newlines
... and the first two from this series will be useful to implement an
example magic "wrap", e.g. "%[wrap(i,j,w)%s%+b%]".
* jg/log-format-body-indent (2009-09-19) 1 commit.
- git-log --format: Add %B tag with %B(x) option
I think we should redo this on top of the first two patches from
js/log-rewrap series; %B(x) is just a special case %B(x,x,0), no? If a
magic value 0 (or negative) given to wrap-width does not disable wrapping,
we probably should make it so.
* bg/rebase-reword (2009-10-07) 1 commit.
- Teach 'rebase -i' the command "reword"
Soon in 'next'
* js/diff-verbose-submodule (2009-10-04) 1 commit.
- Add the --submodule-summary option to the diff option family
Dscho sounded like he has some corrections after list comments, but I did
not pick up his interdiff in the middle.
* jl/submodule-add-noname (2009-09-22) 1 commit.
- git submodule add: make the <path> parameter optional
Dscho started an interesting discussion regarding the larger workflow in
which the "submodule add" is used. I think the patch itself makes sense
but at the same time it probably makes sense to also take the <path> and
infer the <repository> as Dscho suggested, probably in "git submodule
add", not in "git add" proper, at least initially.
* jc/fix-tree-walk (2009-09-14) 10 commits.
- read-tree --debug-unpack
- unpack-trees.c: look ahead in the index
- unpack-trees.c: prepare for looking ahead in the index
- Aggressive three-way merge: fix D/F case
- traverse_trees(): handle D/F conflict case sanely
- more D/F conflict tests
- tests: move convenience regexp to match object names to test-lib.sh
- unpack_callback(): use unpack_failed() consistently
- unpack-trees: typofix
- diff-lib.c: fix misleading comments on oneway_diff()
This is my replacement for Linus's lt/maint-traverse-trees-fix patch. It
is not so much as a counter-proposal; I originally thought it might make
sense to walk the index and drive the walker to return the entries from
trees to match entries from the index, but I ended up doing pretty much
what Linus outlined --- walk the trees, and have the index walker follow
it. It turned out that the index side also needed some hairy look-ahead,
This includes the fix to aggressive mode of three-way merge used by the
resolve strategy. I think the series is Ok for 'next'.
* jp/fetch-tag-match (2009-09-17) 1 commit.
- fetch: Speed up fetch by rewriting find_non_local_tags
I just queued this without reading nor thinking about it very much. I
personally liked my version that had far smaller number of lines changed
(which means I can be fairly certain that it did not introduce any
regression), but perhaps the majorly rewritten logic this patch gives us
may be easier to follow and maintain.
* jc/maint-blank-at-eof (2009-09-15) 0 commits.
(this branch uses jc/maint-1.6.0-blank-at-eof.)
The series does not have a commit of its own but is a preparation for
merging the original jc/1.6.0-maint-blank-at-eof topic to 'maint' and then
'master'
Soon in 'next'
* db/vcs-helper-rest (2009-09-03) 6 commits.
- Allow helpers to report in "list" command that the ref is unchanged
- Add support for "import" helper command
- Add a config option for remotes to specify a foreign vcs
- Allow programs to not depend on remotes having urls
- Allow fetch to modify refs
- Use a function to determine whether a remote is valid
(this branch is used by jh/cvs-helper.)
This holds the remainder of the db/vcs-helper topic that has already
merged in 1.6.5.
* jh/notes (2009-10-09) 22 commits.
- fast-import: Proper notes tree manipulation using the notes API
- Refactor notes concatenation into a flexible interface for combining notes
- Notes API: Allow multiple concurrent notes trees with new struct notes_tree
- Notes API: for_each_note(): Traverse the entire notes tree with a callback
- Notes API: get_note(): Return the note annotating the given object
- Notes API: add_note(): Add note objects to the internal notes tree structure
- Notes API: init_notes(): Initialize the notes tree from the given notes ref
- Notes API: get_commit_notes() -> format_note() + remove the commit restriction
- Add selftests verifying concatenation of multiple notes for the same commit
- Refactor notes code to concatenate multiple notes annotating the same object
- Add selftests verifying that we can parse notes trees with various fanouts
- Teach the notes lookup code to parse notes trees with various fanout schemes
- Teach notes code to free its internal data structures on request
- Add '%N'-format for pretty-printing commit notes
- Add flags to get_commit_notes() to control the format of the note string
- t3302-notes-index-expensive: Speed up create_repo()
- fast-import: Add support for importing commit notes
- Teach "-m <msg>" and "-F <file>" to "git notes edit"
- Add an expensive test for git-notes
- Speed up git notes lookup
- Add a script to edit/inspect notes
- Introduce commit notes
Rerolled and queued.
* jn/gitweb-show-size (2009-09-07) 1 commit.
- gitweb: Add 'show-sizes' feature to show blob sizes in tree view
Soon in 'next'
* jc/maint-1.6.0-blank-at-eof (2009-09-14) 15 commits.
(merged to 'next' on 2009-10-11 at 7f34fb3)
+ diff -B: colour whitespace errors
+ diff.c: emit_add_line() takes only the rest of the line
+ diff.c: split emit_line() from the first char and the rest of the line
+ diff.c: shuffling code around
+ diff --whitespace: fix blank lines at end
+ core.whitespace: split trailing-space into blank-at-{eol,eof}
+ diff --color: color blank-at-eof
+ diff --whitespace=warn/error: fix blank-at-eof check
+ diff --whitespace=warn/error: obey blank-at-eof
+ diff.c: the builtin_diff() deals with only two-file comparison
+ apply --whitespace: warn blank but not necessarily empty lines at EOF
+ apply --whitespace=warn/error: diagnose blank at EOF
+ apply.c: split check_whitespace() into two
+ apply --whitespace=fix: detect new blank lines at eof correctly
+ apply --whitespace=fix: fix handling of blank lines at the eof
(this branch is used by jc/maint-blank-at-eof.)
This is a fix for an ancient bug (or inconsistent set of features); the
topic is based on an ancient codebase and is designed to be merged
upwards. jc/maint-blank-at-eof serves that purpose.
* jn/gitweb-blame (2009-09-01) 5 commits.
- gitweb: Minify gitweb.js if JSMIN is defined
- gitweb: Create links leading to 'blame_incremental' using JavaScript
(merged to 'next' on 2009-10-11 at 73c4a83)
+ gitweb: Colorize 'blame_incremental' view during processing
+ gitweb: Incremental blame (using JavaScript)
+ gitweb: Add optional "time to generate page" info in footer
Ajax-y blame.
* nd/sparse (2009-08-20) 19 commits.
- sparse checkout: inhibit empty worktree
- Add tests for sparse checkout
- read-tree: add --no-sparse-checkout to disable sparse checkout support
- unpack-trees(): ignore worktree check outside checkout area
- unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index
- unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout
- unpack-trees.c: generalize verify_* functions
- unpack-trees(): add CE_WT_REMOVE to remove on worktree alone
- Introduce "sparse checkout"
- dir.c: export excluded_1() and add_excludes_from_file_1()
- excluded_1(): support exclude files in index
- unpack-trees(): carry skip-worktree bit over in merged_entry()
- Read .gitignore from index if it is skip-worktree
- Avoid writing to buffer in add_excludes_from_file_1()
- Teach Git to respect skip-worktree bit (writing part)
- Teach Git to respect skip-worktree bit (reading part)
- Introduce "skip-worktree" bit in index, teach Git to get/set this bit
- Add test-index-version
- update-index: refactor mark_valid() in preparation for new options
--------------------------------------------------
[For 1.7.0]
* jk/1.7.0-status (2009-09-05) 5 commits.
- docs: note that status configuration affects only long format
(merged to 'next' on 2009-10-11 at 65c8513)
+ commit: support alternate status formats
+ status: add --porcelain output format
+ status: refactor format option parsing
+ status: refactor short-mode printing to its own function
(this branch uses jc/1.7.0-status.)
Gives the --short output format to post 1.7.0 "git commit --dry-run" that
is similar to that of post 1.7.0 "git status".
* jc/1.7.0-status (2009-09-05) 4 commits.
(merged to 'next' on 2009-10-11 at 9558627)
+ status: typo fix in usage
+ git status: not "commit --dry-run" anymore
+ git stat -s: short status output
+ git stat: the beginning of "status that is not a dry-run of commit"
(this branch is used by jk/1.7.0-status.)
With this, "git status" is no longer "git commit --dry-run".
* jc/1.7.0-send-email-no-thread-default (2009-08-22) 1 commit.
(merged to 'next' on 2009-10-11 at 043acdf)
+ send-email: make --no-chain-reply-to the default
* jc/1.7.0-diff-whitespace-only-status (2009-08-30) 4 commits.
(merged to 'next' on 2009-10-11 at 546c74d)
+ diff.c: fix typoes in comments
+ Make test case number unique
+ diff: Rename QUIET internal option to QUICK
+ diff: change semantics of "ignore whitespace" options
This changes exit code from "git diff --ignore-whitespace" and friends
when there is no actual output. It is a backward incompatible change, but
we could argue that it is a bugfix.
* jc/1.7.0-push-safety (2009-02-09) 2 commits.
(merged to 'next' on 2009-10-11 at 81b8128)
+ Refuse deleting the current branch via push
+ Refuse updating the current branch in a non-bare repository via push
--------------------------------------------------
[I have been too busy to purge these]
* jc/log-tz (2009-03-03) 1 commit.
- Allow --date=local --date=other-format to work as expected
Maybe some people care about this. I dunno.
* jc/mailinfo-remove-brackets (2009-07-15) 1 commit.
- mailinfo: -b option keeps [bracketed] strings that is not a [PATCH] marker
Maybe some people care about this. I dunno.
* lt/read-directory (2009-05-15) 3 commits.
. Add initial support for pathname conversion to UTF-8
. read_directory(): infrastructure for pathname character set conversion
. Add 'fill_directory()' helper function for directory traversal
* cc/reset-merge (2009-09-16) 4 commits.
. reset: add test cases for "--merge-safe" option
. reset: add option "--merge-safe" to "git reset"
. reset: use "unpack_trees()" directly instead of "git read-tree"
. reset: add a few tests for "git reset --merge"
* cc/sequencer-rebase-i (2009-08-28) 15 commits.
. rebase -i: use "git sequencer--helper --cherry-pick"
. sequencer: add "--cherry-pick" option to "git sequencer--helper"
. sequencer: add "do_commit()" and related functions working on "next_commit"
. pick: libify "pick_help_msg()"
. revert: libify cherry-pick and revert functionnality
. rebase -i: use "git sequencer--helper --fast-forward"
. sequencer: let "git sequencer--helper" callers set "allow_dirty"
. sequencer: add "--fast-forward" option to "git sequencer--helper"
. sequencer: add "do_fast_forward()" to perform a fast forward
. rebase -i: use "git sequencer--helper --reset-hard"
. sequencer: add "--reset-hard" option to "git sequencer--helper"
. sequencer: add "reset_almost_hard()" and related functions
. rebase -i: use "git sequencer--helper --make-patch"
. sequencer: add "make_patch" function to save a patch
. sequencer: add "builtin-sequencer--helper.c"
* lt/maint-traverse-trees-fix (2009-09-06) 1 commit.
. Prepare 'traverse_trees()' for D/F conflict lookahead
^ permalink raw reply [relevance 2%]
* [PATCH] merge: fix out-of-bounds memory access
@ 2009-01-31 14:39 2% ` René Scharfe
0 siblings, 0 replies; 200+ results
From: René Scharfe @ 2009-01-31 14:39 UTC (permalink / raw)
To: Ingo Molnar
Cc: Junio C Hamano, H. Peter Anvin, Git Mailing List, Daniel Barkalow
The following on top of master lets git finish the merge without segfault
(reporting a merge conflict) and valgrind doesn't find an more memory
errors here. Can you confirm that, Ingo?
-- 8< --
The parameter n of unpack_callback() can have a value of up to
MAX_UNPACK_TREES. The check at the top of unpack_trees() (its only
(indirect) caller) makes sure it cannot exceed this limit.
unpack_callback() passes it and the array src to unpack_nondirectories(),
which has this loop:
for (i = 0; i < n; i++) {
/* ... */
src[i + o->merge] = o->df_conflict_entry;
o->merge can be 0 or 1, so unpack_nondirectories() potentially accesses
the array src at index MAX_UNPACK_TREES. This patch makes it big enough.
Reported-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
---
unpack-trees.c | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/unpack-trees.c b/unpack-trees.c
index 16bc2ca..e547282 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -240,8 +240,11 @@ static struct cache_entry *create_ce_entry(const struct traverse_info *info, con
return ce;
}
-static int unpack_nondirectories(int n, unsigned long mask, unsigned long dirmask, struct cache_entry *src[5],
- const struct name_entry *names, const struct traverse_info *info)
+static int unpack_nondirectories(int n, unsigned long mask,
+ unsigned long dirmask,
+ struct cache_entry **src,
+ const struct name_entry *names,
+ const struct traverse_info *info)
{
int i;
struct unpack_trees_options *o = info->data;
@@ -291,7 +294,7 @@ static int unpack_nondirectories(int n, unsigned long mask, unsigned long dirmas
static int unpack_callback(int n, unsigned long mask, unsigned long dirmask, struct name_entry *names, struct traverse_info *info)
{
- struct cache_entry *src[5] = { NULL, };
+ struct cache_entry *src[MAX_UNPACK_TREES + 1] = { NULL, };
struct unpack_trees_options *o = info->data;
const struct name_entry *p = names;
--
1.6.1
^ permalink raw reply related [relevance 2%]
* [PATCH v5 5/8] merge: fix save_state() to work when there are stat-dirty files
2022-07-23 1:53 2% ` [PATCH v5 2/8] merge-resolve: abort if index does not match HEAD Elijah Newren via GitGitGadget
2022-07-23 1:53 2% ` [PATCH v5 4/8] merge: do not abort early if one strategy fails to handle the merge Elijah Newren via GitGitGadget
@ 2022-07-23 1:53 2% ` Elijah Newren via GitGitGadget
2 siblings, 0 replies; 200+ results
From: Elijah Newren via GitGitGadget @ 2022-07-23 1:53 UTC (permalink / raw)
To: git
Cc: ZheNing Hu, Eric Sunshine, Junio C Hamano, Elijah Newren,
Ævar Arnfjörð Bjarmason, Elijah Newren,
Elijah Newren
From: Elijah Newren <newren@gmail.com>
When there are stat-dirty files, but no files are modified,
`git stash create` exits with unsuccessful status. This causes merge
to fail. Copy some code from sequencer.c's create_autostash to refresh
the index first to avoid this problem.
Signed-off-by: Elijah Newren <newren@gmail.com>
---
builtin/merge.c | 8 ++++++++
t/t6424-merge-unrelated-index-changes.sh | 11 +++++++++++
2 files changed, 19 insertions(+)
diff --git a/builtin/merge.c b/builtin/merge.c
index c120ad619c4..780b4b9100a 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -313,8 +313,16 @@ static int save_state(struct object_id *stash)
int len;
struct child_process cp = CHILD_PROCESS_INIT;
struct strbuf buffer = STRBUF_INIT;
+ struct lock_file lock_file = LOCK_INIT;
+ int fd;
int rc = -1;
+ fd = repo_hold_locked_index(the_repository, &lock_file, 0);
+ refresh_cache(REFRESH_QUIET);
+ if (0 <= fd)
+ repo_update_index_if_able(the_repository, &lock_file);
+ rollback_lock_file(&lock_file);
+
strvec_pushl(&cp.args, "stash", "create", NULL);
cp.out = -1;
cp.git_cmd = 1;
diff --git a/t/t6424-merge-unrelated-index-changes.sh b/t/t6424-merge-unrelated-index-changes.sh
index 615061c7af4..2c83210f9fd 100755
--- a/t/t6424-merge-unrelated-index-changes.sh
+++ b/t/t6424-merge-unrelated-index-changes.sh
@@ -275,6 +275,17 @@ test_expect_success 'subtree' '
test_path_is_missing .git/MERGE_HEAD
'
+test_expect_success 'avoid failure due to stat-dirty files' '
+ git reset --hard &&
+ git checkout B^0 &&
+
+ # Make "a" be stat-dirty
+ test-tool chmtime =+1 a &&
+
+ # stat-dirty file should not prevent stash creation in builtin/merge.c
+ git merge -s resolve -s recursive D^0
+'
+
test_expect_success 'with multiple strategies, recursive or ort failure do not early abort' '
git reset --hard &&
git checkout B^0 &&
--
gitgitgadget
^ permalink raw reply related [relevance 2%]
* [PATCH v3 4/8] rebase --merge: fix reflog message after skipping
2022-10-12 9:35 2% ` [PATCH v3 " Phillip Wood via GitGitGadget
2022-10-21 9:21 2% ` [PATCH v4 " Phillip Wood via GitGitGadget
@ 2022-10-12 9:35 2% ` Phillip Wood via GitGitGadget
2022-10-12 9:35 2% ` [PATCH v3 3/8] rebase --merge: fix reflog when continuing Phillip Wood via GitGitGadget
2 siblings, 0 replies; 200+ results
From: Phillip Wood via GitGitGadget @ 2022-10-12 9:35 UTC (permalink / raw)
To: git
Cc: Phillip Wood, Christian Couder, Elijah Newren,
Ævar Arnfjörð Bjarmason, Calvin Wan, Emily Shaffer,
Glen Choo, Victoria Dye, Phillip Wood, Phillip Wood
From: Phillip Wood <phillip.wood@dunelm.org.uk>
The reflog message for every pick after running "rebase --skip" looks
like
rebase (skip) (pick): commit subject line
Fix this by not appending " (skip)" to the reflog action.
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
---
builtin/rebase.c | 2 --
t/t3406-rebase-message.sh | 24 ++++++++++++++++++++++++
2 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/builtin/rebase.c b/builtin/rebase.c
index 488e6bdfd3e..9a40a5e27f8 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -1297,8 +1297,6 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
struct string_list merge_rr = STRING_LIST_INIT_DUP;
options.action = "skip";
- set_reflog_action(&options);
-
rerere_clear(the_repository, &merge_rr);
string_list_clear(&merge_rr, 1);
ropts.flags = RESET_HEAD_HARD;
diff --git a/t/t3406-rebase-message.sh b/t/t3406-rebase-message.sh
index 3ca2fbb0d59..8aa6a79acc1 100755
--- a/t/t3406-rebase-message.sh
+++ b/t/t3406-rebase-message.sh
@@ -163,6 +163,30 @@ test_reflog () {
# check there is only one new entry in the branch reflog
test_cmp_rev fast-forward@{1} X
'
+
+ test_expect_success "rebase $mode --skip reflog${reflog_action:+ GIT_REFLOG_ACTION=$reflog_action}" '
+ git checkout conflicts &&
+ test_when_finished "git reset --hard Q" &&
+
+ (
+ if test -n "$reflog_action"
+ then
+ GIT_REFLOG_ACTION="$reflog_action" &&
+ export GIT_REFLOG_ACTION
+ fi &&
+ test_must_fail git rebase $mode main &&
+ git rebase --skip
+ ) &&
+
+ git log -g --format=%gs -4 >actual &&
+ write_reflog_expect <<-EOF &&
+ ${reflog_action:-rebase} (finish): returning to refs/heads/conflicts
+ ${reflog_action:-rebase} (pick): Q
+ ${reflog_action:-rebase} (pick): P
+ ${reflog_action:-rebase} (start): checkout main
+ EOF
+ test_cmp expect actual
+ '
}
test_reflog --merge
--
gitgitgadget
^ permalink raw reply related [relevance 2%]
* [PATCH v5 4/8] merge: do not abort early if one strategy fails to handle the merge
2022-07-23 1:53 2% ` [PATCH v5 2/8] merge-resolve: abort if index does not match HEAD Elijah Newren via GitGitGadget
@ 2022-07-23 1:53 2% ` Elijah Newren via GitGitGadget
2022-07-23 1:53 2% ` [PATCH v5 5/8] merge: fix save_state() to work when there are stat-dirty files Elijah Newren via GitGitGadget
2 siblings, 0 replies; 200+ results
From: Elijah Newren via GitGitGadget @ 2022-07-23 1:53 UTC (permalink / raw)
To: git
Cc: ZheNing Hu, Eric Sunshine, Junio C Hamano, Elijah Newren,
Ævar Arnfjörð Bjarmason, Elijah Newren,
Elijah Newren
From: Elijah Newren <newren@gmail.com>
builtin/merge is setup to allow multiple strategies to be specified,
and it will find the "best" result and use it. This is defeated if
some of the merge strategies abort early when they cannot handle the
merge. Fix the logic that calls recursive and ort to not do such an
early abort, but instead return "2" or "unhandled" so that the next
strategy can try to handle the merge.
Coming up with a testcase for this is somewhat difficult, since
recursive and ort both handle nearly any two-headed merge (there is
a separate code path that checks for non-two-headed merges and
already returns "2" for them). So use a somewhat synthetic testcase
of having the index not match HEAD before the merge starts, since all
merge strategies will abort for that.
Signed-off-by: Elijah Newren <newren@gmail.com>
---
builtin/merge.c | 6 ++++--
t/t6402-merge-rename.sh | 2 +-
t/t6424-merge-unrelated-index-changes.sh | 16 ++++++++++++++++
t/t6439-merge-co-error-msgs.sh | 1 +
4 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/builtin/merge.c b/builtin/merge.c
index b43876f68e4..c120ad619c4 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -754,8 +754,10 @@ static int try_merge_strategy(const char *strategy, struct commit_list *common,
else
clean = merge_recursive(&o, head, remoteheads->item,
reversed, &result);
- if (clean < 0)
- exit(128);
+ if (clean < 0) {
+ rollback_lock_file(&lock);
+ return 2;
+ }
if (write_locked_index(&the_index, &lock,
COMMIT_LOCK | SKIP_IF_UNCHANGED))
die(_("unable to write %s"), get_index_file());
diff --git a/t/t6402-merge-rename.sh b/t/t6402-merge-rename.sh
index 3a32b1a45cf..772238e582c 100755
--- a/t/t6402-merge-rename.sh
+++ b/t/t6402-merge-rename.sh
@@ -210,7 +210,7 @@ test_expect_success 'updated working tree file should prevent the merge' '
echo >>M one line addition &&
cat M >M.saved &&
git update-index M &&
- test_expect_code 128 git pull --no-rebase . yellow &&
+ test_expect_code 2 git pull --no-rebase . yellow &&
test_cmp M M.saved &&
rm -f M.saved
'
diff --git a/t/t6424-merge-unrelated-index-changes.sh b/t/t6424-merge-unrelated-index-changes.sh
index 187c761ad84..615061c7af4 100755
--- a/t/t6424-merge-unrelated-index-changes.sh
+++ b/t/t6424-merge-unrelated-index-changes.sh
@@ -275,4 +275,20 @@ test_expect_success 'subtree' '
test_path_is_missing .git/MERGE_HEAD
'
+test_expect_success 'with multiple strategies, recursive or ort failure do not early abort' '
+ git reset --hard &&
+ git checkout B^0 &&
+
+ test_seq 0 10 >a &&
+ git add a &&
+
+ sane_unset GIT_TEST_MERGE_ALGORITHM &&
+ test_must_fail git merge -s recursive -s ort -s octopus C^0 >output 2>&1 &&
+
+ grep "Trying merge strategy recursive..." output &&
+ grep "Trying merge strategy ort..." output &&
+ grep "Trying merge strategy octopus..." output &&
+ grep "No merge strategy handled the merge." output
+'
+
test_done
diff --git a/t/t6439-merge-co-error-msgs.sh b/t/t6439-merge-co-error-msgs.sh
index 5bfb027099a..52cf0c87690 100755
--- a/t/t6439-merge-co-error-msgs.sh
+++ b/t/t6439-merge-co-error-msgs.sh
@@ -47,6 +47,7 @@ test_expect_success 'untracked files overwritten by merge (fast and non-fast for
export GIT_MERGE_VERBOSITY &&
test_must_fail git merge branch 2>out2
) &&
+ echo "Merge with strategy ${GIT_TEST_MERGE_ALGORITHM:-ort} failed." >>expect &&
test_cmp out2 expect &&
git reset --hard HEAD^
'
--
gitgitgadget
^ permalink raw reply related [relevance 2%]
* [PATCH v4 4/8] rebase --merge: fix reflog message after skipping
2022-10-21 9:21 2% ` [PATCH v4 " Phillip Wood via GitGitGadget
2022-10-21 9:21 2% ` [PATCH v4 3/8] rebase --merge: fix reflog when continuing Phillip Wood via GitGitGadget
@ 2022-10-21 9:21 2% ` Phillip Wood via GitGitGadget
1 sibling, 0 replies; 200+ results
From: Phillip Wood via GitGitGadget @ 2022-10-21 9:21 UTC (permalink / raw)
To: git
Cc: Phillip Wood, Christian Couder, Elijah Newren,
Ævar Arnfjörð Bjarmason, Calvin Wan, Emily Shaffer,
Glen Choo, Victoria Dye, Phillip Wood, Phillip Wood
From: Phillip Wood <phillip.wood@dunelm.org.uk>
The reflog message for every pick after running "rebase --skip" looks
like
rebase (skip) (pick): commit subject line
Fix this by not appending " (skip)" to the reflog action.
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
---
builtin/rebase.c | 2 --
t/t3406-rebase-message.sh | 24 ++++++++++++++++++++++++
2 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/builtin/rebase.c b/builtin/rebase.c
index 414526f83a8..c1e68173b5f 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -1297,8 +1297,6 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
struct string_list merge_rr = STRING_LIST_INIT_DUP;
options.action = "skip";
- set_reflog_action(&options);
-
rerere_clear(the_repository, &merge_rr);
string_list_clear(&merge_rr, 1);
ropts.flags = RESET_HEAD_HARD;
diff --git a/t/t3406-rebase-message.sh b/t/t3406-rebase-message.sh
index 3ca2fbb0d59..8aa6a79acc1 100755
--- a/t/t3406-rebase-message.sh
+++ b/t/t3406-rebase-message.sh
@@ -163,6 +163,30 @@ test_reflog () {
# check there is only one new entry in the branch reflog
test_cmp_rev fast-forward@{1} X
'
+
+ test_expect_success "rebase $mode --skip reflog${reflog_action:+ GIT_REFLOG_ACTION=$reflog_action}" '
+ git checkout conflicts &&
+ test_when_finished "git reset --hard Q" &&
+
+ (
+ if test -n "$reflog_action"
+ then
+ GIT_REFLOG_ACTION="$reflog_action" &&
+ export GIT_REFLOG_ACTION
+ fi &&
+ test_must_fail git rebase $mode main &&
+ git rebase --skip
+ ) &&
+
+ git log -g --format=%gs -4 >actual &&
+ write_reflog_expect <<-EOF &&
+ ${reflog_action:-rebase} (finish): returning to refs/heads/conflicts
+ ${reflog_action:-rebase} (pick): Q
+ ${reflog_action:-rebase} (pick): P
+ ${reflog_action:-rebase} (start): checkout main
+ EOF
+ test_cmp expect actual
+ '
}
test_reflog --merge
--
gitgitgadget
^ permalink raw reply related [relevance 2%]
* [PATCH v3 3/7] merge: do not abort early if one strategy fails to handle the merge
2022-07-21 8:16 2% ` [PATCH v3 2/7] merge-resolve: abort if index does not match HEAD Elijah Newren via GitGitGadget
@ 2022-07-21 8:16 2% ` Elijah Newren via GitGitGadget
2022-07-21 8:16 2% ` [PATCH v3 4/7] merge: fix save_state() to work when there are stat-dirty files Elijah Newren via GitGitGadget
3 siblings, 0 replies; 200+ results
From: Elijah Newren via GitGitGadget @ 2022-07-21 8:16 UTC (permalink / raw)
To: git
Cc: ZheNing Hu, Eric Sunshine, Junio C Hamano,
Ævar Arnfjörð Bjarmason, Elijah Newren,
Elijah Newren, Elijah Newren
From: Elijah Newren <newren@gmail.com>
builtin/merge is setup to allow multiple strategies to be specified,
and it will find the "best" result and use it. This is defeated if
some of the merge strategies abort early when they cannot handle the
merge. Fix the logic that calls recursive and ort to not do such an
early abort, but instead return "2" or "unhandled" so that the next
strategy can try to handle the merge.
Coming up with a testcase for this is somewhat difficult, since
recursive and ort both handle nearly any two-headed merge (there is
a separate code path that checks for non-two-headed merges and
already returns "2" for them). So use a somewhat synthetic testcase
of having the index not match HEAD before the merge starts, since all
merge strategies will abort for that.
Signed-off-by: Elijah Newren <newren@gmail.com>
---
builtin/merge.c | 6 ++++--
t/t6402-merge-rename.sh | 2 +-
t/t6424-merge-unrelated-index-changes.sh | 16 ++++++++++++++++
t/t6439-merge-co-error-msgs.sh | 1 +
4 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/builtin/merge.c b/builtin/merge.c
index 13884b8e836..dec7375bf2a 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -754,8 +754,10 @@ static int try_merge_strategy(const char *strategy, struct commit_list *common,
else
clean = merge_recursive(&o, head, remoteheads->item,
reversed, &result);
- if (clean < 0)
- exit(128);
+ if (clean < 0) {
+ rollback_lock_file(&lock);
+ return 2;
+ }
if (write_locked_index(&the_index, &lock,
COMMIT_LOCK | SKIP_IF_UNCHANGED))
die(_("unable to write %s"), get_index_file());
diff --git a/t/t6402-merge-rename.sh b/t/t6402-merge-rename.sh
index 3a32b1a45cf..772238e582c 100755
--- a/t/t6402-merge-rename.sh
+++ b/t/t6402-merge-rename.sh
@@ -210,7 +210,7 @@ test_expect_success 'updated working tree file should prevent the merge' '
echo >>M one line addition &&
cat M >M.saved &&
git update-index M &&
- test_expect_code 128 git pull --no-rebase . yellow &&
+ test_expect_code 2 git pull --no-rebase . yellow &&
test_cmp M M.saved &&
rm -f M.saved
'
diff --git a/t/t6424-merge-unrelated-index-changes.sh b/t/t6424-merge-unrelated-index-changes.sh
index f35d3182b86..8b749e19083 100755
--- a/t/t6424-merge-unrelated-index-changes.sh
+++ b/t/t6424-merge-unrelated-index-changes.sh
@@ -268,4 +268,20 @@ test_expect_success 'subtree' '
test_path_is_missing .git/MERGE_HEAD
'
+test_expect_success 'resolve && recursive && ort' '
+ git reset --hard &&
+ git checkout B^0 &&
+
+ test_seq 0 10 >a &&
+ git add a &&
+
+ sane_unset GIT_TEST_MERGE_ALGORITHM &&
+ test_must_fail git merge -s resolve -s recursive -s ort C^0 >output 2>&1 &&
+
+ grep "Trying merge strategy resolve..." output &&
+ grep "Trying merge strategy recursive..." output &&
+ grep "Trying merge strategy ort..." output &&
+ grep "No merge strategy handled the merge." output
+'
+
test_done
diff --git a/t/t6439-merge-co-error-msgs.sh b/t/t6439-merge-co-error-msgs.sh
index 5bfb027099a..52cf0c87690 100755
--- a/t/t6439-merge-co-error-msgs.sh
+++ b/t/t6439-merge-co-error-msgs.sh
@@ -47,6 +47,7 @@ test_expect_success 'untracked files overwritten by merge (fast and non-fast for
export GIT_MERGE_VERBOSITY &&
test_must_fail git merge branch 2>out2
) &&
+ echo "Merge with strategy ${GIT_TEST_MERGE_ALGORITHM:-ort} failed." >>expect &&
test_cmp out2 expect &&
git reset --hard HEAD^
'
--
gitgitgadget
^ permalink raw reply related [relevance 2%]
* Re: When a merge turns into a conflict
@ 2007-12-06 5:51 2% ` Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2007-12-06 5:51 UTC (permalink / raw)
To: Anand Kumria; +Cc: git
Anand Kumria <wildfire@progsoc.org> writes:
> However when my colleague came to merge my patches in; git complained
> that the file had conflict because:
>
> a. it found the ========= AsciiDoc header line
Perhaps .git/hooks/pre-commit hook is enabled for the person who needed
to merge, fix conflicts and make a commit.
We ship the hook _disabled_ by default, but that hook inspects the
change (relative to the HEAD, which means "difference this merge brings
in relative to the state before I started the merge") and complains if
it finds lines that:
* have trailing whitespaces,
* have a SP immediately before HT in the indentation, or
* matches 7 or more <, >, or = at the beginning (i.e. <<<<<<<, =======,
or >>>>>>>, typically are conflict markers).
And the last heuristics does trigger on an AsciiDoc text.
The easiest (and standard) workaround in such a case is, after
inspecting the change yourself to make sure you are bitten by false
positive, to commit with --no-verify option:
git commit --no-verify
This bypasses the pre-commit hook.
^ permalink raw reply [relevance 2%]
* [PATCH v4 3/7] merge: do not abort early if one strategy fails to handle the merge
2022-07-22 5:15 2% ` [PATCH v4 2/7] merge-resolve: abort if index does not match HEAD Elijah Newren via GitGitGadget
2022-07-22 5:15 2% ` [PATCH v4 4/7] merge: fix save_state() to work when there are stat-dirty files Elijah Newren via GitGitGadget
@ 2022-07-22 5:15 2% ` Elijah Newren via GitGitGadget
3 siblings, 0 replies; 200+ results
From: Elijah Newren via GitGitGadget @ 2022-07-22 5:15 UTC (permalink / raw)
To: git
Cc: ZheNing Hu, Eric Sunshine, Junio C Hamano, Elijah Newren,
Elijah Newren, Elijah Newren
From: Elijah Newren <newren@gmail.com>
builtin/merge is setup to allow multiple strategies to be specified,
and it will find the "best" result and use it. This is defeated if
some of the merge strategies abort early when they cannot handle the
merge. Fix the logic that calls recursive and ort to not do such an
early abort, but instead return "2" or "unhandled" so that the next
strategy can try to handle the merge.
Coming up with a testcase for this is somewhat difficult, since
recursive and ort both handle nearly any two-headed merge (there is
a separate code path that checks for non-two-headed merges and
already returns "2" for them). So use a somewhat synthetic testcase
of having the index not match HEAD before the merge starts, since all
merge strategies will abort for that.
Signed-off-by: Elijah Newren <newren@gmail.com>
---
builtin/merge.c | 6 ++++--
t/t6402-merge-rename.sh | 2 +-
t/t6424-merge-unrelated-index-changes.sh | 16 ++++++++++++++++
t/t6439-merge-co-error-msgs.sh | 1 +
4 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/builtin/merge.c b/builtin/merge.c
index 13884b8e836..dec7375bf2a 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -754,8 +754,10 @@ static int try_merge_strategy(const char *strategy, struct commit_list *common,
else
clean = merge_recursive(&o, head, remoteheads->item,
reversed, &result);
- if (clean < 0)
- exit(128);
+ if (clean < 0) {
+ rollback_lock_file(&lock);
+ return 2;
+ }
if (write_locked_index(&the_index, &lock,
COMMIT_LOCK | SKIP_IF_UNCHANGED))
die(_("unable to write %s"), get_index_file());
diff --git a/t/t6402-merge-rename.sh b/t/t6402-merge-rename.sh
index 3a32b1a45cf..772238e582c 100755
--- a/t/t6402-merge-rename.sh
+++ b/t/t6402-merge-rename.sh
@@ -210,7 +210,7 @@ test_expect_success 'updated working tree file should prevent the merge' '
echo >>M one line addition &&
cat M >M.saved &&
git update-index M &&
- test_expect_code 128 git pull --no-rebase . yellow &&
+ test_expect_code 2 git pull --no-rebase . yellow &&
test_cmp M M.saved &&
rm -f M.saved
'
diff --git a/t/t6424-merge-unrelated-index-changes.sh b/t/t6424-merge-unrelated-index-changes.sh
index f35d3182b86..8b749e19083 100755
--- a/t/t6424-merge-unrelated-index-changes.sh
+++ b/t/t6424-merge-unrelated-index-changes.sh
@@ -268,4 +268,20 @@ test_expect_success 'subtree' '
test_path_is_missing .git/MERGE_HEAD
'
+test_expect_success 'resolve && recursive && ort' '
+ git reset --hard &&
+ git checkout B^0 &&
+
+ test_seq 0 10 >a &&
+ git add a &&
+
+ sane_unset GIT_TEST_MERGE_ALGORITHM &&
+ test_must_fail git merge -s resolve -s recursive -s ort C^0 >output 2>&1 &&
+
+ grep "Trying merge strategy resolve..." output &&
+ grep "Trying merge strategy recursive..." output &&
+ grep "Trying merge strategy ort..." output &&
+ grep "No merge strategy handled the merge." output
+'
+
test_done
diff --git a/t/t6439-merge-co-error-msgs.sh b/t/t6439-merge-co-error-msgs.sh
index 5bfb027099a..52cf0c87690 100755
--- a/t/t6439-merge-co-error-msgs.sh
+++ b/t/t6439-merge-co-error-msgs.sh
@@ -47,6 +47,7 @@ test_expect_success 'untracked files overwritten by merge (fast and non-fast for
export GIT_MERGE_VERBOSITY &&
test_must_fail git merge branch 2>out2
) &&
+ echo "Merge with strategy ${GIT_TEST_MERGE_ALGORITHM:-ort} failed." >>expect &&
test_cmp out2 expect &&
git reset --hard HEAD^
'
--
gitgitgadget
^ permalink raw reply related [relevance 2%]
* [PATCH v3 4/7] merge: fix save_state() to work when there are stat-dirty files
2022-07-21 8:16 2% ` [PATCH v3 2/7] merge-resolve: abort if index does not match HEAD Elijah Newren via GitGitGadget
2022-07-21 8:16 2% ` [PATCH v3 3/7] merge: do not abort early if one strategy fails to handle the merge Elijah Newren via GitGitGadget
@ 2022-07-21 8:16 2% ` Elijah Newren via GitGitGadget
3 siblings, 0 replies; 200+ results
From: Elijah Newren via GitGitGadget @ 2022-07-21 8:16 UTC (permalink / raw)
To: git
Cc: ZheNing Hu, Eric Sunshine, Junio C Hamano,
Ævar Arnfjörð Bjarmason, Elijah Newren,
Elijah Newren, Elijah Newren
From: Elijah Newren <newren@gmail.com>
When there are stat-dirty files, but no files are modified,
`git stash create` exits with unsuccessful status. This causes merge
to fail. Copy some code from sequencer.c's create_autostash to refresh
the index first to avoid this problem.
Signed-off-by: Elijah Newren <newren@gmail.com>
---
builtin/merge.c | 8 ++++++++
t/t6424-merge-unrelated-index-changes.sh | 11 +++++++++++
2 files changed, 19 insertions(+)
diff --git a/builtin/merge.c b/builtin/merge.c
index dec7375bf2a..4170c30317e 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -313,8 +313,16 @@ static int save_state(struct object_id *stash)
int len;
struct child_process cp = CHILD_PROCESS_INIT;
struct strbuf buffer = STRBUF_INIT;
+ struct lock_file lock_file = LOCK_INIT;
+ int fd;
int rc = -1;
+ fd = repo_hold_locked_index(the_repository, &lock_file, 0);
+ refresh_cache(REFRESH_QUIET);
+ if (0 <= fd)
+ repo_update_index_if_able(the_repository, &lock_file);
+ rollback_lock_file(&lock_file);
+
strvec_pushl(&cp.args, "stash", "create", NULL);
cp.out = -1;
cp.git_cmd = 1;
diff --git a/t/t6424-merge-unrelated-index-changes.sh b/t/t6424-merge-unrelated-index-changes.sh
index 8b749e19083..3019d030e07 100755
--- a/t/t6424-merge-unrelated-index-changes.sh
+++ b/t/t6424-merge-unrelated-index-changes.sh
@@ -268,6 +268,17 @@ test_expect_success 'subtree' '
test_path_is_missing .git/MERGE_HEAD
'
+test_expect_success 'avoid failure due to stat-dirty files' '
+ git reset --hard &&
+ git checkout B^0 &&
+
+ # Make "a" be stat-dirty
+ test-tool chmtime =+1 a &&
+
+ # stat-dirty file should not prevent stash creation in builtin/merge.c
+ git merge -s resolve -s recursive D^0
+'
+
test_expect_success 'resolve && recursive && ort' '
git reset --hard &&
git checkout B^0 &&
--
gitgitgadget
^ permalink raw reply related [relevance 2%]
* What's cooking in git.git (topics)
2008-07-06 10:04 2% ` Junio C Hamano
@ 2008-07-08 2:46 2% ` Junio C Hamano
2008-07-10 2:32 2% ` Junio C Hamano
0 siblings, 1 reply; 200+ results
From: Junio C Hamano @ 2008-07-08 2:46 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed
with '-' are only in 'pu' while commits prefixed with '+' are
in 'next'.
The topics list the commits in reverse chronological order. The topics
meant to be applied to the maintenance series have "maint-" in their
names.
It already is beginning to become clear what 1.6.0 will look like. What's
already in 'next' all are well intentioned (I do not guarantee they are
already bug-free --- that is what cooking them in 'next' is for) and are
good set of feature enhancements. Bigger changes will be:
* Port for MinGW.
* With the default Makefile settings, most of the programs will be
installed outside your $PATH, except for "git", "gitk", "git-gui" and
some server side programs that need to be accessible for technical
reasons. Invoking a git subcommand as "git-xyzzy" from the command
line has been deprecated since early 2006 (and officially announced in
1.5.4 release notes); use of them from your scripts after adding
output from "git --exec-path" to the $PATH will still be supported in
1.6.0, but users are again strongly encouraged to adjust their
scripts to use "git xyzzy" form, as we will stop installing
"git-xyzzy" hardlinks for built-in commands in later releases.
* git-merge will be rewritten in C.
* default pack and idx versions will be updated as scheduled for some
time ago.
* GIT_CONFIG, which was only documented as affecting "git config", but
actually affected all git commands, now only affects "git config".
GIT_LOCAL_CONFIG, also only documented as affecting "git config" and
not different from GIT_CONFIG in a useful way, is removed.
----------------------------------------------------------------
[New Topics]
* jc/rebase-orig-head (Mon Jul 7 00:16:38 2008 -0700) 1 commit
+ Teach "am" and "rebase" to mark the original position with
ORIG_HEAD
* sb/sequencer (Tue Jul 1 04:38:34 2008 +0200) 4 commits
. Migrate git-am to use git-sequencer
. Add git-sequencer test suite (t3350)
. Add git-sequencer prototype documentation
. Add git-sequencer shell prototype
* js/pick-root (Fri Jul 4 16:19:52 2008 +0100) 1 commit
+ Allow cherry-picking root commits
* ab/bundle (Sat Jul 5 17:26:40 2008 -0400) 1 commit
+ Teach git-bundle to read revision arguments from stdin like git-
rev-list.
----------------------------------------------------------------
[Will merge to master soon]
* js/apply-root (Sun Jul 6 18:36:01 2008 -0700) 3 commits
+ git-apply --directory: make --root more similar to GNU diff
+ apply --root: thinkofix.
+ Teach "git apply" to prepend a prefix with "--root=<root>"
* jc/reflog-expire (Sat Jun 28 22:24:49 2008 -0700) 2 commits
+ Make default expiration period of reflog used for stash infinite
+ Per-ref reflog expiry configuration
As 1.6.0 will be a good time to make backward incompatible changes, the
tip commit makes the default expiry period of stash 'never', unless you
configure them to expire explicitly using gc.refs/stash.* variables.
Needs consensus, but I am guessing that enough people would want stash
that does not expire.
* jk/pager-config (Thu Jul 3 07:46:57 2008 -0400) 1 commit
+ Allow per-command pager config
----------------------------------------------------------------
[Actively Cooking]
* sg/stash-k-i (Fri Jun 27 16:37:15 2008 +0200) 1 commit
+ stash: introduce 'stash save --keep-index' option
One weakness of our "partial commit" workflow support used to be that the
user can incrementally build what is to be committed in the index but that
state cannot be tested as a whole in the working tree. This allows you to
temporarily stash the remaining changes in the working tree so that the
index state before running "stash save --keep-index" can be seen in the
working tree to be tested and then committed.
* am/stash-branch (Mon Jul 7 02:50:10 2008 +0530) 2 commits
+ Add a test for "git stash branch"
+ Implement "git stash branch <newbranch> <stash>"
Creates a new branch out of the stashed state, after returning from the
interrupt that forced you to create the stash in the first place.
* tr/add-i-e (Thu Jul 3 00:00:00 2008 +0200) 3 commits
+ git-add--interactive: manual hunk editing mode
+ git-add--interactive: remove hunk coalescing
+ git-add--interactive: replace hunk recounting with apply --recount
Adds 'e/dit' action to interactive add command.
* jc/report-tracking (Sun Jul 6 02:54:56 2008 -0700) 5 commits
+ branch -r -v: do not spit out garbage
+ stat_tracking_info(): clear object flags used during counting
+ git-branch -v: show the remote tracking statistics
+ git-status: show the remote tracking statistics
+ Refactor "tracking statistics" code used by "git checkout"
Makes the "your branch is ahead of the tracked one by N commits" logic and
messages available to other commands; status and branch are updated.
* jc/merge-theirs (Mon Jun 30 22:18:57 2008 -0700) 5 commits
+ Make "subtree" part more orthogonal to the rest of merge-
recursive.
+ Teach git-pull to pass -X<option> to git-merge
+ Teach git-merge to pass -X<option> to the backend strategy module
+ git-merge-recursive-{ours,theirs}
+ git-merge-file --ours, --theirs
Punting a merge by discarding your own work in conflicting parts but still
salvaging the parts that are cleanly automerged. It is likely that this
will result in nonsense mishmash, but somehow often people want this, so
here they are. The interface to the backends is updated so that you can
say "git merge -Xours -Xsubtree=foo/bar/baz -s recursive other" now.
The -X<option> part may change, Dscho mentions that a single-letter -X
that take stuck option is against syntax rules, and I think he's right.
This is more "because we can", not "because we need to".
* mv/merge-in-c (Mon Jul 7 19:24:20 2008 +0200) 15 commits
- Build in merge
+ Fix t7601-merge-pull-config.sh on AIX
+ git-commit-tree: make it usable from other builtins
+ Add new test case to ensure git-merge prepends the custom merge
message
+ Add new test case to ensure git-merge reduces octopus parents when
possible
+ Introduce reduce_heads()
+ Introduce get_merge_bases_many()
+ Add new test to ensure git-merge handles more than 25 refs.
+ Introduce get_octopus_merge_bases() in commit.c
+ git-fmt-merge-msg: make it usable from other builtins
+ Move read_cache_unmerged() to read-cache.c
+ Add new test to ensure git-merge handles pull.twohead and
pull.octopus
+ Move parse-options's skip_prefix() to git-compat-util.h
+ Move commit_list_count() to commit.c
+ Move split_cmdline() to alias.c
----------------------------------------------------------------
[Graduated to "master"]
* js/import-zip (Mon Jun 30 19:50:44 2008 +0100) 1 commit
+ Add another fast-import example, this time for .zip files
* db/no-git-config (Mon Jun 30 03:37:47 2008 -0400) 1 commit
+ Only use GIT_CONFIG in "git config", not other programs
* dr/ceiling (Mon May 19 23:49:34 2008 -0700) 4 commits
+ Eliminate an unnecessary chdir("..")
+ Add support for GIT_CEILING_DIRECTORIES
+ Fold test-absolute-path into test-path-utils
+ Implement normalize_absolute_path
* jc/rerere (Sun Jun 22 02:04:31 2008 -0700) 5 commits
+ rerere.autoupdate
+ t4200: fix rerere test
+ rerere: remove dubious "tail_optimization"
+ git-rerere: detect unparsable conflicts
+ rerere: rerere_created_at() and has_resolution() abstraction
A new configuration will allow paths that have been resolved cleanly by
rerere to be updated in the index automatically.
* js/maint-daemon-syslog (Thu Jul 3 16:27:24 2008 +0100) 1 commit
+ git daemon: avoid calling syslog() from a signal handler
Meant for 'maint' as well.
----------------------------------------------------------------
[On Hold]
* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit
+ merge: remove deprecated summary and diffstat options and config
variables
This was previously in "will be in master soon" category, but it turns out
that the synonyms to the ones this one deletes are fairly new invention
that happend in 1.5.6 timeframe, and we cannot do this just yet. Perhaps
in 1.7.0.
* jc/dashless (Thu Jun 26 16:43:34 2008 -0700) 2 commits
+ Revert "Make clients ask for "git program" over ssh and local
transport"
+ Make clients ask for "git program" over ssh and local transport
This is the "botched" one. Will be resurrected during 1.7.0 or 1.8.0
timeframe.
* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
- diff: enable "too large a rename" warning when -M/-C is explicitly
asked for
This would be the right thing to do for command line use, but gitk will be
hit due to tcl/tk's limitation, so I am holding this back for now.
----------------------------------------------------------------
[Stalled/Needs more work]
* jc/grafts (Wed Jul 2 17:14:12 2008 -0700) 1 commit
- [BROKEN wrt shallow clones] Ignore graft during object transfer
Cloning or fetching from a repository from grafts did not send objects
that are hidden by grafts, but the commits in the resulting repository do
need these to pass fsck. This fixes object transfer to ignore grafts.
Another fix is needed to git-prune so that it ignores grafts but treats
commits that are mentioned in grafts as reachable.
* ph/parseopt-step-blame (Tue Jun 24 11:12:12 2008 +0200) 7 commits
- Migrate git-blame to parse-option partially.
+ parse-opt: add PARSE_OPT_KEEP_ARGV0 parser option.
+ parse-opt: fake short strings for callers to believe in.
+ parse-opt: do not print errors on unknown options, return -2
intead.
+ parse-opt: create parse_options_step.
+ parse-opt: Export a non NORETURN usage dumper.
+ parse-opt: have parse_options_{start,end}.
I recall Pierre said something about cleaning up the last one when he
finds time, but other than that vague recollection, I lost track of this
series. I am tempted to fork a few topics off of the penúltimo one to
convert a few more commands as examples and merge the result to 'next'.
* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 7 commits
- blame: show "previous" information in --porcelain/--incremental
format
- git-blame: refactor code to emit "porcelain format" output
+ git-blame --reverse
+ builtin-blame.c: allow more than 16 parents
+ builtin-blame.c: move prepare_final() into a separate function.
+ rev-list --children
+ revision traversal: --children option
The blame that finds where each line in the original lines moved to. This
may help a GSoC project that wants to gather statistical overview of the
history. The final presentation may need tweaking (see the log message of
the commit ""git-blame --reverse" on the series).
The tip two commits are for peeling to see what's behind the blamed
commit, which we should be able to separate out into an independent topic
from the rest.
^ permalink raw reply [relevance 2%]
* [PATCH v4 4/7] merge: fix save_state() to work when there are stat-dirty files
2022-07-22 5:15 2% ` [PATCH v4 2/7] merge-resolve: abort if index does not match HEAD Elijah Newren via GitGitGadget
@ 2022-07-22 5:15 2% ` Elijah Newren via GitGitGadget
2022-07-22 5:15 2% ` [PATCH v4 3/7] merge: do not abort early if one strategy fails to handle the merge Elijah Newren via GitGitGadget
3 siblings, 0 replies; 200+ results
From: Elijah Newren via GitGitGadget @ 2022-07-22 5:15 UTC (permalink / raw)
To: git
Cc: ZheNing Hu, Eric Sunshine, Junio C Hamano, Elijah Newren,
Elijah Newren, Elijah Newren
From: Elijah Newren <newren@gmail.com>
When there are stat-dirty files, but no files are modified,
`git stash create` exits with unsuccessful status. This causes merge
to fail. Copy some code from sequencer.c's create_autostash to refresh
the index first to avoid this problem.
Signed-off-by: Elijah Newren <newren@gmail.com>
---
builtin/merge.c | 8 ++++++++
t/t6424-merge-unrelated-index-changes.sh | 11 +++++++++++
2 files changed, 19 insertions(+)
diff --git a/builtin/merge.c b/builtin/merge.c
index dec7375bf2a..4170c30317e 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -313,8 +313,16 @@ static int save_state(struct object_id *stash)
int len;
struct child_process cp = CHILD_PROCESS_INIT;
struct strbuf buffer = STRBUF_INIT;
+ struct lock_file lock_file = LOCK_INIT;
+ int fd;
int rc = -1;
+ fd = repo_hold_locked_index(the_repository, &lock_file, 0);
+ refresh_cache(REFRESH_QUIET);
+ if (0 <= fd)
+ repo_update_index_if_able(the_repository, &lock_file);
+ rollback_lock_file(&lock_file);
+
strvec_pushl(&cp.args, "stash", "create", NULL);
cp.out = -1;
cp.git_cmd = 1;
diff --git a/t/t6424-merge-unrelated-index-changes.sh b/t/t6424-merge-unrelated-index-changes.sh
index 8b749e19083..3019d030e07 100755
--- a/t/t6424-merge-unrelated-index-changes.sh
+++ b/t/t6424-merge-unrelated-index-changes.sh
@@ -268,6 +268,17 @@ test_expect_success 'subtree' '
test_path_is_missing .git/MERGE_HEAD
'
+test_expect_success 'avoid failure due to stat-dirty files' '
+ git reset --hard &&
+ git checkout B^0 &&
+
+ # Make "a" be stat-dirty
+ test-tool chmtime =+1 a &&
+
+ # stat-dirty file should not prevent stash creation in builtin/merge.c
+ git merge -s resolve -s recursive D^0
+'
+
test_expect_success 'resolve && recursive && ort' '
git reset --hard &&
git checkout B^0 &&
--
gitgitgadget
^ permalink raw reply related [relevance 2%]
* Re: What's cooking in git.git (May 2011, #04; Sun, 8)
@ 2011-05-09 8:55 2% ` Ciaran
0 siblings, 0 replies; 200+ results
From: Ciaran @ 2011-05-09 8:55 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
> --------------------------------------------------
> [Stalled]
>
> * kk/maint-prefix-in-config-mak (2011-05-04) 3 commits
> - config.mak.in: allow "configure --sysconfdir=/else/where"
> - Makefile: allow sysconfdir to be used from configure
> (merged to 'next' on 2011-05-02 at c747ba3)
> + Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconfdir
>
> J6t is unhappy that sysconfdir is ignored in relocatable case. Although I
> personally do not think that is a problem, as it has never been an issue,
> let's see what others think.
>
> * jn/gitweb-js (2011-04-28) 13 commits
> - gitweb: Make JavaScript ability to adjust timezones configurable
> - gitweb.js: Add UI for selecting common timezone to display dates
> - gitweb: JavaScript ability to adjust time based on timezone
> - gitweb: Unify the way long timestamp is displayed
> - gitweb: Refactor generating of long dates into format_timestamp_html
> - gitweb.js: Provide getElementsByClassName method (if it not exists)
> - gitweb.js: Introduce code to handle cookies from JavaScript
> - gitweb.js: Extract and improve datetime handling
> - gitweb.js: Provide default values for padding in padLeftStr and padLeft
> - gitweb.js: Update and improve comments in JavaScript files
> - gitweb: Split JavaScript for maintability, combining on build
> - Remove gitweb/gitweb.cgi and other legacy targets from main Makefile
> - git-instaweb: Simplify build dependency on gitweb
>
Sorry if this is dumb, as I'm unsure how Git (the mailing list)
handles regression tracking, but I saw no mention of this thread:
http://marc.info/?l=git&m=130445013906259&w=2
Is this something overlooked or something you're aware of just not
worried about at the minute. What is the process if a merge to
master causes a regression, do you just git revert the offending
merge, fix on the branch, then re-merge?
Many thanks
- cj.
^ permalink raw reply [relevance 2%]
* [PATCH/RFC] updating examples/git-merge (plus a builtin/merge fix)
@ 2010-08-17 6:51 2% Jonathan Nieder
2010-08-17 7:04 2% ` [PATCH 15/24] merge script: improve log message subject Jonathan Nieder
0 siblings, 1 reply; 200+ results
From: Jonathan Nieder @ 2010-08-17 6:51 UTC (permalink / raw)
To: git; +Cc: Lars Hjemli, Tay Ray Chuan, Matthieu Moy, Clemens Buchacher,
Jeff King
While preparing to make some minor "git merge" changes, I noticed that
the old merge script does not pass all tests any more. Since it can
be easier to prototype in shell and then port to C, I think that is
worth fixing.
Of course this is not urgent at all.
Patch 1 fixes a minor bug that the scripted implementation does not
suffer from, illustrated by the test "merge early part of c2" from
t7600-merge.sh.
The underlying problem is a subtlety in the resolve_ref() API (from
v0.99.8~13, Use resolve_ref() to implement read_ref(), 2005-09-30):
the "reading" argument to resolve_ref() should usually be true, but
that is not obvious to newcomers.
Patches 2-7 are minor test changes. They are early in the series
to give flexibility about when to merge them.
Patches 8-10 expose functionality used by merge when handling octopus
merges. merge-base --octopus is get_octopus_merge_bases(), used to
provide basis arguments when running the "git merge-octopus" command.
Of course the latter does not care about its basis arguments, but
that is a topic for another series. merge-base --independent is
reduce_refs(), used to reduce the parent list when --no-ff is not
in use.
These are analagous to show-branch --merge-base and
show-branch --independent but are slower and can be used with more
than 25 refs.
Patch 11 exposes the functionality from fmt-merge-msg needed to
implement merge --log -m.
Patches 12 and later are ports of various patches to builtin/merge.c.
I did the bare minimum to make tests pass. :)
Patches are against jn/merge-renormalize~2 (rerere: migrate to
parse-options API) from pu, because without that,
"rerere --rerere-autoupdate" does not work.
Thoughts?
Jonathan Nieder (24):
merge: do not mistake (ancestor of) tag for branch
t7600 (merge): modernize style
t7600 (merge): do not launch gitk for --debug
t7600 (merge): check reflog entry
t7600 (merge): test merge from branch yet to be born
t6010 (merge-base): modernize style
t6200 (fmt-merge-msg): style nitpicks
Documentation: add a SEE ALSO section for merge-base
merge-base --octopus to mimic show-branch --merge-base
merge-base --independent to print reduced parent list in a merge
fmt-merge-msg -m to replace subject line
merge script: --squash, --ff from unborn branch are errors
merge script: tweak unmerged files message to match builtin
merge script: refuse to merge during merge
merge script: improve log message subject
merge script: merge -X<option>
merge script: allow custom strategies
merge script: forbid merge -s index
merge script: handle -m --log correctly
merge script: handle many-way octopus
merge script: --ff-only to disallow true merge
merge script: handle --no-ff --no-commit correctly
merge script: notice @{-1} shorthand
merge script: learn --[no-]rerere-autoupdate
Documentation/git-fmt-merge-msg.txt | 9 +-
Documentation/git-merge-base.txt | 34 +++-
builtin/fmt-merge-msg.c | 18 ++-
builtin/merge-base.c | 44 ++++-
builtin/merge.c | 2 +-
contrib/examples/git-merge.sh | 115 ++++++++---
t/t6010-merge-base.sh | 358 +++++++++++++++++++--------------
t/t6200-fmt-merge-msg.sh | 306 ++++++++++++++--------------
t/t7600-merge.sh | 385 +++++++++++++++--------------------
9 files changed, 705 insertions(+), 566 deletions(-)
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (Oct 2009, #06; Fri, 30)
@ 2009-10-31 4:04 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2009-10-31 4:04 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
marked with '.' do not appear in any of the integration branches, but I am
still holding onto them.
In 1.7.0, we plan to correct handful of warts in the interfaces everybody
agrees that they were mistakes. The resulting system may not be strictly
backward compatible. Currently planeed changes are:
* refuse push to update the checked out branch in a non-bare repo by
default
Make "git push" into a repository to update the branch that is checked
out fail by default. You can countermand this default by setting a
configuration variable in the receiving repository.
http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007
* refuse push to delete the current branch by default
Make "git push $there :$killed" to delete the branch that is pointed at
by its HEAD fail by default. You can countermand this default by
setting a configuration variable in the receiving repository.
http://thread.gmane.org/gmane.comp.version-control.git/108862/focus=108936
* git-send-email won't make deep threads by default
Many people said that by default when sending more than 2 patches the
threading git-send-email makes by default is hard to read, and they
prefer the default be one cover letter and each patch as a direct
follow-up to the cover letter. You can countermand this by setting a
configuration variable.
http://article.gmane.org/gmane.comp.version-control.git/109790
* git-status won't be "git-commit --dry-run" anymore
http://thread.gmane.org/gmane.comp.version-control.git/125989/focus=125993
* "git-diff -w --exit-code" will exit success if only differences it
found are whitespace changes that are stripped away from the output.
http://thread.gmane.org/gmane.comp.version-control.git/119731/focus=119751
The tests do not pass with three series at the tip of tonight's 'pu' branch.
--------------------------------------------------
[Graduated to "master"]
* cb/doc-fetch-pull-merge (2009-10-21) 1 commit.
(merged to 'next' on 2009-10-21 at 1d9190d)
+ modernize fetch/merge/pull examples
* ja/fetch-doc (2009-10-22) 3 commits.
(merged to 'next' on 2009-10-22 at 8868407)
+ Documentation/merge-options.txt: order options in alphabetical groups
+ Documentation/git-pull.txt: Add subtitles above included option files
(merged to 'next' on 2009-10-21 at bf09f62)
+ Documentation/fetch-options.txt: order options alphabetically
* tr/maint-roff-quote (2009-10-22) 1 commit.
(merged to 'next' on 2009-10-22 at 14c5631)
+ Quote ' as \(aq in manpages
* ak/bisect-reset-to-switch (2009-10-13) 1 commit.
(merged to 'next' on 2009-10-22 at 592fff3)
+ bisect reset: Allow resetting to any commit, not just a branch
* jc/maint-1.6.3-graft-trailing-space (2009-10-14) 1 commit.
(merged to 'next' on 2009-10-22 at 90ccac6)
+ info/grafts: allow trailing whitespaces at the end of line
* jn/show-normalized-refs (2009-10-12) 3 commits.
(merged to 'next' on 2009-10-23 at 332aad3)
+ check-ref-format: simplify --print implementation
+ git check-ref-format --print
+ Add tests for git check-ref-format
* jc/checkout-auto-track (2009-10-18) 3 commits
(merged to 'next' on 2009-10-23 at ff7e8f3)
+ git checkout --no-guess
+ DWIM "git checkout frotz" to "git checkout -b frotz origin/frotz"
+ check_filename(): make verify_filename() callable without dying
The final shape of this series ended up to be more or less exactly what
Dscho hinted he wanted to have in one of the discussion.
* tr/stash-format (2009-10-19) 5 commits
(merged to 'next' on 2009-10-23 at 6c551c3)
+ stash list: drop the default limit of 10 stashes
+ stash list: use new %g formats instead of sed
+ Introduce new pretty formats %g[sdD] for reflog information
+ reflog-walk: refactor the branch@{num} formatting
+ Refactor pretty_print_commit arguments into a struct
* js/diff-verbose-submodule (2009-10-23) 2 commits.
(merged to 'next' on 2009-10-23 at e479773)
+ add tests for git diff --submodule
+ Add the --submodule option to the diff option family
--------------------------------------------------
[New Topics]
* bg/merge-ff-only (2009-10-29) 1 commit
- Teach 'git merge' and 'git pull' the option --ff-only
Soon in 'next'.
* jk/maint-1.6.3-ls-files-i (2009-10-30) 1 commit.
- ls-files: unbreak "ls-files -i"
Soon in 'next'.
* jn/editor-pager (2009-10-30) 8 commits
- Provide a build time default-pager setting
- Provide a build time default-editor setting
- am -i, git-svn: use "git var GIT_PAGER"
- add -i, send-email, svn, p4, etc: use "git var GIT_EDITOR"
- Teach git var about GIT_PAGER
- Teach git var about GIT_EDITOR
- Do not use VISUAL editor on dumb terminals
- Handle more shell metacharacters in editor names
Does not seem to pass t3404 by itself.
* js/maint-diff-color-words (2009-10-30) 3 commits.
- (pu) cleanup with diff_words_flush()
- diff --color-words -U0: fix the location of hunk headers
- t4034-diff-words: add a test for word diff without context
Replaces mh/maint-diff-color-words. The tip one is my "at least it would
be a bit more readable this way" patch without proper commit log message.
* sc/difftool-p4merge (2009-10-28) 1 commit
- mergetool--lib: add p4merge as a pre-configured mergetool option
Soon in 'next'.
* sc/protocol-doc (2009-10-29) 1 commit
- Update packfile transfer protocol documentation
Expecting replacement.
* sr/vcs-helper (2009-10-29) 19 commits
- .gitignore: add git-remote-cvs
- Refactor git_remote_cvs to a more generic git_remote_helpers
- More fixes to the git-remote-cvs installation procedure
- Fix the Makefile-generated path to the git_remote_cvs package in git-remote-cvs
- Add simple selftests of git-remote-cvs functionality
- git-remote-cvs: Remote helper program for CVS repositories
- 2/2: Add Python support library for CVS remote helper
- 1/2: Add Python support library for CVS remote helper
- Basic build infrastructure for Python scripts
- Allow helpers to request marks for fast-import
- Introduce <vcs>::<url> syntax for remote url
- Fix memory leak in helper method for disconnect
- Allow helpers to report in "list" command that the ref is unchanged
- Factor ref updating out of fetch_with_import
- Add support for "import" helper command
- Add a config option for remotes to specify a foreign vcs
- Allow programs to not depend on remotes having urls
- Allow fetch to modify refs
- Use a function to determine whether a remote is valid
Supposed to replace db/vcs-helper-rest and jh/cvs-helper but expecting
replacement. Does not pass selftest yet (e.g. t9801).
* tr/describe-advice (2009-10-28) 1 commit
- describe: when failing, tell the user about options that work
Soon in 'next'.
--------------------------------------------------
[Stalled]
* tr/filter-branch (2009-10-28) 2 commits.
- filter-branch: nearest-ancestor rewriting outside subdir filter
- filter-branch: stop special-casing $filter_subdir argument
J6t has some comments on this.
* ne/rev-cache (2009-10-19) 7 commits.
- support for commit grafts, slight change to general mechanism
- support for path name caching in rev-cache
- full integration of rev-cache into git, completed test suite
- administrative functions for rev-cache, start of integration into git
- support for non-commit object caching in rev-cache
- basic revision cache system, no integration or features
- man page and technical discussion for rev-cache
The author indicated that there is another round coming. Does not seem to
pass the tests when merged to 'pu'.
* jl/submodule-add-noname (2009-09-22) 1 commit.
- git submodule add: make the <path> parameter optional
Dscho started an interesting discussion regarding the larger workflow in
which the "submodule add" is used. I think the patch itself makes sense
but at the same time it probably makes sense to also take the <path> and
infer the <repository> as Dscho suggested, probably in "git submodule
add", not in "git add" proper, at least initially.
* sr/gfi-options (2009-09-06) 6 commits.
- fast-import: test the new option command
- fast-import: add option command
- fast-import: test the new feature command
- fast-import: add feature command
- fast-import: put marks reading in it's own function
- fast-import: put option parsing code in separate functions
Seems to be moving again soon.
* je/send-email-no-subject (2009-08-05) 1 commit.
(merged to 'next' on 2009-10-11 at 1b99c56)
+ send-email: confirm on empty mail subjects
The existing tests cover the positive case (i.e. as long as the user says
"yes" to the "do you really want to send this message that lacks subject",
the message is sent) of this feature, but the feature itself needs its own
test to verify the negative case (i.e. does it correctly stop if the user
says "no"?)
--------------------------------------------------
[Cooking]
* mr/gitweb-snapshot (2009-10-29) 3 commits.
- gitweb: Smarter snapshot names
- t/gitweb-lib.sh: Split gitweb output into headers and body
(merged to 'next' on 2009-10-11 at 22ba047)
+ gitweb: check given hash before trying to create snapshot
Replaced the tip with Jakub's updates.
* jp/dirty-describe (2009-10-21) 1 commit.
(merged to 'next' on 2009-10-30 at 19c7fc7)
+ Teach "git describe" --dirty option
* jp/fetch-cull-many-refs (2009-10-25) 2 commits
- fetch: Speed up fetch of large numbers of refs
- remote: Make ref_remove_duplicates faster for large numbers of refs
* bg/format-patch-p-noop (2009-10-25) 3 commits.
(merged to 'next' on 2009-10-30 at e34a3db)
+ format-patch documentation: Fix formatting
+ format-patch documentation: Remove diff options that are not useful
+ format-patch: Make implementation and documentation agree
* jk/gitignore-anchored (2009-10-26) 1 commit
(merged to 'next' on 2009-10-30 at 9391a93)
+ gitignore: root most patterns at the top-level directory
* jk/maint-add-p-empty (2009-10-27) 1 commit.
(merged to 'next' on 2009-10-30 at 2bd302f)
+ add-interactive: handle deletion of empty files
* jk/maint-push-config (2009-10-25) 1 commit.
(merged to 'next' on 2009-10-30 at 934e3c5)
+ push: always load default config
* lt/revision-bisect (2009-10-27) 1 commit.
(merged to 'next' on 2009-10-30 at 81ee52b)
+ Add '--bisect' revision machinery argument
* jc/pretty-lf (2009-10-04) 1 commit.
- Pretty-format: %[+-]x to tweak inter-item newlines
* rs/pretty-wrap (2009-10-17) 1 commit
(merged to 'next' on 2009-10-30 at 403bbfe)
+ Implement wrap format %w() as if it is a mode switch
(this branch uses js/log-rewrap.)
* js/log-rewrap (2009-10-18) 3 commits
(merged to 'next' on 2009-10-30 at 403bbfe)
+ Teach --wrap to only indent without wrapping
+ Add strbuf_add_wrapped_text() to utf8.[ch]
+ print_wrapped_text(): allow hard newlines
(this branch is used by rs/pretty-wrap.)
* sr/blame-incomplete (2009-10-19) 1 commit.
(merged to 'next' on 2009-10-22 at 133e0ce)
+ blame: make sure that the last line ends in an LF
I think this is _good enough_ as-is; although it would be better if we
added some hint to the output for Porcelain implementations, that can be
done as a follow-up fix.
* fc/doc-fast-forward (2009-10-24) 1 commit.
- Use 'fast-forward' all over the place
* ks/precompute-completion (2009-10-26) 3 commits.
(merged to 'next' on 2009-10-28 at cd5177f)
+ completion: ignore custom merge strategies when pre-generating
(merged to 'next' on 2009-10-22 at f46a28a)
+ bug: precomputed completion includes scripts sources
(merged to 'next' on 2009-10-14 at adf722a)
+ Speedup bash completion loading
* sp/smart-http (2009-10-30) 28 commits
- test smart http fetch and push
- http tests: use /dumb/ URL prefix
- set httpd port before sourcing lib-httpd
- t5540-http-push: remove redundant fetches
- Smart HTTP fetch: gzip requests
- Smart fetch over HTTP: client side
- Smart push over HTTP: client side
- Discover refs via smart HTTP server when available
- http-backend: more explict LocationMatch
- http-backend: add example for gitweb on same URL
- http-backend: use mod_alias instead of mod_rewrite
- http-backend: reword some documentation
- http-backend: add GIT_PROJECT_ROOT environment var
- Smart fetch and push over HTTP: server side
- Add stateless RPC options to upload-pack, receive-pack
- Git-aware CGI to provide dumb HTTP transport
- remote-helpers: return successfully if everything up-to-date
- Move WebDAV HTTP push under remote-curl
- remote-helpers: Support custom transport options
- remote-helpers: Fetch more than one ref in a batch
- fetch: Allow transport -v -v -v to set verbosity to 3
- remote-curl: Refactor walker initialization
- Add multi_ack_detailed capability to fetch-pack/upload-pack
- Move "get_ack()" back to fetch-pack
- fetch-pack: Use a strbuf to compose the want list
- pkt-line: Make packet_read_line easier to debug
- pkt-line: Add strbuf based functions
- http-push: fix check condition on http.c::finish_http_pack_request()
v5
* ef/msys-imap (2009-10-22) 9 commits.
- Windows: use BLK_SHA1 again
- MSVC: Enable OpenSSL, and translate -lcrypto
- mingw: enable OpenSSL
- mingw: wrap SSL_set_(w|r)fd to call _get_osfhandle
- imap-send: build imap-send on Windows
- imap-send: fix compilation-error on Windows
- imap-send: use run-command API for tunneling
- imap-send: use separate read and write fds
- imap-send: remove useless uid code
This is pulled from J6t; I'll merge it to 'next' if Dscho is Ok with it.
* jc/fix-tree-walk (2009-10-22) 11 commits.
(merged to 'next' on 2009-10-22 at 10c0c8f)
+ Revert failed attempt since 353c5ee
+ read-tree --debug-unpack
(merged to 'next' on 2009-10-11 at 0b058e2)
+ unpack-trees.c: look ahead in the index
+ unpack-trees.c: prepare for looking ahead in the index
+ Aggressive three-way merge: fix D/F case
+ traverse_trees(): handle D/F conflict case sanely
+ more D/F conflict tests
+ tests: move convenience regexp to match object names to test-lib.sh
+ unpack_callback(): use unpack_failed() consistently
+ unpack-trees: typofix
+ diff-lib.c: fix misleading comments on oneway_diff()
This has some stupid bugs and temporarily reverted from 'next' until I can
fix it.
* jh/notes (2009-10-09) 22 commits.
- fast-import: Proper notes tree manipulation using the notes API
- Refactor notes concatenation into a flexible interface for combining notes
- Notes API: Allow multiple concurrent notes trees with new struct notes_tree
- Notes API: for_each_note(): Traverse the entire notes tree with a callback
- Notes API: get_note(): Return the note annotating the given object
- Notes API: add_note(): Add note objects to the internal notes tree structure
- Notes API: init_notes(): Initialize the notes tree from the given notes ref
- Notes API: get_commit_notes() -> format_note() + remove the commit restriction
- Add selftests verifying concatenation of multiple notes for the same commit
- Refactor notes code to concatenate multiple notes annotating the same object
- Add selftests verifying that we can parse notes trees with various fanouts
- Teach the notes lookup code to parse notes trees with various fanout schemes
- Teach notes code to free its internal data structures on request
- Add '%N'-format for pretty-printing commit notes
- Add flags to get_commit_notes() to control the format of the note string
- t3302-notes-index-expensive: Speed up create_repo()
- fast-import: Add support for importing commit notes
- Teach "-m <msg>" and "-F <file>" to "git notes edit"
- Add an expensive test for git-notes
- Speed up git notes lookup
- Add a script to edit/inspect notes
- Introduce commit notes
I think Johan indicated that early parts of it is ready for 'next', so I
may do so up to "Add selftests" one.
* jn/gitweb-blame (2009-09-01) 5 commits.
- gitweb: Minify gitweb.js if JSMIN is defined
- gitweb: Create links leading to 'blame_incremental' using JavaScript
(merged to 'next' on 2009-10-11 at 73c4a83)
+ gitweb: Colorize 'blame_incremental' view during processing
+ gitweb: Incremental blame (using JavaScript)
+ gitweb: Add optional "time to generate page" info in footer
Ajax-y blame.
* nd/sparse (2009-08-20) 19 commits.
- sparse checkout: inhibit empty worktree
- Add tests for sparse checkout
- read-tree: add --no-sparse-checkout to disable sparse checkout support
- unpack-trees(): ignore worktree check outside checkout area
- unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index
- unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout
- unpack-trees.c: generalize verify_* functions
- unpack-trees(): add CE_WT_REMOVE to remove on worktree alone
- Introduce "sparse checkout"
- dir.c: export excluded_1() and add_excludes_from_file_1()
- excluded_1(): support exclude files in index
- unpack-trees(): carry skip-worktree bit over in merged_entry()
- Read .gitignore from index if it is skip-worktree
- Avoid writing to buffer in add_excludes_from_file_1()
- Teach Git to respect skip-worktree bit (writing part)
- Teach Git to respect skip-worktree bit (reading part)
- Introduce "skip-worktree" bit in index, teach Git to get/set this bit
- Add test-index-version
- update-index: refactor mark_valid() in preparation for new options
--------------------------------------------------
[For 1.7.0]
* jc/1.7.0-no-commit-no-ff-2 (2009-10-22) 1 commit.
- git-merge: forbid fast-forward and up-to-date when --no-commit is given
This makes "git merge --no-commit" fail when it results in fast-forward or
up-to-date. I haven't described this at the beginning of this message
yet, as it is not clear if this change is even necessary. Opinions?
* jk/1.7.0-status (2009-09-05) 5 commits.
- docs: note that status configuration affects only long format
(merged to 'next' on 2009-10-11 at 65c8513)
+ commit: support alternate status formats
+ status: add --porcelain output format
+ status: refactor format option parsing
+ status: refactor short-mode printing to its own function
(this branch uses jc/1.7.0-status.)
Gives the --short output format to post 1.7.0 "git commit --dry-run" that
is similar to that of post 1.7.0 "git status".
The tip one is not in 'next' as I have been hoping that somebody may want
to change the code to make it unnecessary, but it does not seem to be
happening, so probably it should also go to 'next'.
* jc/1.7.0-status (2009-09-05) 4 commits.
(merged to 'next' on 2009-10-11 at 9558627)
+ status: typo fix in usage
+ git status: not "commit --dry-run" anymore
+ git stat -s: short status output
+ git stat: the beginning of "status that is not a dry-run of commit"
(this branch is used by jk/1.7.0-status.)
With this, "git status" is no longer "git commit --dry-run".
* jc/1.7.0-send-email-no-thread-default (2009-08-22) 1 commit.
(merged to 'next' on 2009-10-11 at 043acdf)
+ send-email: make --no-chain-reply-to the default
* jc/1.7.0-diff-whitespace-only-status (2009-08-30) 4 commits.
(merged to 'next' on 2009-10-11 at 546c74d)
+ diff.c: fix typoes in comments
+ Make test case number unique
+ diff: Rename QUIET internal option to QUICK
+ diff: change semantics of "ignore whitespace" options
This changes exit code from "git diff --ignore-whitespace" and friends
when there is no actual output. It is a backward incompatible change, but
we could argue that it is a bugfix.
* jc/1.7.0-push-safety (2009-02-09) 2 commits.
(merged to 'next' on 2009-10-11 at 81b8128)
+ Refuse deleting the current branch via push
+ Refuse updating the current branch in a non-bare repository via push
--------------------------------------------------
[I have been too busy to purge these]
* jc/log-tz (2009-03-03) 1 commit.
- Allow --date=local --date=other-format to work as expected
Maybe some people care about this. I dunno.
* jc/mailinfo-remove-brackets (2009-07-15) 1 commit.
- mailinfo: -b option keeps [bracketed] strings that is not a [PATCH] marker
Maybe some people care about this. I dunno.
* jg/log-format-body-indent (2009-09-19) 1 commit.
. git-log --format: Add %B tag with %B(x) option
* mh/maint-diff-color-words (2009-10-28) 3 commits
. diff: fix the location of hunk headers for "git diff --color-words -U0"
. diff: move the handling of the hunk header after the changed lines
. t4034-diff-words: add a test for word diff without context
Ejected; js/maint-diff-color-words replaces this.
* db/vcs-helper-rest (2009-10-27) 7 commits.
. Fix memory leak in helper method for disconnect
. Allow helpers to report in "list" command that the ref is unchanged
. Add support for "import" helper command
. Add a config option for remotes to specify a foreign vcs
. Allow programs to not depend on remotes having urls
. Allow fetch to modify refs
. Use a function to determine whether a remote is valid
(this branch is used by jh/cvs-helper.)
* jh/cvs-helper (2009-08-18) 8 commits.
. More fixes to the git-remote-cvs installation procedure
. Fix the Makefile-generated path to the git_remote_cvs package in git-remote-cvs
. Add simple selftests of git-remote-cvs functionality
. git-remote-cvs: Remote helper program for CVS repositories
. 2/2: Add Python support library for CVS remote helper
. 1/2: Add Python support library for CVS remote helper
. Basic build infrastructure for Python scripts
. Allow helpers to request marks for fast-import
(this branch uses db/vcs-helper-rest.)
Ejected; sr/vcs-helper is supposed to replace these two.
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (Oct 2009, #05; Wed, 28)
@ 2009-10-28 21:11 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2009-10-28 21:11 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
marked with '.' do not appear in any of the integration branches, but I am
still holding onto them.
In 1.7.0, we plan to correct handful of warts in the interfaces everybody
agrees that they were mistakes. The resulting system may not be strictly
backward compatible. Currently planeed changes are:
* refuse push to update the checked out branch in a non-bare repo by
default
Make "git push" into a repository to update the branch that is checked
out fail by default. You can countermand this default by setting a
configuration variable in the receiving repository.
http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007
* refuse push to delete the current branch by default
Make "git push $there :$killed" to delete the branch that is pointed at
by its HEAD fail by default. You can countermand this default by
setting a configuration variable in the receiving repository.
http://thread.gmane.org/gmane.comp.version-control.git/108862/focus=108936
* git-send-email won't make deep threads by default
Many people said that by default when sending more than 2 patches the
threading git-send-email makes by default is hard to read, and they
prefer the default be one cover letter and each patch as a direct
follow-up to the cover letter. You can countermand this by setting a
configuration variable.
http://article.gmane.org/gmane.comp.version-control.git/109790
* git-status won't be "git-commit --dry-run" anymore
http://thread.gmane.org/gmane.comp.version-control.git/125989/focus=125993
* "git-diff -w --exit-code" will exit success if only differences it
found are whitespace changes that are stripped away from the output.
http://thread.gmane.org/gmane.comp.version-control.git/119731/focus=119751
--------------------------------------------------
[Graduated to "master"]
* jc/fsck-default-full (2009-10-20) 1 commit
+ fsck: default to "git fsck --full"
* jc/maint-fix-unpack-zlib-check (2009-10-21) 1 commit.
+ Fix incorrect error check while reading deflated pack data
* jc/receive-pack-auto (2009-10-20) 2 commits.
+ receive-pack: run "gc --auto --quiet" and optionally "update-server-info"
+ gc --auto --quiet: make the notice a bit less verboase
* bg/clone-doc (2009-10-20) 1 commit.
+ git-clone.txt: Fix grammar and formatting
* iv/tar-lzma-xz (2009-10-20) 1 commit.
+ import-tars: Add support for tarballs compressed with lzma, xz
* jk/maint-cvsimport-pathname (2009-10-19) 1 commit.
+ cvsimport: fix relative argument filenames
* sb/gitweb-link-author (2009-10-15) 1 commit
+ gitweb: linkify author/committer names with search
--------------------------------------------------
[New Topics]
* jp/dirty-describe (2009-10-21) 1 commit.
- Teach "git describe" --dirty option
Soon in 'next'.
* jp/fetch-cull-many-refs (2009-10-25) 2 commits
- fetch: Speed up fetch of large numbers of refs
- remote: Make ref_remove_duplicates faster for large numbers of refs
* bg/format-patch-p-noop (2009-10-25) 3 commits.
- format-patch documentation: Fix formatting
- format-patch documentation: Remove diff options that are not useful
- format-patch: Make implementation and documentation agree
* jk/gitignore-anchored (2009-10-26) 1 commit
- gitignore: root most patterns at the top-level directory
* jk/maint-add-p-empty (2009-10-27) 1 commit.
- add-interactive: handle deletion of empty files
Soon in 'next'.
* jk/maint-push-config (2009-10-25) 1 commit.
- push: always load default config
Soon in 'next'.
* lt/revision-bisect (2009-10-27) 1 commit.
- Add '--bisect' revision machinery argument
* mh/maint-diff-color-words (2009-10-28) 3 commits
- diff: fix the location of hunk headers for "git diff --color-words -U0"
- diff: move the handling of the hunk header after the changed lines
- t4034-diff-words: add a test for word diff without context
--------------------------------------------------
[Stalled]
* tr/filter-branch (2009-10-21) 2 commits.
- filter-branch: nearest-ancestor rewriting outside subdir filter
- filter-branch: stop special-casing $filter_subdir argument
J6t already has some comments on this.
* mr/gitweb-snapshot (2009-09-26) 2 commits.
- gitweb: append short hash ids to snapshot files
(merged to 'next' on 2009-10-11 at 22ba047)
+ gitweb: check given hash before trying to create snapshot
Jakub says the tip one needs updates.
* ne/rev-cache (2009-10-19) 7 commits.
- support for commit grafts, slight change to general mechanism
- support for path name caching in rev-cache
- full integration of rev-cache into git, completed test suite
- administrative functions for rev-cache, start of integration into git
- support for non-commit object caching in rev-cache
- basic revision cache system, no integration or features
- man page and technical discussion for rev-cache
The author indicated that there is another round coming.
* jl/submodule-add-noname (2009-09-22) 1 commit.
- git submodule add: make the <path> parameter optional
Dscho started an interesting discussion regarding the larger workflow in
which the "submodule add" is used. I think the patch itself makes sense
but at the same time it probably makes sense to also take the <path> and
infer the <repository> as Dscho suggested, probably in "git submodule
add", not in "git add" proper, at least initially.
* sr/gfi-options (2009-09-06) 6 commits.
- fast-import: test the new option command
- fast-import: add option command
- fast-import: test the new feature command
- fast-import: add feature command
- fast-import: put marks reading in it's own function
- fast-import: put option parsing code in separate functions
???
* je/send-email-no-subject (2009-08-05) 1 commit.
(merged to 'next' on 2009-10-11 at 1b99c56)
+ send-email: confirm on empty mail subjects
The existing tests cover the positive case (i.e. as long as the user says
"yes" to the "do you really want to send this message that lacks subject",
the message is sent) of this feature, but the feature itself needs its own
test to verify the negative case (i.e. does it correctly stop if the user
says "no"?)
--------------------------------------------------
[Cooking]
* db/vcs-helper-rest (2009-10-27) 7 commits.
- Fix memory leak in helper method for disconnect
- Allow helpers to report in "list" command that the ref is unchanged
- Add support for "import" helper command
- Add a config option for remotes to specify a foreign vcs
- Allow programs to not depend on remotes having urls
- Allow fetch to modify refs
- Use a function to determine whether a remote is valid
(this branch is used by jh/cvs-helper.)
Queued a fix-up.
* jh/cvs-helper (2009-08-18) 8 commits.
- More fixes to the git-remote-cvs installation procedure
- Fix the Makefile-generated path to the git_remote_cvs package in git-remote-cvs
- Add simple selftests of git-remote-cvs functionality
- git-remote-cvs: Remote helper program for CVS repositories
- 2/2: Add Python support library for CVS remote helper
- 1/2: Add Python support library for CVS remote helper
- Basic build infrastructure for Python scripts
- Allow helpers to request marks for fast-import
(this branch uses db/vcs-helper-rest.)
This depends on the above.
* cb/doc-fetch-pull-merge (2009-10-21) 1 commit.
(merged to 'next' on 2009-10-21 at 1d9190d)
+ modernize fetch/merge/pull examples
Soon in 'master'.
* ja/fetch-doc (2009-10-22) 3 commits.
(merged to 'next' on 2009-10-22 at 8868407)
+ Documentation/merge-options.txt: order options in alphabetical groups
+ Documentation/git-pull.txt: Add subtitles above included option files
(merged to 'next' on 2009-10-21 at bf09f62)
+ Documentation/fetch-options.txt: order options alphabetically
Soon in 'master'.
* tr/maint-roff-quote (2009-10-22) 1 commit.
(merged to 'next' on 2009-10-22 at 14c5631)
+ Quote ' as \(aq in manpages
Soon in 'master'.
* rs/pretty-wrap (2009-10-17) 1 commit
- Implement wrap format %w() as if it is a mode switch
(this branch uses js/log-rewrap.)
* jc/pretty-lf (2009-10-04) 1 commit.
- Pretty-format: %[+-]x to tweak inter-item newlines
* js/log-rewrap (2009-10-18) 3 commits
- Teach --wrap to only indent without wrapping
- Add strbuf_add_wrapped_text() to utf8.[ch]
- print_wrapped_text(): allow hard newlines
(this branch is used by rs/pretty-wrap.)
Before discarding jc/strbuf-nested-expand, I cherry-picked the tip of it
to this series.
* sr/blame-incomplete (2009-10-19) 1 commit.
(merged to 'next' on 2009-10-22 at 133e0ce)
+ blame: make sure that the last line ends in an LF
I think this is _good enough_ as-is; although it would be better if we
added some hint to the output for Porcelain implementations, that can be
done as a follow-up fix.
* ak/bisect-reset-to-switch (2009-10-13) 1 commit.
(merged to 'next' on 2009-10-22 at 592fff3)
+ bisect reset: Allow resetting to any commit, not just a branch
Soon in 'master'.
* fc/doc-fast-forward (2009-10-24) 1 commit.
- Use 'fast-forward' all over the place
* jc/maint-1.6.3-graft-trailing-space (2009-10-14) 1 commit.
(merged to 'next' on 2009-10-22 at 90ccac6)
+ info/grafts: allow trailing whitespaces at the end of line
Soon in 'master'.
* jn/show-normalized-refs (2009-10-12) 3 commits.
(merged to 'next' on 2009-10-23 at 332aad3)
+ check-ref-format: simplify --print implementation
+ git check-ref-format --print
+ Add tests for git check-ref-format
Soon in 'master'.
* jc/checkout-auto-track (2009-10-18) 3 commits
(merged to 'next' on 2009-10-23 at ff7e8f3)
+ git checkout --no-guess
+ DWIM "git checkout frotz" to "git checkout -b frotz origin/frotz"
+ check_filename(): make verify_filename() callable without dying
The final shape of this series ended up to be more or less exactly what
Dscho hinted he wanted to have in one of the discussion.
Soon in 'master'.
* tr/stash-format (2009-10-19) 5 commits
(merged to 'next' on 2009-10-23 at 6c551c3)
+ stash list: drop the default limit of 10 stashes
+ stash list: use new %g formats instead of sed
+ Introduce new pretty formats %g[sdD] for reflog information
+ reflog-walk: refactor the branch@{num} formatting
+ Refactor pretty_print_commit arguments into a struct
Soon in 'master'.
* ks/precompute-completion (2009-10-26) 3 commits.
(merged to 'next' on 2009-10-28 at cd5177f)
+ completion: ignore custom merge strategies when pre-generating
(merged to 'next' on 2009-10-22 at f46a28a)
+ bug: precomputed completion includes scripts sources
(merged to 'next' on 2009-10-14 at adf722a)
+ Speedup bash completion loading
* sp/smart-http (2009-10-25) 24 commits
- remote-helpers: return successfully if everything up-to-date
- update http tests according to remote-curl capabilities
- http-backend: more explict LocationMatch
- http-backend: add example for gitweb on same URL
- http-backend: use mod_alias instead of mod_rewrite
- http-backend: reword some documentation
- http-backend: add GIT_PROJECT_ROOT environment var
- Smart HTTP fetch: gzip requests
- Smart fetch over HTTP: client side
- Smart push over HTTP: client side
- Discover refs via smart HTTP server when available
- Smart fetch and push over HTTP: server side
- Add stateless RPC options to upload-pack, receive-pack
- Git-aware CGI to provide dumb HTTP transport
- Move WebDAV HTTP push under remote-curl
- remote-helpers: Support custom transport options
- remote-helpers: Fetch more than one ref in a batch
- fetch: Allow transport -v -v -v to set verbosity to 3
- remote-curl: Refactor walker initialization
- Add multi_ack_detailed capability to fetch-pack/upload-pack
- Move "get_ack()" back to fetch-pack
- fetch-pack: Use a strbuf to compose the want list
- pkt-line: Make packet_read_line easier to debug
- pkt-line: Add strbuf based functions
Shawn plans another round of re-roll.
* ef/msys-imap (2009-10-22) 9 commits.
- Windows: use BLK_SHA1 again
- MSVC: Enable OpenSSL, and translate -lcrypto
- mingw: enable OpenSSL
- mingw: wrap SSL_set_(w|r)fd to call _get_osfhandle
- imap-send: build imap-send on Windows
- imap-send: fix compilation-error on Windows
- imap-send: use run-command API for tunneling
- imap-send: use separate read and write fds
- imap-send: remove useless uid code
This is pulled from J6t; I'll merge it to 'next' if Dscho is Ok with it.
* js/diff-verbose-submodule (2009-10-23) 2 commits.
(merged to 'next' on 2009-10-23 at e479773)
+ add tests for git diff --submodule
+ Add the --submodule option to the diff option family
Soon in 'master'.
* jc/fix-tree-walk (2009-10-22) 11 commits.
(merged to 'next' on 2009-10-22 at 10c0c8f)
+ Revert failed attempt since 353c5ee
+ read-tree --debug-unpack
(merged to 'next' on 2009-10-11 at 0b058e2)
+ unpack-trees.c: look ahead in the index
+ unpack-trees.c: prepare for looking ahead in the index
+ Aggressive three-way merge: fix D/F case
+ traverse_trees(): handle D/F conflict case sanely
+ more D/F conflict tests
+ tests: move convenience regexp to match object names to test-lib.sh
+ unpack_callback(): use unpack_failed() consistently
+ unpack-trees: typofix
+ diff-lib.c: fix misleading comments on oneway_diff()
This has some stupid bugs and temporarily reverted from 'next' until I can
fix it.
* jh/notes (2009-10-09) 22 commits.
- fast-import: Proper notes tree manipulation using the notes API
- Refactor notes concatenation into a flexible interface for combining notes
- Notes API: Allow multiple concurrent notes trees with new struct notes_tree
- Notes API: for_each_note(): Traverse the entire notes tree with a callback
- Notes API: get_note(): Return the note annotating the given object
- Notes API: add_note(): Add note objects to the internal notes tree structure
- Notes API: init_notes(): Initialize the notes tree from the given notes ref
- Notes API: get_commit_notes() -> format_note() + remove the commit restriction
- Add selftests verifying concatenation of multiple notes for the same commit
- Refactor notes code to concatenate multiple notes annotating the same object
- Add selftests verifying that we can parse notes trees with various fanouts
- Teach the notes lookup code to parse notes trees with various fanout schemes
- Teach notes code to free its internal data structures on request
- Add '%N'-format for pretty-printing commit notes
- Add flags to get_commit_notes() to control the format of the note string
- t3302-notes-index-expensive: Speed up create_repo()
- fast-import: Add support for importing commit notes
- Teach "-m <msg>" and "-F <file>" to "git notes edit"
- Add an expensive test for git-notes
- Speed up git notes lookup
- Add a script to edit/inspect notes
- Introduce commit notes
I think Johan indicated that early parts of it is ready for 'next', so I
may do so up to "Add selftests" one.
* jn/gitweb-blame (2009-09-01) 5 commits.
- gitweb: Minify gitweb.js if JSMIN is defined
- gitweb: Create links leading to 'blame_incremental' using JavaScript
(merged to 'next' on 2009-10-11 at 73c4a83)
+ gitweb: Colorize 'blame_incremental' view during processing
+ gitweb: Incremental blame (using JavaScript)
+ gitweb: Add optional "time to generate page" info in footer
Ajax-y blame. Probably the first three should go to 'master' by now?
* nd/sparse (2009-08-20) 19 commits.
- sparse checkout: inhibit empty worktree
- Add tests for sparse checkout
- read-tree: add --no-sparse-checkout to disable sparse checkout support
- unpack-trees(): ignore worktree check outside checkout area
- unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index
- unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout
- unpack-trees.c: generalize verify_* functions
- unpack-trees(): add CE_WT_REMOVE to remove on worktree alone
- Introduce "sparse checkout"
- dir.c: export excluded_1() and add_excludes_from_file_1()
- excluded_1(): support exclude files in index
- unpack-trees(): carry skip-worktree bit over in merged_entry()
- Read .gitignore from index if it is skip-worktree
- Avoid writing to buffer in add_excludes_from_file_1()
- Teach Git to respect skip-worktree bit (writing part)
- Teach Git to respect skip-worktree bit (reading part)
- Introduce "skip-worktree" bit in index, teach Git to get/set this bit
- Add test-index-version
- update-index: refactor mark_valid() in preparation for new options
--------------------------------------------------
[For 1.7.0]
* jc/1.7.0-no-commit-no-ff-2 (2009-10-22) 1 commit.
- git-merge: forbid fast-forward and up-to-date when --no-commit is given
This makes "git merge --no-commit" fail when it results in fast-forward or
up-to-date. I haven't described this at the beginning of this message
yet, as it is not clear if this change is even necessary. Opinions?
* jk/1.7.0-status (2009-09-05) 5 commits.
- docs: note that status configuration affects only long format
(merged to 'next' on 2009-10-11 at 65c8513)
+ commit: support alternate status formats
+ status: add --porcelain output format
+ status: refactor format option parsing
+ status: refactor short-mode printing to its own function
(this branch uses jc/1.7.0-status.)
Gives the --short output format to post 1.7.0 "git commit --dry-run" that
is similar to that of post 1.7.0 "git status".
The tip one is not in 'next' as I have been hoping that somebody may want
to change the code to make it unnecessary, but it does not seem to be
happening, so probably it should also go to 'next'.
* jc/1.7.0-status (2009-09-05) 4 commits.
(merged to 'next' on 2009-10-11 at 9558627)
+ status: typo fix in usage
+ git status: not "commit --dry-run" anymore
+ git stat -s: short status output
+ git stat: the beginning of "status that is not a dry-run of commit"
(this branch is used by jk/1.7.0-status.)
With this, "git status" is no longer "git commit --dry-run".
* jc/1.7.0-send-email-no-thread-default (2009-08-22) 1 commit.
(merged to 'next' on 2009-10-11 at 043acdf)
+ send-email: make --no-chain-reply-to the default
* jc/1.7.0-diff-whitespace-only-status (2009-08-30) 4 commits.
(merged to 'next' on 2009-10-11 at 546c74d)
+ diff.c: fix typoes in comments
+ Make test case number unique
+ diff: Rename QUIET internal option to QUICK
+ diff: change semantics of "ignore whitespace" options
This changes exit code from "git diff --ignore-whitespace" and friends
when there is no actual output. It is a backward incompatible change, but
we could argue that it is a bugfix.
* jc/1.7.0-push-safety (2009-02-09) 2 commits.
(merged to 'next' on 2009-10-11 at 81b8128)
+ Refuse deleting the current branch via push
+ Refuse updating the current branch in a non-bare repository via push
--------------------------------------------------
[I have been too busy to purge these]
* jc/log-tz (2009-03-03) 1 commit.
- Allow --date=local --date=other-format to work as expected
Maybe some people care about this. I dunno.
* jc/mailinfo-remove-brackets (2009-07-15) 1 commit.
- mailinfo: -b option keeps [bracketed] strings that is not a [PATCH] marker
Maybe some people care about this. I dunno.
* jg/log-format-body-indent (2009-09-19) 1 commit.
. git-log --format: Add %B tag with %B(x) option
^ permalink raw reply [relevance 2%]
* [PATCH v2 4/8] rebase --merge: fix reflog message after skipping
2022-10-12 9:35 2% ` [PATCH v3 " Phillip Wood via GitGitGadget
@ 2022-04-20 9:56 2% ` Phillip Wood via GitGitGadget
2022-04-20 9:56 2% ` [PATCH v2 3/8] rebase --merge: fix reflog when continuing Phillip Wood via GitGitGadget
2 siblings, 0 replies; 200+ results
From: Phillip Wood via GitGitGadget @ 2022-04-20 9:56 UTC (permalink / raw)
To: git
Cc: Phillip Wood, Christian Couder, Elijah Newren, Phillip Wood,
Phillip Wood
From: Phillip Wood <phillip.wood@dunelm.org.uk>
The reflog message for every pick after running "rebase --skip" looks
like
rebase (skip) (pick): commit subject line
Fix this by not appending " (skip)" to the reflog action.
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
---
builtin/rebase.c | 2 --
t/t3406-rebase-message.sh | 24 ++++++++++++++++++++++++
2 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/builtin/rebase.c b/builtin/rebase.c
index cd9a4f3e2f1..36863117fba 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -1273,8 +1273,6 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
struct string_list merge_rr = STRING_LIST_INIT_DUP;
options.action = "skip";
- set_reflog_action(&options);
-
rerere_clear(the_repository, &merge_rr);
string_list_clear(&merge_rr, 1);
ropts.flags = RESET_HEAD_HARD;
diff --git a/t/t3406-rebase-message.sh b/t/t3406-rebase-message.sh
index 3ca2fbb0d59..8aa6a79acc1 100755
--- a/t/t3406-rebase-message.sh
+++ b/t/t3406-rebase-message.sh
@@ -163,6 +163,30 @@ test_reflog () {
# check there is only one new entry in the branch reflog
test_cmp_rev fast-forward@{1} X
'
+
+ test_expect_success "rebase $mode --skip reflog${reflog_action:+ GIT_REFLOG_ACTION=$reflog_action}" '
+ git checkout conflicts &&
+ test_when_finished "git reset --hard Q" &&
+
+ (
+ if test -n "$reflog_action"
+ then
+ GIT_REFLOG_ACTION="$reflog_action" &&
+ export GIT_REFLOG_ACTION
+ fi &&
+ test_must_fail git rebase $mode main &&
+ git rebase --skip
+ ) &&
+
+ git log -g --format=%gs -4 >actual &&
+ write_reflog_expect <<-EOF &&
+ ${reflog_action:-rebase} (finish): returning to refs/heads/conflicts
+ ${reflog_action:-rebase} (pick): Q
+ ${reflog_action:-rebase} (pick): P
+ ${reflog_action:-rebase} (start): checkout main
+ EOF
+ test_cmp expect actual
+ '
}
test_reflog --merge
--
gitgitgadget
^ permalink raw reply related [relevance 2%]
* What's cooking in git.git (topics)
2008-07-08 2:46 2% ` Junio C Hamano
@ 2008-07-10 2:32 2% ` Junio C Hamano
0 siblings, 1 reply; 200+ results
From: Junio C Hamano @ 2008-07-10 2:32 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed
with '-' are only in 'pu' while commits prefixed with '+' are
in 'next'.
The topics list the commits in reverse chronological order. The topics
meant to be applied to the maintenance series have "maint-" in their
names.
It already is beginning to become clear what 1.6.0 will look like. What's
already in 'next' all are well intentioned (I do not guarantee they are
already bug-free --- that is what cooking them in 'next' is for) and are
good set of feature enhancements. Bigger changes will be:
* Port for MinGW.
* With the default Makefile settings, most of the programs will be
installed outside your $PATH, except for "git", "gitk", "git-gui" and
some server side programs that need to be accessible for technical
reasons. Invoking a git subcommand as "git-xyzzy" from the command
line has been deprecated since early 2006 (and officially announced in
1.5.4 release notes); use of them from your scripts after adding
output from "git --exec-path" to the $PATH will still be supported in
1.6.0, but users are again strongly encouraged to adjust their
scripts to use "git xyzzy" form, as we will stop installing
"git-xyzzy" hardlinks for built-in commands in later releases.
* git-merge will be rewritten in C.
* default pack and idx versions will be updated as scheduled for some
time ago.
* GIT_CONFIG, which was only documented as affecting "git config", but
actually affected all git commands, now only affects "git config".
GIT_LOCAL_CONFIG, also only documented as affecting "git config" and
not different from GIT_CONFIG in a useful way, is removed.
----------------------------------------------------------------
[New Topics]
* xx/merge-in-c-into-next (Wed Jul 9 13:51:46 2008 -0700) 4 commits
+ Teach git-merge -X<option> again.
+ Merge branch 'jc/merge-theirs' into xx/merge-in-c-into-next
+ builtin-merge.c: use parse_options_step() "incremental parsing"
machinery
+ Merge branch 'ph/parseopt-step-blame' into xx/merge-in-c-into-next
I've described what this is in a separate message.
* jc/branch-merged (Tue Jul 8 17:55:47 2008 -0700) 3 commits
+ branch --merged/--no-merged: allow specifying arbitrary commit
+ branch --contains: default to HEAD
+ parse-options: add PARSE_OPT_LASTARG_DEFAULT flag
This builds on top of the parse-options enhancement series that
has been cooking in 'next' for some time.
* rs/imap (Wed Jul 9 22:29:02 2008 +0100) 5 commits
+ Documentation: Improve documentation for git-imap-send(1)
+ imap-send.c: more style fixes
+ imap-send.c: style fixes
+ git-imap-send: Support SSL
+ git-imap-send: Allow the program to be run from subdirectories of
a git tree
* om/rerere-careful (Mon Jul 7 14:42:48 2008 +0200) 1 commit
+ builtin-rerere: more carefully find conflict markers
----------------------------------------------------------------
[Will merge to master soon]
* js/pick-root (Fri Jul 4 16:19:52 2008 +0100) 1 commit
+ Allow cherry-picking root commits
* ab/bundle (Sat Jul 5 17:26:40 2008 -0400) 1 commit
+ Teach git-bundle to read revision arguments from stdin like git-
rev-list.
* sg/stash-k-i (Tue Jul 8 00:40:56 2008 -0700) 2 commits
+ Documentation: tweak use case in "git stash save --keep-index"
+ stash: introduce 'stash save --keep-index' option
One weakness of our "partial commit" workflow support used to be that the
user can incrementally build what is to be committed in the index but that
state cannot be tested as a whole in the working tree. This allows you to
temporarily stash the remaining changes in the working tree so that the
index state before running "stash save --keep-index" can be seen in the
working tree to be tested and then committed.
* am/stash-branch (Mon Jul 7 02:50:10 2008 +0530) 2 commits
+ Add a test for "git stash branch"
+ Implement "git stash branch <newbranch> <stash>"
Creates a new branch out of the stashed state, after returning from the
interrupt that forced you to create the stash in the first place.
* tr/add-i-e (Thu Jul 3 00:00:00 2008 +0200) 3 commits
+ git-add--interactive: manual hunk editing mode
+ git-add--interactive: remove hunk coalescing
+ git-add--interactive: replace hunk recounting with apply --recount
Adds 'e/dit' action to interactive add command.
* jc/report-tracking (Sun Jul 6 02:54:56 2008 -0700) 5 commits
+ branch -r -v: do not spit out garbage
+ stat_tracking_info(): clear object flags used during counting
+ git-branch -v: show the remote tracking statistics
+ git-status: show the remote tracking statistics
+ Refactor "tracking statistics" code used by "git checkout"
Makes the "your branch is ahead of the tracked one by N commits" logic and
messages available to other commands; status and branch are updated.
----------------------------------------------------------------
[Actively Cooking]
* jc/rebase-orig-head (Tue Jul 8 00:12:22 2008 -0400) 2 commits
+ Documentation: mention ORIG_HEAD in am, merge, and rebase
+ Teach "am" and "rebase" to mark the original position with
ORIG_HEAD
* ph/parseopt-step-blame (Wed Jul 9 23:38:34 2008 +0200) 18 commits
+ revisions: refactor handle_revision_opt into parse_revision_opt.
+ git-shortlog: migrate to parse-options partially.
+ git-blame: fix lapsus
+ git-blame: migrate to incremental parse-option [2/2]
+ git-blame: migrate to incremental parse-option [1/2]
+ revisions: split handle_revision_opt() from setup_revisions()
+ Merge branch 'jc/blame' (early part) into HEAD
+ parse-opt: add PARSE_OPT_KEEP_ARGV0 parser option.
+ parse-opt: fake short strings for callers to believe in.
+ parse-opt: do not print errors on unknown options, return -2
intead.
+ parse-opt: create parse_options_step.
+ parse-opt: Export a non NORETURN usage dumper.
+ parse-opt: have parse_options_{start,end}.
+ git-blame --reverse
+ builtin-blame.c: allow more than 16 parents
+ builtin-blame.c: move prepare_final() into a separate function.
+ rev-list --children
+ revision traversal: --children option
Became active again ;-) This probably is ready for 'master' already,
except for the last two which I only looked at the patch and have not
used heavily in production yet.
* jc/merge-theirs (Mon Jun 30 22:18:57 2008 -0700) 5 commits
+ Make "subtree" part more orthogonal to the rest of merge-
recursive.
+ Teach git-pull to pass -X<option> to git-merge
+ Teach git-merge to pass -X<option> to the backend strategy module
+ git-merge-recursive-{ours,theirs}
+ git-merge-file --ours, --theirs
Punting a merge by discarding your own work in conflicting parts but still
salvaging the parts that are cleanly automerged. It is likely that this
will result in nonsense mishmash, but somehow often people want this, so
here they are. The interface to the backends is updated so that you can
say "git merge -Xours -Xsubtree=foo/bar/baz -s recursive other" now.
* mv/merge-in-c (Mon Jul 7 19:24:20 2008 +0200) 15 commits
+ Build in merge
+ Fix t7601-merge-pull-config.sh on AIX
+ git-commit-tree: make it usable from other builtins
+ Add new test case to ensure git-merge prepends the custom merge
message
+ Add new test case to ensure git-merge reduces octopus parents when
possible
+ Introduce reduce_heads()
+ Introduce get_merge_bases_many()
+ Add new test to ensure git-merge handles more than 25 refs.
+ Introduce get_octopus_merge_bases() in commit.c
+ git-fmt-merge-msg: make it usable from other builtins
+ Move read_cache_unmerged() to read-cache.c
+ Add new test to ensure git-merge handles pull.twohead and
pull.octopus
+ Move parse-options's skip_prefix() to git-compat-util.h
+ Move commit_list_count() to commit.c
+ Move split_cmdline() to alias.c
----------------------------------------------------------------
[Graduated to "master"]
* js/apply-root (Sun Jul 6 18:36:01 2008 -0700) 3 commits
+ git-apply --directory: make --root more similar to GNU diff
+ apply --root: thinkofix.
+ Teach "git apply" to prepend a prefix with "--root=<root>"
* jc/reflog-expire (Sat Jun 28 22:24:49 2008 -0700) 2 commits
+ Make default expiration period of reflog used for stash infinite
+ Per-ref reflog expiry configuration
As 1.6.0 will be a good time to make backward incompatible changes, the
tip commit makes the default expiry period of stash 'never', unless you
configure them to expire explicitly using gc.refs/stash.* variables.
Needs consensus, but I am guessing that enough people would want stash
that does not expire.
* jk/pager-config (Thu Jul 3 07:46:57 2008 -0400) 1 commit
+ Allow per-command pager config
----------------------------------------------------------------
[On Hold]
* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit
+ merge: remove deprecated summary and diffstat options and config
variables
This was previously in "will be in master soon" category, but it turns out
that the synonyms to the ones this one deletes are fairly new invention
that happend in 1.5.6 timeframe, and we cannot do this just yet. Perhaps
in 1.7.0.
* jc/dashless (Thu Jun 26 16:43:34 2008 -0700) 2 commits
+ Revert "Make clients ask for "git program" over ssh and local
transport"
+ Make clients ask for "git program" over ssh and local transport
This is the "botched" one. Will be resurrected during 1.7.0 or 1.8.0
timeframe.
* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
- diff: enable "too large a rename" warning when -M/-C is explicitly
asked for
This would be the right thing to do for command line use, but gitk will be
hit due to tcl/tk's limitation, so I am holding this back for now.
----------------------------------------------------------------
[Stalled/Needs more work]
* sb/sequencer (Tue Jul 1 04:38:34 2008 +0200) 4 commits
. Migrate git-am to use git-sequencer
. Add git-sequencer test suite (t3350)
. Add git-sequencer prototype documentation
. Add git-sequencer shell prototype
* jc/grafts (Wed Jul 2 17:14:12 2008 -0700) 1 commit
- [BROKEN wrt shallow clones] Ignore graft during object transfer
Cloning or fetching from a repository from grafts did not send objects
that are hidden by grafts, but the commits in the resulting repository do
need these to pass fsck. This fixes object transfer to ignore grafts.
Another fix is needed to git-prune so that it ignores grafts but treats
commits that are mentioned in grafts as reachable.
* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 7 commits
- blame: show "previous" information in --porcelain/--incremental
format
- git-blame: refactor code to emit "porcelain format" output
+ git-blame --reverse
+ builtin-blame.c: allow more than 16 parents
+ builtin-blame.c: move prepare_final() into a separate function.
+ rev-list --children
+ revision traversal: --children option
The blame that finds where each line in the original lines moved to. This
may help a GSoC project that wants to gather statistical overview of the
history. The final presentation may need tweaking (see the log message of
the commit ""git-blame --reverse" on the series).
The tip two commits are for peeling to see what's behind the blamed
commit, which we should be able to separate out into an independent topic
from the rest.
^ permalink raw reply [relevance 2%]
* [PATCH 15/24] merge script: improve log message subject
2010-08-17 6:51 2% [PATCH/RFC] updating examples/git-merge (plus a builtin/merge fix) Jonathan Nieder
@ 2010-08-17 7:04 2% ` Jonathan Nieder
0 siblings, 0 replies; 200+ results
From: Jonathan Nieder @ 2010-08-17 7:04 UTC (permalink / raw)
To: git; +Cc: Lars Hjemli, Tay Ray Chuan, Matthieu Moy, Clemens Buchacher,
Jeff King
- point out remote-tracking branches as "remote branch
'upstream/master'";
- avoid misleading log messages when a tag and branch
share a name.
This approximates the builtin merge command's behavior well
enough to pass the relevant tests.
Based roughly on v1.6.4.2~10^2 (merge: indicate remote tracking
branches in merge message, 2009-08-09) and v1.6.4.2~10^2~1 (merge: fix
incorrect merge message for ambiguous tag/branch, 2009-08-09).
Cc: Jeff King <peff@peff.net>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
contrib/examples/git-merge.sh | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/contrib/examples/git-merge.sh b/contrib/examples/git-merge.sh
index 50042df..d491566 100755
--- a/contrib/examples/git-merge.sh
+++ b/contrib/examples/git-merge.sh
@@ -134,21 +134,32 @@ finish () {
merge_name () {
remote="$1"
rh=$(git rev-parse --verify "$remote^0" 2>/dev/null) || return
- bh=$(git show-ref -s --verify "refs/heads/$remote" 2>/dev/null)
- if test "$rh" = "$bh"
- then
- echo "$rh branch '$remote' of ."
- elif truname=$(expr "$remote" : '\(.*\)~[1-9][0-9]*$') &&
+ if truname=$(expr "$remote" : '\(.*\)~[0-9]*$') &&
git show-ref -q --verify "refs/heads/$truname" 2>/dev/null
then
echo "$rh branch '$truname' (early part) of ."
- elif test "$remote" = "FETCH_HEAD" -a -r "$GIT_DIR/FETCH_HEAD"
+ return
+ fi
+ if found_ref=$(git rev-parse --symbolic-full-name --verify \
+ "$remote" 2>/dev/null)
+ then
+ if test "${found_ref#refs/heads/}" != "$found_ref"
+ then
+ echo "$rh branch '$remote' of ."
+ return
+ elif test "${found_ref#refs/remotes/}" != "$found_ref"
+ then
+ echo "$rh remote branch '$remote' of ."
+ return
+ fi
+ fi
+ if test "$remote" = "FETCH_HEAD" -a -r "$GIT_DIR/FETCH_HEAD"
then
sed -e 's/ not-for-merge / /' -e 1q \
"$GIT_DIR/FETCH_HEAD"
- else
- echo "$rh commit '$remote'"
+ return
fi
+ echo "$rh commit '$remote'"
}
parse_config () {
--
1.7.2.1.544.ga752d.dirty
^ permalink raw reply related [relevance 2%]
* [BUG] test suite broken with GIT_TEST_SPLIT_INDEX
@ 2017-04-20 20:52 2% Thomas Gummerer
0 siblings, 0 replies; 200+ results
From: Thomas Gummerer @ 2017-04-20 20:52 UTC (permalink / raw)
To: Christian Couder; +Cc: git
Hi,
I just tried to run the test suite with GIT_TEST_SPLIT_INDEX=YesPlease
and noticed that a few tests are broken both in pu and master.
Below the test failures on master:
Test Summary Report
-------------------
t7009-filter-branch-null-sha1.sh (Wstat: 256 Tests: 5 Failed: 2)
Failed tests: 4-5
Non-zero exit status: 1
t3900-i18n-commit.sh (Wstat: 256 Tests: 34 Failed: 1)
Failed test: 34
Non-zero exit status: 1
t5407-post-rewrite-hook.sh (Wstat: 256 Tests: 14 Failed: 4)
Failed tests: 11-14
Non-zero exit status: 1
t3415-rebase-autosquash.sh (Wstat: 256 Tests: 19 Failed: 15)
Failed tests: 4-17, 19
Non-zero exit status: 1
t3404-rebase-interactive.sh (Wstat: 256 Tests: 95 Failed: 54)
Failed tests: 18, 20, 22-24, 26-43, 45, 47-74, 84-85
Non-zero exit status: 1
Bisecting between master and v2.10.0 leads me to the merge commit
94c9b5af70 ("Merge branch 'cc/split-index-config'", 2017-03-17).
Unfortunately I don't forsee myself having time to track the bug down
soon. Sorry for not noticing this earlier in the cycle.
The bisect log is below if someone finds it helpful:
git bisect start
# bad: [6a2c2f8d34fa1e8f3bb85d159d354810ed63692e] Git 2.13-rc0
git bisect bad 6a2c2f8d34fa1e8f3bb85d159d354810ed63692e
# good: [6ebdac1bab966b720d776aa43ca188fe378b1f4b] Git 2.10
git bisect good 6ebdac1bab966b720d776aa43ca188fe378b1f4b
# good: [733671b0fd2fb03edb05273f36ec70bd624e544f] Merge branch 'maint'
git bisect good 733671b0fd2fb03edb05273f36ec70bd624e544f
# good: [04b4f7d579056cedaae2de0a019e5993b4d9c2d0] Merge branch 'sb/submodule-update-initial-runs-custom-script' into maint
git bisect good 04b4f7d579056cedaae2de0a019e5993b4d9c2d0
# bad: [af6865a7f1e1d915d3b63e998226028ca4abb6ee] submodule.c: convert is_submodule_modified to use strbuf_getwholeline
git bisect bad af6865a7f1e1d915d3b63e998226028ca4abb6ee
# good: [3f7ebc6ece46f1c23480d094688b8b5f24eb345c] Merge branch 'jk/tempfile-ferror-fclose-confusion'
git bisect good 3f7ebc6ece46f1c23480d094688b8b5f24eb345c
# bad: [94c9b5af703eb70adba349cfbfaaa3029849744c] Merge branch 'cc/split-index-config'
git bisect bad 94c9b5af703eb70adba349cfbfaaa3029849744c
# good: [36d5286f6815542761dae92fdcdce8db1556727f] Merge branch 'ax/line-log-range-merge-fix'
git bisect good 36d5286f6815542761dae92fdcdce8db1556727f
# good: [c3a008250272295271584c6303463ffb9b055cbc] read-cache: use freshen_shared_index() in read_index_from()
git bisect good c3a008250272295271584c6303463ffb9b055cbc
# good: [228b78752de9d759839665764391262c0ec156cf] Merge branch 'jt/perf-updates'
git bisect good 228b78752de9d759839665764391262c0ec156cf
# good: [073778017158ecf3153b050776029907bc75826f] Merge branch 'kn/ref-filter-branch-list'
git bisect good 073778017158ecf3153b050776029907bc75826f
# good: [b46013950aff31b6626af96ccbf2c48469e36c66] Documentation/git-update-index: explain splitIndex.*
git bisect good b46013950aff31b6626af96ccbf2c48469e36c66
# good: [32c43f595f93cdd4ed5305aef97a3f6aaa74ed72] Sync with 'maint'
git bisect good 32c43f595f93cdd4ed5305aef97a3f6aaa74ed72
# first bad commit: [94c9b5af703eb70adba349cfbfaaa3029849744c] Merge branch 'cc/split-index-config'
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (Jan 2010, #02 draft; Wed, 06)
@ 2010-01-06 22:22 2% Junio C Hamano
2010-01-06 22:25 2% ` Junio C Hamano
0 siblings, 1 reply; 200+ results
From: Junio C Hamano @ 2010-01-06 22:22 UTC (permalink / raw)
To: git
I am experimenting with ideas to better manage the periodic "What's
cooking" messages, and here is one of such attempt based on the current
draft of the upcoming "2010 Jan, issue #02".
This is an incremental update (the full version will follow shortly) that
shows the changes since the previous issue, and was generated with a
custom diff driver. One of the things to notice is that the ones that
only moved across sections (e.g. bg/maint-remote-update-default) without
any other changes are shown without the list of commits.
----------------------------------------------------------------
-What's cooking in git.git (Jan 2010, #01; Mon, 04)
+What's cooking in git.git (Jan 2010, #02 draft; Wed, 06)
--------------------------------------------------
Born topics
[New Topics]
* jc/maint-1.6.1-checkout-m-custom-merge (2010-01-06) 1 commit
- checkout -m path: fix recreating conflicts
* jn/makefile (2010-01-06) 4 commits
- Makefile: consolidate .FORCE-* targets
- Makefile: learn to generate listings for targets requiring special flags
- Makefile: use target-specific variable to pass flags to cc
- Makefile: regenerate assembler listings when asked
--------------------------------------------------
Moved from [New Topics] to [Cooking]
* da/difftool (2009-12-22) 2 commits
- - git-difftool: Add '--gui' for selecting a GUI tool
- - t7800-difftool: Set a bogus tool for use by tests
+ (merged to 'next' on 2010-01-06 at e957395)
+ + git-difftool: Add '--gui' for selecting a GUI tool
+ + t7800-difftool: Set a bogus tool for use by tests
* jh/gitweb-cached (2010-01-03) 4 commits
- gitweb: Makefile improvements
- gitweb: Optionally add "git" links in project list page
- gitweb: Add option to force version match
- gitweb: Load checking
+
+Will merge to 'next', unless I hear objections within a few days.
* tc/test-locate-httpd (2010-01-02) 1 commit
- - t/lib-http.sh: Restructure finding of default httpd location
+ (merged to 'next' on 2010-01-06 at 9d913e5)
+ + t/lib-http.sh: Restructure finding of default httpd location
* jc/fix-tree-walk (2009-09-14) 7 commits
-Resurrected from "Ejected" category.
+Resurrected from "Ejected" category. This is fix for a tricky codepath
+and testing and improving before it hits 'next' by brave souls is greatly
+appreciated. I am not very happy about the solution myself.
--------------------------------------------------
Moved from [Cooking] to [Will graduate after a bit more cooking]
* bg/maint-remote-update-default (2009-12-31) 1 commit
* jk/maint-1.6.5-reset-hard (2009-12-30) 1 commit
* jk/push-to-delete (2009-12-30) 1 commit
* mm/config-path (2009-12-30) 1 commit
* pm/cvs-environ (2009-12-30) 1 commit
* so/cvsserver-update (2009-12-07) 1 commit
* tr/maint-1.6.5-bash-prompt-show-submodule-changes (2009-12-31) 1 commit
* js/filter-branch-prime (2009-12-15) 1 commit
* mg/tag-d-show (2009-12-10) 1 commit
* sb/maint-octopus (2009-12-11) 3 commits
* bg/maint-add-all-doc (2009-12-07) 4 commits
* mv/commit-date (2009-12-03) 2 commits
* mo/bin-wrappers (2009-12-02) 3 commits
* tr/http-updates (2009-12-28) 4 commits
* nd/sparse (2009-12-30) 23 commits
--------------------------------------------------
Other topics
[Cooking]
-* cc/reset-more (2010-01-04) 6 commits
+* cc/reset-more (2010-01-05) 7 commits
+ (merged to 'next' on 2010-01-06 at 96639cb)
+ + Documentation: reset: add some missing tables
(merged to 'next' on 2010-01-04 at 8802c2c)
+ Fix bit assignment for CE_CONFLICTED
(merged to 'next' on 2010-01-03 at f83d4c6)
+ "reset --merge": fix unmerged case
+ reset: use "unpack_trees()" directly instead of "git read-tree"
+ reset: add a few tests for "git reset --merge"
+ Documentation: reset: add some tables to describe the different options
+ reset: improve mixed reset error message when in a bare repo
* jc/branch-d (2009-12-29) 1 commit
- branch -d: base the "already-merged" safety on the branch it merges with
+
+http://thread.gmane.org/gmane.comp.version-control.git/135837/focus=135863
+I am tempted to merge this to 'next', but please stop me if people see issues
+in it.
* jk/run-command-use-shell (2010-01-01) 8 commits
- t4030, t4031: work around bogus MSYS bash path conversion
- - t0021: use $SHELL_PATH for the filter script
- diff: run external diff helper with shell
- textconv: use shell to run helper
- editor: use run_command's shell feature
- run-command: optimize out useless shell calls
- run-command: convert simple callsites to use_shell
+ - t0021: use $SHELL_PATH for the filter script
- run-command: add "use shell" option
- Xref: news.gmane.org gmane.comp.version-control.git:136128
- * check t0021: drop one to t4030;
- * reorder and move t0021 up, immediately after run-command: optimize
+Shuffled the commits in the topic, following J6t's suggestion in
+http://thread.gmane.org/gmane.comp.version-control.git/136128
* tc/clone-v-progress (2009-12-26) 4 commits
- clone: use --progress to force progress reporting
- clone: set transport->verbose when -v/--verbose is used
- git-clone.txt: reword description of progress behaviour
- check stderr with isatty() instead of stdout when deciding to show progress
+
+Perhaps needs an entry in the Release Notes, but otherwise looked Ok.
* tc/smart-http-restrict (2010-01-02) 4 commits
- - Smart-http tests: Test http-backend without curl or a webserver
- - Smart-http tests: Break test t5560-http-backend into pieces
- - Smart-http tests: Improve coverage in test t5560
- - Smart-http: check if repository is OK to export before serving it
+ (merged to 'next' on 2010-01-06 at 82736cb)
+ + Smart-http tests: Test http-backend without curl or a webserver
+ + Smart-http tests: Break test t5560-http-backend into pieces
+ + Smart-http tests: Improve coverage in test t5560
+ + Smart-http: check if repository is OK to export before serving it
* jc/cache-unmerge (2009-12-25) 9 commits
- rerere forget path: forget recorded resolution
- rerere: refactor rerere logic to make it independent from I/O
- rerere: remove silly 1024-byte line limit
- resolve-undo: teach "update-index --unresolve" to use resolve-undo info
- resolve-undo: "checkout -m path" uses resolve-undo information
- resolve-undo: allow plumbing to clear the information
- resolve-undo: basic tests
- resolve-undo: record resolved conflicts in a new index extension section
- builtin-merge.c: use standard active_cache macros
+
+Will wait a bit more before moving it to 'next'.
* jh/commit-status (2009-12-07) 1 commit
- [test?] Add commit.status, --status, and --no-status
+
+Needs tests.
* jc/checkout-merge-base (2009-11-20) 2 commits
(merged to 'next' on 2010-01-02 at 6a8f6fc)
+ "rebase --onto A...B" replays history on the merge base between A and B
+ "checkout A...B" switches to the merge base between A and B
+
+Users of "rebase -i" might want to teach this to the command. Volunteers?
* tr/http-push-ref-status (2009-12-24) 6 commits
- transport-helper.c::push_refs(): emit "no refs" error message
- transport-helper.c::push_refs(): ignore helper-reported status if ref is not to be pushed
- transport.c::transport_push(): make ref status affect return value
- refactor ref status logic for pushing
- t5541-http-push.sh: add test for unmatched, non-fast-forwarded refs
- t5541-http-push.sh: add tests for non-fast-forward pushes
+
+Peff: $gmane/136169, 136167, 136168
+RC: $gmane/136172
* il/vcs-helper (2009-12-09) 8 commits
- - Remove special casing of http, https and ftp
- - Support remote archive from all smart transports
- - Support remote helpers implementing smart transports
- - Support taking over transports
- - Refactor git transport options parsing
- - Pass unknown protocols to external protocol handlers
- - Support mandatory capabilities
- - Add remote helper debug mode
+ (merged to 'next' on 2010-01-06 at 7c79f42)
+ + Remove special casing of http, https and ftp
+ + Support remote archive from all smart transports
+ + Support remote helpers implementing smart transports
+ + Support taking over transports
+ + Refactor git transport options parsing
+ + Pass unknown protocols to external protocol handlers
+ + Support mandatory capabilities
+ + Add remote helper debug mode
* mm/diag-path-in-treeish (2009-12-07) 1 commit
- - Detailed diagnosis when parsing an object name fails.
+ (merged to 'next' on 2010-01-06 at 6b4201e)
+ + Detailed diagnosis when parsing an object name fails.
* mh/rebase-fixup (2009-12-07) 2 commits
- - Add a command "fixup" to rebase --interactive
- - t3404: Use test_commit to set up test repository
+ (merged to 'next' on 2010-01-06 at c4779a7)
+ + Add a command "fixup" to rebase --interactive
+ + t3404: Use test_commit to set up test repository
(this branch is used by ns/rebase-auto-squash.)
* ns/rebase-auto-squash (2009-12-08) 2 commits
- - fixup! rebase -i --autosquash
- - rebase -i --autosquash: auto-squash commits
+ (merged to 'next' on 2010-01-06 at 91913ca)
+ + fixup! rebase -i --autosquash
+ + rebase -i --autosquash: auto-squash commits
(this branch uses mh/rebase-fixup.)
* jh/notes (2009-12-07) 11 commits
- Refactor notes concatenation into a flexible interface for combining notes
- Notes API: Allow multiple concurrent notes trees with new struct notes_tree
- Notes API: for_each_note(): Traverse the entire notes tree with a callback
- Notes API: get_note(): Return the note annotating the given object
- Notes API: add_note(): Add note objects to the internal notes tree structure
- Notes API: init_notes(): Initialize the notes tree from the given notes ref
- Notes API: get_commit_notes() -> format_note() + remove the commit restriction
- Minor style fixes to notes.c
(merged to 'next' on 2010-01-02 at ae42130)
+ Add more testcases to test fast-import of notes
+ Rename t9301 to t9350, to make room for more fast-import tests
+ fast-import: Proper notes tree manipulation
+
+http://thread.gmane.org/gmane.comp.version-control.git/134738
+
+What's the status of the fourth and later patches on this topic? Overall
+it looked reasonable, if I recall correctly what I thought when I reviewed
+it last time, and I am tempted to merge it to 'next' soonish. Please
+file complaints before I do so if people have objections.
+
+http://mid.gmane.org/201001051231.43048.johan@herland.net Hold!
* fc/opt-quiet-gc-reset (2009-12-02) 1 commit
- - General --quiet improvements
+ (merged to 'next' on 2010-01-06 at 03e00cd)
+ + General --quiet improvements
* sr/gfi-options (2009-12-04) 7 commits
- fast-import: add (non-)relative-marks feature
- fast-import: allow for multiple --import-marks= arguments
- fast-import: test the new option command
- fast-import: add option command
- fast-import: add feature command
- fast-import: put marks reading in its own function
- fast-import: put option parsing code in separate functions
+
+http://thread.gmane.org/gmane.comp.version-control.git/134540
+
+I haven't seen comments on this round, and I am tempted to merge it to
+'next' soonish. Please file complaints before I do so if people have
+objections.
^ permalink raw reply [relevance 2%]
* Re: [PATCH v3] merge: fix cache_entry use-after-free
2015-10-16 16:04 2% ` Junio C Hamano
@ 2015-10-19 22:27 2% ` David Turner
2015-10-20 2:13 1% ` Junio C Hamano
0 siblings, 1 reply; 200+ results
From: David Turner @ 2015-10-19 22:27 UTC (permalink / raw)
To: Junio C Hamano; +Cc: René Scharfe, git, Keith McGuigan
On Fri, 2015-10-16 at 09:04 -0700, Junio C Hamano wrote:
> David Turner <dturner@twopensource.com> writes:
>
> > We also do dozens or hundreds of merges per day and only saw this quite
> > rarely. Interestingly, we could only trigger it with an alternate
> > hashing function for git's hashmap implementation, and only once a
> > certain bug in that implementation was *fixed*. But that was just a
> > trigger; it was certainly not the cause. The bug would, in general,
> > have caused more hash collisions due to worse mixing, but I believe it
> > is possible that some particular collision would have been present in
> > the non-bugged version of the code but not in the bugged version.
> >
> > It may have also had something to do with a case-insensitive filesystem;
> > we never saw anyone reproduce it on anything but OS X, and even there it
> > was quite difficult to reproduce.
> >
> > In short, I don't think we know why the bug was not seen widely.
>
> It has been a long time since I looked at name-hash.c and I am fuzzy
> on what the four functions (cache|index)_(file|dir)_exists are meant
> for, but I have this feeling that the original premise of the patch,
> "we may free a ce because we no longer use it in the index, but it
> may still need to keep a reference to it in name-hash" may be wrong
> in the first place. The proposed "fix" conceptually feels wrong.
>
> The whole point of the name-hash is so that we can detect collisions
> in two names, one of which wants to have a file in one place while
> the other wants to have a directory, at the same path in the index.
> The pathnames and cache entries registered in the name-hash have to
> be the ones that are relevant to the index in quesition. If a new
> ce will be added to the index, the name-hash will have to know about
> its path (and that is what CE_HASHED bit is about). On the other
> hand, if you are going to remove an existing ce from the index, its
> sub-paths should no longer prevent other cache entries to be there.
>
> E.g. if you have "a/b", it must prevent "A" from entering the index
> and the name-hash helps you to do so; when you remove "a/b", then
> name-hash must now allow "A" to enter the index. So "a/b" must be
> removed from the name-hash by calling remove_name_hash() and normal
> codepaths indeed do so.
>
> I do not doubt the existence of "use-after-free bug" you observed,
> but I am not convinced that refcounting is "fixing" the problem; it
> smells like papering over a different bug that is the root cause of
> the use-after-free.
>
> For example, if we forget to "unhash" a ce from name-hash when we
> remove a ce from the index (or after we "hashed" it, expecting to
> add it to the index, but in the end decided not to add to the index,
> perhaps), we would see a now-freed ce still in the name-hash.
> Checking a path against the name-hash in such a state would have to
> use the ce->name from that stale ce, which is a use-after-free bug.
>
> In such a situation, isn't the real cause of the bug the fact that
> the stale ce that is no longer relevant to the true index contents
> still in name-hash? The refcounting does not fix the fact that a
> ce->name of a stale ce that is no longer relevant being used for D/F
> collision checking.
>
> I am not saying that I found such a codepath that forgets to unhash,
> but from the overall design and purpose of the name-hash subsystem,
> anything that deliberately _allows_ a stale ce that does not exist
> in the index in there smells like a workaround going in a wrong
> direction.
I've spent some time looking into this, but I don't quite have a repro.
I do have some comments which might be interesting.
The problem is not the name_hash, but with the dir_hash. The dir_hash
is only even populated on case-insensitive filesystems (which is why you
and Linus don't see this bug). The dir_hash is not designed to catch
d/f conflicts, but rather case conflicts (one side of a merge has
foo/bar; the other has FOO/bar). For each directory, it maintains a
pointer to a cache_entry. Then add_to_index uses that cache_entry to
rewrite incoming entries' parent directories to the expected case.
Weirdly, that part of add_to_index is, so far as I can tell, never
called during a merge. So where's are we using the freed value?
Probably in dir_entry_cmp, while adding another entry to the hashmap;
that's where our crash seems to have happened. And our failure depended
on the details of the hash function as well; if a certain collision did
not happen, we would not see it.
There is, I think, another way to handle this: we could *copy* the path
into the struct dir_entry instead of pointing to a cache_entry. But
this seems like a bunch of extra work; the refcounting is simpler.
^ permalink raw reply [relevance 2%]
* [PATCH 3/7] rebase --merge: fix reflog message after skipping
@ 2022-02-21 11:10 2% ` Phillip Wood via GitGitGadget
2022-02-21 11:10 1% ` [PATCH 2/7] rebase --merge: fix reflog when continuing Phillip Wood via GitGitGadget
2 siblings, 0 replies; 200+ results
From: Phillip Wood via GitGitGadget @ 2022-02-21 11:10 UTC (permalink / raw)
To: git; +Cc: Phillip Wood, Phillip Wood
From: Phillip Wood <phillip.wood@dunelm.org.uk>
The reflog message for every pick after running "rebase --skip" looks
like
rebase (skip) (pick): commit subject line
Fix this by not appending " (skip)" to the reflog action.
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
---
builtin/rebase.c | 2 --
t/t3406-rebase-message.sh | 24 ++++++++++++++++++++++++
2 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/builtin/rebase.c b/builtin/rebase.c
index cd9a4f3e2f1..36863117fba 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -1273,8 +1273,6 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
struct string_list merge_rr = STRING_LIST_INIT_DUP;
options.action = "skip";
- set_reflog_action(&options);
-
rerere_clear(the_repository, &merge_rr);
string_list_clear(&merge_rr, 1);
ropts.flags = RESET_HEAD_HARD;
diff --git a/t/t3406-rebase-message.sh b/t/t3406-rebase-message.sh
index 3ca2fbb0d59..8aa6a79acc1 100755
--- a/t/t3406-rebase-message.sh
+++ b/t/t3406-rebase-message.sh
@@ -163,6 +163,30 @@ test_reflog () {
# check there is only one new entry in the branch reflog
test_cmp_rev fast-forward@{1} X
'
+
+ test_expect_success "rebase $mode --skip reflog${reflog_action:+ GIT_REFLOG_ACTION=$reflog_action}" '
+ git checkout conflicts &&
+ test_when_finished "git reset --hard Q" &&
+
+ (
+ if test -n "$reflog_action"
+ then
+ GIT_REFLOG_ACTION="$reflog_action" &&
+ export GIT_REFLOG_ACTION
+ fi &&
+ test_must_fail git rebase $mode main &&
+ git rebase --skip
+ ) &&
+
+ git log -g --format=%gs -4 >actual &&
+ write_reflog_expect <<-EOF &&
+ ${reflog_action:-rebase} (finish): returning to refs/heads/conflicts
+ ${reflog_action:-rebase} (pick): Q
+ ${reflog_action:-rebase} (pick): P
+ ${reflog_action:-rebase} (start): checkout main
+ EOF
+ test_cmp expect actual
+ '
}
test_reflog --merge
--
gitgitgadget
^ permalink raw reply related [relevance 2%]
* "What's cooking" incremental edition
@ 2010-01-10 19:55 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2010-01-10 19:55 UTC (permalink / raw)
To: git
This is "git show --ext-diff" output in 'todo' branch (see README.cooking
in the same branch) for today's updates to highlight the updated parts.
-- >8 --
-What's cooking in git.git (Jan 2010, #02; Thu, 07)
+What's cooking in git.git (Jan 2010, #03; Sun, 10)
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
marked with '.' do not appear in any of the integration branches, but I am
still holding onto them.
-
-The tip of 'next' has been rebuilt on top of the current 'master'.
--------------------------------------------------
Born topics
[New Topics]
* bk/fix-relative-gitdir-file (2010-01-08) 2 commits
- Handle relative paths in submodule .git files
- Test update-index for a gitlink to a .git file
* jc/ident (2010-01-08) 3 commits
- ident.c: treat $EMAIL as giving user.email identity explicitly
(merged to 'next' on 2010-01-10 at f1f9ded)
+ ident.c: check explicit identity for name and email separately
+ ident.c: remove unused variables
* jc/ls-files-ignored-pathspec (2010-01-08) 4 commits
- ls-files: fix overeager pathspec optimization
- read_directory(): further split treat_path()
- read_directory_recursive(): refactor handling of a single path into a separate function
- t3001: test ls-files -o ignored/dir
* js/exec-error-report (2010-01-10) 4 commits
- Improve error message when a transport helper was not found
- start_command: detect execvp failures early
- run-command: move wait_or_whine earlier
- start_command: report child process setup errors to the parent's stderr
(this branch uses il/vcs-helper.)
--------------------------------------------------
Moved from [New Topics] to [Cooking]
* jc/maint-1.6.1-checkout-m-custom-merge (2010-01-06) 1 commit
- - checkout -m path: fix recreating conflicts
+ (merged to 'next' on 2010-01-10 at df14116)
+ + checkout -m path: fix recreating conflicts
* jn/makefile (2010-01-06) 4 commits
- - Makefile: consolidate .FORCE-* targets
- - Makefile: learn to generate listings for targets requiring special flags
- - Makefile: use target-specific variable to pass flags to cc
- - Makefile: regenerate assembler listings when asked
+ (merged to 'next' on 2010-01-10 at f5a5d42)
+ + Makefile: consolidate .FORCE-* targets
+ + Makefile: learn to generate listings for targets requiring special flags
+ + Makefile: use target-specific variable to pass flags to cc
+ + Makefile: regenerate assembler listings when asked
--------------------------------------------------
Moved from [Will graduate after a bit more cooking] to [Graduated to "master"]
* tr/http-updates (2009-12-28) 4 commits
* jk/maint-1.6.5-reset-hard (2009-12-30) 1 commit
* jk/push-to-delete (2009-12-30) 1 commit
* mm/config-path (2009-12-30) 1 commit
* pm/cvs-environ (2009-12-30) 1 commit
* tr/maint-1.6.5-bash-prompt-show-submodule-changes (2009-12-31) 1 commit
* bg/maint-remote-update-default (2009-12-31) 1 commit
--------------------------------------------------
Moved from [Cooking] to [Will graduate after a bit more cooking]
* cc/reset-more (2010-01-08) 8 commits
- - t7111: check that reset options work as described in the tables
+ (merged to 'next' on 2010-01-10 at 84730de)
+ + t7111: check that reset options work as described in the tables
(merged to 'next' on 2010-01-06 at 96639cb)
+ Documentation: reset: add some missing tables
(merged to 'next' on 2010-01-04 at 8802c2c)
+ Fix bit assignment for CE_CONFLICTED
(merged to 'next' on 2010-01-03 at f83d4c6)
+ "reset --merge": fix unmerged case
+ reset: use "unpack_trees()" directly instead of "git read-tree"
+ reset: add a few tests for "git reset --merge"
+ Documentation: reset: add some tables to describe the different options
+ reset: improve mixed reset error message when in a bare repo
* rs/maint-archive-match-pathspec (2009-12-12) 1 commit
-* il/vcs-helper (2009-12-09) 8 commits
+* il/vcs-helper (2010-01-09) 9 commits
+ (merged to 'next' on 2010-01-10 at 11e448e)
+ + Reset possible helper before reusing remote structure
(merged to 'next' on 2010-01-06 at 7c79f42)
+ Remove special casing of http, https and ftp
+ Support remote archive from all smart transports
+ Support remote helpers implementing smart transports
+ Support taking over transports
+ Refactor git transport options parsing
+ Pass unknown protocols to external protocol handlers
+ Support mandatory capabilities
+ Add remote helper debug mode
+ (this branch is used by js/exec-error-report.)
--------------------------------------------------
Moved from [Cooking] to [Stalled]
* jh/commit-status (2009-12-07) 1 commit
* mh/rebase-fixup (2009-12-07) 2 commits
-Initial round of "fixup" action that is similar to "squash" action in
-"rebase -i" that excludes the commit log message from follow-up commits
-when composing the log message for the updated one. Expected is a further
-improvement to skip opening the editor if a pick is followed only by
-"fixup" and no "squash".
+Expecting further improvements to skip opening the editor if a pick is
+followed only by "fixup" and no "squash".
* ns/rebase-auto-squash (2009-12-08) 1 commit
(merged to 'next' on 2010-01-06 at da4e2f5)
+ rebase -i --autosquash: auto-squash commits
(this branch uses mh/rebase-fixup.)
+
+Blocked by the above.
* jh/notes (2009-12-07) 11 commits
-http://mid.gmane.org/201001051231.43048.johan@herland.net Hold!
+Hold: JH on 2010-01-05, http://article.gmane.org/gmane.comp.version-control.git/136183
* ap/merge-backend-opts (2008-07-18) 6 commits
--------------------------------------------------
Moved from [Cooking] to [Graduated to "master"]
* mm/diag-path-in-treeish (2009-12-07) 1 commit
* fc/opt-quiet-gc-reset (2009-12-02) 1 commit
--------------------------------------------------
Other topics
[Will graduate after a bit more cooking]
* nd/sparse (2010-01-04) 25 commits
- - t7002: test for not using external grep on skip-worktree paths
- - t7002: set test prerequisite "external-grep" if supported
+ (merged to 'next' on 2010-01-10 at fa73d6e)
+ + t7002: test for not using external grep on skip-worktree paths
+ + t7002: set test prerequisite "external-grep" if supported
(merged to 'next' on 2010-01-02 at 5499bbe)
+ grep: do not do external grep on skip-worktree entries
+ commit: correctly respect skip-worktree bit
+ ie_match_stat(): do not ignore skip-worktree bit with CE_MATCH_IGNORE_VALID
+ tests: rename duplicate t1009
+ sparse checkout: inhibit empty worktree
+ Add tests for sparse checkout
+ read-tree: add --no-sparse-checkout to disable sparse checkout support
+ unpack-trees(): ignore worktree check outside checkout area
+ unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index
+ unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout
+ unpack-trees.c: generalize verify_* functions
+ unpack-trees(): add CE_WT_REMOVE to remove on worktree alone
+ Introduce "sparse checkout"
+ dir.c: export excluded_1() and add_excludes_from_file_1()
+ excluded_1(): support exclude files in index
+ unpack-trees(): carry skip-worktree bit over in merged_entry()
+ Read .gitignore from index if it is skip-worktree
+ Avoid writing to buffer in add_excludes_from_file_1()
+ Teach Git to respect skip-worktree bit (writing part)
+ Teach Git to respect skip-worktree bit (reading part)
+ Introduce "skip-worktree" bit in index, teach Git to get/set this bit
+ Add test-index-version
+ update-index: refactor mark_valid() in preparation for new options
+
+I've queued the (close to) original tests for external grep, but as a belt
+and suspender measure Nguyễn may also want to add the whitebox test
+in the review thread.
[Cooking]
-* da/difftool (2009-12-22) 2 commits
+* da/difftool (2010-01-09) 6 commits
+ (merged to 'next' on 2010-01-10 at 749c870)
+ + git-diff.txt: Link to git-difftool
+ + difftool: Allow specifying unconfigured commands with --extcmd
+ + difftool--helper: Remove use of the GIT_MERGE_TOOL variable
+ + difftool--helper: Update copyright and remove distracting comments
(merged to 'next' on 2010-01-06 at e957395)
+ git-difftool: Add '--gui' for selecting a GUI tool
+ t7800-difftool: Set a bogus tool for use by tests
* jh/gitweb-cached (2010-01-03) 4 commits
-Will merge to 'next', unless I hear objections within a few days.
+Hold: Warthog on 2010-01-06, http://article.gmane.org/gmane.comp.version-control.git/136306
* jc/fix-tree-walk (2009-09-14) 7 commits
Resurrected from "Ejected" category. This is fix for a tricky codepath
and testing and improving before it hits 'next' by brave souls is greatly
-appreciated. I am not very happy about the solution myself.
+appreciated (I am using this in my private build).
* jc/branch-d (2009-12-29) 1 commit
- - branch -d: base the "already-merged" safety on the branch it merges with
-
+ (merged to 'next' on 2010-01-10 at 61a14b7)
+ + branch -d: base the "already-merged" safety on the branch it merges with
-http://thread.gmane.org/gmane.comp.version-control.git/135837/focus=135863
-I am tempted to merge this to 'next', but please stop me if people see issues
-in it.
* jc/rerere (2009-12-04) 1 commit
- - Teach --[no-]rerere-autoupdate option to merge, revert and friends
+ (merged to 'next' on 2010-01-10 at e295b7f)
+ + Teach --[no-]rerere-autoupdate option to merge, revert and friends
* jk/run-command-use-shell (2010-01-01) 8 commits
- - t4030, t4031: work around bogus MSYS bash path conversion
- - diff: run external diff helper with shell
- - textconv: use shell to run helper
- - editor: use run_command's shell feature
- - run-command: optimize out useless shell calls
- - run-command: convert simple callsites to use_shell
- - t0021: use $SHELL_PATH for the filter script
- - run-command: add "use shell" option
+ (merged to 'next' on 2010-01-10 at 7479e2a)
+ + t4030, t4031: work around bogus MSYS bash path conversion
+ + diff: run external diff helper with shell
+ + textconv: use shell to run helper
+ + editor: use run_command's shell feature
+ + run-command: optimize out useless shell calls
+ + run-command: convert simple callsites to use_shell
+ + t0021: use $SHELL_PATH for the filter script
+ + run-command: add "use shell" option
* tc/clone-v-progress (2009-12-26) 4 commits
- - clone: use --progress to force progress reporting
- - clone: set transport->verbose when -v/--verbose is used
- - git-clone.txt: reword description of progress behaviour
- - check stderr with isatty() instead of stdout when deciding to show progress
+ (merged to 'next' on 2010-01-10 at ec2bfd7)
+ + clone: use --progress to force progress reporting
+ + clone: set transport->verbose when -v/--verbose is used
+ + git-clone.txt: reword description of progress behaviour
+ + check stderr with isatty() instead of stdout when deciding to show progress
* jc/cache-unmerge (2009-12-25) 9 commits
-Will wait a bit more before moving it to 'next'.
+Will wait a bit more before moving it to 'next'. J6t spotted an issue
+with "rerere forget" and has a test script.
-* tr/http-push-ref-status (2009-12-24) 6 commits
+* tr/http-push-ref-status (2010-01-08) 6 commits
-Peff: $gmane/136169, 136167, 136168
-RC: $gmane/136172
+Rerolled.
* sr/gfi-options (2009-12-04) 7 commits
- - fast-import: add (non-)relative-marks feature
- - fast-import: allow for multiple --import-marks= arguments
- - fast-import: test the new option command
- - fast-import: add option command
- - fast-import: add feature command
- - fast-import: put marks reading in its own function
- - fast-import: put option parsing code in separate functions
-
-http://thread.gmane.org/gmane.comp.version-control.git/134540
-
+ (merged to 'next' on 2010-01-10 at 8b305fb)
+ + fast-import: add (non-)relative-marks feature
+ + fast-import: allow for multiple --import-marks= arguments
+ + fast-import: test the new option command
+ + fast-import: add option command
+ + fast-import: add feature command
+ + fast-import: put marks reading in its own function
+ + fast-import: put option parsing code in separate functions
-I haven't seen comments on this round, and I am tempted to merge it to
-'next' soonish. Please file complaints before I do so if people have
-objections.
--------------------------------------------------
Gone topics
Was in [Graduated to "master"]
* mo/bin-wrappers (2009-12-02) 3 commits
(merged to 'next' on 2010-01-03 at 8c5fa27)
+ INSTALL: document a simpler way to run uninstalled builds
+ run test suite without dashed git-commands in PATH
+ build dashless "bin-wrappers" directory similar to installed bindir
* mv/commit-date (2009-12-03) 2 commits
(merged to 'next' on 2010-01-03 at 1c45fdf)
+ Document date formats accepted by parse_date()
+ builtin-commit: add --date option
* bg/maint-add-all-doc (2009-12-07) 4 commits
(merged to 'next' on 2010-01-03 at b19a323)
+ squash! rm documentation--also mention add-u where we mention commit-a
+ git-rm doc: Describe how to sync index & work tree
+ git-add/rm doc: Consistently back-quote
+ Documentation: 'git add -A' can remove files
* so/cvsserver-update (2009-12-07) 1 commit
(merged to 'next' on 2010-01-03 at 99959b6)
+ cvsserver: make the output of 'update' more compatible with cvs.
* mg/tag-d-show (2009-12-10) 1 commit
(merged to 'next' on 2010-01-03 at 87657d2)
+ tag -d: print sha1 of deleted tag
* sb/maint-octopus (2009-12-11) 3 commits
(merged to 'next' on 2010-01-03 at ffe77d6)
+ octopus: remove dead code
+ octopus: reenable fast-forward merges
+ octopus: make merge process simpler to follow
* js/filter-branch-prime (2009-12-15) 1 commit
(merged to 'next' on 2010-01-03 at 7c90319)
+ filter-branch: remove an unnecessary use of 'git read-tree'
^ permalink raw reply [relevance 2%]
* [PATCH v3 0/8] rebase: make reflog messages independent of the backend
@ 2022-10-12 9:35 2% ` Phillip Wood via GitGitGadget
2022-10-21 9:21 2% ` [PATCH v4 " Phillip Wood via GitGitGadget
` (2 more replies)
2022-04-20 9:56 2% ` [PATCH v2 4/8] rebase --merge: fix reflog message after skipping Phillip Wood via GitGitGadget
2022-04-20 9:56 2% ` [PATCH v2 3/8] rebase --merge: fix reflog when continuing Phillip Wood via GitGitGadget
2 siblings, 3 replies; 200+ results
From: Phillip Wood via GitGitGadget @ 2022-10-12 9:35 UTC (permalink / raw)
To: git
Cc: Phillip Wood, Christian Couder, Elijah Newren,
Ævar Arnfjörð Bjarmason, Calvin Wan, Emily Shaffer,
Glen Choo, Victoria Dye, Phillip Wood
This series fixes some bugs in the reflog messages when rebasing and changes
the reflog messages of "rebase --apply" to match "rebase --merge" with the
aim of making the reflog easier to parse.
Thanks to everyone who commented on V2, I've added the review club
participants that I've got address for to the cc list. I've rebased onto
pw/rebase-keep-base-fixes.
Change since V2:
* Patch 1: Reworded the commit message to address the concerns in [1,2]
about the behavior when head_name is NULL. There is also a small change
due to being rebased.
* Patch 2: Unchanged. There wasn't much love for parameterized tests in
review club but we want to ensure both backends produce the same messages
I think this is the safest way to achieve that. Using separate tests
makes it too easy to introduce subtle differences in the testing of the
two backends.
* Patch 3: Added a note to the commit message to address the concerns in
[1] about not resetting GIT_REFLOG_ACTION when we return early.
* Patches 4 & 5: Unchanged.
* Patch 6: Reworded the commit message to make a stronger argument for this
change. There are concerns about backwards compatibility in [1,3,4] but
(i) we have made similar changes in the past without complaints and (ii)
we're changing the message to an existing format. There is also a small
change due to being rebased.
* Patches 7 & 8: Small changes due to rebase.
[1]
https://docs.google.com/document/d/14L8BAumGTpsXpjDY8VzZ4rRtpAjuGrFSRqn3stCuS_w/edit?pli=1#heading=h.t6g5l2t5ibzw
[2] https://lore.kernel.org/git/xmqq35i7r4rj.fsf@gitster.g/ [3]
https://lore.kernel.org/git/xmqq4k2nmmeg.fsf@gitster.g/ [4]
https://lore.kernel.org/git/220420.865yn4833u.gmgdl@evledraar.gmail.com/
V2 Cover Letter:
Thanks to Christian and Elijah for their comments on V1.
I've updated commit message for patch 1 to try and be clearer about the
removal of a call to strbuf_release() and spilt out the test changes from
the old patch 2 into a separate preparatory patch.
V1 Cover Letter:
This is a series of rebase reflog related patches with the aim of unifying
the reflog messages from the two rebase backends.
* improve rebase reflog test coverage
* rebase --merge: fix reflog messages for --continue and --skip
* rebase --apply: respect GIT_REFLOG_ACTION
* rebase --abort: improve reflog message
* unify reflog messages between the two rebase backends
This series is based on pw/use-inprocess-checkout-in-rebase
Phillip Wood (8):
rebase --apply: remove duplicated code
t3406: rework rebase reflog tests
rebase --merge: fix reflog when continuing
rebase --merge: fix reflog message after skipping
rebase --apply: respect GIT_REFLOG_ACTION
rebase --apply: make reflog messages match rebase --merge
rebase --abort: improve reflog message
rebase: cleanup action handling
builtin/rebase.c | 146 ++++++++++++------------------
sequencer.c | 5 ++
t/t3406-rebase-message.sh | 185 +++++++++++++++++++++++++++++++-------
3 files changed, 215 insertions(+), 121 deletions(-)
base-commit: 0203c679871112c78adc6428a8ed6c04c30ccad9
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1150%2Fphillipwood%2Fwip%2Frebase-reflog-fixes-v3
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1150/phillipwood/wip/rebase-reflog-fixes-v3
Pull-Request: https://github.com/gitgitgadget/git/pull/1150
Range-diff vs v2:
1: a4320f2fcf3 ! 1: a84cf971a75 rebase --apply: remove duplicated code
@@ Metadata
## Commit message ##
rebase --apply: remove duplicated code
- When we are reattaching HEAD after a fast-forward we can use
- move_to_original_branch() rather than open coding a copy of that
- code. The old code appears to handle the case where the rebase is
- started from a detached HEAD but in fact in that case there is nothing
- to do as we have already updated HEAD.
+ Use move_to_original_branch() when reattaching HEAD after a fast-forward
+ rather than open coding a copy of that code. move_to_original_branch()
+ does not call reset_head() if head_name is NULL but there should be no
+ user visible changes even though we currently call reset_head() in that
+ case. The reason for this is that the reset_head() call does not add a
+ message to the reflog because we're not changing the commit that HEAD
+ points to and so lock_ref_for_update() elides the update. When head_name
+ is not NULL then reset_head() behaves like "git symbolic-ref" and so the
+ reflog is updated.
Note that the removal of "strbuf_release(&msg)" is safe as there is an
identical call just above this hunk which can be seen by viewing the
@@ builtin/rebase.c: int cmd_rebase(int argc, const char **argv, const char *prefix
* we just fast-forwarded.
*/
- strbuf_reset(&msg);
- if (oideq(&merge_base, &options.orig_head)) {
+ if (oideq(&branch_base, &options.orig_head->object.oid)) {
printf(_("Fast-forwarded %s to %s.\n"),
branch_name, options.onto_name);
- strbuf_addf(&msg, "rebase finished: %s onto %s",
2: 0904b50a377 = 2: b9255ad35d2 t3406: rework rebase reflog tests
3: 6c15f00e170 ! 3: ea4da25a19c rebase --merge: fix reflog when continuing
@@ Commit message
in pick_commits(). Both of these will be fixed in a future series that
stops the sequencer calling setenv().
+ If we fail to commit the staged changes then we error out so
+ GIT_REFLOG_ACTION does not need to be reset in that case.
+
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
## builtin/rebase.c ##
4: d3afa85ffc5 = 4: 225ff4baef7 rebase --merge: fix reflog message after skipping
5: afa67abe01a = 5: 1094681eb11 rebase --apply: respect GIT_REFLOG_ACTION
6: 95161f21e00 ! 6: a5338e6bdd8 rebase --apply: make reflog messages match rebase --merge
@@ Commit message
rebase --apply: make reflog messages match rebase --merge
The apply backend creates slightly different reflog messages to the
- merge backend when starting and finishing a rebase and when picking
- commits. The choice of backend is really an implementation detail so
- it is confusing to have the same command create different messages
- depending on which backend is selected. Change the apply backend so
- the reflog messages from the two backends match as closely as
- possible. Note that there is still a difference when committing a
- conflict resolution - the merge backend will use "(continue)" rather
- than "(pick)" in that case as it does not know which command created
- the conflict that it is committing.
+ merge backend when starting or finishing a rebase and when picking
+ commits. These differences make it harder than it needs to be to parse
+ the reflog (I have a script that reads the finishing messages from
+ rebase and it is a pain to have to accommodate two different message
+ formats). While it is possible to determine the backend used for a
+ rebase from the reflog messages, the differences are not designed for
+ that purpose. c2417d3af7 (rebase: drop '-i' from the reflog for
+ interactive-based rebases, 2020-02-15) removed the clear distinction
+ between the reflog messages of the two backends without complaint.
+
+ As the merge backend is the default it is likely to be the format most
+ common in existing reflogs. For that reason the apply backend is changed
+ to format its reflog messages to match the merge backend as closely as
+ possible. Note that there is still a difference as when committing a
+ conflict resolution the apply backend will use "(pick)" rather than
+ "(continue)" because it is not currently possible to change the message
+ for a single commit.
+
+ In addition to c2417d3af7 we also changed the reflog messages in
+ 68aa495b59 (rebase: implement --merge via the interactive machinery,
+ 2018-12-11) and 2ac0d6273f (rebase: change the default backend from "am"
+ to "merge", 2020-02-15). This commit makes the same change to "git
+ rebase --apply" that 2ac0d6273f made to "git rebase" without any backend
+ specific options. As the messages are changed to use an existing format
+ any scripts that can parse the reflog messages of the default rebase
+ backend should be unaffected by this change.
+
+ There are existing tests for the messages from both backends which are
+ adjusted to ensure that they do not get out of sync in the future.
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
@@ builtin/rebase.c: static int run_am(struct rebase_options *opts)
am.git_cmd = 1;
strvec_push(&am.args, "am");
-
-+ strvec_pushf(&am.env_array, GIT_REFLOG_ACTION_ENVIRONMENT "=%s (pick)",
++ strvec_pushf(&am.env, GIT_REFLOG_ACTION_ENVIRONMENT "=%s (pick)",
+ getenv(GIT_REFLOG_ACTION_ENVIRONMENT));
if (opts->action && !strcmp("continue", opts->action)) {
strvec_push(&am.args, "--resolved");
@@ builtin/rebase.c: int cmd_rebase(int argc, const char **argv, const char *prefix
+ strbuf_addf(&msg, "%s (start): checkout %s",
getenv(GIT_REFLOG_ACTION_ENVIRONMENT), options.onto_name);
ropts.oid = &options.onto->object.oid;
- ropts.orig_head = &options.orig_head,
+ ropts.orig_head = &options.orig_head->object.oid,
## t/t3406-rebase-message.sh ##
@@ t/t3406-rebase-message.sh: test_expect_success 'error out early upon -C<n> or --whitespace=<bad>' '
7: d2c1dfbcd5e ! 7: aa808725fb8 rebase --abort: improve reflog message
@@ builtin/rebase.c: int cmd_rebase(int argc, const char **argv, const char *prefix
+ strbuf_addf(&head_msg, "%s (abort): returning to %s",
+ getenv(GIT_REFLOG_ACTION_ENVIRONMENT),
+ options.head_name ? options.head_name
-+ : oid_to_hex(&options.orig_head));
- ropts.oid = &options.orig_head;
++ : oid_to_hex(&options.orig_head->object.oid));
+ ropts.oid = &options.orig_head->object.oid;
+ ropts.head_msg = head_msg.buf;
ropts.branch = options.head_name;
ropts.flags = RESET_HEAD_HARD;
- ropts.default_reflog_action = DEFAULT_REFLOG_ACTION;
if (reset_head(the_repository, &ropts) < 0)
die(_("could not move back to %s"),
- oid_to_hex(&options.orig_head));
+ oid_to_hex(&options.orig_head->object.oid));
## t/t3406-rebase-message.sh ##
@@ t/t3406-rebase-message.sh: test_reflog () {
8: b0d21affa78 ! 8: f9c8664b883 rebase: cleanup action handling
@@ builtin/rebase.c: static int run_sequencer_rebase(struct rebase_options *opts,
return ret;
@@ builtin/rebase.c: static int run_am(struct rebase_options *opts)
strvec_push(&am.args, "am");
- strvec_pushf(&am.env_array, GIT_REFLOG_ACTION_ENVIRONMENT "=%s (pick)",
+ strvec_pushf(&am.env, GIT_REFLOG_ACTION_ENVIRONMENT "=%s (pick)",
getenv(GIT_REFLOG_ACTION_ENVIRONMENT));
- if (opts->action && !strcmp("continue", opts->action)) {
+ if (opts->action == ACTION_CONTINUE) {
@@ builtin/rebase.c: static int run_specific_rebase(struct rebase_options *opts, en
else
@@ builtin/rebase.c: int cmd_rebase(int argc, const char **argv, const char *prefix)
struct strbuf buf = STRBUF_INIT;
- struct object_id merge_base;
+ struct object_id branch_base;
int ignore_whitespace = 0;
- enum action action = ACTION_NONE;
const char *gpg_sign = NULL;
@@ builtin/rebase.c: int cmd_rebase(int argc, const char **argv, const char *prefix
ACTION_SHOW_CURRENT_PATCH),
OPT_CALLBACK_F(0, "apply", &options, NULL,
@@ builtin/rebase.c: int cmd_rebase(int argc, const char **argv, const char *prefix)
- if (preserve_merges_selected)
- die(_("--preserve-merges was replaced by --rebase-merges"));
+ } else if (is_directory(merge_dir())) {
+ strbuf_reset(&buf);
+ strbuf_addf(&buf, "%s/rewritten", merge_dir());
+- if (!(action == ACTION_ABORT) && is_directory(buf.buf)) {
++ if (!(options.action == ACTION_ABORT) && is_directory(buf.buf)) {
+ die(_("`rebase --preserve-merges` (-p) is no longer supported.\n"
+ "Use `git rebase --abort` to terminate current rebase.\n"
+ "Or downgrade to v2.33, or earlier, to complete the rebase."));
+@@ builtin/rebase.c: int cmd_rebase(int argc, const char **argv, const char *prefix)
+ "Note: Your `pull.rebase` configuration may also be set to 'preserve',\n"
+ "which is no longer supported; use 'merges' instead"));
- if (action != ACTION_NONE && total_argc != 2) {
+ if (options.action != ACTION_NONE && total_argc != 2) {
@@ builtin/rebase.c: int cmd_rebase(int argc, const char **argv, const char *prefix
}
@@ builtin/rebase.c: int cmd_rebase(int argc, const char **argv, const char *prefix)
if (options.root && options.fork_point > 0)
- die(_("cannot combine '--root' with '--fork-point'"));
+ die(_("options '%s' and '%s' cannot be used together"), "--root", "--fork-point");
- if (action != ACTION_NONE && !in_progress)
+ if (options.action != ACTION_NONE && !in_progress)
--
gitgitgadget
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (Nov 2015, #01; Thu, 5)
@ 2015-11-05 23:13 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2015-11-05 23:13 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
Git 2.6.3 has been tagged, with accumulated fixes and minor updates
that are already in 'master'. We have about 5 weeks left til -rc0
so hopefully a handful of topics that are not yet in 'next' but have
already been reviewed and polished may be able to be merged to
'next', cook in there for a while and be in 2.7.0 release. I'll be
offline for a few weeks starting this weekend, but I am confident
that our capable interim maintainer can shepherd these topics
forward with the help from our contributors ;-).
You can find the changes described here in the integration branches
of the repositories listed at
http://git-blame.blogspot.com/p/git-public-repositories.html
--------------------------------------------------
[Graduated to "master"]
* da/difftool (2015-10-29) 1 commit
(merged to 'next' on 2015-11-01 at 4e5ab33)
+ difftool: ignore symbolic links in use_wt_file
The code to prepare the working tree side of temporary directory
for the "dir-diff" feature forgot that symbolic links need not be
copied (or symlinked) to the temporary area, as the code already
special cases and overwrites them. Besides, it was wrong to try
computing the object name of the target of symbolic link, which may
not even exist or may be a directory.
* jc/mailinfo-lib (2015-11-01) 1 commit
(merged to 'next' on 2015-11-01 at 3ecaa28)
+ mailinfo: fix passing wrong address to git_mailinfo_config
Hotfix for a topic already in 'master'.
* jk/initialization-fix-to-add-submodule-odb (2015-10-28) 1 commit
(merged to 'next' on 2015-11-01 at da94b97)
+ add_submodule_odb: initialize alt_odb list earlier
We peek objects from submodule's object store by linking it to the
list of alternate object databases, but the code to do so forgot to
correctly initialize the list.
* js/git-gdb (2015-10-30) 1 commit
(merged to 'next' on 2015-11-01 at 3d232d5)
+ test: facilitate debugging Git executables in tests with gdb
Allow easier debugging of a single "git" invocation in our test
scripts.
* kn/for-each-branch (2015-10-30) 1 commit
(merged to 'next' on 2015-11-01 at 4249dc9)
+ ref-filter: fallback on alphabetical comparison
Using the timestamp based criteria in "git branch --sort" did not
tiebreak branches that point at commits with the same timestamp (or
the same commit), making the resulting output unstable.
* mk/blame-first-parent (2015-10-30) 3 commits
(merged to 'next' on 2015-11-01 at 3f87150)
+ blame: allow blame --reverse --first-parent when it makes sense
+ blame: extract find_single_final
+ blame: test to describe use of blame --reverse --first-parent
"git blame" learnt to take "--first-parent" and "--reverse" at the
same time when it makes sense.
* rs/daemon-plug-child-leak (2015-11-02) 2 commits
(merged to 'next' on 2015-11-02 at 64afbb9)
+ daemon: plug memory leak
+ run-command: factor out child_process_clear()
(this branch is used by sb/submodule-parallel-update.)
"git daemon" uses "run_command()" without "finish_command()", so it
needs to release resources itself, which it forgot to do.
* rs/show-branch-argv-array (2015-11-01) 1 commit
(merged to 'next' on 2015-11-01 at fac4fa6)
+ show-branch: use argv_array for default arguments
Code simplification.
* rs/wt-status-detached-branch-fix (2015-11-01) 5 commits
(merged to 'next' on 2015-11-01 at cb23615)
+ wt-status: use skip_prefix() to get rid of magic string length constants
+ wt-status: don't skip a magical number of characters blindly
+ wt-status: avoid building bogus branch name with detached HEAD
+ wt-status: exit early using goto in wt_shortstatus_print_tracking()
+ t7060: add test for status --branch on a detached HEAD
"git status --branch --short" accessed beyond the constant string
"HEAD", which has been corrected.
--------------------------------------------------
[New Topics]
* ad/sha1-update-chunked (2015-11-05) 2 commits
- sha1: allow limiting the size of the data passed to SHA1_Update()
- sha1: provide another level of indirection for the SHA-1 functions
Apple's common crypto implementation of SHA1_Update() does not take
more than 4GB at a time, and we now have a compile-time workaround
for it.
I think this is more or less ready. I am skeptical about the file
location reorg ([PATCH 3/3] $gmane/280912) and did not queue it.
* dt/http-range (2015-11-02) 2 commits
(merged to 'next' on 2015-11-03 at 7c3cc60)
+ http: use off_t to store partial file size
+ http.c: use CURLOPT_RANGE for range requests
A Range: request can be responded with a full response and when
asked properly libcurl knows how to strip the result down to the
requested range. However, we were hand-crafting a range request
and it did not kick in.
Will merge to 'master'.
* vl/grep-configurable-threads (2015-11-01) 1 commit
- grep: add --threads=<num> option and grep.threads configuration
"git grep" can now be configured (or told from the command line)
how many threads to use when searching in the working tree files.
Expecting a reroll.
($gmane/280854)
* kf/http-proxy-auth-methods (2015-11-04) 3 commits
- SQUASH???
- http: use credential API to handle proxy authentication
- http: allow selection of proxy authentication method
New http.proxyAuthMethod configuration variable can be used to
specify what authentication method to use, as a way to work around
proxies that do not give error response expected by libcurl when
CURLAUTH_ANY is used. Also, the codepath for proxy authentication
has been taught to use credential API to store the authentication
material in user's keyrings.
Still being worked on.
($gmane/280925).
* lf/ref-is-hidden-namespace (2015-11-05) 4 commits
- t5509: add basic tests for hideRefs
- hideRefs: add support for matching full refs
- upload-pack: strip refs before calling ref_is_hidden()
- config.txt: document the semantics of hideRefs with namespaces
Extend transfer.hideRefs to work better with use of namespaces.
Will merge to 'next'.
* dg/git-svn-empty-dirs (2015-11-05) 1 commit
- git-svn: improve rebase/mkdirs performance
* fp/subtree-todo-update (2015-11-05) 1 commit
- contrib/subtree: remove "push" command from the "todo" file
--------------------------------------------------
[Stalled]
* nd/ita-cleanup (2015-09-06) 6 commits
- grep: make it clear i-t-a entries are ignored
- checkout(-index): do not checkout i-t-a entries
- apply: make sure check_preimage() does not leave empty file on error
- apply: fix adding new files on i-t-a entries
- add and use a convenience macro ce_intent_to_add()
- blame: remove obsolete comment
Paths that have been told the index about with "add -N" are not yet
in the index, but various commands behaved as if they already are.
Some commits need better explanation.
Waiting for a reroll.
* ld/p4-detached-head (2015-09-09) 2 commits
- git-p4: work with a detached head
- git-p4: add failing test for submit from detached head
Will be rerolled.
($gmane/277574)
* mg/httpd-tests-update-for-apache-2.4 (2015-04-08) 2 commits
- t/lib-git-svn: check same httpd module dirs as lib-httpd
- t/lib-httpd: load mod_unixd
This is the first two commits in a three-patch series $gmane/266962
Becoming tired of waiting for a reroll.
with updated log message ($gmane/268061).
* wp/sha1-name-negative-match (2015-06-08) 2 commits
- sha1_name.c: introduce '^{/!-<negative pattern>}' notation
- test for '!' handling in rev-parse's named commits
Introduce "branch^{/!-<pattern>}" notation to name a commit
reachable from branch that does not match the given pattern.
Becoming tired of waiting for a reroll.
($gmane/271213).
* ak/format-patch-odir-config (2015-06-19) 1 commit
- format-patch: introduce format.outputDirectory configuration
Reroll exists but didn't pick it up as it seemed to be still
collecting review comments.
Becoming tired of waiting for a reroll.
($gmane/272180).
* jc/diff-b-m (2015-02-23) 5 commits
. WIPWIP
. WIP: diff-b-m
- diffcore-rename: allow easier debugging
- diffcore-rename.c: add locate_rename_src()
- diffcore-break: allow debugging
"git diff -B -M" produced incorrect patch when the postimage of a
completely rewritten file is similar to the preimage of a removed
file; such a resulting file must not be expressed as a rename from
other place.
The fix in this patch is broken, unfortunately.
--------------------------------------------------
[Cooking]
* dk/gc-idx-wo-pack (2015-11-04) 3 commits
- gc: remove garbage .idx files from pack dir
- t5304: test cleaning pack garbage
- prepare_packed_git(): refactor garbage reporting in pack directory
Having a leftover .idx file without corresponding .pack file in
the repository hurts performance; "git gc" learned to prune them.
We may want to do the same for .bitmap (and notice but not prune
.keep) without corresponding .pack, but that can be a separate
topic.
Will merge to 'next'.
* sb/submodule-parallel-update (2015-11-05) 10 commits
- clone: allow an explicit argument for parallel submodule clones
- submodule update: expose parallelism to the user
- git submodule update: have a dedicated helper for cloning
- fetching submodules: respect `submodule.jobs` config option
- submodule config: update parse_config()
- submodule config: remove name_and_item_from_var
- submodule config: keep update strategy around
- run_processes_parallel: add output to tracing messages
- Merge branch 'rs/daemon-plug-child-leak' into sb/submodule-parallel-update
- Merge branch 'sb/submodule-parallel-fetch' into sb/submodule-parallel-update
(this branch uses sb/submodule-parallel-fetch; is tangled with rs/daemon-leak-fix.)
Builds on top of the "fetch --recurse-submodules" work to introduce
parallel downloading into multiple submodules for "submodule update".
Waiting for sb/submodule-parallel-fetch to stabilize.
It would be the cleanest to rebuild sb/submodule-parallel-fetch on
top of 2.7.0 once it ships and then build this directly on top;
that way, we do not have to have merges in this topic that
distracting (besides, some part of the other topic can be updated
in-place instead of this follow-up topic tweaking them as past
mistakes and inflexibilities).
* jc/strbuf-gets (2015-10-28) 17 commits
- test-sha1-array: read command stream with strbuf_gets()
- grep: read -f file with strbuf_gets()
- send-pack: read list of refs with strbuf_gets()
- column: read lines with strbuf_gets()
- cat-file: read batch stream with strbuf_gets()
- transport-helper: read helper response with strbuf_gets()
- clone/sha1_file: read info/alternates with strbuf_gets()
- remote.c: read $GIT_DIR/remotes/* with strbuf_gets()
- ident.c: read /etc/mailname with strbuf_gets()
- rev-parse: read parseopt spec with strbuf_gets()
- revision: read --stdin with strbuf_gets()
- hash-object: read --stdin-paths with strbuf_gets()
- mktree: read textual tree representation with strbuf_gets()
- update-index: read list of paths with strbuf_gets() under --stdin
- update-index: read --index-info with strbuf_gets()
- check-attr, check-ignore, checkout-index: read paths with strbuf_gets()
- strbuf: add strbuf_gets()
Teach codepaths that communicate with users by reading text files
to be more lenient to editors that write CRLF-terminated lines.
Note that this is only about communication with Git, like feeding
list of object names from the standard input instead of from the
command line, and does not involve files in the working tree.
Waiting for reviews.
* eg/p4-submit-catch-failure (2015-10-30) 1 commit
- git-p4: clean up after p4 submit failure
Just like the working tree is cleaned up when the user cancelled
submission in P4Submit.applyCommit(), clean up the mess if "p4
submit" fails.
Needs an update to test.
($gmane/280539)
* ep/ident-with-getaddrinfo (2015-10-30) 1 commit
- (NEEDSWORK $gmane/280507) ident.c: add support for IPv6
A build without NO_IPv6 used to use gethostbyname() when guessing
user's hostname, instead of getaddrinfo() that is used in other
codepaths in such a build.
Waiting for a reroll.
($gmane/280507)
* ea/checkout-progress (2015-11-01) 1 commit
(merged to 'next' on 2015-11-03 at 08a8d1f)
+ checkout: add --progress option
"git checkout" did not follow the usual "--[no-]progress"
convention and implemented only "--quiet" that is essentially
a superset of "--no-progress". Extend the command to support the
usual "--[no-]progress".
Will merge to 'master'.
* jc/test-must-fail-with-sigpipe (2015-10-30) 1 commit
- test: accept death by SIGPIPE as a valid failure mode
In some tests we expect a git command that transfers objects to
result in failure, but it is normal for the failure to come from
SIGPIPE when the other end of the connection detects an (expected)
error and hangs up. However, test_expect_failure helper function
was not prepared to see a death by sigpipe as a normal failure
exit.
It probably is more sensible to limit the test that allows depth by
SIGPIPE as Lars Schneider suggests, so it is likely that this will
be replaced while I am away ;-)
* pt/http-socks-proxy (2015-10-26) 1 commit
- remote-http(s): support SOCKS proxies
Add support for talking http/https over socks proxy.
Needs a sign-off from the original author.
* mh/notes-allow-reading-treeish (2015-10-08) 3 commits
(merged to 'next' on 2015-10-23 at 8a697f0)
+ notes: allow treeish expressions as notes ref
+ Merge branch 'jk/notes-dwim-doc' into next
+ Merge branch 'jc/merge-drop-old-syntax' into next
(this branch uses jc/merge-drop-old-syntax.)
Some "git notes" operations, e.g. "git log --notes=<note>", should
be able to read notes from any tree-ish that is shaped like a notes
tree, but the notes infrastructure required that the argument must
be a ref under refs/notes/. Loosen it to require a valid ref only
when the operation would update the notes (in which case we must
have a place to store the updated notes tree, iow, a ref).
As the patch was done on top of the 'drop old-syntax from merge',
this has to wait until that other topic can graduate, unfortunately.
It can be redone in a way that does not depend on that topic after
this cycle, though.
Will keep in 'next'.
* jc/mailinfo (2015-10-21) 1 commit
- mailinfo: ignore in-body header that we do not care about
Some people write arbitrary garbage at the beginning of a piece of
e-mail (or after -- >8 -- scissors -- >8 -- line) in the commit log
message and expect them to be discarded, even though "From:" and
"Subject:" are the only documented in-body headers that you are
supposed to have there. Allow some garbage (specifically, what may
look like RFC2822 headers like "MIME-Version: ...") to be there and
ignore them.
I have a feeling that that this is a step in a wrong direction.
Comments?
* js/am-3-merge-recursive-direct (2015-10-12) 2 commits
(merged to 'next' on 2015-10-23 at dc631e5)
+ am: make a direct call to merge_recursive
+ merge_recursive_options: introduce the "gently" flag
The merge_recursive_generic() function has been made a bit safer to
call from inside a process. "git am -3" was taught to make a direct
call to the function when falling back to three-way merge.
Being able to make a direct call would be good in general, but as a
performance thing, we would want to see it backed up by numbers.
I haven't gone through the "gently" change with fine toothed comb;
I can see that the change avoids calling die(), but I haven't made
sure that the program states (e.g. what's in the in-core index) are
adjusted sensibly when it returns to the caller instead of dying,
or the codepaths that used to die() are free of resource leaks.
The original code certainly did not care the program states at the
point of dying exactly because it knew it is going to exit, but now
they have to care, and they need to be audited.
Will keep in 'next'.
* sg/pretty-more-date-mode-format (2015-10-07) 1 commit
- pretty: add format specifiers for short and raw date formats
Introduce "%as" and "%aR" placeholders for "log --format" to show
the author date in the short and raw formats.
I have a feeling that that this is a step in a wrong direction.
Comments?
* kn/for-each-branch-remainder (2015-10-02) 9 commits
- branch: implement '--format' option
- branch: use ref-filter printing APIs
- ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams
- ref-filter: introduce format_ref_array_item()
- ref-filter: adopt get_head_description() from branch.c
- ref-filter: modify "%(objectname:short)" to take length
- ref-filter: add support for %(path) atom
- ref-filter: implement %(if:equals=<string>) and %(if:notequals=<string>)
- ref-filter: implement %(if), %(then), and %(else) atoms
More unification among "branch -l", "tag -l" and "for-each-ref --format".
Expecting a reroll.
($gmane/278926)
* jk/graph-format-padding (2015-09-14) 1 commit
- pretty: pass graph width to pretty formatting for use in '%>|(N)'
Redefine the way '%>|(N)' padding and the "--graph" option
interacts. It has been that the available columns to display the
log message was measured from the edge of the area the graph ended,
but with this it becomes the beginning of the entire output.
I have a suspicion that 50% of the users would appreciate this
change, and the remainder see this break their expectation. If
that is the case, we might need to introduce a similar but
different alignment operator so that this new behaviour is
available to those who want to use it, without negatively affecting
existing uses.
Undecided.
($gmane/278326)
* sb/submodule-parallel-fetch (2015-11-05) 16 commits
- strbuf: update documentation for strbuf_read_once()
- run-command: remove set_nonblocking()
(merged to 'next' on 2015-10-23 at 8f04bbd)
+ run-command: fix missing output from late callbacks
+ test-run-command: increase test coverage
+ test-run-command: test for gracefully aborting
+ run-command: initialize the shutdown flag
+ run-command: clear leftover state from child_process structure
+ run-command: fix early shutdown
(merged to 'next' on 2015-10-15 at df63590)
+ submodules: allow parallel fetching, add tests and documentation
+ fetch_populated_submodules: use new parallel job processing
+ run-command: add an asynchronous parallel child processor
+ sigchain: add command to pop all common signals
+ strbuf: add strbuf_read_once to read without blocking
+ xread_nonblock: add functionality to read from fds without blocking
+ xread: poll on non blocking fds
+ submodule.c: write "Fetching submodule <foo>" to stderr
(this branch is used by sb/submodule-parallel-update; is tangled with rs/daemon-leak-fix.)
Add a framework to spawn a group of processes in parallel, and use
it to run "git fetch --recurse-submodules" in parallel.
Still being worked on, but it seems that we are seeing light at the
end of the tunnel.
($gmane/280937)
* ad/cygwin-wants-rename (2015-08-07) 1 commit
- config.mak.uname: Cygwin needs OBJECT_CREATION_USES_RENAMES
Will hold.
($gmane/275680).
* jc/rerere-multi (2015-09-14) 7 commits
- rerere: do use multiple variants
- t4200: rerere a merge with two identical conflicts
- rerere: allow multiple variants to exist
- rerere: delay the recording of preimage
- rerere: handle leftover rr-cache/$ID directory and postimage files
- rerere: scan $GIT_DIR/rr-cache/$ID when instantiating a rerere_id
- rerere: split conflict ID further
"git rerere" can encounter two or more files with the same conflict
signature that have to be resolved in different ways, but there was
no way to record these separate resolutions.
* jc/merge-drop-old-syntax (2015-04-29) 1 commit
(merged to 'next' on 2015-10-07 at 50fed71)
+ merge: drop 'git merge <message> HEAD <commit>' syntax
(this branch is used by mh/notes-allow-reading-treeish.)
Originally merged to 'next' on 2015-05-28
Stop supporting "git merge <message> HEAD <commit>" syntax that has
been deprecated since October 2007. It has been reported that
git-gui still uses the deprecated syntax, which needs to be fixed
before this final step can proceed.
Will keep in 'next'.
--------------------------------------------------
[Discarded]
* km/cache-entry-refcnt (2015-10-14) 1 commit
. merge: fix cache_entry use-after-free
Made unnecessary with dt/name-hash-dir-entry-fix topic.
* rs/daemon-leak-fix (2015-10-31) 3 commits
(merged to 'next' on 2015-11-01 at 9b6c8f9)
+ daemon: plug memory leak
+ run-command: export child_process_clear()
+ run-command: name the cleanup function child_process_clear()
(this branch uses sb/submodule-parallel-fetch; is tangled with sb/submodule-parallel-update.)
"git daemon" uses "run_command()" without "finish_command()", so it
needs to release resources itself, which it forgot to do.
This was tangled with another topic that was not quite ready.
Discard and replace it with an equivalent rs/daemon-plug-child-leak
that is independent.
* dt/refs-backend-pre-vtable (2015-10-15) 26 commits
. refs: break out ref conflict checks
. refs: make files_log_ref_write functions public
. initdb: move safe_create_dir into common code
. refs.c: move should_autocreate_reflog to common code
. refs.c: move peel_object to the common code
. refs.c: move copy_msg to the common code
. refs.c: move refname_is_safe to the common code
. refs: move transaction functions into common code
. refs.c: move head_ref_namespaced to the common code
. refs.c: move ref iterators to the common code
. refs.c: move prettify_refname to the common code
. refs.c: move is_branch to the common code
. refs.c: move check_refname_format to the common code
. refs.c: move resolve_refdup to common
. refs.c: move read_ref, read_ref_full and ref_exists to the common code
. refs.c: move warn_if_dangling_symref* to the common code
. refs.c: move dwim and friend functions to the common refs code
. refs.c: move the hidden refs functions to the common code
. refs.c: move read_ref_at to the common refs file
. refs.c: move delete_pseudoref and delete_ref to the common code
. refs.c: move update_ref to refs.c
. refs.c: add a new refs.c file to hold all common refs code
. refs-be-files.c: rename refs to refs-be-files
. refs: make repack_without_refs and is_branch public
. refs.c: create a public version of verify_refname_available
. Merge branch 'jk/war-on-sprintf' into HEAD
The early part of the pluggable ref backend series, which sifts the
ref API functions into two bins: the filesystem backend specific
ones and the generic API functions. The next step will start
introducing the framework to dispatch generic calls to specific
backend implementation(s) and then finally plug a new backend that
is different from the file backend.
It seems Michael's "I'd do it like this if I were doing it"
$gmane/280754 would be the way forward?
Ejected while the topic is in flux, as this and its later reroll
both want to move things around while other topics want to update
the files involved.
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (Mar 2017, #04; Fri, 10)
@ 2017-03-10 23:03 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2017-03-10 23:03 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'. The ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.
You can find the changes described here in the integration branches
of the repositories listed at
http://git-blame.blogspot.com/p/git-public-repositories.html
--------------------------------------------------
[Graduated to "master"]
* ew/markdown-url-in-readme (2017-03-01) 1 commit
(merged to 'next' on 2017-03-03 at 3d35e3a991)
+ README: create HTTP/HTTPS links from URLs in Markdown
Doc update.
* jc/config-case-cmdline-take-2 (2017-02-23) 2 commits
(merged to 'next' on 2017-03-01 at 2e9920eeeb)
+ config: use git_config_parse_key() in git_config_parse_parameter()
+ config: move a few helper functions up
The code to parse "git -c VAR=VAL cmd" and set configuration
variable for the duration of cmd had two small bugs, which have
been fixed.
This supersedes jc/config-case-cmdline topic that has been discarded.
* jh/send-email-one-cc (2017-02-27) 1 commit
(merged to 'next' on 2017-03-02 at 32c0e6ad88)
+ send-email: only allow one address per body tag
"Cc:" on the trailer part does not have to conform to RFC strictly,
unlike in the e-mail header. "git send-email" has been updated to
ignore anything after '>' when picking addresses, to allow non-address
cruft like " # stable 4.4" after the address.
* jk/http-auth (2017-02-27) 2 commits
(merged to 'next' on 2017-03-02 at 87f81b4395)
+ http: add an "auto" mode for http.emptyauth
+ http: restrict auth methods to what the server advertises
Reduce authentication round-trip over HTTP when the server supports
just a single authentication method.
* jk/ident-empty (2017-02-23) 4 commits
(merged to 'next' on 2017-03-01 at ff80031ce6)
+ ident: do not ignore empty config name/email
+ ident: reject all-crud ident name
+ ident: handle NULL email when complaining of empty name
+ ident: mark error messages for translation
user.email that consists of only cruft chars should consistently
error out, but didn't.
* jk/parse-config-key-cleanup (2017-02-24) 3 commits
(merged to 'next' on 2017-03-01 at e531d8d3a9)
+ parse_hide_refs_config: tell parse_config_key we don't want a subsection
+ parse_config_key: allow matching single-level config
+ parse_config_key: use skip_prefix instead of starts_with
(this branch uses sb/parse-hide-refs-config-cleanup.)
The "parse_config_key()" API function has been cleaned up.
* jk/t6300-cleanup (2017-02-27) 1 commit
(merged to 'next' on 2017-03-02 at 3087521bea)
+ t6300: avoid creating refs/heads/HEAD
A test that creates a confusing branch whose name is HEAD has been
corrected not to do so.
* jt/http-base-url-update-upon-redirect (2017-02-28) 1 commit
(merged to 'next' on 2017-03-03 at 5225bd3ef8)
+ http: attempt updating base URL only if no error
When a redirected http transport gets an error during the
redirected request, we ignored the error we got from the server,
and ended up giving a not-so-useful error message.
* jt/upload-pack-error-report (2017-02-23) 1 commit
(merged to 'next' on 2017-03-01 at aea583dbe5)
+ upload-pack: report "not our ref" to client
"git upload-pack", which is a counter-part of "git fetch", did not
report a request for a ref that was not advertised as invalid.
This is generally not a problem (because "git fetch" will stop
before making such a request), but is the right thing to do.
* ps/docs-diffcore (2017-02-28) 2 commits
(merged to 'next' on 2017-03-03 at 9ca5691de2)
+ docs/diffcore: unquote "Complete Rewrites" in headers
+ docs/diffcore: fix grammar in diffcore-rename header
Doc update.
* rj/remove-unused-mktemp (2017-02-28) 2 commits
(merged to 'next' on 2017-03-03 at 4512f0c5ab)
+ wrapper.c: remove unused gitmkstemps() function
+ wrapper.c: remove unused git_mkstemp() function
Code cleanup.
* rs/commit-parsing-optim (2017-02-27) 2 commits
(merged to 'next' on 2017-03-02 at 22239f35df)
+ commit: don't check for space twice when looking for header
+ commit: be more precise when searching for headers
The code that parses header fields in the commit object has been
updated for (micro)performance and code hygiene.
* rs/log-email-subject (2017-03-01) 2 commits
(merged to 'next' on 2017-03-03 at a2ecc84866)
+ pretty: use fmt_output_email_subject()
+ log-tree: factor out fmt_output_email_subject()
Code clean-up.
* rs/sha1-file-plug-fallback-base-leak (2017-02-27) 1 commit
(merged to 'next' on 2017-03-02 at 03344b1119)
+ sha1_file: release fallback base's memory in unpack_entry()
A leak in a codepath to read from a packed object in (rare) cases
has been plugged.
* rs/strbuf-add-real-path (2017-02-27) 2 commits
(merged to 'next' on 2017-03-02 at 69191becd6)
+ strbuf: add strbuf_add_real_path()
+ cocci: use ALLOC_ARRAY
An helper function to make it easier to append the result from
real_path() to a strbuf has been added.
* sb/parse-hide-refs-config-cleanup (2017-02-24) 1 commit
(merged to 'next' on 2017-03-01 at fd722ba039)
+ refs: parse_hide_refs_config to use parse_config_key
(this branch is used by jk/parse-config-key-cleanup.)
Code clean-up.
* sb/submodule-init-url-selection (2017-02-28) 1 commit
(merged to 'next' on 2017-03-03 at 847d1f9a91)
+ submodule init: warn about falling back to a local path
When "git submodule init" decides that the submodule in the working
tree is its upstream, it now gives a warning as it is not a very
common setup.
* tg/stash-push (2017-02-28) 6 commits
(merged to 'next' on 2017-03-03 at b50fda0389)
+ stash: allow pathspecs in the no verb form
+ stash: use stash_push for no verb form
+ stash: teach 'push' (and 'create_stash') to honor pathspec
+ stash: refactor stash_create
+ stash: add test for the create command line arguments
+ stash: introduce push verb
"git stash save" takes a pathspec so that the local changes can be
stashed away only partially.
--------------------------------------------------
[New Topics]
* jk/ref-filter-flags-cleanup (2017-03-10) 4 commits
- ref-filter: use separate cache for contains_tag_algo
- ref-filter: die on parse_commit errors
- ref-filter: use contains_result enum consistently
- ref-filter: move ref_cbdata definition into ref-filter.c
"git tag --contains" used to (ab)use the object bits to keep track
of the state of object reachability without clearing them after
use; this has been cleaned up and made to use the newer commit-slab
facility.
--------------------------------------------------
[Stalled]
* nd/prune-in-worktree (2017-02-19) 15 commits
. rev-list: expose and document --single-worktree
. revision.c: --reflog add HEAD reflog from all worktrees
. files-backend: make reflog iterator go through per-worktree reflog
. refs: add refs_for_each_reflog[_ent]()
. revision.c: --all adds HEAD from all worktrees
. refs: remove dead for_each_*_submodule()
. revision.c: use refs_for_each*() instead of for_each_*_submodule()
. refs: add a refs_for_each_in() and friends
. refs: add refs_for_each_ref()
. refs: add refs_head_ref()
. refs: add refs_read_ref[_full]()
. refs: move submodule slash stripping code to get_submodule_ref_store
. revision.c: --indexed-objects add objects from all worktrees
. revision.c: refactor add_index_objects_to_pending()
. revision.h: new flag in struct rev_info wrt. worktree-related refs
(this branch uses nd/worktree-kill-parse-ref; is tangled with nd/files-backend-git-dir.)
"git gc" and friends when multiple worktrees are used off of a
single repository did not consider the index and per-worktree refs
of other worktrees as the root for reachability traversal, making
objects that are in use only in other worktrees to be subject to
garbage collection.
* nd/worktree-kill-parse-ref (2017-02-19) 22 commits
. refs: kill set_worktree_head_symref()
. refs: add refs_create_symref()
. worktree.c: kill parse_ref() in favor of refs_resolve_ref_unsafe()
. refs.c: add refs_resolve_ref_unsafe()
. refs: introduce get_worktree_ref_store()
. refs: rename get_ref_store() to get_submodule_ref_store() and make it public
. files-backend: remove submodule_allowed from files_downcast()
. refs: move submodule code out of files-backend.c
. path.c: move some code out of strbuf_git_path_submodule()
. refs.c: make get_main_ref_store() public and use it
. refs.c: kill register_ref_store(), add register_submodule_ref_store()
. refs.c: flatten get_ref_store() a bit
. refs: rename lookup_ref_store() to lookup_submodule_ref_store()
. refs.c: introduce get_main_ref_store()
. files-backend: remove the use of git_path()
. refs.c: share is_per_worktree_ref() to files-backend.c
. files-backend: replace *git_path*() with files_path()
. files-backend: add files_path()
. files-backend: convert git_path() to strbuf_git_path()
. refs-internal.c: make files_log_ref_write() static
. Merge branch 'mh/ref-remove-empty-directory' into nd/files-backend-git-dir
. Merge branch 'mh/submodule-hash' into nd/files-backend-git-dir
(this branch is used by nd/prune-in-worktree; is tangled with nd/files-backend-git-dir.)
(hopefully) a beginning of safer "git worktree" that is resistant
to "gc".
Waiting for nd/files-backend-git-dir to settle.
* nd/files-backend-git-dir (2017-02-22) 26 commits
. t1406: new tests for submodule ref store
. t1405: some basic tests on main ref store
. t/helper: add test-ref-store to test ref-store functions
. refs: delete pack_refs() in favor of refs_pack_refs()
. files-backend: avoid ref api targetting main ref store
. refs: new transaction related ref-store api
. refs: add new ref-store api
. refs: rename get_ref_store() to get_submodule_ref_store() and make it public
. files-backend: replace submodule_allowed check in files_downcast()
. refs: move submodule code out of files-backend.c
. path.c: move some code out of strbuf_git_path_submodule()
. refs.c: make get_main_ref_store() public and use it
. refs.c: kill register_ref_store(), add register_submodule_ref_store()
. refs.c: flatten get_ref_store() a bit
. refs: rename lookup_ref_store() to lookup_submodule_ref_store()
. refs.c: introduce get_main_ref_store()
. files-backend: remove the use of git_path()
. files-backend: add and use files_refname_path()
. files-backend: add and use files_reflog_path()
. files-backend: move "logs/" out of TMP_RENAMED_LOG
. files-backend: convert git_path() to strbuf_git_path()
. files-backend: add and use files_packed_refs_path()
. files-backend: make files_log_ref_write() static
. refs.h: add forward declaration for structs used in this file
. Merge branch 'mh/ref-remove-empty-directory' into nd/files-backend-git-dir
. Merge branch 'mh/submodule-hash' into nd/files-backend-git-dir
(this branch is tangled with nd/prune-in-worktree and nd/worktree-kill-parse-ref.)
The "submodule" specific field in the ref_store structure is
replaced with a more generic "gitdir" that can later be used also
when dealing with ref_store that represents the set of refs visible
from the other worktrees.
* nd/worktree-move (2017-01-27) 7 commits
. fixup! worktree move: new command
. worktree remove: new command
. worktree move: refuse to move worktrees with submodules
. worktree move: accept destination as directory
. worktree move: new command
. worktree.c: add update_worktree_location()
. worktree.c: add validate_worktree()
"git worktree" learned move and remove subcommands.
Tentatively ejected as it seems to break 'pu' when merged.
* pb/bisect (2017-02-18) 28 commits
- fixup! bisect--helper: `bisect_next_check` & bisect_voc shell function in C
- bisect--helper: remove the dequote in bisect_start()
- bisect--helper: retire `--bisect-auto-next` subcommand
- bisect--helper: retire `--bisect-autostart` subcommand
- bisect--helper: retire `--bisect-write` subcommand
- bisect--helper: `bisect_replay` shell function in C
- bisect--helper: `bisect_log` shell function in C
- bisect--helper: retire `--write-terms` subcommand
- bisect--helper: retire `--check-expected-revs` subcommand
- bisect--helper: `bisect_state` & `bisect_head` shell function in C
- bisect--helper: `bisect_autostart` shell function in C
- bisect--helper: retire `--next-all` subcommand
- bisect--helper: retire `--bisect-clean-state` subcommand
- bisect--helper: `bisect_next` and `bisect_auto_next` shell function in C
- t6030: no cleanup with bad merge base
- bisect--helper: `bisect_start` shell function partially in C
- bisect--helper: `get_terms` & `bisect_terms` shell function in C
- bisect--helper: `bisect_next_check` & bisect_voc shell function in C
- bisect--helper: `check_and_set_terms` shell function in C
- bisect--helper: `bisect_write` shell function in C
- bisect--helper: `is_expected_rev` & `check_expected_revs` shell function in C
- bisect--helper: `bisect_reset` shell function in C
- wrapper: move is_empty_file() and rename it as is_empty_or_missing_file()
- t6030: explicitly test for bisection cleanup
- bisect--helper: `bisect_clean_state` shell function in C
- bisect--helper: `write_terms` shell function in C
- bisect: rewrite `check_term_format` shell function in C
- bisect--helper: use OPT_CMDMODE instead of OPT_BOOL
Move more parts of "git bisect" to C.
Expecting a reroll.
cf. <CAFZEwPPXPPHi8KiEGS9ggzNHDCGhuqMgH9Z8-Pf9GLshg8+LPA@mail.gmail.com>
cf. <CAFZEwPM9RSTGN54dzaw9gO9iZmsYjJ_d1SjUD4EzSDDbmh-XuA@mail.gmail.com>
cf. <CAFZEwPNUXcNY9Qdz=_B7q2kQuaecPzJtTMGdv8YMUPEz2vnp8A@mail.gmail.com>
* sh/grep-tree-obj-tweak-output (2017-01-20) 2 commits
- grep: use '/' delimiter for paths
- grep: only add delimiter if there isn't one already
"git grep", when fed a tree-ish as an input, shows each hit
prefixed with "<tree-ish>:<path>:<lineno>:". As <tree-ish> is
almost always either a commit or a tag that points at a commit, the
early part of the output "<tree-ish>:<path>" can be used as the
name of the blob and given to "git show". When <tree-ish> is a
tree given in the extended SHA-1 syntax (e.g. "<commit>:", or
"<commit>:<dir>"), however, this results in a string that does not
name a blob (e.g. "<commit>::<path>" or "<commit>:<dir>:<path>").
"git grep" has been taught to be a bit more intelligent about these
cases and omit a colon (in the former case) or use slash (in the
latter case) to produce "<commit>:<path>" and
"<commit>:<dir>/<path>" that can be used as the name of a blob.
Expecting a reroll? Is this good enough with known limitations?
* jc/diff-b-m (2015-02-23) 5 commits
. WIPWIP
. WIP: diff-b-m
- diffcore-rename: allow easier debugging
- diffcore-rename.c: add locate_rename_src()
- diffcore-break: allow debugging
"git diff -B -M" produced incorrect patch when the postimage of a
completely rewritten file is similar to the preimage of a removed
file; such a resulting file must not be expressed as a rename from
other place.
The fix in this patch is broken, unfortunately.
Will discard.
--------------------------------------------------
[Cooking]
* ew/http-alternates-as-redirects-warning (2017-03-06) 2 commits
(merged to 'next' on 2017-03-10 at 23be072a07)
+ http: release strbuf on disabled alternates
+ http: inform about alternates-as-redirects behavior
Recent versions of Git treats http alternates (used in dumb http
transport) just like HTTP redirects and requires the client to
enable following it, due to security concerns. But we forgot to
give a warning when we decide not to honor the alternates.
Will merge to 'master'.
* jk/ewah-use-right-type-in-sizeof (2017-03-06) 1 commit
(merged to 'next' on 2017-03-10 at ad66adacda)
+ ewah: fix eword_t/uint64_t confusion
Code clean-up.
Will merge to 'master'.
* jk/push-deadlock-regression-fix (2017-03-07) 6 commits
(merged to 'next' on 2017-03-10 at ceb0b819bf)
+ send-pack: report signal death of pack-objects
+ send-pack: read "unpack" status even on pack-objects failure
+ send-pack: improve unpack-status error messages
+ send-pack: use skip_prefix for parsing unpack status
+ send-pack: extract parsing of "unpack" response
+ receive-pack: fix deadlock when we cannot create tmpdir
"git push" had a handful of codepaths that could lead to a deadlock
when unexpected error happened, which has been fixed.
Will merge to 'master'.
* vn/line-log-memcpy-size-fix (2017-03-06) 1 commit
(merged to 'next' on 2017-03-10 at 2e65ff89b7)
+ line-log: use COPY_ARRAY to fix mis-sized memcpy
The command-line parsing of "git log -L" copied internal data
structures using incorrect size on ILP32 systems.
Will merge to 'master'.
* js/realpath-pathdup-fix (2017-03-08) 2 commits
(merged to 'next' on 2017-03-10 at 5a84dbbd1d)
+ real_pathdup(): fix callsites that wanted it to die on error
+ t1501: demonstrate NULL pointer access with invalid GIT_WORK_TREE
Git v2.12 was shipped with an embarrassing breakage where various
operations that verify paths given from the user stopped dying when
seeing an issue, and instead later triggering segfault.
Will merge to 'master'.
... and then to down to 'maint'.
* kn/ref-filter-branch-list (2017-03-10) 1 commit
(merged to 'next' on 2017-03-10 at 73b43443f1)
+ branch: honor --abbrev/--no-abbrev in --list mode
"git branch --list" takes the "--abbrev" and "--no-abbrev" options
to control the output of the object name in its "-v"(erbose)
output, but a recent update started ignoring them; this fixes it
before the breakage reaches to any released version.
Will merge to 'master'.
* sb/rev-parse-show-superproject-root (2017-03-08) 1 commit
- rev-parse: add --show-superproject-working-tree
From a working tree of a repository, a new option of "rev-parse"
lets you ask if the repository is used as a submodule of another
project, and where the root level of the working tree of that
project (i.e. your superproject) is.
Almost there, but documentation needs a bit more work.
* ls/filter-process-delayed (2017-03-06) 1 commit
- convert: add "status=delayed" to filter process protocol
cf. <xmqq60jmnmef.fsf@junio-linux.mtv.corp.google.com>
* jk/add-i-patch-do-prompt (2017-03-02) 1 commit
(merged to 'next' on 2017-03-10 at 891ec6f5ba)
+ add--interactive: fix missing file prompt for patch mode with "-i"
The patch subcommand of "git add -i" was meant to have paths
selection prompt just like other subcommand, unlike "git add -p"
directly jumps to hunk selection. Recently, this was broken and
"add -i" lost the paths selection dialog, but it now has been
fixed.
Will merge to 'master'.
* ax/line-log-range-merge-fix (2017-03-03) 1 commit
(merged to 'next' on 2017-03-10 at 201073f113)
+ line-log.c: prevent crash during union of too many ranges
The code to parse "git log -L..." command line was buggy when there
are many ranges specified with -L; overrun of the allocated buffer
has been fixed.
Will merge to 'master'.
* js/early-config (2017-03-10) 11 commits
- t1309: document cases where we would want early config not to die()
- setup_git_directory_gently_1(): avoid die()ing
- t1309: test read_early_config()
- read_early_config(): really discover .git/
- read_early_config(): avoid .git/config hack when unneeded
- setup: make read_early_config() reusable
- setup: introduce the discover_git_directory() function
- setup_git_directory_1(): avoid changing global state
- setup: prepare setup_discovered_git_directory() the root directory
- setup_git_directory(): use is_dir_sep() helper
- t7006: replace dubious test
The start-up sequence of "git" needs to figure out some configured
settings before it finds and set itself up in the location of the
repository and was quite messy due to its "chicken-and-egg" nature.
The code has been restructured.
Almost perfect.
cf. <xmqqefy5yn4k.fsf@gitster.mtv.corp.google.com>
cf. <xmqq4lz1ylgv.fsf@gitster.mtv.corp.google.com>
* jt/perf-updates (2017-03-03) 3 commits
(merged to 'next' on 2017-03-10 at 0c0b124ed4)
+ t/perf: add fallback for pre-bin-wrappers versions of git
+ t/perf: use $MODERN_GIT for all repo-copying steps
+ t/perf: export variable used in other blocks
The t/perf performance test suite was not prepared to test not so
old versions of Git, but now it covers versions of Git that are not
so ancient.
Will merge to 'master'.
* ss/remote-bzr-hg-placeholder-wo-python (2017-03-03) 1 commit
(merged to 'next' on 2017-03-10 at c8c4bb78a2)
+ contrib: git-remote-{bzr,hg} placeholders don't need Python
There is no need for Python only to give a few messages to the
standard error stream, but we somehow did.
Will merge to 'master'.
* jk/interpret-branch-name (2017-03-02) 9 commits
(merged to 'next' on 2017-03-10 at 95cc55f9a3)
+ checkout: restrict @-expansions when finding branch
+ strbuf_check_ref_format(): expand only local branches
+ branch: restrict @-expansions when deleting
+ t3204: test git-branch @-expansion corner cases
+ interpret_branch_name: allow callers to restrict expansions
+ strbuf_branchname: add docstring
+ strbuf_branchname: drop return value
+ interpret_branch_name: move docstring to header file
+ interpret_branch_name(): handle auto-namelen for @{-1}
"git branch @" created refs/heads/@ as a branch, and in general the
code that handled @{-1} and @{upstream} was a bit too loose in
disambiguating.
Will merge to 'master'.
* jk/sha1dc (2017-03-01) 7 commits
- Put sha1dc on a diet
- sha1dc: avoid 'for' loop initial decl
- sha1dc: resurrect LICENSE file
- sha1dc: avoid c99 declaration-after-statement
- Makefile: add USE_SHA1DC knob
- sha1dc: adjust header includes for git
- add collision-detecting sha1 implementation
Borrow "detect attempt to create collisions" variant of SHA-1
implementation by Marc Stevens (CWI) and Dan Shumow (Microsoft).
Expecting a cleaned-up reroll after discussion settles.
cf. <CA+55aFxTWqsTTiDKo4DBZT-8Z9t80bGMD3uijzKONa_bYEZABQ@mail.gmail.com>
* js/travis-32bit-linux (2017-03-06) 1 commit
(merged to 'next' on 2017-03-10 at 4cb69d0f77)
+ Travis: also test on 32-bit Linux
Add 32-bit Linux variant to the set of platforms to be tested with
Travis CI.
Will merge to 'master'.
* jt/mark-tree-uninteresting-for-uninteresting-commit (2017-02-28) 3 commits
- upload-pack: compute blob reachability correctly
- revision: exclude trees/blobs given commit
- revision: unify {tree,blob}_objects in rev_info
The revision/object traversal machinery did not mark all tree and
blob objects that are contained in an uninteresting commit as
uninteresting, because that is quite costly. Instead, it only
marked those that are contained in an uninteresting boundary commit
as uninteresting.
cf. <20170228215937.yd4juycjf7y3vish@sigill.intra.peff.net>
* jc/diff-populate-filespec-size-only-fix (2017-03-02) 1 commit
(merged to 'next' on 2017-03-10 at 9b2d1ca50f)
+ diff: do not short-cut CHECK_SIZE_ONLY check in diff_populate_filespec()
"git diff --quiet" relies on the size field in diff_filespec to be
correctly populated, but diff_populate_filespec() helper function
made an incorrect short-cut when asked only to populate the size
field for paths that need to go through convert_to_git() (e.g. CRLF
conversion).
Will merge to 'master'.
* nd/conditional-config-include (2017-03-03) 5 commits
- SQUASH??? cond config include test
- SQUASH???
- config: add conditional include
- config.txt: reflow the second include.path paragraph
- config.txt: clarify multiple key values in include.path
The configuration file learned a new "includeIf.<condition>.path"
that includes the contents of the given path only when the
condition holds. This allows you to say "include this work-related
bit only in the repositories under my ~/work/ directory".
Will merge to 'next' after squashing niggle-fixes in.
* cc/split-index-config (2017-03-06) 22 commits
- Documentation/git-update-index: explain splitIndex.*
- Documentation/config: add splitIndex.sharedIndexExpire
- read-cache: use freshen_shared_index() in read_index_from()
- read-cache: refactor read_index_from()
- t1700: test shared index file expiration
- read-cache: unlink old sharedindex files
- config: add git_config_get_expiry() from gc.c
- read-cache: touch shared index files when used
- sha1_file: make check_and_freshen_file() non static
- Documentation/config: add splitIndex.maxPercentChange
- t1700: add tests for splitIndex.maxPercentChange
- read-cache: regenerate shared index if necessary
- config: add git_config_get_max_percent_split_change()
- Documentation/git-update-index: talk about core.splitIndex config var
- Documentation/config: add information for core.splitIndex
- t1700: add tests for core.splitIndex
- update-index: warn in case of split-index incoherency
- read-cache: add and then use tweak_split_index()
- split-index: add {add,remove}_split_index() functions
- config: add git_config_get_split_index()
- t1700: change here document style
- config: mark an error message up for translation
The experimental "split index" feature has gained a few
configuration variables to make it easier to use.
Will merge to 'next'.
* dp/filter-branch-prune-empty (2017-03-03) 4 commits
(merged to 'next' on 2017-03-10 at 9317e24cd3)
+ p7000: add test for filter-branch with --prune-empty
+ filter-branch: fix --prune-empty on parentless commits
+ t7003: ensure --prune-empty removes entire branch when applicable
+ t7003: ensure --prune-empty can prune root commit
"git filter-branch --prune-empty" drops a single-parent commit that
becomes a no-op, but did not drop a root commit whose tree is empty.
Will merge to 'master'.
* ab/cond-skip-tests (2017-03-01) 3 commits
(merged to 'next' on 2017-03-10 at 38124fb5ce)
+ gitweb tests: skip tests when we don't have Time::HiRes
+ gitweb tests: change confusing "skip_all" phrasing
+ cvs tests: skip tests that call "cvs commit" when running as root
A few tests were run conditionally under (rare) conditions where
they cannot be run (like running cvs tests under 'root' account).
Will merge to 'master'.
* jk/interop-test (2017-03-10) 2 commits
- t/interop: add test of old clients against modern git-daemon
- t: add an interoperability test harness
Picking two versions of Git and running tests to make sure the
older one and the newer one interoperate happily has now become
possible.
Will merge to 'next'.
* sg/clone-refspec-from-command-line-config (2017-02-27) 1 commit
- clone: respect configured fetch respecs during initial fetch
Needs review.
cf. <20170227211217.73gydlxb2qu2sp3m@sigill.intra.peff.net>
* sk/dash-is-previous (2017-03-01) 5 commits
- revert.c: delegate handling of "-" shorthand to setup_revisions
- sha1_name.c: teach get_sha1_1 "-" shorthand for "@{-1}"
- revision.c: args starting with "-" might be a revision
- revision.c: swap if/else blocks
- revision.c: do not update argv with unknown option
A dash "-" can be written to mean "the branch that was previously
checked out" in more places.
Needs review.
cf. <1488007487-12965-1-git-send-email-kannan.siddharth12@gmail.com>
* ah/doc-ls-files-quotepath (2017-03-02) 1 commit
(merged to 'next' on 2017-03-10 at 5dfa78423a)
+ Documentation: improve description for core.quotePath
Documentation for "git ls-files" did not refer to core.quotePath
Will merge to 'master'.
* jh/memihash-opt (2017-02-17) 5 commits
- name-hash: remember previous dir_entry during lazy_init_name_hash
- name-hash: specify initial size for istate.dir_hash table
- name-hash: precompute hash values during preload-index
- hashmap: allow memihash computation to be continued
- name-hash: eliminate duplicate memihash call
Expecting an update for perf.
cf. <MWHPR03MB29581B0EDDEDCA7D51EC396F8A280@MWHPR03MB2958.namprd03.prod.outlook.com>
* mm/fetch-show-error-message-on-unadvertised-object (2017-03-02) 3 commits
(merged to 'next' on 2017-03-10 at 69e2023804)
+ fetch-pack: add specific error for fetching an unadvertised object
+ fetch_refs_via_pack: call report_unmatched_refs
+ fetch-pack: move code to report unmatched refs to a function
"git fetch" that requests a commit by object name, when the other
side does not allow such an request, failed without much
explanation.
Will merge to 'master'.
* sb/checkout-recurse-submodules (2017-03-10) 19 commits
- submodule--helper.c: remove duplicate code
- builtin/read-tree: add --recurse-submodules switch
- builtin/checkout: add --recurse-submodules switch
- entry.c: update submodules when interesting
- read-cache, remove_marked_cache_entries: wipe selected submodules.
- unpack-trees: check if we can perform the operation for submodules
- unpack-trees: pass old oid to verify_clean_submodule
- update submodules: add submodule_move_head
- update submodules: move up prepare_submodule_repo_env
- submodules: introduce check to see whether to touch a submodule
- update submodules: add a config option to determine if submodules are updated
- update submodules: add submodule config parsing
- connect_work_tree_and_git_dir: safely create leading directories
- make is_submodule_populated gently
- lib-submodule-update.sh: define tests for recursing into submodules
- lib-submodule-update.sh: replace sha1 by hash
- lib-submodule-update: teach test_submodule_content the -C <dir> flag
- lib-submodule-update.sh: do not use ./. as submodule remote
- lib-submodule-update.sh: reorder create_lib_submodule_repo
"git checkout" is taught --recurse-submodules option.
* bc/object-id (2017-02-22) 19 commits
- wt-status: convert to struct object_id
- builtin/merge-base: convert to struct object_id
- Convert object iteration callbacks to struct object_id
- sha1_file: introduce an nth_packed_object_oid function
- refs: simplify parsing of reflog entries
- refs: convert each_reflog_ent_fn to struct object_id
- reflog-walk: convert struct reflog_info to struct object_id
- builtin/replace: convert to struct object_id
- Convert remaining callers of resolve_refdup to object_id
- builtin/merge: convert to struct object_id
- builtin/clone: convert to struct object_id
- builtin/branch: convert to struct object_id
- builtin/grep: convert to struct object_id
- builtin/fmt-merge-message: convert to struct object_id
- builtin/fast-export: convert to struct object_id
- builtin/describe: convert to struct object_id
- builtin/diff-tree: convert to struct object_id
- builtin/commit: convert to struct object_id
- hex: introduce parse_oid_hex
"uchar [40]" to "struct object_id" conversion continues.
Now at v5.
cf. <20170221234737.894681-1-sandals@crustytoothpaste.net>
* jh/mingw-openssl-sha1 (2017-02-09) 1 commit
(merged to 'next' on 2017-03-10 at 8a1aa07def)
+ mingw: use OpenSSL's SHA-1 routines
Windows port wants to use OpenSSL's implementation of SHA-1
routines, so let them.
Will merge to 'master'.
* sg/completion-refs-speedup (2017-02-13) 13 commits
- squash! completion: fill COMPREPLY directly when completing refs
- completion: fill COMPREPLY directly when completing refs
- completion: list only matching symbolic and pseudorefs when completing refs
- completion: let 'for-each-ref' sort remote branches for 'checkout' DWIMery
- completion: let 'for-each-ref' filter remote branches for 'checkout' DWIMery
- completion: let 'for-each-ref' strip the remote name from remote branches
- completion: let 'for-each-ref' and 'ls-remote' filter matching refs
- completion: don't disambiguate short refs
- completion: don't disambiguate tags and branches
- completion: support excluding full refs
- completion: support completing full refs after '--option=refs/<TAB>'
- completion: wrap __git_refs() for better option parsing
- completion: remove redundant __gitcomp_nl() options from _git_commit()
The refs completion for large number of refs has been sped up,
partly by giving up disambiguating ambiguous refs and partly by
eliminating most of the shell processing between 'git for-each-ref'
and 'ls-remote' and Bash's completion facility.
What's the donness of this topic?
* jk/no-looking-at-dotgit-outside-repo-final (2016-10-26) 1 commit
(merged to 'next' on 2017-02-27 at 7373a1b73d)
+ setup_git_env: avoid blind fall-back to ".git"
This is the endgame of the topic to avoid blindly falling back to
".git" when the setup sequence said we are _not_ in Git repository.
A corner case that happens to work right now may be broken by a
call to die("BUG").
Will cook in 'next'.
* jc/merge-drop-old-syntax (2015-04-29) 1 commit
(merged to 'next' on 2017-02-27 at 2c0f5f73d8)
+ merge: drop 'git merge <message> HEAD <commit>' syntax
Stop supporting "git merge <message> HEAD <commit>" syntax that has
been deprecated since October 2007, and issues a deprecation
warning message since v2.5.0.
Will cook in 'next'.
* jc/bundle (2016-03-03) 6 commits
- index-pack: --clone-bundle option
- Merge branch 'jc/index-pack' into jc/bundle
- bundle v3: the beginning
- bundle: keep a copy of bundle file name in the in-core bundle header
- bundle: plug resource leak
- bundle doc: 'verify' is not about verifying the bundle
The beginning of "split bundle", which could be one of the
ingredients to allow "git clone" traffic off of the core server
network to CDN.
--------------------------------------------------
[Discarded]
* jk/auto-namelen-in-interpret-branch-name (2017-02-27) 1 commit
. interpret_branch_name(): handle auto-namelen for @{-1}
A small bug in the code that parses @{...} has been fixed.
This is now a part of jk/interpret-branch-name topic.
^ permalink raw reply [relevance 2%]
* [PATCH] ll-merge: fix typo in comment
@ 2016-04-14 22:12 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2016-04-14 22:12 UTC (permalink / raw)
To: git
When a944af1d (merge: teach -Xours/-Xtheirs to binary ll-merge
driver, 2012-09-08) introduced FAVOR_OURS/FAVOR_THEIRS to the binary
ll-merge driver, it changed what happens to the merge result for the
outer merge, and updated the comment from:
The tentative merge result is "ours" for the final round, or
common ancestor for an internal merge. Still return "conflicted
merge" status.
to
The tentative merge result is the or common ancestor for an
internal merge.
What happened is obvious. I noticed the lack of definitive article
in front of "common" but failed to remove "or". Also I forgot to
describe what I did for the final merge, probably because I was
satisified by the description in the log message.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
ll-merge.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/ll-merge.c b/ll-merge.c
index ff4a43a..fe22412 100644
--- a/ll-merge.c
+++ b/ll-merge.c
@@ -47,7 +47,9 @@ static int ll_binary_merge(const struct ll_merge_driver *drv_unused,
assert(opts);
/*
- * The tentative merge result is the or common ancestor for an internal merge.
+ * The tentative merge result is the common ancestor for an
+ * internal merge. For the final merge, it is "ours" by
+ * default but -Xours/-Xtheirs can tweak the choice.
*/
if (opts->virtual_ancestor) {
stolen = orig;
^ permalink raw reply related [relevance 2%]
* [RFC PATCH v1 02/13] doc: typeset branches and remotes in monospace
@ 2021-04-09 4:02 2% ` Firmin Martin
0 siblings, 0 replies; 200+ results
From: Firmin Martin @ 2021-04-09 4:02 UTC (permalink / raw)
To: git; +Cc: Firmin Martin
Wrap branch and remote names with backticks as indicated in the
CodingGuidelines.
Signed-off-by: Firmin Martin <firminmartin24@gmail.com>
---
Documentation/diff-options.txt | 2 +-
Documentation/git-add.txt | 10 +--
Documentation/git-am.txt | 4 +-
Documentation/git-archimport.txt | 2 +-
Documentation/git-bisect-lk2009.txt | 10 +--
Documentation/git-bisect.txt | 6 +-
Documentation/git-branch.txt | 22 +++---
Documentation/git-bundle.txt | 6 +-
Documentation/git-check-ref-format.txt | 2 +-
Documentation/git-checkout.txt | 2 +-
Documentation/git-cherry-pick.txt | 22 +++---
Documentation/git-cherry.txt | 4 +-
Documentation/git-clone.txt | 16 ++---
Documentation/git-commit-tree.txt | 2 +-
Documentation/git-commit.txt | 6 +-
Documentation/git-config.txt | 2 +-
Documentation/git-cvsimport.txt | 8 +--
Documentation/git-cvsserver.txt | 2 +-
Documentation/git-describe.txt | 6 +-
Documentation/git-diff-index.txt | 6 +-
Documentation/git-diff.txt | 20 +++---
Documentation/git-fast-export.txt | 16 ++---
Documentation/git-fetch-pack.txt | 2 +-
Documentation/git-fetch.txt | 4 +-
Documentation/git-filter-branch.txt | 2 +-
Documentation/git-fmt-merge-msg.txt | 4 +-
Documentation/git-for-each-ref.txt | 12 ++--
Documentation/git-format-patch.txt | 4 +-
Documentation/git-http-push.txt | 6 +-
Documentation/git-log.txt | 8 +--
Documentation/git-ls-remote.txt | 2 +-
Documentation/git-merge.txt | 2 +-
Documentation/git-notes.txt | 12 ++--
Documentation/git-p4.txt | 4 +-
Documentation/git-pull.txt | 4 +-
Documentation/git-push.txt | 8 +--
Documentation/git-read-tree.txt | 4 +-
Documentation/git-rebase.txt | 92 +++++++++++++-------------
Documentation/git-reflog.txt | 4 +-
Documentation/git-request-pull.txt | 2 +-
Documentation/git-rerere.txt | 34 +++++-----
Documentation/git-reset.txt | 6 +-
Documentation/git-rev-parse.txt | 4 +-
Documentation/git-revert.txt | 8 +--
Documentation/git-rm.txt | 2 +-
Documentation/git-show-ref.txt | 2 +-
Documentation/git-show.txt | 2 +-
Documentation/git-stash.txt | 8 +--
Documentation/git-status.txt | 12 ++--
Documentation/git-submodule.txt | 28 ++++----
Documentation/git-svn.txt | 20 +++---
Documentation/git-switch.txt | 10 +--
Documentation/git-symbolic-ref.txt | 2 +-
Documentation/git-tag.txt | 2 +-
Documentation/git-update-ref.txt | 4 +-
Documentation/git-worktree.txt | 2 +-
Documentation/git.txt | 4 +-
Documentation/gitcli.txt | 2 +-
Documentation/gitcore-tutorial.txt | 36 +++++-----
Documentation/giteveryday.txt | 16 ++---
Documentation/githooks.txt | 8 +--
Documentation/gitk.txt | 2 +-
Documentation/gitnamespaces.txt | 2 +-
Documentation/gitremote-helpers.txt | 6 +-
Documentation/gitrepository-layout.txt | 4 +-
Documentation/gittutorial-2.txt | 2 +-
Documentation/gittutorial.txt | 44 ++++++------
Documentation/gitweb.txt | 4 +-
Documentation/gitworkflows.txt | 70 ++++++++++----------
Documentation/glossary-content.txt | 12 ++--
Documentation/rev-list-options.txt | 2 +-
Documentation/revisions.txt | 52 +++++++--------
Documentation/user-manual.txt | 78 +++++++++++-----------
73 files changed, 421 insertions(+), 421 deletions(-)
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 13e0753862..e4ac746428 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -803,7 +803,7 @@ endif::git-format-patch[]
Ignore changes to submodules in the diff generation. <when> can be
either "none", "untracked", "dirty" or "all", which is the default.
Using "none" will consider the submodule modified when it either contains
- untracked or modified files or its HEAD differs from the commit recorded
+ untracked or modified files or its `HEAD` differs from the commit recorded
in the superproject and can be used to override any settings of the
'ignore' option in linkgit:git-config[1] or linkgit:gitmodules[5]. When
"untracked" is used submodules are not considered dirty when they only
diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt
index 6a7cb07a8a..8ec99c5c12 100644
--- a/Documentation/git-add.txt
+++ b/Documentation/git-add.txt
@@ -256,7 +256,7 @@ The main command loop has 6 subcommands (plus help and quit).
status::
- This shows the change between HEAD and index (i.e. what will be
+ This shows the change between `HEAD` and index (i.e. what will be
committed if you say `git commit`), and between index and
working tree files (i.e. what you could stage further before
`git commit` using `git add`) for each path. A sample output
@@ -268,7 +268,7 @@ status::
2: +403/-35 +1/-1 git-add--interactive.perl
------------
+
-It shows that foo.png has differences from HEAD (but that is
+It shows that foo.png has differences from `HEAD` (but that is
binary so line count cannot be shown) and there is no
difference between indexed copy and the working tree
version (if the working tree version were also different,
@@ -311,7 +311,7 @@ revert::
This has a very similar UI to 'update', and the staged
information for selected paths are reverted to that of the
- HEAD version. Reverting new paths makes them untracked.
+ `HEAD` version. Reverting new paths makes them untracked.
add untracked::
@@ -350,7 +350,7 @@ variable `interactive.singleKey` to `true`.
diff::
This lets you review what will be committed (i.e. between
- HEAD and index).
+ `HEAD` and index).
EDITING PATCHES
@@ -389,7 +389,7 @@ There are also more complex operations that can be performed. But beware
that because the patch is applied only to the index and not the working
tree, the working tree will appear to "undo" the change in the index.
For example, introducing a new line into the index that is in neither
-the HEAD nor the working tree will stage the new line for commit, but
+the `HEAD` nor the working tree will stage the new line for commit, but
the line will appear to be reverted in the working tree.
Avoid using these constructs, or do so with extreme caution.
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index decd8ae122..cd56054be0 100644
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -176,7 +176,7 @@ default. You can use `--no-utf8` to override this.
Restore the original branch and abort the patching operation.
--quit::
- Abort the patching operation but keep HEAD and the index
+ Abort the patching operation but keep `HEAD` and the index
untouched.
--show-current-patch[=(diff|raw)]::
@@ -229,7 +229,7 @@ operation is finished, so if you decide to start over from scratch,
run `git am --abort` before running the command with mailbox
names.
-Before any patches are applied, ORIG_HEAD is set to the tip of the
+Before any patches are applied, `ORIG_HEAD` is set to the tip of the
current branch. This is useful if you have problems with multiple
commits, like running 'git am' on the wrong branch or an error in the
commits that is more easily fixed by changing the mailbox (e.g.
diff --git a/Documentation/git-archimport.txt b/Documentation/git-archimport.txt
index b477e3c495..6e2dec5ef1 100644
--- a/Documentation/git-archimport.txt
+++ b/Documentation/git-archimport.txt
@@ -45,7 +45,7 @@ archives that it imports, it is also possible to specify Git branch names
manually. To do so, write a Git branch name after each <archive/branch>
parameter, separated by a colon. This way, you can shorten the Arch
branch names and convert Arch jargon to Git jargon, for example mapping a
-"PROJECT{litdd}devo{litdd}VERSION" branch to "master".
+"PROJECT{litdd}devo{litdd}VERSION" branch to `master`.
Associating multiple Arch branches to one Git branch is possible; the
result will make the most sense only if no commits are made to the first
diff --git a/Documentation/git-bisect-lk2009.txt b/Documentation/git-bisect-lk2009.txt
index f3d9566c89..1276424d65 100644
--- a/Documentation/git-bisect-lk2009.txt
+++ b/Documentation/git-bisect-lk2009.txt
@@ -767,8 +767,8 @@ They cannot be on a branch that has no link with the branch of the
bad commit and yet not be neither one of its ancestor nor one of its
descendants.
-For example, there can be a "main" branch, and a "dev" branch that was
-forked of the main branch at a commit named "D" like this:
+For example, there can be a `main` branch, and a `dev` branch that was
+forked of the `main` branch at a commit named "D" like this:
-------------
A-B-C-D-E-F-G <--main
@@ -776,7 +776,7 @@ A-B-C-D-E-F-G <--main
H-I-J <--dev
-------------
-The commit "D" is called a "merge base" for branch "main" and "dev"
+The commit "D" is called a "merge base" for branch `main` and `dev`
because it's the best common ancestor for these branches for a merge.
Now let's suppose that commit J is bad and commit G is good and that
@@ -794,7 +794,7 @@ H-I-J
-------------
But what happens if the first bad commit is "B" and if it has been
-fixed in the "main" branch by commit "F"?
+fixed in the `main` branch by commit "F"?
The result of such a bisection would be that we would find that H is
the first bad commit, when in fact it's B. So that would be wrong!
@@ -1229,7 +1229,7 @@ message or the author. And it can also be used instead of git "grafts"
to link a repository with another old repository.
In fact it's this last feature that "sold" it to the Git community, so
-it is now in the "master" branch of Git's Git repository and it should
+it is now in the `master` branch of Git's Git repository and it should
be released in Git 1.6.5 in October or November 2009.
One problem with "git replace" is that currently it stores all the
diff --git a/Documentation/git-bisect.txt b/Documentation/git-bisect.txt
index fbb39fbdf5..ff50c66e29 100644
--- a/Documentation/git-bisect.txt
+++ b/Documentation/git-bisect.txt
@@ -98,7 +98,7 @@ Bisect reset
~~~~~~~~~~~~
After a bisect session, to clean up the bisection state and return to
-the original HEAD, issue the following command:
+the original `HEAD`, issue the following command:
------------------------------------------------
$ git bisect reset
@@ -379,7 +379,7 @@ branch contained broken or non-buildable commits, but the merge itself was OK.
EXAMPLES
--------
-* Automatically bisect a broken build between v1.2 and HEAD:
+* Automatically bisect a broken build between v1.2 and `HEAD`:
+
------------
$ git bisect start HEAD v1.2 -- # HEAD is bad, v1.2 is good
@@ -387,7 +387,7 @@ $ git bisect run make # "make" builds the app
$ git bisect reset # quit the bisect session
------------
-* Automatically bisect a test failure between origin and HEAD:
+* Automatically bisect a test failure between `origin` and `HEAD`:
+
------------
$ git bisect start HEAD origin -- # HEAD is bad, origin is good
diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
index 271b4ee34e..fa38fa4dc1 100644
--- a/Documentation/git-branch.txt
+++ b/Documentation/git-branch.txt
@@ -175,7 +175,7 @@ This option is only applicable in non-verbose mode.
the pattern(s).
--show-current::
- Print the name of the current branch. In detached HEAD state,
+ Print the name of the current branch. In detached `HEAD` state,
nothing is printed.
-v::
@@ -186,7 +186,7 @@ This option is only applicable in non-verbose mode.
relationship to upstream branch (if any). If given twice, print
the path of the linked worktree (if any) and the name of the upstream
branch, as well (see also `git remote show <remote>`). Note that the
- current worktree's HEAD will not have its path printed (it will always
+ current worktree's `HEAD` will not have its path printed (it will always
be your current directory).
-q::
@@ -250,15 +250,15 @@ start-point is either a local or remote-tracking branch.
--no-contains [<commit>]::
Only list branches which don't contain the specified commit
- (HEAD if not specified). Implies `--list`.
+ (`HEAD` if not specified). Implies `--list`.
--merged [<commit>]::
Only list branches whose tips are reachable from the
- specified commit (HEAD if not specified). Implies `--list`.
+ specified commit (`HEAD` if not specified). Implies `--list`.
--no-merged [<commit>]::
Only list branches whose tips are not reachable from the
- specified commit (HEAD if not specified). Implies `--list`.
+ specified commit (`HEAD` if not specified). Implies `--list`.
<branchname>::
The name of the branch to create or delete.
@@ -269,7 +269,7 @@ start-point is either a local or remote-tracking branch.
<start-point>::
The new branch head will point to this commit. It may be
given as a branch name, a commit-id, or a tag. If this
- option is omitted, the current HEAD will be used instead.
+ option is omitted, the current `HEAD` will be used instead.
<oldbranch>::
The name of an existing branch to rename.
@@ -286,7 +286,7 @@ start-point is either a local or remote-tracking branch.
for-each-ref`. Sort order defaults to the value configured for the
`branch.sort` variable if exists, or to sorting based on the
full refname (including `refs/...` prefix). This lists
- detached HEAD (if present) first, then local branches and
+ detached `HEAD` (if present) first, then local branches and
finally remote-tracking branches. See linkgit:git-config[1].
@@ -328,10 +328,10 @@ $ git branch -d -r origin/todo origin/html origin/man <1>
$ git branch -D test <2>
------------
+
-<1> Delete the remote-tracking branches "todo", "html" and "man". The next
+<1> Delete the remote-tracking branches `todo`, `html` and `man`. The next
'fetch' or 'pull' will create them again unless you configure them not to.
See linkgit:git-fetch[1].
-<2> Delete the "test" branch even if the "master" branch (or whichever branch
+<2> Delete the `test` branch even if the `master` branch (or whichever branch
is currently checked out) does not have all commits from the test branch.
Listing branches from a specific remote::
@@ -365,10 +365,10 @@ serve four related but different purposes:
contain the specified <commit>.
- `--merged` is used to find all branches which can be safely deleted,
- since those branches are fully contained by HEAD.
+ since those branches are fully contained by `HEAD`.
- `--no-merged` is used to find branches which are candidates for merging
- into HEAD, since those branches are not fully contained by HEAD.
+ into `HEAD`, since those branches are not fully contained by `HEAD`.
include::ref-reachability-filters.txt[]
diff --git a/Documentation/git-bundle.txt b/Documentation/git-bundle.txt
index 4f1e59a3b2..20da47cbd6 100644
--- a/Documentation/git-bundle.txt
+++ b/Documentation/git-bundle.txt
@@ -68,7 +68,7 @@ unbundle <file>::
'git rev-list' (and containing a named ref, see SPECIFYING REFERENCES
below), that specifies the specific objects and references
to transport. For example, `master~10..master` causes the
- current master reference to be packaged along with all objects
+ current `master` reference to be packaged along with all objects
added since its 10th ancestor commit. There is no explicit
limit to the number of references and objects that may be
packaged.
@@ -146,7 +146,7 @@ Assume you want to transfer the history from a repository R1 on machine A
to another repository R2 on machine B.
For whatever reason, direct connection between A and B is not allowed,
but we can move data from A to B via some mechanism (CD, email, etc.).
-We want to update R2 with development made on the branch master in R1.
+We want to update R2 with development made on the branch `master` in R1.
To bootstrap the process, you can first create a bundle that does not have
any basis. You can use a tag to remember up to what commit you last
@@ -167,7 +167,7 @@ create a new repository on machine B by cloning from it:
machineB$ git clone -b master /home/me/tmp/file.bundle R2
----------------
-This will define a remote called "origin" in the resulting repository that
+This will define a remote called `origin` in the resulting repository that
lets you fetch and pull from the bundle. The $GIT_DIR/config file in R2 will
have an entry like this:
diff --git a/Documentation/git-check-ref-format.txt b/Documentation/git-check-ref-format.txt
index ee6a4144fb..f39622c0da 100644
--- a/Documentation/git-check-ref-format.txt
+++ b/Documentation/git-check-ref-format.txt
@@ -80,7 +80,7 @@ reference name expressions (see linkgit:gitrevisions[7]):
With the `--branch` option, the command takes a name and checks if
it can be used as a valid branch name (e.g. when creating a new
branch). But be cautious when using the
-previous checkout syntax that may refer to a detached HEAD state.
+previous checkout syntax that may refer to a detached `HEAD` state.
The rule `git check-ref-format --branch $name` implements
may be stricter than what `git check-ref-format refs/heads/$name`
says (e.g. a dash may appear at the beginning of a ref component,
diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
index 3336b8dace..192dbfe9b0 100644
--- a/Documentation/git-checkout.txt
+++ b/Documentation/git-checkout.txt
@@ -189,7 +189,7 @@ one for the purposes of disambiguation, even if the `<branch>` isn't
unique across all remotes. Set it to
e.g. `checkout.defaultRemote=origin` to always checkout remote
branches from there if `<branch>` is ambiguous but exists on the
-'origin' remote. See also `checkout.defaultRemote` in
+`origin` remote. See also `checkout.defaultRemote` in
linkgit:git-config[1].
+
`--guess` is the default behavior. Use `--no-guess` to disable it.
diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt
index 0127f56204..6069cc77a0 100644
--- a/Documentation/git-cherry-pick.txt
+++ b/Documentation/git-cherry-pick.txt
@@ -17,7 +17,7 @@ DESCRIPTION
Given one or more existing commits, apply the change each one
introduces, recording a new commit for each. This requires your
-working tree to be clean (no modifications from the HEAD commit).
+working tree to be clean (no modifications from the `HEAD` commit).
When it is not obvious how to apply a change, the following
happens:
@@ -96,7 +96,7 @@ OPTIONS
each named commit to your working tree and the index,
without making any commit. In addition, when this
option is used, your index does not have to match the
- HEAD commit. The cherry-pick is done against the
+ `HEAD` commit. The cherry-pick is done against the
beginning state of your index.
+
This is useful when cherry-picking more than one commits'
@@ -117,7 +117,7 @@ effect to your index in a row.
earlier `--gpg-sign`.
--ff::
- If the current HEAD is the same as the parent of the
+ If the current `HEAD` is the same as the parent of the
cherry-pick'ed commit, then a fast forward to this commit will
be performed.
@@ -176,13 +176,13 @@ EXAMPLES
`git cherry-pick ^HEAD master`::
Apply the changes introduced by all commits that are ancestors
- of master but not of HEAD to produce new commits.
+ of `master` but not of `HEAD` to produce new commits.
`git cherry-pick maint next ^master`::
`git cherry-pick maint master..next`::
Apply the changes introduced by all commits that are
- ancestors of maint or next, but not master or any of its
+ ancestors of `maint` or `next`, but not `master` or any of its
ancestors. Note that the latter does not mean `maint` and
everything between `master` and `next`; specifically,
`maint` will not be used if it is included in `master`.
@@ -190,27 +190,27 @@ EXAMPLES
`git cherry-pick master~4 master~2`::
Apply the changes introduced by the fifth and third last
- commits pointed to by master and create 2 new commits with
+ commits pointed to by `master` and create 2 new commits with
these changes.
`git cherry-pick -n master~1 next`::
Apply to the working tree and the index the changes introduced
- by the second last commit pointed to by master and by the last
+ by the second last commit pointed to by `master` and by the last
commit pointed to by next, but do not create any commit with
these changes.
`git cherry-pick --ff ..next`::
- If history is linear and HEAD is an ancestor of next, update
- the working tree and advance the HEAD pointer to match next.
+ If history is linear and `HEAD` is an ancestor of next, update
+ the working tree and advance the `HEAD` pointer to match next.
Otherwise, apply the changes introduced by those commits that
- are in next but not HEAD to the current branch, creating a new
+ are in next but not `HEAD` to the current branch, creating a new
commit for each new change.
`git rev-list --reverse master -- README | git cherry-pick -n --stdin`::
- Apply the changes introduced by all commits on the master
+ Apply the changes introduced by all commits on the `master`
branch that touched README to the working tree and index,
so the result can be inspected and made into a single new
commit if suitable.
diff --git a/Documentation/git-cherry.txt b/Documentation/git-cherry.txt
index 0ea921a593..4374f398fa 100644
--- a/Documentation/git-cherry.txt
+++ b/Documentation/git-cherry.txt
@@ -31,10 +31,10 @@ OPTIONS
<upstream>::
Upstream branch to search for equivalent commits.
- Defaults to the upstream branch of HEAD.
+ Defaults to the upstream branch of `HEAD`.
<head>::
- Working branch; defaults to HEAD.
+ Working branch; defaults to `HEAD`.
<limit>::
Do not report commits up to (and including) limit.
diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt
index 22334771d1..8cd602a852 100644
--- a/Documentation/git-clone.txt
+++ b/Documentation/git-clone.txt
@@ -30,8 +30,8 @@ currently active branch.
After the clone, a plain `git fetch` without arguments will update
all the remote-tracking branches, and a `git pull` without
-arguments will in addition merge the remote master branch into the
-current master branch, if any (this is untrue when `--single-branch`
+arguments will in addition merge the remote `master` branch into the
+current `master` branch, if any (this is untrue when `--single-branch`
is given; see below).
This default configuration is achieved by creating references to
@@ -147,7 +147,7 @@ objects from the source repository into a pack in the cloned repository.
-n::
--no-checkout::
- No checkout of HEAD is performed after the clone is complete.
+ No checkout of `HEAD` is performed after the clone is complete.
--[no-]reject-shallow::
Fail if the source repository is a shallow repository.
@@ -198,11 +198,11 @@ objects from the source repository into a pack in the cloned repository.
-b <name>::
--branch <name>::
- Instead of pointing the newly created HEAD to the branch pointed
- to by the cloned repository's HEAD, point to `<name>` branch
+ Instead of pointing the newly created `HEAD` to the branch pointed
+ to by the cloned repository's `HEAD`, point to `<name>` branch
instead. In a non-bare repository, this is the branch that will
be checked out.
- `--branch` can also take tags and detaches the HEAD at that commit
+ `--branch` can also take tags and detaches the `HEAD` at that commit
in the resulting repository.
-u <upload-pack>::
@@ -224,7 +224,7 @@ objects from the source repository into a pack in the cloned repository.
linkgit:git-config[1] (e.g., `core.eol=true`). If multiple
values are given for the same key, each value will be written to
the config file. This makes it safe, for example, to add
- additional fetch refspecs to the origin remote.
+ additional fetch refspecs to the `origin` remote.
+
Due to limitations of the current implementation, some configuration
variables do not take effect until after the initial fetch and checkout.
@@ -253,7 +253,7 @@ corresponding `--mirror` and `--no-tags` options instead.
branch remote's `HEAD` points at.
Further fetches into the resulting repository will only update the
remote-tracking branch for the branch this option was used for the
- initial cloning. If the HEAD at the remote did not point at any
+ initial cloning. If the `HEAD` at the remote did not point at any
branch when `--single-branch` clone was made, no remote-tracking
branch is created.
diff --git a/Documentation/git-commit-tree.txt b/Documentation/git-commit-tree.txt
index 2e2c581098..b76a825c94 100644
--- a/Documentation/git-commit-tree.txt
+++ b/Documentation/git-commit-tree.txt
@@ -36,7 +36,7 @@ While a tree represents a particular directory state of a working
directory, a commit represents that state in "time", and explains how
to get there.
-Normally a commit would identify a new "HEAD" state, and while Git
+Normally a commit would identify a new `HEAD` state, and while Git
doesn't care where you save the note about that state, in practice we
tend to just write the result to the file that is pointed at by
`.git/HEAD`, so that we can always see what the last committed
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index 6d0d663b50..f507ae00a1 100644
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -21,9 +21,9 @@ DESCRIPTION
-----------
Create a new commit containing the current contents of the index and
the given log message describing the changes. The new commit is a
-direct child of HEAD, usually the tip of the current branch, and the
+direct child of `HEAD`, usually the tip of the current branch, and the
branch is updated to point to it (unless no branch is associated with
-the working tree, in which case HEAD is "detached" as described in
+the working tree, in which case `HEAD` is "detached" as described in
linkgit:git-checkout[1]).
The content to be committed can be specified in several ways:
@@ -352,7 +352,7 @@ configuration variable documented in linkgit:git-config[1].
-v::
--verbose::
- Show unified diff between the HEAD commit and what
+ Show unified diff between the `HEAD` commit and what
would be committed at the bottom of the commit message
template to help the user describe the commit by reminding
what changes the commit has.
diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt
index b93394ea45..e6d70ffda1 100644
--- a/Documentation/git-config.txt
+++ b/Documentation/git-config.txt
@@ -148,7 +148,7 @@ See also <<FILES>>.
--blob blob::
Similar to `--file` but use the given blob instead of a file. E.g.
you can use 'master:.gitmodules' to read values from the file
- '.gitmodules' in the master branch. See "SPECIFYING REVISIONS"
+ '.gitmodules' in the `master` branch. See "SPECIFYING REVISIONS"
section in linkgit:gitrevisions[7] for a more complete list of
ways to spell blob names.
diff --git a/Documentation/git-cvsimport.txt b/Documentation/git-cvsimport.txt
index 143c726511..95fa94de74 100644
--- a/Documentation/git-cvsimport.txt
+++ b/Documentation/git-cvsimport.txt
@@ -35,7 +35,7 @@ Please see the section <<issues,ISSUES>> for further reference.
You should *never* do any work of your own on the branches that are
created by 'git cvsimport'. By default initial import will create and populate a
-"master" branch from the CVS repository's main branch which you're free
+`master` branch from the CVS repository's main branch which you're free
to work with; after that, you need to 'git merge' incremental imports, or
any CVS branches, yourself. It is advisable to specify a named remote via
`-r` to separate and protect the incoming branches.
@@ -71,11 +71,11 @@ OPTIONS
-r <remote>::
The Git remote to import this CVS repository into.
Moves all CVS branches into remotes/<remote>/<branch>
- akin to the way 'git clone' uses 'origin' by default.
+ akin to the way 'git clone' uses `origin` by default.
-o <branch-for-HEAD>::
When no remote is specified (via `-r`) the `HEAD` branch
- from CVS is imported to the 'origin' branch within the Git
+ from CVS is imported to the `origin` branch within the Git
repository, as `HEAD` already has a special meaning for Git.
When a remote is specified the `HEAD` branch is named
remotes/<remote>/master mirroring 'git clone' behaviour.
@@ -200,7 +200,7 @@ Problems related to timestamps:
to be used for ordering commits changes may show up in the wrong
order.
* If any files were ever "cvs import"ed more than once (e.g., import of
- more than one vendor release) the HEAD contains the wrong content.
+ more than one vendor release) the `HEAD` contains the wrong content.
* If the timestamp order of different files cross the revision order
within the commit matching time window the order of commits may be
wrong.
diff --git a/Documentation/git-cvsserver.txt b/Documentation/git-cvsserver.txt
index 955bae46c9..c6a926d8d2 100644
--- a/Documentation/git-cvsserver.txt
+++ b/Documentation/git-cvsserver.txt
@@ -199,7 +199,7 @@ allowing access over SSH.
5. Clients should now be able to check out the project. Use the CVS 'module'
name to indicate what Git 'head' you want to check out. This also sets the
name of your newly checked-out directory, unless you tell it otherwise with
- `-d <dir_name>`. For example, this checks out 'master' branch to the
+ `-d <dir_name>`. For example, this checks out `master` branch to the
`project-master` directory:
+
------
diff --git a/Documentation/git-describe.txt b/Documentation/git-describe.txt
index a3f015743b..7d2649c477 100644
--- a/Documentation/git-describe.txt
+++ b/Documentation/git-describe.txt
@@ -30,17 +30,17 @@ If the given object refers to a blob, it will be described
as `<commit-ish>:<path>`, such that the blob can be found
at `<path>` in the `<commit-ish>`, which itself describes the
first commit in which this blob occurs in a reverse revision walk
-from HEAD.
+from `HEAD`.
OPTIONS
-------
<commit-ish>...::
- Commit-ish object names to describe. Defaults to HEAD if omitted.
+ Commit-ish object names to describe. Defaults to `HEAD` if omitted.
--dirty[=<mark>]::
--broken[=<mark>]::
Describe the state of the working tree. When the working
- tree matches HEAD, the output is the same as "git describe
+ tree matches `HEAD`, the output is the same as "git describe
HEAD". If the working tree has local modification "-dirty"
is appended to it. If a repository is corrupt and Git
cannot determine if there is local modification, Git will
diff --git a/Documentation/git-diff-index.txt b/Documentation/git-diff-index.txt
index 27acb31cbf..10e79a29aa 100644
--- a/Documentation/git-diff-index.txt
+++ b/Documentation/git-diff-index.txt
@@ -31,7 +31,7 @@ include::diff-options.txt[]
--merge-base::
Instead of comparing <tree-ish> directly, use the merge base
- between <tree-ish> and HEAD instead. <tree-ish> must be a
+ between <tree-ish> and `HEAD` instead. <tree-ish> must be a
commit.
-m::
@@ -53,7 +53,7 @@ CACHED MODE
-----------
If `--cached` is specified, it allows you to ask:
- show me the differences between HEAD and the current index
+ show me the differences between `HEAD` and the current index
contents (the ones I'd write using 'git write-tree')
For example, let's say that you have worked on your working directory, updated
@@ -89,7 +89,7 @@ the more useful of the two in that what it does can't be emulated with
a 'git write-tree' + 'git diff-tree'. Thus that's the default mode.
The non-cached version asks the question:
- show me the differences between HEAD and the currently checked out
+ show me the differences between `HEAD` and the currently checked out
tree - index contents _and_ files that aren't up to date
which is obviously a very useful question too, since that tells you what
diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt
index 9f4b46c910..33a47958bc 100644
--- a/Documentation/git-diff.txt
+++ b/Documentation/git-diff.txt
@@ -45,20 +45,20 @@ files on disk.
This form is to view the changes you staged for the next
commit relative to the named <commit>. Typically you
would want comparison with the latest commit, so if you
- do not give <commit>, it defaults to HEAD.
- If HEAD does not exist (e.g. unborn branches) and
+ do not give <commit>, it defaults to `HEAD`.
+ If `HEAD` does not exist (e.g. unborn branches) and
<commit> is not given, it shows all staged changes.
`--staged` is a synonym of `--cached`.
+
If `--merge-base` is given, instead of using <commit>, use the merge base
-of <commit> and HEAD. `git diff --merge-base A` is equivalent to
+of <commit> and `HEAD`. `git diff --merge-base A` is equivalent to
`git diff $(git merge-base A HEAD)`.
'git diff' [<options>] <commit> [--] [<path>...]::
This form is to view the changes you have in your
working tree relative to the named <commit>. You can
- use HEAD to compare it with the latest commit, or a
+ use `HEAD` to compare it with the latest commit, or a
branch name to compare with the tip of a different
branch.
@@ -85,7 +85,7 @@ If `--merge-base` is given, use the merge base of the two commits for the
This is synonymous to the earlier form (without the `..`) for
viewing the changes between two arbitrary <commit>. If <commit> on
one side is omitted, it will have the same effect as
- using HEAD instead.
+ using `HEAD` instead.
'git diff' [<options>] <commit>\...<commit> [--] [<path>...]::
@@ -93,7 +93,7 @@ If `--merge-base` is given, use the merge base of the two commits for the
and up to the second <commit>, starting at a common ancestor
of both <commit>. `git diff A...B` is equivalent to
`git diff $(git merge-base A B) B`. You can omit any one
- of <commit>, which has the same effect as using HEAD instead.
+ of <commit>, which has the same effect as using `HEAD` instead.
Just in case you are doing something exotic, it should be
noted that all of the <commit> in the above description, except
@@ -165,8 +165,8 @@ $ git diff HEAD^ HEAD <3>
------------
+
<1> Instead of using the tip of the current branch, compare with the
- tip of "test" branch.
-<2> Instead of comparing with the tip of "test" branch, compare with
+ tip of `test` branch.
+<2> Instead of comparing with the tip of `test` branch, compare with
the tip of the current branch, but limit the comparison to the
file "test".
<3> Compare the version before the last commit and the last commit.
@@ -179,9 +179,9 @@ $ git diff topic..master <2>
$ git diff topic...master <3>
------------
+
-<1> Changes between the tips of the topic and the master branches.
+<1> Changes between the tips of the `topic` and the `master` branches.
<2> Same as above.
-<3> Changes that occurred on the master branch since when the topic
+<3> Changes that occurred on the `master` branch since when the `topic`
branch was started off it.
Limiting the diff output::
diff --git a/Documentation/git-fast-export.txt b/Documentation/git-fast-export.txt
index a1c02918f9..3a6a77abac 100644
--- a/Documentation/git-fast-export.txt
+++ b/Documentation/git-fast-export.txt
@@ -126,10 +126,10 @@ by keeping the marks the same across runs.
--reference-excluded-parents::
By default, running a command such as `git fast-export
- master~5..master` will not include the commit master{tilde}5
- and will make master{tilde}4 no longer have master{tilde}5 as
- a parent (though both the old master{tilde}4 and new
- master{tilde}4 will have all the same files). Use
+ master~5..master` will not include the commit `master~5`
+ and will make `master~4` no longer have `master~5` as
+ a parent (though both the old `master~4` and new
+ `master~4` will have all the same files). Use
`--reference-excluded-parents` to instead have the stream
refer to commits in the excluded range of history by their
sha1sum. Note that the resulting stream can only be used by a
@@ -158,10 +158,10 @@ by keeping the marks the same across runs.
A list of arguments, acceptable to 'git rev-parse' and
'git rev-list', that specifies the specific objects and references
to export. For example, `master~10..master` causes the
- current master reference to be exported along with all objects
+ current `master` reference to be exported along with all objects
added since its 10th ancestor commit and (unless the
`--reference-excluded-parents` option is specified) all files
- common to master{tilde}9 and master{tilde}10.
+ common to `master~9` and `master~10`.
EXAMPLES
--------
@@ -180,8 +180,8 @@ $ git fast-export master~5..master |
git fast-import
-----------------------------------------------------
-This makes a new branch called 'other' from 'master~5..master'
-(i.e. if 'master' has linear history, it will take the last 5 commits).
+This makes a new branch called `other` from `master~5`..`master`
+(i.e. if `master` has linear history, it will take the last 5 commits).
Note that this assumes that none of the blobs and commit messages
referenced by that revision range contains the string
diff --git a/Documentation/git-fetch-pack.txt b/Documentation/git-fetch-pack.txt
index 88c2b9d426..1f48f89e3e 100644
--- a/Documentation/git-fetch-pack.txt
+++ b/Documentation/git-fetch-pack.txt
@@ -116,7 +116,7 @@ be in a separate packet, and the list must end with a flush packet.
<refs>...::
The remote heads to update from. This is relative to
- $GIT_DIR (e.g. "HEAD", "refs/heads/master"). When
+ $GIT_DIR (e.g. `HEAD`, "refs/heads/master"). When
unspecified, update from all heads the remote side has.
+
If the remote has enabled the options `uploadpack.allowTipSHA1InWant`,
diff --git a/Documentation/git-fetch.txt b/Documentation/git-fetch.txt
index 85b073a61a..a5ecf00db3 100644
--- a/Documentation/git-fetch.txt
+++ b/Documentation/git-fetch.txt
@@ -87,10 +87,10 @@ This configuration is used in two ways:
<refspec>s given on the command line determine what are to be
fetched (e.g. `master` in the example,
which is a short-hand for `master:`, which in turn means
- "fetch the 'master' branch but I do not explicitly say what
+ "fetch the `master` branch but I do not explicitly say what
remote-tracking branch to update with it from the command line"),
and the example command will
- fetch _only_ the 'master' branch. The `remote.<repository>.fetch`
+ fetch _only_ the `master` branch. The `remote.<repository>.fetch`
values determine which
remote-tracking branch, if any, is updated. When used in this
way, the `remote.<repository>.fetch` values do not have any
diff --git a/Documentation/git-filter-branch.txt b/Documentation/git-filter-branch.txt
index 2de3511459..e2955bc648 100644
--- a/Documentation/git-filter-branch.txt
+++ b/Documentation/git-filter-branch.txt
@@ -267,7 +267,7 @@ history, so we also add `--ignore-unmatch`:
git filter-branch --index-filter 'git rm --cached --ignore-unmatch filename' HEAD
--------------------------------------------------------------------------
-Now, you will get the rewritten history saved in HEAD.
+Now, you will get the rewritten history saved in `HEAD`.
To rewrite the repository to look as if `foodir/` had been its project
root, and discard all other history:
diff --git a/Documentation/git-fmt-merge-msg.txt b/Documentation/git-fmt-merge-msg.txt
index 9004861eae..86fb26dcea 100644
--- a/Documentation/git-fmt-merge-msg.txt
+++ b/Documentation/git-fmt-merge-msg.txt
@@ -65,8 +65,8 @@ $ git fetch origin master
$ git fmt-merge-msg --log <$GIT_DIR/FETCH_HEAD
---------
-Print a log message describing a merge of the "master" branch from
-the "origin" remote.
+Print a log message describing a merge of the `master` branch from
+the `origin` remote.
SEE ALSO
diff --git a/Documentation/git-for-each-ref.txt b/Documentation/git-for-each-ref.txt
index e035edf11d..4bde4f9d05 100644
--- a/Documentation/git-for-each-ref.txt
+++ b/Documentation/git-for-each-ref.txt
@@ -76,18 +76,18 @@ OPTIONS
--merged[=<object>]::
Only list refs whose tips are reachable from the
- specified commit (HEAD if not specified).
+ specified commit (`HEAD` if not specified).
--no-merged[=<object>]::
Only list refs whose tips are not reachable from the
- specified commit (HEAD if not specified).
+ specified commit (`HEAD` if not specified).
--contains[=<object>]::
- Only list refs which contain the specified commit (HEAD if not
+ Only list refs which contain the specified commit (`HEAD` if not
specified).
--no-contains[=<object>]::
- Only list refs which don't contain the specified commit (HEAD
+ Only list refs which don't contain the specified commit (`HEAD`
if not specified).
--ignore-case::
@@ -169,7 +169,7 @@ push::
ref is configured.
HEAD::
- '*' if HEAD matches current ref (the checked out branch), ' '
+ '*' if `HEAD` matches current ref (the checked out branch), ' '
otherwise.
color::
@@ -201,7 +201,7 @@ if::
everything after %(else) is printed. We ignore space when
evaluating the string before %(then), this is useful when we
use the %(HEAD) atom which prints either "*" or " " and we
- want to apply the 'if' condition only on the 'HEAD' ref.
+ want to apply the 'if' condition only on the `HEAD` ref.
Append ":equals=<string>" or ":notequals=<string>" to compare
the value between the %(if:...) and %(then) atoms with the
given string.
diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt
index ca500ba72c..fd7c6c705b 100644
--- a/Documentation/git-format-patch.txt
+++ b/Documentation/git-format-patch.txt
@@ -706,7 +706,7 @@ $ git format-patch -k --stdout R1..R2 | git am -3 -k
------------
* Extract all commits which are in the current branch but not in the
- origin branch:
+ `origin` branch:
+
------------
$ git format-patch origin
@@ -714,7 +714,7 @@ $ git format-patch origin
+
For each commit a separate file is created in the current directory.
-* Extract all commits that lead to 'origin' since the inception of the
+* Extract all commits that lead to `origin` since the inception of the
project:
+
------------
diff --git a/Documentation/git-http-push.txt b/Documentation/git-http-push.txt
index 5dd4d2b63a..7ba8ea2383 100644
--- a/Documentation/git-http-push.txt
+++ b/Documentation/git-http-push.txt
@@ -44,12 +44,12 @@ OPTIONS
-d::
-D::
Remove <ref> from remote repository. The specified branch
- cannot be the remote HEAD. If `-d` is specified the following
+ cannot be the remote `HEAD`. If `-d` is specified the following
other conditions must also be met:
- - Remote HEAD must resolve to an object that exists locally
+ - Remote `HEAD` must resolve to an object that exists locally
- Specified branch resolves to an object that exists locally
- - Specified branch is an ancestor of the remote HEAD
+ - Specified branch is an ancestor of the remote `HEAD`
<ref>...::
The remote refs to update.
diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index 1bbf865a1b..b306dced1c 100644
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -152,13 +152,13 @@ EXAMPLES
`git log --branches --not --remotes=origin`::
Shows all commits that are in any of local branches but not in
- any of remote-tracking branches for 'origin' (what you have that
- origin doesn't).
+ any of remote-tracking branches for `origin` (what you have that
+ `origin` doesn't).
`git log master --not --remotes=*/master`::
- Shows all commits that are in local master but not in any remote
- repository master branches.
+ Shows all commits that are in local `master` but not in any remote
+ repository `master` branches.
`git log -p -m --first-parent`::
diff --git a/Documentation/git-ls-remote.txt b/Documentation/git-ls-remote.txt
index 4cb4e2fd5d..af005ece9a 100644
--- a/Documentation/git-ls-remote.txt
+++ b/Documentation/git-ls-remote.txt
@@ -59,7 +59,7 @@ OPTIONS
--symref::
In addition to the object pointed by it, show the underlying
ref pointed by it when showing a symbolic ref. Currently,
- upload-pack only shows the symref HEAD, so it will be the only
+ upload-pack only shows the symref `HEAD`, so it will be the only
one shown by ls-remote.
--sort=<key>::
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 3819fadac1..58fd091d73 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -146,7 +146,7 @@ To avoid recording unrelated changes in the merge commit,
'git pull' and 'git merge' will also abort if there are any changes
registered in the index relative to the `HEAD` commit. (Special
narrow exceptions to this rule may exist depending on which merge
-strategy is in use, but generally, the index must match HEAD.)
+strategy is in use, but generally, the index must match `HEAD`.)
If all named commits are already ancestors of `HEAD`, 'git merge'
will exit early with the message "Already up to date."
diff --git a/Documentation/git-notes.txt b/Documentation/git-notes.txt
index b0a5ab9a72..ef04e3a8ff 100644
--- a/Documentation/git-notes.txt
+++ b/Documentation/git-notes.txt
@@ -60,7 +60,7 @@ list::
This is the default subcommand if no subcommand is given.
add::
- Add notes for a given object (defaults to HEAD). Abort if the
+ Add notes for a given object (defaults to `HEAD`). Abort if the
object already has notes (use `-f` to overwrite existing notes).
However, if you're using `add` interactively (using an editor
to supply the notes contents), then - instead of aborting -
@@ -69,7 +69,7 @@ add::
copy::
Copy the notes for the first object onto the second object (defaults to
- HEAD). Abort if the second object already has notes, or if the first
+ `HEAD`). Abort if the second object already has notes, or if the first
object has none (use -f to overwrite existing notes to the
second object). This subcommand is equivalent to:
`git notes add [-f] -C $(git notes list <from-object>) <to-object>`
@@ -85,14 +85,14 @@ corresponding <to-object>. (The optional `<rest>` is ignored so that
the command can read the input given to the `post-rewrite` hook.)
append::
- Append to the notes of an existing object (defaults to HEAD).
+ Append to the notes of an existing object (defaults to `HEAD`).
Creates a new notes object if needed.
edit::
- Edit the notes for a given object (defaults to HEAD).
+ Edit the notes for a given object (defaults to `HEAD`).
show::
- Show the notes for a given object (defaults to HEAD).
+ Show the notes for a given object (defaults to `HEAD`).
merge::
Merge the given notes ref into the current notes ref.
@@ -110,7 +110,7 @@ When done, the user can either finalize the merge with
'git notes merge --abort'.
remove::
- Remove the notes for given objects (defaults to HEAD). When
+ Remove the notes for given objects (defaults to `HEAD`). When
giving zero or one object from the command line, this is
equivalent to specifying an empty note message to
the `edit` subcommand.
diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt
index d9d29a5efa..ec23ab7d96 100644
--- a/Documentation/git-p4.txt
+++ b/Documentation/git-p4.txt
@@ -76,7 +76,7 @@ This:
2. Imports the full contents of the head revision from the given p4
depot path into a single commit in the Git branch 'refs/remotes/p4/master'.
+
-3. Creates a local branch, 'master' from this remote and checks it out.
+3. Creates a local branch, `master` from this remote and checks it out.
To reproduce the entire p4 history in Git, use the '@all' modifier on
the depot path:
@@ -176,7 +176,7 @@ Unshelve
Unshelving will take a shelved P4 changelist, and produce the equivalent git commit
in the branch refs/remotes/p4-unshelved/<changelist>.
-The git commit is created relative to the current origin revision (HEAD by default).
+The git commit is created relative to the current origin revision (`HEAD` by default).
A parent commit is created based on the origin, and then the unshelve commit is
created based on that.
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index edecf393d3..d9a5507195 100644
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -211,7 +211,7 @@ $ git pull
$ git pull origin
------------------------------------------------
+
-Normally the branch merged in is the HEAD of the remote repository,
+Normally the branch merged in is the `HEAD` of the remote repository,
but the choice is determined by the branch.<name>.remote and
branch.<name>.merge options; see linkgit:git-config[1] for details.
@@ -221,7 +221,7 @@ branch.<name>.merge options; see linkgit:git-config[1] for details.
$ git pull origin next
------------------------------------------------
+
-This leaves a copy of `next` temporarily in FETCH_HEAD, and
+This leaves a copy of `next` temporarily in `FETCH_HEAD`, and
updates the remote-tracking branch `origin/next`.
The same can be done by invoking fetch and merge:
+
diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
index fc91d41ce0..91dcaa108c 100644
--- a/Documentation/git-push.txt
+++ b/Documentation/git-push.txt
@@ -667,9 +667,9 @@ made on `satellite`.
(e.g. `refs/heads/experimental`), and delete it.
`git push origin +dev:master`::
- Update the origin repository's master branch with the dev branch,
+ Update the `origin` repository's `master` branch with the `dev` branch,
allowing non-fast-forward updates. *This can leave unreferenced
- commits dangling in the origin repository.* Consider the
+ commits dangling in the `origin` repository.* Consider the
following situation, where a fast-forward is not possible:
+
----
@@ -678,7 +678,7 @@ made on `satellite`.
X---Y---Z dev
----
+
-The above command would change the origin repository to
+The above command would change the `origin` repository to
+
----
A---B (unnamed branch)
@@ -688,7 +688,7 @@ The above command would change the origin repository to
+
Commits A and B would no longer belong to a branch with a symbolic name,
and so would be unreachable. As such, these commits would be removed by
-a `git gc` command on the origin repository.
+a `git gc` command on the `origin` repository.
include::transfer-data-leaks.txt[]
diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt
index 3f53688170..d22d3855d1 100644
--- a/Documentation/git-read-tree.txt
+++ b/Documentation/git-read-tree.txt
@@ -118,7 +118,7 @@ OPTIONS
--[no-]recurse-submodules::
Using `--recurse-submodules` will update the content of all active
submodules according to the commit recorded in the superproject by
- calling read-tree recursively, also setting the submodules' HEAD to be
+ calling read-tree recursively, also setting the submodules' `HEAD` to be
detached at that commit.
--no-sparse-checkout::
@@ -356,7 +356,7 @@ $ git fetch git://.... linus
$ LT=`git rev-parse FETCH_HEAD`
----------------
-Your work tree is still based on your HEAD ($JC), but you have
+Your work tree is still based on your `HEAD` ($JC), but you have
some edits since. Three-way merge makes sure that you have not
added or modified index entries since $JC, and if you haven't,
then does the right thing. So with the following sequence:
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index f063d54623..bd9f15ea26 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -35,13 +35,13 @@ description on `--fork-point` below); or by `git log HEAD`, if the
The current branch is reset to <upstream>, or <newbase> if the
`--onto` option was supplied. This has the exact same effect as
-`git reset --hard <upstream>` (or <newbase>). ORIG_HEAD is set
+`git reset --hard <upstream>` (or <newbase>). `ORIG_HEAD` is set
to point at the tip of the branch before the reset.
The commits that were previously saved into the temporary area are
then reapplied to the current branch, one by one, in order. Note that
-any commits in HEAD which introduce the same textual changes as a commit
-in HEAD..<upstream> are omitted (i.e., a patch already accepted upstream
+any commits in `HEAD` which introduce the same textual changes as a commit
+in `HEAD`..<upstream> are omitted (i.e., a patch already accepted upstream
with a different commit message or timestamp will be skipped).
It is possible that a merge failure will prevent this process from being
@@ -51,7 +51,7 @@ that caused the merge failure with `git rebase --skip`. To check out the
original <branch> and remove the .git/rebase-apply working files, use the
command `git rebase --abort` instead.
-Assume the following history exists and the current branch is "topic":
+Assume the following history exists and the current branch is `topic`:
------------
A---B---C topic
@@ -101,9 +101,9 @@ Here is how you would transplant a topic branch based on one
branch to another, to pretend that you forked the topic branch
from the latter branch, using `rebase --onto`.
-First let's assume your 'topic' is based on branch 'next'.
-For example, a feature developed in 'topic' depends on some
-functionality which is found in 'next'.
+First let's assume your `topic` is based on branch `next`.
+For example, a feature developed in `topic` depends on some
+functionality which is found in `next'.
------------
o---o---o---o---o master
@@ -113,9 +113,9 @@ functionality which is found in 'next'.
o---o---o topic
------------
-We want to make 'topic' forked from branch 'master'; for example,
-because the functionality on which 'topic' depends was merged into the
-more stable 'master' branch. We want our tree to look like this:
+We want to make `topic` forked from branch `master`; for example,
+because the functionality on which `topic` depends was merged into the
+more stable `master` branch. We want our tree to look like this:
------------
o---o---o---o---o master
@@ -216,7 +216,7 @@ OPTIONS
+
As a special case, you may use "A\...B" as a shortcut for the
merge base of A and B if there is exactly one merge base. You can
-leave out at most one of A and B, in which case it defaults to HEAD.
+leave out at most one of A and B, in which case it defaults to `HEAD`.
--keep-base::
Set the starting point at which to create the new commits to the
@@ -242,20 +242,20 @@ See also INCOMPATIBLE OPTIONS below.
upstream for the current branch.
<branch>::
- Working branch; defaults to HEAD.
+ Working branch; defaults to `HEAD`.
--continue::
Restart the rebasing process after having resolved a merge conflict.
--abort::
- Abort the rebase operation and reset HEAD to the original
+ Abort the rebase operation and reset `HEAD` to the original
branch. If <branch> was provided when the rebase operation was
- started, then HEAD will be reset to <branch>. Otherwise HEAD
+ started, then `HEAD` will be reset to <branch>. Otherwise `HEAD`
will be reset to where it was when the rebase operation was
started.
--quit::
- Abort the rebase operation but HEAD is not reset back to the
+ Abort the rebase operation but `HEAD` is not reset back to the
original branch. The index and working tree are also left
unchanged as a result. If a temporary stash entry was created
using `--autostash`, it will be saved to the stash list.
@@ -905,7 +905,7 @@ when a command fails due to merge errors. When you are done editing
and/or resolving conflicts you can continue with `git rebase --continue`.
For example, if you want to reorder the last 5 commits, such that what
-was HEAD~4 becomes the new HEAD. To achieve that, you would call
+was `HEAD~4` becomes the new `HEAD`. To achieve that, you would call
'git rebase' like this:
----------------------
@@ -925,8 +925,8 @@ like this:
---o---O---P---Q
------------------
-Suppose you want to rebase the side branch starting at "A" to "Q". Make
-sure that the current HEAD is "B", and call
+Suppose you want to rebase the side branch starting at `A` to `Q`. Make
+sure that the current `HEAD` is `B`, and call
-----------------------------
$ git rebase -i -r --onto Q O
@@ -990,7 +990,7 @@ add other commits. This can be used to split a commit into two:
- Mark the commit you want to split with the action "edit".
- When it comes to editing that commit, execute `git reset HEAD^`. The
- effect is that the HEAD is rewound by one, and the index follows suit.
+ effect is that the `HEAD` is rewound by one, and the index follows suit.
However, the working tree stays the same.
- Now add the changes to the index that you want to have in the first
@@ -1020,8 +1020,8 @@ from the downstream's point of view. The real fix, however, would be
to avoid rebasing the upstream in the first place.
To illustrate, suppose you are in a situation where someone develops a
-'subsystem' branch, and you are working on a 'topic' that is dependent
-on this 'subsystem'. You might end up with a history like the
+`subsystem` branch, and you are working on a `topic` that is dependent
+on this `subsystem`. You might end up with a history like the
following:
------------
@@ -1032,7 +1032,7 @@ following:
*---*---* topic
------------
-If 'subsystem' is rebased against 'master', the following happens:
+If `subsystem` is rebased against `master`, the following happens:
------------
o---o---o---o---o---o---o---o master
@@ -1042,8 +1042,8 @@ If 'subsystem' is rebased against 'master', the following happens:
*---*---* topic
------------
-If you now continue development as usual, and eventually merge 'topic'
-to 'subsystem', the commits from 'subsystem' will remain duplicated forever:
+If you now continue development as usual, and eventually merge `topic`
+to `subsystem`, the commits from `subsystem` will remain duplicated forever:
------------
o---o---o---o---o---o---o---o master
@@ -1055,20 +1055,20 @@ to 'subsystem', the commits from 'subsystem' will remain duplicated forever:
Such duplicates are generally frowned upon because they clutter up
history, making it harder to follow. To clean things up, you need to
-transplant the commits on 'topic' to the new 'subsystem' tip, i.e.,
-rebase 'topic'. This becomes a ripple effect: anyone downstream from
-'topic' is forced to rebase too, and so on!
+transplant the commits on `topic` to the new `subsystem` tip, i.e.,
+rebase `topic`. This becomes a ripple effect: anyone downstream from
+`topic` is forced to rebase too, and so on!
There are two kinds of fixes, discussed in the following subsections:
Easy case: The changes are literally the same.::
- This happens if the 'subsystem' rebase was a simple rebase and
+ This happens if the `subsystem` rebase was a simple rebase and
had no conflicts.
Hard case: The changes are not the same.::
- This happens if the 'subsystem' rebase had conflicts, or used
+ This happens if the `subsystem` rebase had conflicts, or used
`--interactive` to omit, edit, squash, or fixup commits; or
if the upstream used one of `commit --amend`, `reset`, or
a full history rewriting command like
@@ -1079,13 +1079,13 @@ The easy case
~~~~~~~~~~~~~
Only works if the changes (patch IDs based on the diff contents) on
-'subsystem' are literally the same before and after the rebase
-'subsystem' did.
+`subsystem` are literally the same before and after the rebase
+`subsystem` did.
In that case, the fix is easy because 'git rebase' knows to skip
changes that are already present in the new upstream (unless
`--reapply-cherry-picks` is given). So if you say
-(assuming you're on 'topic')
+(assuming you're on `topic`)
------------
$ git rebase subsystem
------------
@@ -1102,7 +1102,7 @@ you will end up with the fixed history
The hard case
~~~~~~~~~~~~~
-Things get more complicated if the 'subsystem' changes do not exactly
+Things get more complicated if the `subsystem` changes do not exactly
correspond to the ones before the rebase.
NOTE: While an "easy case recovery" sometimes appears to be successful
@@ -1110,26 +1110,26 @@ NOTE: While an "easy case recovery" sometimes appears to be successful
example, a commit that was removed via `git rebase
--interactive` will be **resurrected**!
-The idea is to manually tell 'git rebase' "where the old 'subsystem'
-ended and your 'topic' began", that is, what the old merge base
+The idea is to manually tell 'git rebase' "where the old `subsystem`
+ended and your `topic` began", that is, what the old merge base
between them was. You will have to find a way to name the last commit
-of the old 'subsystem', for example:
+of the old `subsystem`, for example:
-* With the 'subsystem' reflog: after 'git fetch', the old tip of
- 'subsystem' is at `subsystem@{1}`. Subsequent fetches will
+* With the `subsystem` reflog: after 'git fetch', the old tip of
+ `subsystem` is at `subsystem@{1}`. Subsequent fetches will
increase the number. (See linkgit:git-reflog[1].)
-* Relative to the tip of 'topic': knowing that your 'topic' has three
- commits, the old tip of 'subsystem' must be `topic~3`.
+* Relative to the tip of `topic`: knowing that your `topic` has three
+ commits, the old tip of `subsystem` must be `topic~3`.
-You can then transplant the old `subsystem..topic` to the new tip by
-saying (for the reflog case, and assuming you are on 'topic' already):
+You can then transplant the old `subsystem`..`topic` to the new tip by
+saying (for the reflog case, and assuming you are on `topic` already):
------------
$ git rebase --onto subsystem subsystem@{1}
------------
The ripple effect of a "hard case" recovery is especially bad:
-'everyone' downstream from 'topic' will now have to perform a "hard
+'everyone' downstream from `topic` will now have to perform a "hard
case" recovery too!
REBASING MERGES
@@ -1193,7 +1193,7 @@ merge -C 6f5e4d report-a-bug # Merge 'report-a-bug'
In contrast to a regular interactive rebase, there are `label`, `reset`
and `merge` commands in addition to `pick` ones.
-The `label` command associates a label with the current HEAD when that
+The `label` command associates a label with the current `HEAD` when that
command is executed. These labels are created as worktree-local refs
(`refs/rewritten/<label>`) that will be deleted when the rebase
finishes. That way, rebase operations in multiple worktrees linked to
@@ -1201,7 +1201,7 @@ the same repository do not interfere with one another. If the `label`
command fails, it is rescheduled immediately, with a helpful message how
to proceed.
-The `reset` command resets the HEAD, index and worktree to the specified
+The `reset` command resets the `HEAD`, index and worktree to the specified
revision. It is similar to an `exec git reset --hard <label>`, but
refuses to overwrite untracked files. If the `reset` command fails, it is
rescheduled immediately, with a helpful message how to edit the todo list
@@ -1209,7 +1209,7 @@ rescheduled immediately, with a helpful message how to edit the todo list
list manually and contains a typo).
The `merge` command will merge the specified revision(s) into whatever
-is HEAD at that time. With `-C <original-commit>`, the commit message of
+is `HEAD` at that time. With `-C <original-commit>`, the commit message of
the specified merge commit will be used. When the `-C` is changed to
a lower-case `-c`, the message will be opened in an editor after a
successful merge so that the user can edit the message.
diff --git a/Documentation/git-reflog.txt b/Documentation/git-reflog.txt
index ff487ff77d..cf1d7e0810 100644
--- a/Documentation/git-reflog.txt
+++ b/Documentation/git-reflog.txt
@@ -28,8 +28,8 @@ depending on the subcommand:
Reference logs, or "reflogs", record when the tips of branches and
other references were updated in the local repository. Reflogs are
useful in various Git commands, to specify the old value of a
-reference. For example, `HEAD@{2}` means "where HEAD used to be two
-moves ago", `master@{one.week.ago}` means "where master used to point
+reference. For example, `HEAD@{2}` means "where `HEAD` used to be two
+moves ago", `master@{one.week.ago}` means "where `master` used to point
to one week ago in this local repository", and so on. See
linkgit:gitrevisions[7] for more details.
diff --git a/Documentation/git-request-pull.txt b/Documentation/git-request-pull.txt
index 4d4392d0f8..f58164aee1 100644
--- a/Documentation/git-request-pull.txt
+++ b/Documentation/git-request-pull.txt
@@ -37,7 +37,7 @@ OPTIONS
The repository URL to be pulled from.
<end>::
- Commit to end at (defaults to HEAD). This names the commit
+ Commit to end at (defaults to `HEAD`). This names the commit
at the tip of the history you are asking to be pulled.
+
When the repository named by `<url>` has the commit at a tip of a
diff --git a/Documentation/git-rerere.txt b/Documentation/git-rerere.txt
index 4cfc883378..c5c6be5202 100644
--- a/Documentation/git-rerere.txt
+++ b/Documentation/git-rerere.txt
@@ -76,10 +76,10 @@ variables respectively.
DISCUSSION
----------
-When your topic branch modifies an overlapping area that your
-master branch (or upstream) touched since your topic branch
-forked from it, you may want to test it with the latest master,
-even before your topic branch is ready to be pushed upstream:
+When your `topic` branch modifies an overlapping area that your
+`master` branch (or upstream) touched since your `topic` branch
+forked from it, you may want to test it with the latest `master`,
+even before your `topic` branch is ready to be pushed upstream:
------------
o---*---o topic
@@ -87,8 +87,8 @@ even before your topic branch is ready to be pushed upstream:
o---o---o---*---o---o master
------------
-For such a test, you need to merge master and topic somehow.
-One way to do it is to pull master into the topic branch:
+For such a test, you need to merge `master` and `topic` somehow.
+One way to do it is to pull `master` into the `topic` branch:
------------
$ git switch topic
@@ -106,9 +106,9 @@ work-in-progress still works with what is in the latest master.
After this test merge, there are two ways to continue your work
on the topic. The easiest is to build on top of the test merge
-commit `+`, and when your work in the topic branch is finally
-ready, pull the topic branch into master, and/or ask the
-upstream to pull from you. By that time, however, the master or
+commit `+`, and when your work in the `topic` branch is finally
+ready, pull the `topic` branch into `master`, and/or ask the
+upstream to pull from you. By that time, however, the `master` or
the upstream might have been advanced since the test merge `+`,
in which case the final commit graph would look like this:
@@ -124,14 +124,14 @@ in which case the final commit graph would look like this:
o---o---o---*---o---o---o---o---+ master
------------
-When your topic branch is long-lived, however, your topic branch
-would end up having many such "Merge from master" commits on it,
+When your `topic` branch is long-lived, however, your `topic` branch
+would end up having many such "Merge from `master`" commits on it,
which would unnecessarily clutter the development history.
Readers of the Linux kernel mailing list may remember that Linus
complained about such too frequent test merges when a subsystem
maintainer asked to pull from a branch full of "useless merges".
-As an alternative, to keep the topic branch clean of test
+As an alternative, to keep the `topic` branch clean of test
merges, you could blow away the test merge, and keep building on
top of the tip before the test merge:
@@ -148,8 +148,8 @@ top of the tip before the test merge:
o---o---o---*---o---o---o---o---+ master
------------
-This would leave only one merge commit when your topic branch is
-finally ready and merged into the master branch. This merge
+This would leave only one merge commit when your `topic` branch is
+finally ready and merged into the `master` branch. This merge
would require you to resolve the conflict, introduced by the
commits marked with `*`. However, this conflict is often the
same conflict you resolved when you created the test merge you
@@ -163,7 +163,7 @@ usual conflict markers `<<<<<<<`, `=======`, and `>>>>>>>` in
them. Later, after you are done resolving the conflicts,
running 'git rerere' again will record the resolved state of these
files. Suppose you did this when you created the test merge of
-master into the topic branch.
+`master` into the `topic` branch.
Next time, after seeing the same conflicted automerge,
running 'git rerere' will perform a three-way merge between the
@@ -185,12 +185,12 @@ the rerere.enabled config variable).
In our example, when you do the test merge, the manual
resolution is recorded, and it will be reused when you do the
-actual merge later with the updated master and topic branch, as long
+actual merge later with the updated `master` and `topic` branch, as long
as the recorded resolution is still applicable.
The information 'git rerere' records is also used when running
'git rebase'. After blowing away the test merge and continuing
-development on the topic branch:
+development on the `topic` branch:
------------
o---*---o-------o---o topic
diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt
index e9e816a986..4a55d1f1ac 100644
--- a/Documentation/git-reset.txt
+++ b/Documentation/git-reset.txt
@@ -3,7 +3,7 @@ git-reset(1)
NAME
----
-git-reset - Reset current HEAD to the specified state
+git-reset - Reset current `HEAD` to the specified state
SYNOPSIS
--------
@@ -92,7 +92,7 @@ but carries forward unmerged index entries.
When the working tree is updated, using `--recurse-submodules` will
also recursively reset the working tree of all active submodules
according to the commit recorded in the superproject, also setting
- the submodules' HEAD to be detached at that commit.
+ the submodules' `HEAD` to be detached at that commit.
--
See "Reset, restore and revert" in linkgit:git[1] for the differences
@@ -187,7 +187,7 @@ $ git switch topic/wip <3>
to be in the `master` branch. You want to continue polishing
them in a topic branch, so create `topic/wip` branch off of the
current `HEAD`.
-<2> Rewind the master branch to get rid of those three commits.
+<2> Rewind the `master` branch to get rid of those three commits.
<3> Switch to `topic/wip` branch and keep working.
Undo commits permanently::
diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt
index 4b1af8c5a6..7c3c0e0007 100644
--- a/Documentation/git-rev-parse.txt
+++ b/Documentation/git-rev-parse.txt
@@ -155,7 +155,7 @@ for another option.
This is similar to `--symbolic`, but it omits input that
are not refs (i.e. branch or tag names; or more
explicitly disambiguating "heads/master" form, when you
- want to name the "master" branch when there is an
+ want to name the `master` branch when there is an
unfortunately named tag "master"), and show them as full
refnames (e.g. "refs/heads/master").
@@ -475,7 +475,7 @@ This will error out if $REV is empty or not a valid revision.
$ git rev-parse --default master --verify --end-of-options $REV
------------
+
-but if $REV is empty, the commit object name from master will be printed.
+but if $REV is empty, the commit object name from `master` will be printed.
GIT
---
diff --git a/Documentation/git-revert.txt b/Documentation/git-revert.txt
index bb92a4a451..a232db1d98 100644
--- a/Documentation/git-revert.txt
+++ b/Documentation/git-revert.txt
@@ -17,7 +17,7 @@ DESCRIPTION
Given one or more existing commits, revert the changes that the
related patches introduce, and record some new commits that record
them. This requires your working tree to be clean (no modifications
-from the HEAD commit).
+from the `HEAD` commit).
Note: 'git revert' is used to record some new commits to reverse the
effect of some earlier commits (often only a faulty one). If you want to
@@ -82,7 +82,7 @@ more details.
to revert the named commits to your working tree
and the index, but does not make the commits. In addition,
when this option is used, your index does not have to match
- the HEAD commit. The revert is done against the
+ the `HEAD` commit. The revert is done against the
beginning state of your index.
+
This is useful when reverting more than one commits'
@@ -125,13 +125,13 @@ EXAMPLES
--------
`git revert HEAD~3`::
- Revert the changes specified by the fourth last commit in HEAD
+ Revert the changes specified by the fourth last commit in `HEAD`
and create a new commit with the reverted changes.
`git revert -n master~5..master~2`::
Revert the changes done by commits from the fifth last commit
- in master (included) to the third last commit in master
+ in `master` (included) to the third last commit in `master`
(included), but do not create any commit with the reverted
changes. The revert only modifies the working tree and the
index.
diff --git a/Documentation/git-rm.txt b/Documentation/git-rm.txt
index e7ff1b5fbd..ea1f349a87 100644
--- a/Documentation/git-rm.txt
+++ b/Documentation/git-rm.txt
@@ -153,7 +153,7 @@ the submodule's history. If it exists the submodule.<name> section
in the linkgit:gitmodules[5] file will also be removed and that file
will be staged (unless `--cached` or `-n` are used).
-A submodule is considered up to date when the HEAD is the same as
+A submodule is considered up to date when the `HEAD` is the same as
recorded in the index, no tracked files are modified and no untracked
files that aren't ignored are present in the submodules work tree.
Ignored files are deemed expendable and won't stop a submodule's work
diff --git a/Documentation/git-show-ref.txt b/Documentation/git-show-ref.txt
index 8c739adc70..9d7ba22603 100644
--- a/Documentation/git-show-ref.txt
+++ b/Documentation/git-show-ref.txt
@@ -35,7 +35,7 @@ OPTIONS
--head::
- Show the HEAD reference, even if it would normally be filtered out.
+ Show the `HEAD` reference, even if it would normally be filtered out.
--heads::
--tags::
diff --git a/Documentation/git-show.txt b/Documentation/git-show.txt
index 2b1bc7288d..b7a6f9b544 100644
--- a/Documentation/git-show.txt
+++ b/Documentation/git-show.txt
@@ -35,7 +35,7 @@ This manual page describes only the most frequently used options.
OPTIONS
-------
<object>...::
- The names of objects to show (defaults to 'HEAD').
+ The names of objects to show (defaults to `HEAD`).
For a more complete list of ways to spell object names, see
"SPECIFYING REVISIONS" section in linkgit:gitrevisions[7].
diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt
index a8c8c32f1e..a2b69ae00f 100644
--- a/Documentation/git-stash.txt
+++ b/Documentation/git-stash.txt
@@ -50,7 +50,7 @@ COMMANDS
push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [-m|--message <message>] [--pathspec-from-file=<file> [--pathspec-file-nul]] [--] [<pathspec>...]::
Save your local modifications to a new 'stash entry' and roll them
- back to HEAD (in the working tree and in the index).
+ back to `HEAD` (in the working tree and in the index).
The <message> part is optional and gives
the description along with the stashed state.
+
@@ -121,7 +121,7 @@ branch <branchname> [<stash>]::
+
This is useful if the branch on which you ran `git stash push` has
changed enough that `git stash apply` fails due to conflicts. Since
-the stash entry is applied on top of the commit that was HEAD at the
+the stash entry is applied on top of the commit that was `HEAD` at the
time `git stash` was run, it restores the originally stashed state
with no conflicts.
@@ -192,7 +192,7 @@ All changes already added to the index are left intact.
--patch::
This option is only valid for `push` and `save` commands.
+
-Interactively select hunks from the diff between HEAD and the
+Interactively select hunks from the diff between `HEAD` and the
working tree to be stashed. The stash entry is constructed such
that its index state is the same as the index state of your
repository, and its worktree contains only the changes you selected
@@ -237,7 +237,7 @@ Separates pathspec from options for disambiguation purposes.
+
The new stash entry records the modified states only for the files
that match the pathspec. The index entries and working tree files
-are then rolled back to the state in HEAD only for these files,
+are then rolled back to the state in `HEAD` only for these files,
too, leaving files that do not match the pathspec intact.
+
For more details, see the 'pathspec' entry in linkgit:gitglossary[7].
diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt
index 2fa3bc58f7..4b1951c5ce 100644
--- a/Documentation/git-status.txt
+++ b/Documentation/git-status.txt
@@ -14,7 +14,7 @@ SYNOPSIS
DESCRIPTION
-----------
Displays paths that have differences between the index file and the
-current HEAD commit, paths that have differences between the working
+current `HEAD` commit, paths that have differences between the working
tree and the index file, and paths in the working tree that are not
tracked by Git (and are not ignored by linkgit:gitignore[5]). The first
are what you _would_ commit by running `git commit`; the second and
@@ -88,7 +88,7 @@ configuration variable documented in linkgit:git-config[1].
Ignore changes to submodules when looking for changes. <when> can be
either "none", "untracked", "dirty" or "all", which is the default.
Using "none" will consider the submodule modified when it either contains
- untracked or modified files or its HEAD differs from the commit recorded
+ untracked or modified files or its `HEAD` differs from the commit recorded
in the superproject and can be used to override any settings of the
'ignore' option in linkgit:git-config[1] or linkgit:gitmodules[5]. When
"untracked" is used submodules are not considered dirty when they only
@@ -242,7 +242,7 @@ U U unmerged, both modified
....
Submodules have more state and instead report
- M the submodule has a different HEAD than
+ M the submodule has a different `HEAD` than
recorded in the index
m the submodule has modified content
? the submodule has untracked files
@@ -341,10 +341,10 @@ Field Meaning
<c> is "C" if the commit changed; otherwise ".".
<m> is "M" if it has tracked changes; otherwise ".".
<u> is "U" if there are untracked changes; otherwise ".".
-<mH> The octal file mode in HEAD.
+<mH> The octal file mode in `HEAD`.
<mI> The octal file mode in the index.
<mW> The octal file mode in the worktree.
-<hH> The object name in HEAD.
+<hH> The object name in `HEAD`.
<hI> The object name in the index.
<X><score> The rename or copy score (denoting the percentage
of similarity between the source and target of the
@@ -354,7 +354,7 @@ Field Meaning
<sep> When the `-z` option is used, the 2 pathnames are separated
with a NUL (ASCII 0x00) byte; otherwise, a tab (ASCII 0x09)
byte separates them.
-<origPath> The pathname in the commit at HEAD or in the index.
+<origPath> The pathname in the commit at `HEAD` or in the index.
This is only present in a renamed/copied entry, and
tells where the renamed/copied contents came from.
--------------------------------------------------------
diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt
index 1bcde161ca..891c9e48e5 100644
--- a/Documentation/git-submodule.txt
+++ b/Documentation/git-submodule.txt
@@ -39,7 +39,7 @@ add [-b <branch>] [-f|--force] [--name <name>] [--reference <repository>] [--dep
to the changeset to be committed next to the current
project: the current project is termed the "superproject".
+
-<repository> is the URL of the new submodule's origin repository.
+<repository> is the URL of the new submodule's `origin` repository.
This may be either an absolute URL, or (if it begins with ./
or ../), the location relative to the superproject's default remote
repository (Please note that to specify a repository 'foo.git'
@@ -50,7 +50,7 @@ of relative URLs in Git is identical to that of relative directories).
+
The default remote is the remote of the remote-tracking branch
of the current branch. If no such remote-tracking branch exists or
-the HEAD is detached, "origin" is assumed to be the default remote.
+the `HEAD` is detached, `origin` is assumed to be the default remote.
If the superproject doesn't have a default remote configured
the superproject is its own authoritative upstream and the current
working directory is used instead.
@@ -88,7 +88,7 @@ If `--recursive` is specified, this command will recurse into nested
submodules, and show their status as well.
+
If you are only interested in changes of the currently initialized
-submodules with respect to the commit recorded in the index or the HEAD,
+submodules with respect to the commit recorded in the index or the `HEAD`,
linkgit:git-status[1] and linkgit:git-diff[1] will provide that information
too (and can also report changes to a submodule's work tree).
@@ -147,7 +147,7 @@ The 'update' procedures supported both from the command line as well as
through the `submodule.<name>.update` configuration are:
checkout;; the commit recorded in the superproject will be
- checked out in the submodule on a detached HEAD.
+ checked out in the submodule on a detached `HEAD`.
+
If `--force` is specified, the submodule will be checked out (using
`git checkout --force`), even if the commit specified
@@ -183,7 +183,7 @@ set-branch (-d|--default) [--] <path>::
Sets the default remote tracking branch for the submodule. The
`--branch` option allows the remote branch to be specified. The
`--default` option removes the submodule.<name>.branch configuration
- key, which causes the tracking branch to default to the remote 'HEAD'.
+ key, which causes the tracking branch to default to the remote `HEAD`.
set-url [--] <path> <newurl>::
Sets the URL of the specified submodule to <newurl>. Then, it will
@@ -191,7 +191,7 @@ set-url [--] <path> <newurl>::
configuration.
summary [--cached|--files] [(-n|--summary-limit) <n>] [commit] [--] [<path>...]::
- Show commit summary between the given commit (defaults to HEAD) and
+ Show commit summary between the given commit (defaults to `HEAD`) and
working tree/index. For a submodule in question, a series of commits
in the submodule between the given super project commit and the
index or working tree (switched by `--cached`) are shown. If the option
@@ -284,7 +284,7 @@ OPTIONS
`.gitmodules` for `update --remote`. A special value of `.` is used to
indicate that the name of the branch in the submodule should be the
same name as the current branch in the current repository. If the
- option is not specified, it defaults to the remote 'HEAD'.
+ option is not specified, it defaults to the remote `HEAD`.
-f::
--force::
@@ -301,12 +301,12 @@ OPTIONS
--cached::
This option is only valid for status and summary commands. These
- commands typically use the commit found in the submodule HEAD, but
+ commands typically use the commit found in the submodule `HEAD`, but
with this option, the commit stored in the index is used instead.
--files::
This option is only valid for the summary command. This command
- compares the commit in the index with that in the submodule HEAD
+ compares the commit in the index with that in the submodule `HEAD`
when this option is used.
-n::
@@ -339,7 +339,7 @@ SHA-1. If you don't want to fetch, you should use `submodule update
--remote --no-fetch`.
+
Use this option to integrate changes from the upstream subproject with
-your submodule's current HEAD. Alternatively, you can run `git pull`
+your submodule's current `HEAD`. Alternatively, you can run `git pull`
from the submodule, which is equivalent except for the remote branch
name: `update --remote` uses the default upstream repository and
`submodule.<name>.branch`, while `git pull` uses the submodule's
@@ -355,7 +355,7 @@ the submodule itself.
--checkout::
This option is only valid for the update command.
- Checkout the commit recorded in the superproject on a detached HEAD
+ Checkout the commit recorded in the superproject on a detached `HEAD`
in the submodule. This is the default behavior, the main use of
this option is to override `submodule.$name.update` when set to
a value other than `checkout`.
@@ -365,7 +365,7 @@ the submodule itself.
--merge::
This option is only valid for the update command.
Merge the commit recorded in the superproject into the current branch
- of the submodule. If this option is given, the submodule's HEAD will
+ of the submodule. If this option is given, the submodule's `HEAD` will
not be detached. If a merge failure prevents this process, you will
have to resolve the resulting conflicts within the submodule with the
usual conflict resolution tools.
@@ -375,7 +375,7 @@ the submodule itself.
--rebase::
This option is only valid for the update command.
Rebase the current branch onto the commit recorded in the
- superproject. If this option is given, the submodule's HEAD will not
+ superproject. If this option is given, the submodule's `HEAD` will not
be detached. If a merge failure prevents this process, you will have
to resolve these failures with linkgit:git-rebase[1].
If the key `submodule.$name.update` is set to `rebase`, this option is
@@ -432,7 +432,7 @@ options carefully.
--[no-]single-branch::
This option is only valid for the update command.
- Clone only one branch during update: HEAD or one specified by `--branch`.
+ Clone only one branch during update: `HEAD` or one specified by `--branch`.
<path>...::
Paths to submodule(s). When specified this will restrict the command
diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index 3f55e9c419..f316b7dfc4 100644
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@ -140,7 +140,7 @@ repository, either don't use this option or you should both use it in
the same local time zone.
--parent;;
- Fetch only from the SVN parent of the current HEAD.
+ Fetch only from the SVN parent of the current `HEAD`.
--ignore-refs=<regex>;;
Ignore refs for branches or tags matching the Perl regular
@@ -224,7 +224,7 @@ config key: svn-remote.<name>.include-paths
Default: ".gitignore"
'rebase'::
- This fetches revisions from the SVN parent of the current HEAD
+ This fetches revisions from the SVN parent of the current `HEAD`
and rebases the current (uncommitted to SVN) work against it.
+
This works similarly to `svn update` or 'git pull' except that
@@ -394,7 +394,7 @@ Any other arguments are passed directly to 'git log'
output of this mode is format-compatible with the output of
`svn blame' by default. Like the SVN blame command,
local uncommitted changes in the working tree are ignored;
- the version of the file in the HEAD revision is annotated. Unknown
+ the version of the file in the `HEAD` revision is annotated. Unknown
arguments are passed directly to 'git blame'.
+
--git-format;;
@@ -558,7 +558,7 @@ git svn fetch
r2---r3---A---B master
------------
+
-Then fixup "master" with 'git rebase'.
+Then fixup `master` with 'git rebase'.
Do NOT use 'git merge' or your history will not be compatible with a
future 'dcommit'!
+
@@ -954,7 +954,7 @@ HANDLING OF SVN BRANCHES
If 'git svn' is configured to fetch branches (and `--follow-branches`
is in effect), it sometimes creates multiple Git branches for one
SVN branch, where the additional branches have names of the form
-'branchname@nnn' (with nnn an SVN revision number). These additional
+`branchname@nnn` (with nnn an SVN revision number). These additional
branches are created if 'git svn' cannot find a parent commit for the
first commit in an SVN branch, to connect the branch to the history of
the other branches.
@@ -976,7 +976,7 @@ branch was copied from and create appropriate Git commits. This is
indicated by the message "Initializing parent: <branchname>".
Additionally, it will create a special branch named
-'<branchname>@<SVN-Revision>', where <SVN-Revision> is the SVN revision
+`<branchname>@<SVN-Revision>`, where <SVN-Revision> is the SVN revision
number the branch was copied from. This branch will point to the newly
created parent commit of the branch. If in SVN the branch was deleted
and later recreated from a different version, there will be multiple
@@ -988,12 +988,12 @@ single SVN revision.
An example: in an SVN repository with a standard
trunk/tags/branches layout, a directory trunk/sub is created in r.100.
In r.200, trunk/sub is branched by copying it to branches/. 'git svn
-clone -s' will then create a branch 'sub'. It will also create new Git
+clone -s' will then create a branch `sub`. It will also create new Git
commits for r.100 through r.199 and use these as the history of branch
-'sub'. Thus there will be two Git commits for each revision from r.100
+`sub`. Thus there will be two Git commits for each revision from r.100
to r.199 (one containing trunk/, one containing trunk/sub/). Finally,
-it will create a branch 'sub@200' pointing to the new parent commit of
-branch 'sub' (i.e. the commit for r.200 and trunk/sub/).
+it will create a branch `sub@200` pointing to the new parent commit of
+branch `sub` (i.e. the commit for r.200 and trunk/sub/).
CAVEATS
-------
diff --git a/Documentation/git-switch.txt b/Documentation/git-switch.txt
index 5c438cd505..5737f25cf6 100644
--- a/Documentation/git-switch.txt
+++ b/Documentation/git-switch.txt
@@ -42,7 +42,7 @@ OPTIONS
<start-point>::
The starting point for the new branch. Specifying a
`<start-point>` allows you to create a branch based on some
- other point in history than where HEAD currently points. (Or,
+ other point in history than where `HEAD` currently points. (Or,
in the case of `--detach`, allows you to inspect and detach
from some other point.)
+
@@ -99,7 +99,7 @@ the `checkout.defaultRemote` configuration variable, we'll use that
one for the purposes of disambiguation, even if the `<branch>` isn't
unique across all remotes. Set it to e.g. `checkout.defaultRemote=origin`
to always checkout remote branches from there if `<branch>` is
-ambiguous but exists on the 'origin' remote. See also
+ambiguous but exists on the `origin` remote. See also
`checkout.defaultRemote` in linkgit:git-config[1].
+
`--guess` is the default behavior. Use `--no-guess` to disable it.
@@ -193,7 +193,7 @@ name, the guessing is aborted. You can explicitly give a name with
EXAMPLES
--------
-The following command switches to the "master" branch:
+The following command switches to the `master` branch:
------------
$ git switch master
@@ -228,14 +228,14 @@ registered in your index file, so `git diff` would show you what
changes you made since the tip of the new branch.
To switch back to the previous branch before we switched to mytopic
-(i.e. "master" branch):
+(i.e. `master` branch):
------------
$ git switch -
------------
You can grow a new branch from any commit. For example, switch to
-"HEAD~3" and create branch "fixup":
+`HEAD~3` and create branch `fixup`:
------------
$ git switch -c fixup HEAD~3
diff --git a/Documentation/git-symbolic-ref.txt b/Documentation/git-symbolic-ref.txt
index ef68ad2b71..2cbec2d033 100644
--- a/Documentation/git-symbolic-ref.txt
+++ b/Documentation/git-symbolic-ref.txt
@@ -39,7 +39,7 @@ OPTIONS
-q::
--quiet::
Do not issue an error message if the <name> is not a
- symbolic ref but a detached HEAD; instead exit with
+ symbolic ref but a detached `HEAD`; instead exit with
non-zero status silently.
--short::
diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt
index b802972bb2..13a0d2abbb 100644
--- a/Documentation/git-tag.txt
+++ b/Documentation/git-tag.txt
@@ -209,7 +209,7 @@ This option is only applicable when listing tags without annotation lines.
<commit>::
<object>::
The object that the new tag will refer to, usually a commit.
- Defaults to HEAD.
+ Defaults to `HEAD`.
CONFIGURATION
-------------
diff --git a/Documentation/git-update-ref.txt b/Documentation/git-update-ref.txt
index 3c3da97c29..be48daa825 100644
--- a/Documentation/git-update-ref.txt
+++ b/Documentation/git-update-ref.txt
@@ -20,7 +20,7 @@ Given three arguments, stores the <newvalue> in the <ref>,
possibly dereferencing the symbolic refs, after verifying that
the current value of the <ref> matches <oldvalue>.
E.g. `git update-ref refs/heads/master <newvalue> <oldvalue>`
-updates the master branch head to <newvalue> only if its current
+updates the `master` branch head to <newvalue> only if its current
value is <oldvalue>. You can specify 40 "0" or an empty string
as <oldvalue> to make sure that the ref you are creating does
not exist.
@@ -151,7 +151,7 @@ LOGGING UPDATES
---------------
If config parameter "core.logAllRefUpdates" is true and the ref is one
under "refs/heads/", "refs/remotes/", "refs/notes/", or a pseudoref
-like HEAD or ORIG_HEAD; or the file "$GIT_DIR/logs/<ref>" exists then
+like `HEAD` or `ORIG_HEAD`; or the file "$GIT_DIR/logs/<ref>" exists then
`git update-ref` will append a line to the log file
"$GIT_DIR/logs/<ref>" (dereferencing all symbolic refs before creating
the log name) describing the change in ref value. Log lines are
diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt
index f1bb1fa5f5..35bb1bb120 100644
--- a/Documentation/git-worktree.txt
+++ b/Documentation/git-worktree.txt
@@ -97,7 +97,7 @@ list::
List details of each working tree. The main working tree is listed first,
followed by each of the linked working trees. The output details include
whether the working tree is bare, the revision currently checked out, the
-branch currently checked out (or "detached HEAD" if none), "locked" if
+branch currently checked out (or "detached `HEAD`" if none), "locked" if
the worktree is locked, "prunable" if the worktree can be pruned by `prune`
command.
diff --git a/Documentation/git.txt b/Documentation/git.txt
index fc49a4fd42..dcc52adff6 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -516,7 +516,7 @@ double-quotes and respecting backslash escapes. E.g., the value
`GIT_COMMON_DIR`::
If this variable is set to a path, non-worktree files that are
normally in $GIT_DIR will be taken from this path
- instead. Worktree-specific files such as HEAD or index are
+ instead. Worktree-specific files such as `HEAD` or index are
taken from $GIT_DIR. See linkgit:gitrepository-layout[5] and
linkgit:git-worktree[1] for
details. This variable has lower precedence than other path
@@ -914,7 +914,7 @@ standard output.
`GIT_PRINT_SHA1_ELLIPSIS` (deprecated)::
If set to `yes`, print an ellipsis following an
(abbreviated) SHA-1 value. This affects indications of
- detached HEADs (linkgit:git-checkout[1]) and the raw
+ detached `HEAD`s (linkgit:git-checkout[1]) and the raw
diff output (linkgit:git-diff[1]). Printing an
ellipsis in the cases mentioned is no longer considered
adequate and support for it is likely to be removed in the
diff --git a/Documentation/gitcli.txt b/Documentation/gitcli.txt
index 92e4ba6a2f..0fb18e3f35 100644
--- a/Documentation/gitcli.txt
+++ b/Documentation/gitcli.txt
@@ -29,7 +29,7 @@ arguments. Here are the rules:
E.g. `git diff -- HEAD` is, "I have a file called HEAD in my work
tree. Please show changes between the version I staged in the index
and what I have in the work tree for that file", not "show difference
- between the HEAD commit and the work tree as a whole". You can say
+ between the `HEAD` commit and the work tree as a whole". You can say
`git diff HEAD --` to ask for the latter.
* Without disambiguating `--`, Git makes a reasonable guess, but errors
diff --git a/Documentation/gitcore-tutorial.txt b/Documentation/gitcore-tutorial.txt
index 633439702f..77573c813c 100644
--- a/Documentation/gitcore-tutorial.txt
+++ b/Documentation/gitcore-tutorial.txt
@@ -330,7 +330,7 @@ object name for the commit to its standard output.
And this is where we create the `.git/refs/heads/master` file
which is pointed at by `HEAD`. This file is supposed to contain
-the reference to the top-of-tree of the master branch, and since
+the reference to the top-of-tree of the `master` branch, and since
that's exactly what 'git commit-tree' spits out, we can do this
all with a sequence of simple shell commands:
@@ -402,7 +402,7 @@ In other words, 'git diff-index' normally compares a tree against the
working tree, but when given the `--cached` flag, it is told to
instead compare against just the index cache contents, and ignore the
current working tree state entirely. Since we just wrote the index
-file to HEAD, doing `git diff-index --cached -p HEAD` should thus return
+file to `HEAD`, doing `git diff-index --cached -p HEAD` should thus return
an empty set of differences, and that's exactly what it does.
[NOTE]
@@ -446,7 +446,7 @@ flag or not, since now the index is coherent with the working tree.
Now, since we've updated `hello` in the index, we can commit the new
version. We could do it by writing the tree by hand again, and
committing the tree (this time we'd have to use the `-p HEAD` flag to
-tell commit that the HEAD was the *parent* of the new commit, and that
+tell commit that the `HEAD` was the *parent* of the new commit, and that
this wasn't an initial commit any more), but you've done that once
already, so let's just use the helpful script this time:
@@ -822,7 +822,7 @@ commit log message from the command line.
Now, to make it a bit more interesting, let's assume that somebody else
does some work in the original branch, and simulate that by going back
-to the master branch, and editing the same file differently there:
+to the `master` branch, and editing the same file differently there:
------------
$ git switch master
@@ -838,7 +838,7 @@ $ echo "Lots of fun" >>example
$ git commit -m "Some fun." -i hello example
------------
-since the master branch is obviously in a much better mood.
+since the `master` branch is obviously in a much better mood.
Now, you've got two branches, and you decide that you want to merge the
work done. Before we do that, let's introduce a cool graphical tool that
@@ -933,21 +933,21 @@ shows an ordinary commit on the current branch, `-` is a merge commit), which
means they are now part of the `master` branch. Only the "Some
work" commit has the plus `+` character in the second column,
because `mybranch` has not been merged to incorporate these
-commits from the master branch. The string inside brackets
+commits from the `master` branch. The string inside brackets
before the commit log message is a short name you can use to
-name the commit. In the above example, 'master' and 'mybranch'
-are branch heads. 'master^' is the first parent of 'master'
+name the commit. In the above example, `master` and `mybranch`
+are branch heads. `master^` is the first parent of `master`
branch head. Please see linkgit:gitrevisions[7] if you want to
see more complex cases.
[NOTE]
Without the `--more=1` option, 'git show-branch' would not output the
'[master^]' commit, as '[mybranch]' commit is a common ancestor of
-both 'master' and 'mybranch' tips. Please see linkgit:git-show-branch[1]
+both `master` and `mybranch` tips. Please see linkgit:git-show-branch[1]
for details.
[NOTE]
-If there were more commits on the 'master' branch after the merge, the
+If there were more commits on the `master` branch after the merge, the
merge commit itself would not be shown by 'git show-branch' by
default. You would need to provide `--sparse` option to make the
merge commit visible in this case.
@@ -1523,7 +1523,7 @@ like this:
the initial cloning is stored in the remote.origin.url
configuration variable.
-2. Do your work in your repository on 'master' branch.
+2. Do your work in your repository on `master` branch.
3. Run `git fetch origin` from the public repository of your
upstream every once in a while. This does only the first
@@ -1559,9 +1559,9 @@ using branches with Git.
We have already seen how branches work previously,
with "fun and work" example using two branches. The idea is the
same if there are more than two branches. Let's say you started
-out from "master" head, and have some new code in the "master"
-branch, and two independent fixes in the "commit-fix" and
-"diff-fix" branches:
+out from `master` head, and have some new code in the `master`
+branch, and two independent fixes in the `commit-fix` and
+`diff-fix` branches:
------------
$ git show-branch
@@ -1577,8 +1577,8 @@ $ git show-branch
------------
Both fixes are tested well, and at this point, you want to merge
-in both of them. You could merge in 'diff-fix' first and then
-'commit-fix' next, like this:
+in both of them. You could merge in `diff-fix` first and then
+`commit-fix` next, like this:
------------
$ git merge -m "Merge fix in diff-fix" diff-fix
@@ -1607,8 +1607,8 @@ first and the other next, when what you have are a set of truly
independent changes (if the order mattered, then they are not
independent by definition). You could instead merge those two
branches into the current branch at once. First let's undo what
-we just did and start over. We would want to get the master
-branch before these two merges by resetting it to 'master~2':
+we just did and start over. We would want to get the `master`
+branch before these two merges by resetting it to `master~2`:
------------
$ git reset --hard master~2
diff --git a/Documentation/giteveryday.txt b/Documentation/giteveryday.txt
index faba2ef088..03c9e5e8d5 100644
--- a/Documentation/giteveryday.txt
+++ b/Documentation/giteveryday.txt
@@ -104,8 +104,8 @@ modification will be caught if you do `git commit -a` later.
<6> look at all your changes including the previous commit.
<7> amend the previous commit, adding all your new changes,
using your original message.
-<8> switch to the master branch.
-<9> merge a topic branch into your master branch.
+<8> switch to the `master` branch.
+<9> merge a topic branch into your `master` branch.
<10> review commit logs; other forms to limit output can be
combined and include `-10` (to show up to 10 commits),
`--until=2005-12-10`, etc.
@@ -123,7 +123,7 @@ addition to the ones needed by a standalone developer.
* linkgit:git-clone[1] from the upstream to prime your local
repository.
- * linkgit:git-pull[1] and linkgit:git-fetch[1] from "origin"
+ * linkgit:git-pull[1] and linkgit:git-fetch[1] from `origin`
to keep up-to-date with the upstream.
* linkgit:git-push[1] to shared repository, if you adopt CVS
@@ -160,9 +160,9 @@ $ git reset --hard ORIG_HEAD <10>
$ git gc <11>
------------
+
-<1> checkout a new branch `mine` from master.
+<1> checkout a new branch `mine` from `master`.
<2> repeat as needed.
-<3> extract patches from your branch, relative to master,
+<3> extract patches from your branch, relative to `master`,
<4> and email them.
<5> return to `master`, ready to see what's new
<6> `git pull` fetches from `origin` by default and merges into the
@@ -210,7 +210,7 @@ remote-tracking branches on the mothership machine. You could use this
as a back-up method. Likewise, you can pretend that mothership
"fetched" from you (useful when access is one sided).
<5> on mothership machine, merge the work done on the satellite
-machine into the master branch.
+machine into the `master` branch.
Branch off of a specific tag.::
+
@@ -305,7 +305,7 @@ master or exposed as a part of a stable branch.
<8> and bundle topic branches still cooking.
<9> backport a critical fix.
<10> create a signed tag.
-<11> make sure master was not accidentally rewound beyond that
+<11> make sure `master` was not accidentally rewound beyond that
already pushed out.
<12> In the output from `git show-branch`, `master` should have
everything `ko/master` has, and `next` should have
@@ -446,7 +446,7 @@ refs/tags/v[0-9]* david
<2> and make the shared repository writable by the group.
<3> use update-hook example by Carl from Documentation/howto/
for branch policy control.
-<4> alice and cindy can push into master, only bob can push into doc-update.
+<4> alice and cindy can push into `master`, only bob can push into `doc-update`.
david is the release manager and is the only person who can
create and push version tags.
diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt
index b51959ff94..5e87987882 100644
--- a/Documentation/githooks.txt
+++ b/Documentation/githooks.txt
@@ -189,8 +189,8 @@ post-checkout
This hook is invoked when a linkgit:git-checkout[1] or
linkgit:git-switch[1] is run after having updated the
-worktree. The hook is given three parameters: the ref of the previous HEAD,
-the ref of the new HEAD (which may or may not have changed), and a flag
+worktree. The hook is given three parameters: the ref of the previous `HEAD`,
+the ref of the new `HEAD` (which may or may not have changed), and a flag
indicating whether the checkout was a branch checkout (changing branches,
flag=1) or a file checkout (retrieving a file from the index, flag=0).
This hook cannot affect the outcome of `git switch` or `git checkout`,
@@ -199,11 +199,11 @@ these two commands.
It is also run after linkgit:git-clone[1], unless the `--no-checkout` (`-n`) option is
used. The first parameter given to the hook is the null-ref, the second the
-ref of the new HEAD and the flag is always 1. Likewise for `git worktree add`
+ref of the new `HEAD` and the flag is always 1. Likewise for `git worktree add`
unless `--no-checkout` is used.
This hook can be used to perform repository validity checks, auto-display
-differences from the previous HEAD if different, or set working dir metadata
+differences from the previous `HEAD` if different, or set working dir metadata
properties.
post-merge
diff --git a/Documentation/gitk.txt b/Documentation/gitk.txt
index 6ceeae227c..29bd307bb9 100644
--- a/Documentation/gitk.txt
+++ b/Documentation/gitk.txt
@@ -64,7 +64,7 @@ linkgit:git-rev-list[1] for a complete list.
--merge::
After an attempt to merge stops with conflicts, show the commits on
- the history between two branches (i.e. the HEAD and the MERGE_HEAD)
+ the history between two branches (i.e. the `HEAD` and the `MERGE_HEAD`)
that modify the conflicted files and do not exist on all the heads
being merged.
diff --git a/Documentation/gitnamespaces.txt b/Documentation/gitnamespaces.txt
index b614969ad2..29bac9e1bf 100644
--- a/Documentation/gitnamespaces.txt
+++ b/Documentation/gitnamespaces.txt
@@ -16,7 +16,7 @@ DESCRIPTION
-----------
Git supports dividing the refs of a single repository into multiple
-namespaces, each of which has its own branches, tags, and HEAD. Git can
+namespaces, each of which has its own branches, tags, and `HEAD`. Git can
expose each namespace as an independent repository to pull from and push
to, while sharing the object store, and exposing all the refs to
operations such as linkgit:git-gc[1].
diff --git a/Documentation/gitremote-helpers.txt b/Documentation/gitremote-helpers.txt
index 6f1e269ae4..f5ac7ae7ca 100644
--- a/Documentation/gitremote-helpers.txt
+++ b/Documentation/gitremote-helpers.txt
@@ -322,9 +322,9 @@ Supported if the helper has the "fetch" capability.
(if there is only one reference to push, a single 'push' command
is followed by a blank line). For example, the following would
be two batches of 'push', the first asking the remote-helper
- to push the local ref 'master' to the remote ref 'master' and
- the local `HEAD` to the remote 'branch', and the second
- asking to push ref 'foo' to ref 'bar' (forced update requested
+ to push the local ref `master` to the remote ref `master` and
+ the local `HEAD` to the remote `branch`, and the second
+ asking to push ref `foo` to ref `bar` (forced update requested
by the '+').
+
------------
diff --git a/Documentation/gitrepository-layout.txt b/Documentation/gitrepository-layout.txt
index 1a2ef4c150..e174a28360 100644
--- a/Documentation/gitrepository-layout.txt
+++ b/Documentation/gitrepository-layout.txt
@@ -128,7 +128,7 @@ HEAD::
describing the currently active branch. It does not mean
much if the repository is not associated with any working tree
(i.e. a 'bare' repository), but a valid Git repository
- *must* have the HEAD file; some porcelains may use it to
+ *must* have the `HEAD` file; some porcelains may use it to
guess the designated "default" branch of the repository
(usually 'master'). It is legal if the named branch
'name' does not (yet) exist. In some legacy setups, it is
@@ -137,7 +137,7 @@ HEAD::
+
HEAD can also record a specific commit directly, instead of
being a symref to point at the current branch. Such a state
-is often called 'detached HEAD.' See linkgit:git-checkout[1]
+is often called 'detached `HEAD`.' See linkgit:git-checkout[1]
for details.
config::
diff --git a/Documentation/gittutorial-2.txt b/Documentation/gittutorial-2.txt
index e1e09070ad..2b3cba8ae3 100644
--- a/Documentation/gittutorial-2.txt
+++ b/Documentation/gittutorial-2.txt
@@ -132,7 +132,7 @@ and the contents of these files is just the compressed data plus a
header identifying their length and their type. The type is either a
blob, a tree, a commit, or a tag.
-The simplest commit to find is the HEAD commit, which we can find
+The simplest commit to find is the `HEAD` commit, which we can find
from .git/HEAD:
------------------------------------------------
diff --git a/Documentation/gittutorial.txt b/Documentation/gittutorial.txt
index ff366cc752..089a89f776 100644
--- a/Documentation/gittutorial.txt
+++ b/Documentation/gittutorial.txt
@@ -182,7 +182,7 @@ Managing branches
-----------------
A single Git repository can maintain multiple branches of
-development. To create a new branch named "experimental", use
+development. To create a new branch named `experimental`, use
------------------------------------------------
$ git branch experimental
@@ -201,8 +201,8 @@ you'll get a list of all existing branches:
* master
------------------------------------------------
-The "experimental" branch is the one you just created, and the
-"master" branch is a default branch that was created for you
+The `experimental` branch is the one you just created, and the
+`master` branch is a default branch that was created for you
automatically. The asterisk marks the branch you are currently on;
type
@@ -211,7 +211,7 @@ $ git switch experimental
------------------------------------------------
to switch to the experimental branch. Now edit a file, commit the
-change, and switch back to the master branch:
+change, and switch back to the `master` branch:
------------------------------------------------
(edit file)
@@ -220,9 +220,9 @@ $ git switch master
------------------------------------------------
Check that the change you made is no longer visible, since it was
-made on the experimental branch and you're back on the master branch.
+made on the experimental branch and you're back on the `master` branch.
-You can make a different change on the master branch:
+You can make a different change on the `master` branch:
------------------------------------------------
(edit file)
@@ -230,7 +230,7 @@ $ git commit -a
------------------------------------------------
at this point the two branches have diverged, with different changes
-made in each. To merge the changes made in experimental into master, run
+made in each. To merge the changes made in `experimental` into `master`, run
------------------------------------------------
$ git merge experimental
@@ -310,7 +310,7 @@ alice$ cd /home/alice/project
alice$ git pull /home/bob/myrepo master
------------------------------------------------
-This merges the changes from Bob's "master" branch into Alice's
+This merges the changes from Bob's `master` branch into Alice's
current branch. If Alice has made her own changes in the meantime,
then she may need to manually fix any conflicts.
@@ -327,7 +327,7 @@ some way and pull again when this happens).
Alice can peek at what Bob did without merging first, using the "fetch"
command; this allows Alice to inspect what Bob did, using a special
-symbol "FETCH_HEAD", in order to determine if he has anything worth
+symbol `FETCH_HEAD`, in order to determine if he has anything worth
pulling, like this:
------------------------------------------------
@@ -336,10 +336,10 @@ alice$ git log -p HEAD..FETCH_HEAD
------------------------------------------------
This operation is safe even if Alice has uncommitted local changes.
-The range notation "HEAD..FETCH_HEAD" means "show everything that is reachable
-from the FETCH_HEAD but exclude anything that is reachable from HEAD".
-Alice already knows everything that leads to her current state (HEAD),
-and reviews what Bob has in his state (FETCH_HEAD) that she has not
+The range notation "`HEAD`..`FETCH_HEAD`" means "show everything that is reachable
+from the `FETCH_HEAD` but exclude anything that is reachable from `HEAD`".
+Alice already knows everything that leads to her current state (`HEAD`),
+and reviews what Bob has in his state (`FETCH_HEAD`) that she has not
seen with this command.
If Alice wants to visualize what Bob did since their histories forked
@@ -397,10 +397,10 @@ alice$ git log -p master..bob/master
-------------------------------------
shows a list of all the changes that Bob made since he branched from
-Alice's master branch.
+Alice's `master` branch.
After examining those changes, Alice
-could merge the changes into her master branch:
+could merge the changes into her `master` branch:
-------------------------------------
alice$ git merge bob/master
@@ -436,8 +436,8 @@ bob$ git config --get remote.origin.url
`git config -l`, and the linkgit:git-config[1] man page
explains the meaning of each option.)
-Git also keeps a pristine copy of Alice's master branch under the
-name "origin/master":
+Git also keeps a pristine copy of Alice's `master` branch under the
+name `origin/master`:
-------------------------------------
bob$ git branch -r
@@ -570,22 +570,22 @@ $ git log v2.5.. Makefile # commits since v2.5 which modify
You can also give 'git log' a "range" of commits where the first is not
necessarily an ancestor of the second; for example, if the tips of
-the branches "stable" and "master" diverged from a common
+the branches `stable` and `master` diverged from a common
commit some time ago, then
-------------------------------------
$ git log stable..master
-------------------------------------
-will list commits made in the master branch but not in the
-stable branch, while
+will list commits made in the `master` branch but not in the
+`stable` branch, while
-------------------------------------
$ git log master..stable
-------------------------------------
-will show the list of commits made on the stable branch but not
-the master branch.
+will show the list of commits made on the `stable` branch but not
+the `master` branch.
The 'git log' command has a weakness: it must present commits in a
list. When the history has lines of development that diverged and
diff --git a/Documentation/gitweb.txt b/Documentation/gitweb.txt
index 3cc9b034c4..ee6e6a30fd 100644
--- a/Documentation/gitweb.txt
+++ b/Documentation/gitweb.txt
@@ -291,7 +291,7 @@ action::
is not set, and to 'summary' otherwise.
revision::
- Revision shown. Defaults to HEAD.
+ Revision shown. Defaults to `HEAD`.
path::
The path within the <repository> that the action is performed on,
@@ -385,7 +385,7 @@ The 'shortlog' view is more compact; it shows one commit per line.
history::
Shows history of the file or directory in a given repository path,
- starting from given revision (defaults to HEAD, i.e. default branch).
+ starting from given revision (defaults to `HEAD`, i.e. default branch).
+
This view is similar to 'shortlog' view.
diff --git a/Documentation/gitworkflows.txt b/Documentation/gitworkflows.txt
index 47cf97f9be..07344bf85a 100644
--- a/Documentation/gitworkflows.txt
+++ b/Documentation/gitworkflows.txt
@@ -75,25 +75,25 @@ As a given feature goes from experimental to stable, it also
"graduates" between the corresponding branches of the software.
`git.git` uses the following 'integration branches':
-* 'maint' tracks the commits that should go into the next "maintenance
+* `maint` tracks the commits that should go into the next "maintenance
release", i.e., update of the last released stable version;
-* 'master' tracks the commits that should go into the next release;
+* `master` tracks the commits that should go into the next release;
-* 'next' is intended as a testing branch for topics being tested for
- stability for master.
+* `next` is intended as a testing branch for topics being tested for
+ stability for `master`.
There is a fourth official branch that is used slightly differently:
-* 'seen' (patches seen by the maintainer) is an integration branch for
+* `seen` (patches seen by the maintainer) is an integration branch for
things that are not quite ready for inclusion yet (see "Integration
Branches" below).
Each of the four branches is usually a direct descendant of the one
above it.
-Conceptually, the feature enters at an unstable branch (usually 'next'
-or 'seen'), and "graduates" to 'master' for the next release once it is
+Conceptually, the feature enters at an unstable branch (usually `next`
+or `seen`), and "graduates" to `master` for the next release once it is
considered stable enough.
@@ -113,7 +113,7 @@ other.
=====================================
This gives a very controlled flow of fixes. If you notice that you
-have applied a fix to e.g. 'master' that is also required in 'maint',
+have applied a fix to e.g. `master` that is also required in `maint`,
you will need to cherry-pick it (using linkgit:git-cherry-pick[1])
downwards. This will happen a few times and is nothing to worry about
unless you do it very frequently.
@@ -149,11 +149,11 @@ Many things can then be done very naturally:
it. If the topic has evolved further in the meantime, merge again.
(Note that you do not necessarily have to merge it to the oldest
integration branch first. For example, you can first merge a bugfix
- to 'next', give it some testing time, and merge to 'maint' when you
+ to `next`, give it some testing time, and merge to `maint` when you
know it is stable.)
-* If you find you need new features from the branch 'other' to continue
- working on your topic, merge 'other' to 'topic'. (However, do not
+* If you find you need new features from the branch `other` to continue
+ working on your topic, merge `other` to `topic`. (However, do not
do this "just habitually", see below.)
* If you find you forked off the wrong branch and want to move it
@@ -207,7 +207,7 @@ If you make it (very) clear that this branch is going to be deleted
right after the testing, you can even publish this branch, for example
to give the testers a chance to work with it, or other developers a
chance to see if their in-progress work will be compatible. `git.git`
-has such an official throw-away integration branch called 'seen'.
+has such an official throw-away integration branch called `seen`.
Branch management for a release
@@ -217,27 +217,27 @@ Assuming you are using the merge approach discussed above, when you
are releasing your project you will need to do some additional branch
management work.
-A feature release is created from the 'master' branch, since 'master'
+A feature release is created from the `master` branch, since `master`
tracks the commits that should go into the next feature release.
-The 'master' branch is supposed to be a superset of 'maint'. If this
-condition does not hold, then 'maint' contains some commits that
-are not included on 'master'. The fixes represented by those commits
+The `master` branch is supposed to be a superset of `maint`. If this
+condition does not hold, then `maint` contains some commits that
+are not included on `master`. The fixes represented by those commits
will therefore not be included in your feature release.
-To verify that 'master' is indeed a superset of 'maint', use git log:
+To verify that `master` is indeed a superset of `maint`, use git log:
-.Verify 'master' is a superset of 'maint'
+.Verify `master` is a superset of `maint`
[caption="Recipe: "]
=====================================
`git log master..maint`
=====================================
This command should not list any commits. Otherwise, check out
-'master' and merge 'maint' into it.
+`master` and merge `maint` into it.
Now you can proceed with the creation of the feature release. Apply a
-tag to the tip of 'master' indicating the release version:
+tag to the tip of `master` indicating the release version:
.Release tagging
[caption="Recipe: "]
@@ -251,9 +251,9 @@ others tracking your project. The push could also trigger a
post-update hook to perform release-related items such as building
release tarballs and preformatted documentation pages.
-Similarly, for a maintenance release, 'maint' is tracking the commits
+Similarly, for a maintenance release, `maint` is tracking the commits
to be released. Therefore, in the steps above simply tag and push
-'maint' rather than 'master'.
+`maint` rather than `master`.
Maintenance branch management after a feature release
@@ -275,10 +275,10 @@ where X.Y.Z is the current release).
`git branch maint-X.Y.(Z-1) maint`
=====================================
-The 'maint' branch should now be fast-forwarded to the newly released
+The `maint` branch should now be fast-forwarded to the newly released
code so that maintenance fixes can be tracked for the current release:
-.Update maint to new release
+.Update `maint` to new release
[caption="Recipe: "]
=====================================
* `git checkout maint`
@@ -286,7 +286,7 @@ code so that maintenance fixes can be tracked for the current release:
=====================================
If the merge fails because it is not a fast-forward, then it is
-possible some fixes on 'maint' were missed in the feature release.
+possible some fixes on `maint` were missed in the feature release.
This will not happen if the content of the branches was verified as
described in the previous section.
@@ -294,9 +294,9 @@ described in the previous section.
Branch management for next and seen after a feature release
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-After a feature release, the integration branch 'next' may optionally be
-rewound and rebuilt from the tip of 'master' using the surviving
-topics on 'next':
+After a feature release, the integration branch `next` may optionally be
+rewound and rebuilt from the tip of `master` using the surviving
+topics on `next`:
.Rewind and rebuild next
[caption="Recipe: "]
@@ -307,20 +307,20 @@ topics on 'next':
* ...
=====================================
-The advantage of doing this is that the history of 'next' will be
-clean. For example, some topics merged into 'next' may have initially
+The advantage of doing this is that the history of `next` will be
+clean. For example, some topics merged into `next` may have initially
looked promising, but were later found to be undesirable or premature.
-In such a case, the topic is reverted out of 'next' but the fact
+In such a case, the topic is reverted out of `next` but the fact
remains in the history that it was once merged and reverted. By
-recreating 'next', you give another incarnation of such topics a clean
+recreating `next`, you give another incarnation of such topics a clean
slate to retry, and a feature release is a good point in history to do
so.
If you do this, then you should make a public announcement indicating
-that 'next' was rewound and rebuilt.
+that `next` was rewound and rebuilt.
-The same rewind and rebuild process may be followed for 'seen'. A public
-announcement is not necessary since 'seen' is a throw-away branch, as
+The same rewind and rebuild process may be followed for `seen`. A public
+announcement is not necessary since `seen` is a throw-away branch, as
described above.
diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt
index 67c7a50b96..88ee109fdf 100644
--- a/Documentation/glossary-content.txt
+++ b/Documentation/glossary-content.txt
@@ -113,16 +113,16 @@ to point at the new commit.
[[def_detached_HEAD]]detached HEAD::
Normally the <<def_HEAD,HEAD>> stores the name of a
<<def_branch,branch>>, and commands that operate on the
- history HEAD represents operate on the history leading to the
- tip of the branch the HEAD points at. However, Git also
+ history `HEAD` represents operate on the history leading to the
+ tip of the branch the `HEAD` points at. However, Git also
allows you to <<def_checkout,check out>> an arbitrary
<<def_commit,commit>> that isn't necessarily the tip of any
- particular branch. The HEAD in such a state is called
+ particular branch. The `HEAD` in such a state is called
"detached".
+
Note that commands that operate on the history of the current branch
(e.g. `git commit` to build a new history on top of it) still work
-while the HEAD is detached. They update the HEAD to point at the tip
+while the `HEAD` is detached. They update the `HEAD` to point at the tip
of the updated history without affecting any branch. Commands that
update or inquire information _about_ the current branch (e.g. `git
branch --set-upstream-to` that sets what remote-tracking branch the
@@ -193,7 +193,7 @@ for a more flexible and robust system to do the same thing.
[[def_HEAD]]HEAD::
The current <<def_branch,branch>>. In more detail: Your <<def_working_tree,
working tree>> is normally derived from the state of the tree
- referred to by HEAD. HEAD is a reference to one of the
+ referred to by `HEAD`. `HEAD` is a reference to one of the
<<def_head,heads>> in your repository, except when using a
<<def_detached_HEAD,detached HEAD>>, in which case it directly
references an arbitrary commit.
@@ -456,7 +456,7 @@ exclude;;
like refs for the purposes of rev-parse, but which are treated
specially by git. Pseudorefs both have names that are all-caps,
and always start with a line consisting of a
- <<def_SHA1,SHA-1>> followed by whitespace. So, HEAD is not a
+ <<def_SHA1,SHA-1>> followed by whitespace. So, `HEAD` is not a
pseudoref, because it is sometimes a symbolic ref. They might
optionally contain some additional data. `MERGE_HEAD` and
`CHERRY_PICK_HEAD` are examples. Unlike
diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt
index 965cb32f9c..e6e9669f68 100644
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@ -252,7 +252,7 @@ to list all commits on only one side of them is with
`--left-right` (see the example below in the description of
the `--left-right` option). However, it shows the commits that were
cherry-picked from the other branch (for example, ``3rd on b'' may be
-cherry-picked from branch A). With this option, such pairs of commits are
+cherry-picked from branch `A`). With this option, such pairs of commits are
excluded from the output.
--left-only::
diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt
index d9169c062e..33f30b62eb 100644
--- a/Documentation/revisions.txt
+++ b/Documentation/revisions.txt
@@ -23,8 +23,8 @@ characters and to avoid word splitting.
followed by a dash and a number of commits, followed by a dash, a
'g', and an abbreviated object name.
-'<refname>', e.g. 'master', 'heads/master', 'refs/heads/master'::
- A symbolic ref name. E.g. 'master' typically means the commit
+'<refname>', e.g. `master`, 'heads/master', 'refs/heads/master'::
+ A symbolic ref name. E.g. `master` typically means the commit
object referenced by 'refs/heads/master'. If you
happen to have both 'heads/master' and 'tags/master', you can
explicitly say 'heads/master' to tell Git which one you mean.
@@ -65,7 +65,7 @@ some output processing may assume ref names in UTF-8.
'@'::
'@' alone is a shortcut for `HEAD`.
-'[<refname>]@{<date>}', e.g. 'master@\{yesterday\}', 'HEAD@{5 minutes ago}'::
+'[<refname>]@{<date>}', e.g. `master@{yesterday}`, `HEAD@{5 minutes ago}`::
A ref followed by the suffix '@' with a date specification
enclosed in a brace
pair (e.g. '\{yesterday\}', '{1 month 2 weeks 3 days 1 hour 1
@@ -74,28 +74,28 @@ some output processing may assume ref names in UTF-8.
used immediately following a ref name and the ref must have an
existing log ('$GIT_DIR/logs/<ref>'). Note that this looks up the state
of your *local* ref at a given time; e.g., what was in your local
- 'master' branch last week. If you want to look at commits made during
+ `master` branch last week. If you want to look at commits made during
certain times, see `--since` and `--until`.
-'<refname>@{<n>}', e.g. 'master@\{1\}'::
+'<refname>@{<n>}', e.g. `master@{1}`::
A ref followed by the suffix '@' with an ordinal specification
enclosed in a brace pair (e.g. '\{1\}', '\{15\}') specifies
- the n-th prior value of that ref. For example 'master@\{1\}'
- is the immediate prior value of 'master' while 'master@\{5\}'
- is the 5th prior value of 'master'. This suffix may only be used
+ the n-th prior value of that ref. For example `master@{1}`
+ is the immediate prior value of `master` while `master@{5}`
+ is the 5th prior value of `master`. This suffix may only be used
immediately following a ref name and the ref must have an existing
log ('$GIT_DIR/logs/<refname>').
'@{<n>}', e.g. '@\{1\}'::
You can use the '@' construct with an empty ref part to get at a
reflog entry of the current branch. For example, if you are on
- branch 'blabla' then '@\{1\}' means the same as 'blabla@\{1\}'.
+ branch `blabla` then `@{1}` means the same as `blabla@{1}`.
'@{-<n>}', e.g. '@{-1}'::
The construct '@{-<n>}' means the <n>th branch/commit checked out
before the current one.
-'[<branchname>]@\{upstream\}', e.g. 'master@\{upstream\}', '@\{u\}'::
+'[<branchname>]@\{upstream\}', e.g. `master@{upstream}`, '@\{u\}'::
The suffix '@\{upstream\}' to a branchname (short form '<branchname>@\{u\}')
refers to the branch that the branch specified by branchname is set to build on
top of (configured with `branch.<name>.remote` and
@@ -103,7 +103,7 @@ some output processing may assume ref names in UTF-8.
current one. These suffixes are also accepted when spelled in uppercase, and
they mean the same thing no matter the case.
-'[<branchname>]@\{push\}', e.g. 'master@\{push\}', '@\{push\}'::
+'[<branchname>]@\{push\}', e.g. `master@{push}`, '@\{push\}'::
The suffix '@\{push}' reports the branch "where we would push to" if
`git push` were run while `branchname` was checked out (or the current
`HEAD` if no branchname is specified). Since our push destination is
@@ -131,7 +131,7 @@ from one location and push to another. In a non-triangular workflow,
This suffix is also accepted when spelled in uppercase, and means the same
thing no matter the case.
-'<rev>{caret}[<n>]', e.g. 'HEAD{caret}, v1.5.1{caret}0'::
+'<rev>{caret}[<n>]', e.g. `HEAD^`, 'v1.5.1{caret}0'::
A suffix '{caret}' to a revision parameter means the first parent of
that commit object. '{caret}<n>' means the <n>th parent (i.e.
'<rev>{caret}'
@@ -139,7 +139,7 @@ thing no matter the case.
'<rev>{caret}0' means the commit itself and is used when '<rev>' is the
object name of a tag object that refers to a commit object.
-'<rev>{tilde}[<n>]', e.g. 'HEAD{tilde}, master{tilde}3'::
+'<rev>{tilde}[<n>]', e.g. `HEAD~`, `master~3`::
A suffix '{tilde}' to a revision parameter means the first parent of
that commit object.
A suffix '{tilde}<n>' to a revision parameter means the commit
@@ -175,7 +175,7 @@ existing tag object.
and dereference the tag recursively until a non-tag object is
found.
-'<rev>{caret}{/<text>}', e.g. 'HEAD^{/fix nasty bug}'::
+'<rev>{caret}{/<text>}', e.g. `HEAD^{/fix nasty bug}`::
A suffix '{caret}' to a revision parameter, followed by a brace
pair that contains a text led by a slash,
is the same as the ':/fix nasty bug' syntax below except that
@@ -186,7 +186,7 @@ existing tag object.
A colon, followed by a slash, followed by a text, names
a commit whose commit message matches the specified regular expression.
This name returns the youngest matching commit which is
- reachable from any ref, including HEAD.
+ reachable from any ref, including `HEAD`.
The regular expression can match any part of the
commit message. To match messages starting with a string, one can use
e.g. ':/^foo'. The special sequence ':/!' is reserved for modifiers to what
@@ -196,7 +196,7 @@ existing tag object.
Depending on the given text, the shell's word splitting rules might
require additional quoting.
-'<rev>:<path>', e.g. 'HEAD:README', 'master:./README'::
+'<rev>:<path>', e.g. `HEAD:README`, `master:./README`::
A suffix ':' followed by a path names the blob or tree
at the given path in the tree-ish object named by the part
before the colon.
@@ -287,12 +287,12 @@ The '...' (three-dot) Symmetric Difference Notation::
It is the set of commits that are reachable from either one of
'r1' (left side) or 'r2' (right side) but not from both.
-In these two shorthand notations, you can omit one end and let it default to HEAD.
-For example, 'origin..' is a shorthand for 'origin..HEAD' and asks "What
-did I do since I forked from the origin branch?" Similarly, '..origin'
-is a shorthand for 'HEAD..origin' and asks "What did the origin do since
-I forked from them?" Note that '..' would mean 'HEAD..HEAD' which is an
-empty range that is both reachable and unreachable from HEAD.
+In these two shorthand notations, you can omit one end and let it default to `HEAD`.
+For example, '`origin`..' is a shorthand for '`origin`..`HEAD`' and asks "What
+did I do since I forked from the `origin` branch?" Similarly, '..`origin`'
+is a shorthand for '`HEAD`..`origin`' and asks "What did the `origin` do since
+I forked from them?" Note that '..' would mean '`HEAD`..`HEAD`' which is an
+empty range that is both reachable and unreachable from `HEAD`.
Other <rev>{caret} Parent Shorthand Notations
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -313,7 +313,7 @@ itself).
While '<rev>{caret}<n>' was about specifying a single commit parent, these
three notations also consider its parents. For example you can say
-'HEAD{caret}2{caret}@', however you cannot say 'HEAD{caret}@{caret}2'.
+`HEAD^2^@`, however you cannot say `HEAD^@^2`.
Revision Range Summary
----------------------
@@ -336,17 +336,17 @@ Revision Range Summary
<rev2> but exclude those that are reachable from both. When
either <rev1> or <rev2> is omitted, it defaults to `HEAD`.
-'<rev>{caret}@', e.g. 'HEAD{caret}@'::
+'<rev>{caret}@', e.g. `HEAD^@`::
A suffix '{caret}' followed by an at sign is the same as listing
all parents of '<rev>' (meaning, include anything reachable from
its parents, but not the commit itself).
-'<rev>{caret}!', e.g. 'HEAD{caret}!'::
+'<rev>{caret}!', e.g. `HEAD^!`::
A suffix '{caret}' followed by an exclamation mark is the same
as giving commit '<rev>' and then all its parents prefixed with
'{caret}' to exclude them (and their ancestors).
-'<rev>{caret}-<n>', e.g. 'HEAD{caret}-, HEAD{caret}-2'::
+'<rev>{caret}-<n>', e.g. `HEAD^-`, `HEAD^-2`::
Equivalent to '<rev>{caret}<n>..<rev>', with '<n>' = 1 if not
given.
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 0f9a699c09..62ddf41e75 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -280,7 +280,7 @@ a summary of the commands:
create a new branch `<new>` referencing `<start-point>`, and
check it out.
-The special symbol "HEAD" can always be used to refer to the current
+The special symbol `HEAD` can always be used to refer to the current
branch. In fact, Git uses a file named `HEAD` in the `.git` directory
to remember which branch is current:
@@ -300,7 +300,7 @@ you can check out the commit referenced by a tag:
$ git switch --detach v2.6.17
Note: checking out 'v2.6.17'.
-You are in 'detached HEAD' state. You can look around, make experimental
+You are in 'detached `HEAD`' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
state without impacting any branches by performing another switch.
@@ -309,10 +309,10 @@ do so (now or later) by using `-c` with the switch command again. Example:
git switch -c new_branch_name
-HEAD is now at 427abfa Linux v2.6.17
+`HEAD` is now at 427abfa Linux v2.6.17
------------------------------------------------
-The HEAD then refers to the SHA-1 of the commit instead of to a branch,
+The `HEAD` then refers to the SHA-1 of the commit instead of to a branch,
and git branch shows that you are no longer on a branch:
------------------------------------------------
@@ -323,7 +323,7 @@ $ git branch
master
------------------------------------------------
-In this case we say that the HEAD is "detached".
+In this case we say that the `HEAD` is "detached".
This is an easy way to check out a particular version without having to
make up a name for the new branch. You can still create a new branch
@@ -332,8 +332,8 @@ make up a name for the new branch. You can still create a new branch
[[examining-remote-branches]]
=== Examining branches from a remote repository
-The "master" branch that was created at the time you cloned is a copy
-of the HEAD in the repository that you cloned from. That repository
+The `master` branch that was created at the time you cloned is a copy
+of the `HEAD` in the repository that you cloned from. That repository
may also have had other branches, though, and your local repository
keeps branches which track each of those remote branches, called
remote-tracking branches, which you
@@ -351,7 +351,7 @@ $ git branch -r
origin/todo
------------------------------------------------
-In this example, "origin" is called a remote repository, or "remote"
+In this example, `origin` is called a remote repository, or "remote"
for short. The branches of this repository are called "remote
branches" from our point of view. The remote-tracking branches listed
above were created based on the remote branches at clone time and will
@@ -368,7 +368,7 @@ $ git switch -c my-todo-copy origin/todo
You can also check out `origin/todo` directly to examine it or
write a one-off patch. See <<detached-head,detached head>>.
-Note that the name "origin" is just the name that Git uses by default
+Note that the name `origin` is just the name that Git uses by default
to refer to the repository that you cloned from.
[[how-git-stores-references]]
@@ -391,9 +391,9 @@ under the path given by their name. However, for efficiency reasons
they may also be packed together in a single file; see
linkgit:git-pack-refs[1]).
-As another useful shortcut, the "HEAD" of a repository can be referred
-to just using the name of that repository. So, for example, "origin"
-is usually a shortcut for the HEAD branch in the repository "origin".
+As another useful shortcut, the `HEAD` of a repository can be referred
+to just using the name of that repository. So, for example, `origin`
+is usually a shortcut for the HEAD branch in the repository `origin`.
For the complete list of paths which Git checks for references, and
the order it uses to decide which to choose when there are multiple
@@ -491,9 +491,9 @@ Bisecting: 3537 revisions left to test after this
-------------------------------------------------
If you run `git branch` at this point, you'll see that Git has
-temporarily moved you in "(no branch)". HEAD is now detached from any
+temporarily moved you in "(no branch)". `HEAD` is now detached from any
branch and points directly to a commit (with commit id 65934) that
-is reachable from "master" but not from v2.6.18. Compile and test it,
+is reachable from `master` but not from v2.6.18. Compile and test it,
and see whether it crashes. Assume it does crash. Then:
-------------------------------------------------
@@ -566,7 +566,7 @@ We have seen several ways of naming commits already:
- tag name: refers to the commit pointed to by the given tag
(we've seen branches and tags are special cases of
<<how-git-stores-references,references>>).
- - HEAD: refers to the head of the current branch
+ - `HEAD`: refers to the head of the current branch
There are many more; see the "SPECIFYING REVISIONS" section of the
linkgit:gitrevisions[7] man page for the complete list of ways to
@@ -589,24 +589,24 @@ $ git show HEAD^1 # show the first parent of HEAD
$ git show HEAD^2 # show the second parent of HEAD
-------------------------------------------------
-In addition to HEAD, there are several other special names for
+In addition to `HEAD`, there are several other special names for
commits:
Merges (to be discussed later), as well as operations such as
`git reset`, which change the currently checked-out commit, generally
-set ORIG_HEAD to the value HEAD had before the current operation.
+set `ORIG_HEAD` to the value `HEAD` had before the current operation.
The `git fetch` operation always stores the head of the last fetched
-branch in FETCH_HEAD. For example, if you run `git fetch` without
+branch in `FETCH_HEAD`. For example, if you run `git fetch` without
specifying a local branch as the target of the operation
-------------------------------------------------
$ git fetch git://example.com/proj.git theirbranch
-------------------------------------------------
-the fetched commits will still be available from FETCH_HEAD.
+the fetched commits will still be available from `FETCH_HEAD`.
-When we discuss merges we'll also see the special name MERGE_HEAD,
+When we discuss merges we'll also see the special name `MERGE_HEAD`,
which refers to the other branch that we're merging in to the current
branch.
@@ -914,7 +914,7 @@ any version of a project; for example:
$ git archive -o latest.tar.gz --prefix=project/ HEAD
-------------------------------------------------
-will use HEAD to produce a gzipped tar archive in which each filename
+will use `HEAD` to produce a gzipped tar archive in which each filename
is preceded by `project/`. The output file format is inferred from
the output file extension if possible, see linkgit:git-archive[1] for
details.
@@ -1037,8 +1037,8 @@ at step 3, Git maintains a snapshot of the tree's contents in a
special staging area called "the index."
At the beginning, the content of the index will be identical to
-that of the HEAD. The command `git diff --cached`, which shows
-the difference between the HEAD and the index, should therefore
+that of the `HEAD`. The command `git diff --cached`, which shows
+the difference between the `HEAD` and the index, should therefore
produce no output at that point.
Modifying the index is easy:
@@ -1061,7 +1061,7 @@ After each step you can verify that
$ git diff --cached
-------------------------------------------------
-always shows the difference between the HEAD and the index file--this
+always shows the difference between the `HEAD` and the index file--this
is what you'd commit if you created the commit now--and that
-------------------------------------------------
@@ -1283,8 +1283,8 @@ index 802992c,2b60207..0000000
Recall that the commit which will be committed after we resolve this
conflict will have two parents instead of the usual one: one parent
-will be HEAD, the tip of the current branch; the other will be the
-tip of the other branch, which is stored temporarily in MERGE_HEAD.
+will be `HEAD`, the tip of the current branch; the other will be the
+tip of the other branch, which is stored temporarily in `MERGE_HEAD`.
During the merge, the index holds three versions of each file. Each of
these three "file stages" represents a different version of the file:
@@ -1348,8 +1348,8 @@ $ git log --merge
$ gitk --merge
-------------------------------------------------
-These will display all commits which exist only on HEAD or on
-MERGE_HEAD, and which touch an unmerged file.
+These will display all commits which exist only on `HEAD` or on
+`MERGE_HEAD`, and which touch an unmerged file.
You may also use linkgit:git-mergetool[1], which lets you merge the
unmerged files using external tools such as Emacs or kdiff3.
@@ -1433,7 +1433,7 @@ commit; for example, to revert the most recent commit:
$ git revert HEAD
-------------------------------------------------
-This will create a new commit which undoes the change in HEAD. You
+This will create a new commit which undoes the change in `HEAD`. You
will be given a chance to edit the commit message for the new commit.
You can also revert an earlier change, for example, the next-to-last:
@@ -1486,7 +1486,7 @@ linkgit:git-restore[1]. The command
$ git restore --source=HEAD^ path/to/file
-------------------------------------------------
-replaces path/to/file by the contents it had in the commit HEAD^, and
+replaces path/to/file by the contents it had in the commit `HEAD^`, and
also updates the index to match. It does not change branches.
If you just want to look at an old version of the file, without
@@ -1600,13 +1600,13 @@ $ gitk master@{"1 week ago"} # ... or last week
$ git log --walk-reflogs master # show reflog entries for master
-------------------------------------------------
-A separate reflog is kept for the HEAD, so
+A separate reflog is kept for the `HEAD`, so
-------------------------------------------------
$ git show HEAD@{"1 week ago"}
-------------------------------------------------
-will show what HEAD pointed to one week ago, not what the current branch
+will show what `HEAD` pointed to one week ago, not what the current branch
pointed to one week ago. This allows you to see the history of what
you've checked out.
@@ -1677,7 +1677,7 @@ into your own work.
We have already seen <<Updating-a-repository-With-git-fetch,how to
keep remote-tracking branches up to date>> with linkgit:git-fetch[1],
and how to merge two branches. So you can merge in changes from the
-original repository's master branch with:
+original repository's `master` branch with:
-------------------------------------------------
$ git fetch
@@ -1692,7 +1692,7 @@ $ git pull origin master
-------------------------------------------------
In fact, if you have `master` checked out, then this branch has been
-configured by `git clone` to get changes from the HEAD branch of the
+configured by `git clone` to get changes from the `HEAD` branch of the
origin repository. So often you can
accomplish the above with just a simple
@@ -2568,7 +2568,7 @@ You can also edit a patch series with an interactive rebase. This is
the same as <<reordering-patch-series,reordering a patch series using
`format-patch`>>, so use whichever interface you like best.
-Rebase your current HEAD on the last commit you want to retain as-is.
+Rebase your current `HEAD` on the last commit you want to retain as-is.
For example, if you want to reorder the last 5 commits, use:
-------------------------------------------------
@@ -2980,7 +2980,7 @@ file data at changing paths suggests a rename. (See, for example, the
`-M` option to linkgit:git-diff[1]).
A commit is usually created by linkgit:git-commit[1], which creates a
-commit whose parent is normally the current HEAD, and whose tree is
+commit whose parent is normally the current `HEAD`, and whose tree is
taken from the content currently stored in the index.
[[tree-object]]
@@ -3507,7 +3507,7 @@ $ ls -a
The `git submodule add <repo> <path>` command does a couple of things:
- It clones the submodule from `<repo>` to the given `<path>` under the
- current directory and by default checks out the master branch.
+ current directory and by default checks out the `master` branch.
- It adds the submodule's clone path to the linkgit:gitmodules[5] file and
adds this file to the index, ready to be committed.
- It adds the submodule's current commit ID to the index, ready to be
@@ -3540,7 +3540,7 @@ $ git submodule status
-------------------------------------------------
NOTE: The commit object names shown above would be different for you, but they
-should match the HEAD commit object names of your repositories. You can check
+should match the `HEAD` commit object names of your repositories. You can check
it by running `git ls-remote ../a`.
Pulling down the submodules is a two-step process. First run `git submodule
@@ -4334,7 +4334,7 @@ $ git branch new # create branch "new" starting at current HEAD
$ git branch -d new # delete branch "new"
-----------------------------------------------
-Instead of basing a new branch on current HEAD (the default), use:
+Instead of basing a new branch on current `HEAD` (the default), use:
-----------------------------------------------
$ git branch new test # branch named "test"
--
2.31.1.133.g84d06cdc06
^ permalink raw reply related [relevance 2%]
* What's cooking in git.git (Nov 2009, #05; Sun, 22)
@ 2009-11-23 6:16 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2009-11-23 6:16 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
marked with '.' do not appear in any of the integration branches, but I am
still holding onto them.
In 1.7.0, we plan to correct handful of warts in the interfaces everybody
agrees that they were mistakes. The resulting system may not be strictly
backward compatible. Currently planned changes are:
* refuse push to update the checked out branch in a non-bare repo by
default
Make "git push" into a repository to update the branch that is checked
out fail by default. You can countermand this default by setting a
configuration variable in the receiving repository.
http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007
* refuse push to delete the current branch by default
Make "git push $there :$killed" to delete the branch that is pointed at
by its HEAD fail by default. You can countermand this default by
setting a configuration variable in the receiving repository.
http://thread.gmane.org/gmane.comp.version-control.git/108862/focus=108936
* "git send-email" won't make deep threads by default
Many people said that by default when sending more than 2 patches the
threading git-send-email makes by default is hard to read, and they
prefer the default be one cover letter and each patch as a direct
follow-up to the cover letter. You can countermand this by setting a
configuration variable.
http://article.gmane.org/gmane.comp.version-control.git/109790
* git-status won't be "git-commit --dry-run" anymore
http://thread.gmane.org/gmane.comp.version-control.git/125989/focus=125993
* "git diff -w --exit-code" will exit success if only differences it
found are whitespace changes that are stripped away from the output.
http://thread.gmane.org/gmane.comp.version-control.git/119731/focus=119751
* "git diff -w/-b" won't even produce "diff --git" header when all changes
are about whitespaces.
http://thread.gmane.org/gmane.comp.version-control.git/133256
Tonight's tip of 'master' is at v1.6.6-rc0. I am aware of a handful of
patches sent today but they didn't arraive before I started today's
integration cycle and are left out from today's tree.
--------------------------------------------------
[Graduated to "master"]
* ls/maint-mailinfo-no-inbody (2009-11-20) 1 commit.
(merged to 'next' on 2009-11-21 at dba8141)
+ git am/mailinfo: Don't look at in-body headers when rebasing
* rj/maint-t9700 (2009-11-19) 1 commit.
(merged to 'next' on 2009-11-21 at 29e149b)
+ t9700-perl-git.sh: Fix a test failure on Cygwin
* jn/faster-completion-startup (2009-11-17) 1 commit.
+ Speed up bash completion loading
* th/maint-remote-update-help-string (2009-11-15) 1 commit.
+ Update 'git remote update' usage string to match man page.
* tc/format-attribute (2009-11-14) 1 commit
+ Check the format of more printf-type functions
* jk/maint-break-rename-reduce-memory (2009-11-16) 2 commits.
(merged to 'next' on 2009-11-16 at 5b5a93f)
+ diffcore-break: save cnt_data for other phases
+ diffcore-break: free filespec data as we go
* bc/grep-i-F (2009-11-06) 1 commit.
(merged to 'next' on 2009-11-17 at a9b138c)
+ grep: Allow case insensitive search of fixed-strings
* mm/config-pathname-tilde-expand (2009-11-17) 1 commit.
(merged to 'next' on 2009-11-17 at 7ba213d)
+ Expand ~ and ~user in core.excludesfile, commit.template
* pb/maint-use-custom-perl (2009-11-17) 1 commit.
(merged to 'next' on 2009-11-17 at 1ee8d46)
+ Make sure $PERL_PATH is defined when the test suite is run.
* th/remote-usage (2009-11-16) 1 commit.
+ git remote: Separate usage strings for subcommands
* mo/maint-crlf-doc (2009-11-14) 1 commit.
(merged to 'next' on 2009-11-17 at abd9133)
+ core.autocrlf documentation: mention the crlf attribute
* rj/cygwin-msvc (2009-11-09) 2 commits.
+ MSVC: Add support for building with NO_MMAP
+ Makefile: keep MSVC and Cygwin configuration separate
(this branch uses rj/maint-simplify-cygwin-makefile.)
* jp/fetch-cull-many-refs (2009-11-13) 3 commits
(merged to 'next' on 2009-11-15 at db0f967)
+ remote: fix use-after-free error detected by glibc in ref_remove_duplicates
(merged to 'next' on 2009-11-01 at 1f09ce9)
+ fetch: Speed up fetch of large numbers of refs
+ remote: Make ref_remove_duplicates faster for large numbers of refs
* jn/help-everywhere (2009-11-09) 21 commits
(merged to 'next' on 2009-11-17 at 3a2dffe)
+ diff --no-index: make the usage string less scary
+ merge-{recursive,subtree}: use usagef() to print usage
+ Introduce usagef() that takes a printf-style format
+ Let 'git <command> -h' show usage without a git dir
+ Show usage string for 'git http-push -h'
+ Let 'git http-fetch -h' show usage outside any git repository
+ Show usage string for 'git stripspace -h'
+ Show usage string for 'git unpack-file -h'
+ Show usage string for 'git show-index -h'
+ Show usage string for 'git rev-parse -h'
+ Show usage string for 'git merge-one-file -h'
+ Show usage string for 'git mailsplit -h'
+ Show usage string for 'git imap-send -h'
+ Show usage string for 'git get-tar-commit-id -h'
+ Show usage string for 'git fast-import -h'
+ Show usage string for 'git check-ref-format -h'
+ Show usage string for 'git show-ref -h'
+ Show usage string for 'git merge-ours -h'
+ Show usage string for 'git commit-tree -h'
+ Show usage string for 'git cherry -h'
+ Show usage string for 'git grep -h'
(this branch uses jn/maint-http-fetch-mingw and jn/remove-fetch--tool.)
* jn/maint-http-fetch-mingw (2009-11-09) 1 commit.
(merged to 'next' on 2009-11-17 at cd35125)
+ http-fetch: add missing initialization of argv0_path
(this branch is used by jn/help-everywhere.)
* jn/remove-fetch--tool (2009-11-09) 1 commit
(merged to 'next' on 2009-11-17 at 72f6c3b)
+ Retire fetch--tool helper to contrib/examples
(this branch is used by jn/help-everywhere.)
* jn/gitweb-log-history (2009-11-13) 3 commits
(merged to 'next' on 2009-11-17 at d225f7d)
+ gitweb: Make 'history' view (re)use git_log_generic()
+ gitweb: Refactor common parts of 'log' and 'shortlog' views
+ gitweb: Refactor 'log' action generation, adding git_log_body()
* rg/doc-workflow (2009-11-17) 1 commit.
+ Add branch management for releases to gitworkflows
* sb/ls-tree-parseopt (2009-11-13) 2 commits.
(merged to 'next' on 2009-11-17 at c383204)
+ ls-tree: migrate to parse-options
+ t3101: test more ls-tree options
* jl/submodule-add-noname (2009-09-22) 1 commit.
(merged to 'next' on 2009-11-15 at 3a77d01)
+ git submodule add: make the <path> parameter optional
Dscho started an interesting discussion regarding the larger workflow in
which the "submodule add" is used. I think the patch itself makes sense
but at the same time it probably makes sense to also take the <path> and
infer the <repository> as Dscho suggested, probably in "git submodule
add", not in "git add" proper, at least initially.
* sc/protocol-doc (2009-11-03) 1 commit.
(merged to 'next' on 2009-11-15 at 32d6de8)
+ Update packfile transfer protocol documentation
* tr/filter-branch (2009-11-10) 2 commits.
(merged to 'next' on 2009-11-15 at 79c6a1d)
+ filter-branch: nearest-ancestor rewriting outside subdir filter
+ filter-branch: stop special-casing $filter_subdir argument
* bg/format-patch-doc-update (2009-11-07) 4 commits.
(merged to 'next' on 2009-11-17 at 68b9056)
+ format-patch: Add "--no-stat" as a synonym for "-p"
+ format-patch documentation: Fix formatting
+ format-patch documentation: Remove diff options that are not useful
+ format-patch: Always generate a patch
* rj/maint-simplify-cygwin-makefile (2009-10-27) 1 commit.
+ Makefile: merge two Cygwin configuration sections into one
(this branch is used by rj/cygwin-msvc.)
* jn/editor-pager (2009-10-30) 9 commits
(merged to 'next' on 2009-11-15 at 7f3e3ae)
+ Provide a build time default-pager setting
+ Provide a build time default-editor setting
+ am -i, git-svn: use "git var GIT_PAGER"
+ add -i, send-email, svn, p4, etc: use "git var GIT_EDITOR"
+ Teach git var about GIT_PAGER
+ Teach git var about GIT_EDITOR
+ Suppress warnings from "git var -l"
+ Do not use VISUAL editor on dumb terminals
+ Handle more shell metacharacters in editor names
* bw/autoconf-more (2009-11-04) 2 commits
(merged to 'next' on 2009-11-15 at e86a8c9)
+ configure: add settings for gitconfig, editor and pager
+ configure: add macro to set arbitrary make variables
* sp/smart-http (2009-11-14) 37 commits
(merged to 'next' on 2009-11-17 at 11067eb)
+ http-backend: Let gcc check the format of more printf-type functions.
+ http-backend: Fix access beyond end of string.
(merged to 'next' on 2009-11-15 at 2a326b2)
+ http-backend: Fix bad treatment of uintmax_t in Content-Length
+ t5551-http-fetch: Work around broken Accept header in libcurl
+ t5551-http-fetch: Work around some libcurl versions
+ http-backend: Protect GIT_PROJECT_ROOT from /../ requests
+ Git-aware CGI to provide dumb HTTP transport
(merged to 'next' on 2009-11-06 at 666837c)
+ http-backend: Test configuration options
+ http-backend: Use http.getanyfile to disable dumb HTTP serving
+ test smart http fetch and push
+ http tests: use /dumb/ URL prefix
+ set httpd port before sourcing lib-httpd
+ t5540-http-push: remove redundant fetches
+ Smart HTTP fetch: gzip requests
+ Smart fetch over HTTP: client side
+ Smart push over HTTP: client side
+ Discover refs via smart HTTP server when available
+ http-backend: more explict LocationMatch
+ http-backend: add example for gitweb on same URL
+ http-backend: use mod_alias instead of mod_rewrite
+ http-backend: reword some documentation
+ http-backend: add GIT_PROJECT_ROOT environment var
+ Smart fetch and push over HTTP: server side
+ Add stateless RPC options to upload-pack, receive-pack
+ Git-aware CGI to provide dumb HTTP transport
+ remote-helpers: return successfully if everything up-to-date
+ Move WebDAV HTTP push under remote-curl
+ remote-helpers: Support custom transport options
+ remote-helpers: Fetch more than one ref in a batch
+ fetch: Allow transport -v -v -v to set verbosity to 3
+ remote-curl: Refactor walker initialization
+ Add multi_ack_detailed capability to fetch-pack/upload-pack
+ Move "get_ack()" back to fetch-pack
+ fetch-pack: Use a strbuf to compose the want list
+ pkt-line: Make packet_read_line easier to debug
+ pkt-line: Add strbuf based functions
+ http-push: fix check condition on http.c::finish_http_pack_request()
--------------------------------------------------
[New Topics]
* bg/apply-doc (2009-11-22) 4 commits
(merged to 'next' on 2009-11-22 at b42fece)
+ apply: Use the term "working tree" consistently
+ apply: Format all options using back-quotes
+ apply: apply works outside a repository
+ Clarify and correct -z
* cc/replace (2009-11-19) 3 commits
(merged to 'next' on 2009-11-21 at 2aaf84b)
+ Documentation: talk a little bit about GIT_NO_REPLACE_OBJECTS
+ Documentation: fix typos and spelling in replace documentation
+ replace: use a GIT_NO_REPLACE_OBJECTS env variable
* fc/send-email-envelope (2009-11-22) 1 commit.
- t9001: test --envelope-sender option of send-email
The new feature itself looked promising; this is just an unrelated test
patch.
* gb/1.7.0-diff-whitespace-only-outout (2009-11-19) 1 commit
(merged to 'next' on 2009-11-21 at 3375bf4)
+ No diff -b/-w output for all-whitespace changes
* jc/checkout-merge-base (2009-11-20) 2 commits
- "rebase --onto A...B" replays history on the merge base between A and B
- "checkout A...B" switches to the merge base between A and B
* mm/maint-hint-failed-merge (2009-11-22) 2 commits.
(merged to 'next' on 2009-11-22 at c0f64c2)
+ user-manual: Document that "git merge" doesn't like uncommited changes.
+ merge-recursive: point the user to commit when file would be overwritten.
* rj/maint-cygwin-count-objects (2009-11-19) 2 commits.
(merged to 'next' on 2009-11-22 at 4ba5880)
+ ST_BLOCKS_COUNTS_IN_BLKSIZE to say on-disk size is (st_blksize * st_blocks)
+ git-count-objects: Fix a disk-space under-estimate on Cygwin
* rs/color-escape-has-zero-width (2009-11-23) 1 commit
- Teach %w() that color escape codes have zero width
* tr/reset-checkout-patch (2009-11-19) 1 commit.
(merged to 'next' on 2009-11-22 at b224950)
+ {checkout,reset} -p: make patch direction configurable
--------------------------------------------------
[Stalled]
* jc/fix-tree-walk (2009-10-22) 8 commits
(merged to 'next' on 2009-10-22 at 10c0c8f)
+ Revert failed attempt since 353c5ee
+ read-tree --debug-unpack
(merged to 'next' on 2009-10-11 at 0b058e2)
+ unpack-trees.c: look ahead in the index
+ unpack-trees.c: prepare for looking ahead in the index
+ Aggressive three-way merge: fix D/F case
+ traverse_trees(): handle D/F conflict case sanely
+ more D/F conflict tests
+ tests: move convenience regexp to match object names to test-lib.sh
This has some stupid bugs and reverted from 'next' until I can fix it, but
the "temporarily" turned out to be very loooong. Sigh...
* sr/gfi-options (2009-09-06) 6 commits.
- fast-import: test the new option command
- fast-import: add option command
- fast-import: test the new feature command
- fast-import: add feature command
- fast-import: put marks reading in it's own function
- fast-import: put option parsing code in separate functions
It seemed to be moving again soon, but nothing has happened yet...
* je/send-email-no-subject (2009-08-05) 1 commit.
(merged to 'next' on 2009-10-11 at 1b99c56)
+ send-email: confirm on empty mail subjects
The existing tests cover the positive case (i.e. as long as the user says
"yes" to the "do you really want to send this message that lacks subject",
the message is sent) of this feature, but the feature itself needs its own
test to verify the negative case (i.e. does it correctly stop if the user
says "no"?)
--------------------------------------------------
[Cooking]
* jh/notes (2009-11-20) 10 commits
- Add more testcases to test fast-import of notes
- Rename t9301 to t9350, to make room for more fast-import tests
- fast-import: Proper notes tree manipulation using the notes API
- Refactor notes concatenation into a flexible interface for combining notes
- Notes API: Allow multiple concurrent notes trees with new struct notes_tree
- Notes API: for_each_note(): Traverse the entire notes tree with a callback
- Notes API: get_note(): Return the note annotating the given object
- Notes API: add_note(): Add note objects to the internal notes tree structure
- Notes API: init_notes(): Initialize the notes tree from the given notes ref
- Notes API: get_commit_notes() -> format_note() + remove the commit restriction
Early part has been lived in 'next' for a while and has graduated. This
is a reroll of the remainder. Is everybody happy with merging this to
'next'? I saw some checkpatch style violations, but didn't find anything
objectionable in the logic.
* jn/gitweb-blame (2009-11-19) 6 commits.
- gitweb.js: fix null object exception in initials calculation
- gitweb: Minify gitweb.js if JSMIN is defined
- gitweb: Create links leading to 'blame_incremental' using JavaScript
(merged to 'next' on 2009-10-11 at 73c4a83)
+ gitweb: Colorize 'blame_incremental' view during processing
+ gitweb: Incremental blame (using JavaScript)
+ gitweb: Add optional "time to generate page" info in footer
Ajax-y blame, with a few recent fixes.
* tr/maint-merge-ours-clarification (2009-11-15) 1 commit
(merged to 'next' on 2009-11-21 at fadaf7b)
+ rebase: refuse to rebase with -s ours
* jc/log-stdin (2009-11-20) 4 commits
(merged to 'next' on 2009-11-21 at c3e2e52)
+ Make --stdin option to "log" family read also pathspecs
+ setup_revisions(): do not call get_pathspec() too early
+ Teach --stdin option to "log" family
+ read_revision_from_stdin(): use strbuf
Still no tests yet but with docs from Peff.
* jn/rfc-pull-rebase-error-message (2009-11-12) 1 commit
- git-pull.sh --rebase: overhaul error handling when no candidates are found
I heard this needs at least retitling among other changes?
* em/commit-claim (2009-11-04) 1 commit
- commit -c/-C/--amend: reset timestamp and authorship to committer with --reset-author
I just picked better bits from both versions, but this needs to be
rethought.
* bg/fetch-multi (2009-11-10) 9 commits.
(merged to 'next' on 2009-11-21 at 282f464)
+ Re-implement 'git remote update' using 'git fetch'
+ builtin-fetch: add --dry-run option
+ builtin-fetch: add --prune option
+ teach warn_dangling_symref to take a FILE argument
+ remote: refactor some logic into get_stale_heads()
+ Add missing test for 'git remote update --prune'
+ Add the configuration option skipFetchAll
+ Teach the --multiple option to 'git fetch'
+ Teach the --all option to 'git fetch'
* cc/bisect-doc (2009-11-08) 1 commit
- Documentation: add "Fighting regressions with git bisect" article
Any comments? Should it go to Documentation/technical instead?
* sr/vcs-helper (2009-11-18) 12 commits
- Add Python support library for remote helpers
- Basic build infrastructure for Python scripts
- Allow helpers to report in "list" command that the ref is unchanged
- Fix various memory leaks in transport-helper.c
- Allow helper to map private ref names into normal names
- Add support for "import" helper command
- Allow specifying the remote helper in the url
- Add a config option for remotes to specify a foreign vcs
- Allow fetch to modify refs
- Use a function to determine whether a remote is valid
- Allow programs to not depend on remotes having urls
- Fix memory leak in helper method for disconnect
Replaced again. Is everybody happy with merging this to 'next'?
* mr/gitweb-snapshot (2009-11-07) 4 commits.
(merged to 'next' on 2009-11-21 at e825ad9)
+ gitweb: Smarter snapshot names
+ gitweb: Document current snapshot rules via new tests
+ t/gitweb-lib.sh: Split gitweb output into headers and body
(merged to 'next' on 2009-10-11 at 22ba047)
+ gitweb: check given hash before trying to create snapshot
Soon in 'master'.
* jc/pretty-lf (2009-10-04) 1 commit.
- Pretty-format: %[+-]x to tweak inter-item newlines
* ks/precompute-completion (2009-11-15) 4 commits.
(merged to 'next' on 2009-11-15 at 23cdb96)
+ Revert ks/precompute-completion series
(merged to 'next' on 2009-10-28 at cd5177f)
+ completion: ignore custom merge strategies when pre-generating
(merged to 'next' on 2009-10-22 at f46a28a)
+ bug: precomputed completion includes scripts sources
(merged to 'next' on 2009-10-14 at adf722a)
+ Speedup bash completion loading
Reverted out of 'next', to be replaced with jn/faster-completion-startup
topic.
* nd/sparse (2009-08-20) 19 commits.
- sparse checkout: inhibit empty worktree
- Add tests for sparse checkout
- read-tree: add --no-sparse-checkout to disable sparse checkout support
- unpack-trees(): ignore worktree check outside checkout area
- unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index
- unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout
- unpack-trees.c: generalize verify_* functions
- unpack-trees(): add CE_WT_REMOVE to remove on worktree alone
- Introduce "sparse checkout"
- dir.c: export excluded_1() and add_excludes_from_file_1()
- excluded_1(): support exclude files in index
- unpack-trees(): carry skip-worktree bit over in merged_entry()
- Read .gitignore from index if it is skip-worktree
- Avoid writing to buffer in add_excludes_from_file_1()
- Teach Git to respect skip-worktree bit (writing part)
- Teach Git to respect skip-worktree bit (reading part)
- Introduce "skip-worktree" bit in index, teach Git to get/set this bit
- Add test-index-version
- update-index: refactor mark_valid() in preparation for new options
The latest update I didn't look at very closely but I had an impression
that it was touching very generic codepath that would affect non sparse
cases, iow the patch looked very scary (the entire series already is).
--------------------------------------------------
[For 1.7.0]
* jc/1.7.0-no-commit-no-ff-2 (2009-10-22) 1 commit.
- git-merge: forbid fast-forward and up-to-date when --no-commit is given
This makes "git merge --no-commit" fail when it results in fast-forward or
up-to-date. I haven't described this at the beginning of this message
yet, as it is not clear if this change is even necessary. Opinions?
* jk/1.7.0-status (2009-09-05) 5 commits.
(merged to 'next' on 2009-11-21 at 884bb56)
+ docs: note that status configuration affects only long format
(merged to 'next' on 2009-10-11 at 65c8513)
+ commit: support alternate status formats
+ status: add --porcelain output format
+ status: refactor format option parsing
+ status: refactor short-mode printing to its own function
(this branch uses jc/1.7.0-status.)
Gives the --short output format to post 1.7.0 "git commit --dry-run" that
is similar to that of post 1.7.0 "git status".
* jc/1.7.0-status (2009-09-05) 4 commits.
(merged to 'next' on 2009-10-11 at 9558627)
+ status: typo fix in usage
+ git status: not "commit --dry-run" anymore
+ git stat -s: short status output
+ git stat: the beginning of "status that is not a dry-run of commit"
(this branch is used by jk/1.7.0-status.)
With this, "git status" is no longer "git commit --dry-run".
* jc/1.7.0-send-email-no-thread-default (2009-08-22) 1 commit.
(merged to 'next' on 2009-10-11 at 043acdf)
+ send-email: make --no-chain-reply-to the default
* jc/1.7.0-diff-whitespace-only-status (2009-08-30) 4 commits.
(merged to 'next' on 2009-10-11 at 546c74d)
+ diff.c: fix typoes in comments
+ Make test case number unique
+ diff: Rename QUIET internal option to QUICK
+ diff: change semantics of "ignore whitespace" options
This changes exit code from "git diff --ignore-whitespace" and friends
when there is no actual output. It is a backward incompatible change, but
we could argue that it is a bugfix.
* jc/1.7.0-push-safety (2009-02-09) 2 commits.
(merged to 'next' on 2009-10-11 at 81b8128)
+ Refuse deleting the current branch via push
+ Refuse updating the current branch in a non-bare repository via push
--------------------------------------------------
[I have been too busy to purge these]
* ne/rev-cache (2009-10-19) 7 commits.
. support for commit grafts, slight change to general mechanism
. support for path name caching in rev-cache
. full integration of rev-cache into git, completed test suite
. administrative functions for rev-cache, start of integration into git
. support for non-commit object caching in rev-cache
. basic revision cache system, no integration or features
. man page and technical discussion for rev-cache
The author indicated that there is another round coming. Does not seem to
pass the tests when merged to 'pu', so it has been ejected for now.
* jc/log-tz (2009-03-03) 1 commit.
- Allow --date=local --date=other-format to work as expected
Maybe some people care about this. I dunno.
* jc/mailinfo-remove-brackets (2009-07-15) 1 commit.
- mailinfo: -b option keeps [bracketed] strings that is not a [PATCH] marker
Maybe some people care about this. I dunno.
* pb/gitweb-no-project-list (2009-11-06) 3 commits.
. gitweb: Polish the content tags support
. gitweb: Support for no project list on gitweb front page
. gitweb: Refactor project list routines
I picked these up but didn't queue as Warthog9's comments made certain
amount of sense to me.
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (Aug 2009, #02; Wed, 12)
@ 2009-08-13 2:14 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2009-08-13 2:14 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
marked with '.' do not appear in any of the branches, but I am still
holding onto them.
After the 1.6.5 cycle, the next release will be 1.7.0, and we will push
out the planned "push safety" change. 1.7.0 would be a good time to
introduce "justifiable" changes that are not strictly backward compatible.
During 1.6.5 cycle, 'next' will hold topics meant for 1.6.5 and 1.7.0.
----------------------------------------------------------------
[New Topics]
* ld/p4 (Thu Jul 30 00:13:46 2009 +0100) 1 commit
- git-p4: stream from perforce to speed up clones
Waiting for Ack/Nack from stakeholders. Probably I should merge this to
'next' soon, keep it there for a week and see if anybody screams, aka
"Nack now or forever hold your peace" ;-).
* mr/gitweb-xz (Thu Aug 6 10:28:25 2009 -0400) 3 commits
- gitweb: add support for XZ compressed snapshots
- gitweb: update INSTALL regarding specific snapshot settings
- gitweb: support to globally disable a snapshot format
This should be safe as long as it does not silently enable itself for
folks who merely updated gitweb to this version without explicitly asking
for the new format (but I do not remember if that is what the patch does).
* jh/cvs-helper (Wed Aug 12 02:13:51 2009 +0200) 4 commits
- Add simple selftests of git-remote-cvs functionality
- Third draft of CVS remote helper program
- Add Python support library for CVS remote helper
- Basic build infrastructure for Python scripts
Builds on db/vcs-helper. The last round failed its own selftest for me,
but this one seems to be Ok. Documentation/git-remote-cvs.txt needs to be
fixed to build, though.
* bc/maint-am-email (Thu Aug 6 20:08:13 2009 -0500) 2 commits
+ git-am: print fair error message when format detection fails
+ am: allow individual e-mail files as input
It seems that the "not mbox but a single piece of e-mail" format was
something many people relied on. I'm cooking this in 'next', and
hopefully it can graduate both to 'master' and 'maint'.
* js/maint-cover-letter-non-ascii (Mon Aug 10 18:22:22 2009 +0200) 2 commits
+ Correctly mark cover letters' encodings if they are not pure ASCII
+ Expose the has_non_ascii() function
* jc/verify-pack-stat (Fri Aug 7 15:45:30 2009 -0700) 2 commits
+ verify-pack --stat-only: show histogram without verifying
+ Merge branch 'maint' into jc/verify-pack-stat
* lt/block-sha1 (Wed Aug 12 15:47:55 2009 -0400) 15 commits
+ block-sha1: support for architectures with memory alignment
restrictions
+ block-sha1: split the different "hacks" to be individually
selected
+ block-sha1: move code around
+ block-sha1: improve code on large-register-set machines
+ block-sha1: improved SHA1 hashing
+ block-sha1: perform register rotation using cpp
+ block-sha1: get rid of redundant 'lenW' context
+ block-sha1: Use '(B&C)+(D&(B^C))' instead of '(B&C)|(D&(B|C))' in
round 3
+ block-sha1: macroize the rounds a bit further
+ block-sha1: re-use the temporary array as we calculate the SHA1
+ block-sha1: make the 'ntohl()' part of the first SHA1 loop
+ block-sha1: minor fixups
+ block-sha1: try to use rol/ror appropriately
+ block-sha1: undo ctx->size change
+ Add new optimized C 'block-sha1' routines
Linus's "written in C, faster than handcrafted asm" SHA-1 implementation
with clean-up and ARM support from Nico.
* nd/sparse (Tue Aug 11 22:44:06 2009 +0700) 8 commits
. --sparse for porcelains
. Support sparse checkout in unpack_trees() and read-tree
. unpack-trees.c: generalize verify_* functions
. dir.c: export excluded_1() and add_excludes_from_file_1()
. excluded_1(): support exclude "directories" in index
. Read .gitignore from index if it is assume-unchanged
. Avoid writing to buffer in add_excludes_from_file_1()
. Prevent diff machinery from examining assume-unchanged entries on
worktree
Privately applied but not yet queued to 'pu', expecting a minor reroll
near the tip.
* jk/maint-merge-msg-fix (Sun Aug 9 06:02:51 2009 -0400) 3 commits
+ merge: indicate remote tracking branches in merge message
+ merge: fix incorrect merge message for ambiguous tag/branch
+ add tests for merge message headings
----------------------------------------------------------------
[Graduated to "master"]
* zf/maint-gitweb-acname (Sun Aug 2 09:42:24 2009 +0200) 1 commit
- gitweb: parse_commit_text encoding fix
* jc/maint-merge-recursive-fix (Thu Jul 30 17:38:15 2009 -0700) 1 commit
- merge-recursive: don't segfault while handling rename clashes
* js/run-command-updates (Tue Aug 4 11:28:40 2009 +0200) 7 commits
+ run-command.c: squelch a "use before assignment" warning
+ receive-pack: remove unnecessary run_status report
+ run_command: report failure to execute the program, but optionally
don't
+ run_command: encode deadly signal number in the return value
+ run_command: report system call errors instead of returning error
codes
+ run_command: return exit code as positive value
+ MinGW: simplify waitpid() emulation macros
* mk/grep-max-depth (Wed Jul 22 19:52:15 2009 +0200) 1 commit
+ grep: Add --max-depth option.
* jp/symlink-dirs (Wed Jul 29 20:22:25 2009 -0700) 3 commits
+ git-checkout: be careful about untracked symlinks
+ lstat_cache: guard against full match of length of 'name'
parameter
+ Demonstrate bugs when a directory is replaced with a symlink
----------------------------------------------------------------
[In 'next']
* bc/mailsplit-cr-at-eol (Tue Aug 4 22:31:59 2009 -0500) 4 commits
+ Allow mailsplit (and hence git-am) to handle mails with CRLF line-
endings
+ builtin-mailsplit.c: remove read_line_with_nul() since it is no
longer used
+ builtin-mailinfo,builtin-mailsplit: use strbufs
+ strbuf: add new function strbuf_getwholeline()
* gb/apply-ignore-whitespace (Tue Aug 4 13:16:49 2009 +0200) 1 commit
+ git apply: option to ignore whitespace differences
* cc/replace (Wed May 27 07:14:09 2009 +0200) 14 commits
+ t6050: check pushing something based on a replaced commit
+ Documentation: add documentation for "git replace"
+ Add git-replace to .gitignore
+ builtin-replace: use "usage_msg_opt" to give better error messages
+ parse-options: add new function "usage_msg_opt"
+ builtin-replace: teach "git replace" to actually replace
+ Add new "git replace" command
+ environment: add global variable to disable replacement
+ mktag: call "check_sha1_signature" with the replacement sha1
+ replace_object: add a test case
+ object: call "check_sha1_signature" with the replacement sha1
+ sha1_file: add a "read_sha1_file_repl" function
+ replace_object: add mechanism to replace objects found in
"refs/replace/"
+ refs: add a "for_each_replace_ref" function
* jc/1.7.0-diff-whitespace-only-status (Sat May 23 01:15:35 2009 -0700) 2 commits
+ diff: Rename QUIET internal option to QUICK
+ diff: change semantics of "ignore whitespace" options
This changes exit code from "git diff --ignore-whitespace" and friends
when there is no actual output. It is a backward incompatible change, but
we could argue that it is a bugfix.
* jc/1.7.0-push-safety (Mon Feb 9 00:19:46 2009 -0800) 2 commits
+ Refuse deleting the current branch via push
+ Refuse updating the current branch in a non-bare repository via
push
----------------------------------------------------------------
[In 'pu']
* jn/gitweb-blame (Thu Aug 6 19:11:52 2009 +0200) 14 commits
- gitweb: Create links leading to 'blame_incremental' using
JavaScript
- gitweb: Incremental blame (proof of concept)
- gitweb: Add optional "time to generate page" info in footer
+ Revert the four topmost commits from jn/gitweb-blame topic
+ gitweb: Create links leading to 'blame_incremental' using
JavaScript
+ gitweb: Incremental blame (proof of concept)
+ gitweb: Add optional "time to generate page" info in footer
+ gitweb: Add -partial_query option to href() subroutine
+ gitweb: Use light/dark for class names also in 'blame' view
+ gitweb: Add author initials in 'blame' view, a la "git gui blame"
+ gitweb: Mark commits with no "previous" in 'blame' view
+ gitweb: Use "previous" header of git-blame -p in 'blame' view
+ gitweb: Mark boundary commits in 'blame' view
+ gitweb: Make .error style generic
I haven't picked up Jakub's replacement to the second one from the tip.
We probably should merge up to "Use light/dark" (aef3768) to 'master' and
start the rest over.
* jc/maint-clean-nested-dir-safety (Tue Jun 30 15:33:45 2009 -0700) 1 commit
+ clean: require double -f options to nuke nested git repository and
work tree
This probably should go in 'master' soonish.
* jc/shortstatus (Tue Aug 4 23:55:22 2009 -0700) 12 commits
- git stat -s: short status output
- git stat: pathspec limits, unlike traditional "git status"
- git stat: the beginning
+ wt-status: collect untracked files in a separate "collect" phase
+ Make git_status_config() file scope static to builtin-commit.c
+ wt-status: move wt_status_colors[] into wt_status structure
+ wt-status: move many global settings to wt_status structure
+ commit: --dry-run
+ status: show worktree status of conflicted paths separately
+ wt-status.c: rework the way changes to the index and work tree are
summarized
+ diff-index: keep the original index intact
+ diff-index: report unmerged new entries
Slowly progressing. I've addressed issues pointed out by Jeff in his
review, and hopefully the whole thing would be ready to go.
* db/vcs-helper (Sun Aug 9 15:28:28 2009 -0400) 17 commits
- Allow helpers to request marks for fast-import
- Allow helpers to report in "list" command that the ref is
unchanged
- Add support for "import" helper command
- transport-helper_init(): fix a memory leak in error path
- Add a config option for remotes to specify a foreign vcs
- Allow programs to not depend on remotes having urls
- Allow fetch to modify refs
- Use a function to determine whether a remote is valid
- Use a clearer style to issue commands to remote helpers
+ Makefile: install hardlinks for git-remote-<scheme> supported by
libcurl if possible
+ Makefile: do not link three copies of git-remote-* programs
+ Makefile: git-http-fetch does not need expat
+ http-fetch: Fix Makefile dependancies
+ Add transport native helper executables to .gitignore
+ git-http-fetch: not a builtin
+ Use an external program to implement fetching with curl
+ Add support for external programs for handling native fetches
This consolidates various previous rounds from Daniel and Johan. It seems
that the use of colon ':' before vcs helper name needs to be corrected
before this series can go further.
* je/send-email-no-subject (Wed Aug 5 18:49:54 2009 +0200) 1 commit
- send-email: confirm on empty mail subjects
This seems to break t9001. Near the tip of 'pu' I have a iffy workaround.
* jh/notes (Wed Jul 29 04:25:26 2009 +0200) 8 commits
- t3302-notes-index-expensive: Speed up create_repo()
- fast-import: Add support for importing commit notes
- First draft of notes tree parser with support for fanout subtrees
- Teach "-m <msg>" and "-F <file>" to "git notes edit"
- Add an expensive test for git-notes
- Speed up git notes lookup
- Add a script to edit/inspect notes
- Introduce commit notes
* cc/sequencer-rebase-i (Wed Aug 5 22:53:00 2009 +0200) 8 commits
- rebase -i: use "git sequencer--helper --reset-hard"
- sequencer: add "--reset-hard" option to "git sequencer--helper"
- sequencer: add comments about reset_almost_hard()
- sequencer: add "reset_almost_hard()" and related functions
- rebase -i: use "git sequencer--helper --make-patch"
- sequencer: free memory used in "make_patch" function
- sequencer: add "make_patch" function to save a patch
- sequencer: add "builtin-sequencer--helper.c"
More sequencer updates. I didn't look at the latest round that had a
handful "oops, fix that earlier botch" patches, expecting a cleaner
reroll.
* jc/mailinfo-remove-brackets (Wed Jul 15 15:31:12 2009 -0700) 1 commit
- mailinfo: -b option keeps [bracketed] strings that is not a
[PATCH] marker
* tr/reset-checkout-patch (Tue Jul 28 23:20:12 2009 +0200) 8 commits
- DWIM 'git stash save -p' for 'git stash -p'
- Merge branch 'js/stash-dwim' into tr/reset-checkout-patch
- Make 'git stash -k' a short form for 'git stash save --keep-index'
- Implement 'git stash save --patch'
- Implement 'git checkout --patch'
- Implement 'git reset --patch'
- builtin-add: refactor the meat of interactive_add()
- git-apply--interactive: Refactor patch mode code
Progress?
* js/stash-dwim (Mon Jul 27 20:37:10 2009 +0200) 1 commit
- Make 'git stash -k' a short form for 'git stash save --keep-index'
This should be merged to 'next' soonish, but I keep forgetting.
* pb/tracking (Thu Jul 16 16:26:15 2009 -0500) 7 commits
. branch.c: if remote is not config'd for branch, don't try delete
push config
. branch, checkout: introduce autosetuppush
. move deletion of merge configuration to branch.c
. remote: add per-remote autosetupmerge and autosetuprebase
configuration
. introduce a struct tracking_config
. branch: install_branch_config and struct tracking refactoring
. config: allow false and true values for branch.autosetuprebase
Has been ejected from 'pu' for some time, expecting a reroll.
* jc/log-tz (Tue Mar 3 00:45:37 2009 -0800) 1 commit
- Allow --date=local --date=other-format to work as expected
^ permalink raw reply [relevance 2%]
* [PATCH] git-svn: merge: fix rooturl/branchurl match check
@ 2014-10-15 12:39 2% Tommaso Colombo
2014-10-20 6:24 2% ` Eric Wong
0 siblings, 1 reply; 200+ results
From: Tommaso Colombo @ 2014-10-15 12:39 UTC (permalink / raw)
To: git; +Cc: Tommaso Colombo
When populating svn:mergeinfo, git-svn merge checks if the merge parent
of the merged branch is under the same root as the git-svn repository.
This was implemented comparing $gs->repos_root with the return value of
of cmt_metadata for the merge parent. However, the first may contain a
username, whereas the second does not. In this case the comparison
fails.
Remove the username from $gs->repos_root before performing the
comparison.
---
git-svn.perl | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/git-svn.perl b/git-svn.perl
index b6e2186..0a5a5ff 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -707,7 +707,8 @@ sub populate_merge_info {
my $all_parents_ok = 1;
my $aggregate_mergeinfo = '';
my $rooturl = $gs->repos_root;
- my ($target_branch) = $gs->full_pushurl =~ /^\Q$rooturl\E(.*)/;
+ Git::SVN::remove_username($rooturl);
+ my $target_branch = $gs->path;
if (defined($rewritten_parent)) {
# Replace first parent with newly-rewritten version
@@ -729,7 +730,7 @@ sub populate_merge_info {
}
my $branchpath = $1;
- my $ra = Git::SVN::Ra->new($branchurl);
+ my $ra = Git::SVN::Ra->new(add_path_to_url($gs->repos_root, $branchpath));
my (undef, undef, $props) =
$ra->get_dir(canonicalize_path("."), $svnrev);
my $par_mergeinfo = $props->{'svn:mergeinfo'};
@@ -921,6 +922,7 @@ sub cmd_dcommit {
# information from different SVN repos, and paths
# which are not underneath this repository root.
my $rooturl = $gs->repos_root;
+ Git::SVN::remove_username($rooturl);
foreach my $d (@$linear_refs) {
my %parentshash;
read_commit_parents(\%parentshash, $d);
--
2.1.2.443.g670a3c1.dirty
^ permalink raw reply related [relevance 2%]
* [PATCH v1 0/2] rebase --merge: fix fast forwarding when `rebase.abbreviateCommands' is set
@ 2020-03-30 12:42 2% ` Alban Gruin
0 siblings, 0 replies; 200+ results
From: Alban Gruin @ 2020-03-30 12:42 UTC (permalink / raw)
To: git
Cc: Johannes Schindelin, Elijah Newren, Phillip Wood, Junio C Hamano,
jan.steffens, Alban Gruin
Jan Alexander Steffens reported that when `rebase.abbreviateCommands' is
set, the merge backend fails to fast forward. This is because the
backend generates a todo list with only a `noop', and since this command
has no abbreviated form, it is replaced by a comment mark. The
sequencer then interprets it as if there is nothing to do, and fails.
This patch series fixes this issue by teaching the sequencer not to
abbreviate a command if it does not have a short form, and adds a bunch
of regression tests.
This series is based on 9fadedd637 ("Merge branch
'ds/default-pack-use-sparse-to-true'", 2020-03-29).
The tip of this series is tagged as "rebase-dont-abbreviate-v1" at
https://github.com/agrn/git.
Alban Gruin (2):
sequencer: don't abbreviate a command if it doesn't have a short form
t3432: test `--merge' with `rebase.abbreviateCommands = true', too
sequencer.c | 9 ++++++---
t/t3432-rebase-fast-forward.sh | 24 +++++++++++++++++++-----
2 files changed, 25 insertions(+), 8 deletions(-)
--
2.25.0
^ permalink raw reply [relevance 2%]
* Re: [RFC] Git rerere and non-conflicting changes during conflict resolution
@ 2017-07-25 20:40 2% ` Junio C Hamano
2017-07-25 20:58 2% ` Jeff King
1 sibling, 0 replies; 200+ results
From: Junio C Hamano @ 2017-07-25 20:40 UTC (permalink / raw)
To: Jeff King; +Cc: Raman Gupta, git
Junio C Hamano <gitster@pobox.com> writes:
> To populate the database, we'd need a reverse.
> ...
> * Then the user tells Git that semantic conflicts were resolved and
> need to be recorded (just like running "git rerere" manually,
> before "git commit" automatically does it for them these days).
> This will result in the following:
>
> - The database is updated so that key <A, B> yields the
> "merge-fix" commit;
> ...
I probably should have been aiming for stars, as I were outlining
the ideal merge-fix logic. The key <A, B> is merely a default, and
the worst one at that. There should be a way for the user to tell
which exact pair of commits (i.e. another side branch that was
merged earlier to the mainline A that renamed 'xyzzy' to 'frotz'
wholesale, and the exact commit on the side branch B that added an
extra mention of 'xyzzy').
If the logic can figure out what these two commits are without
user's help, mechanically by only looking at the merge-fix commit,
that would be even better. But I do not believe in miracles, so...
^ permalink raw reply [relevance 2%]
* Re: What's cooking in git.git (May 2017, #07; Tue, 23)
@ 2017-05-25 3:42 2% ` Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2017-05-25 3:42 UTC (permalink / raw)
To: Ævar Arnfjörð Bjarmason; +Cc: Stefan Beller, git@vger.kernel.org
Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:
>> The tests added by grep rely on the old content of
>> test 2 'grep correctly finds patterns in a submodule'.
>
> Sorry about the fallout.
>
>> The (whitespace broken) diff below fixes it.
Ah, then, this was an example of maintainer not doing a good job.
When I see a topic that pass its own test that fails when merged to
'pu', I usually try to see where it goes wrong myself and come up
with a fix in an evil merge, but this time I didn't have enough time
to do so before sending out the "What's cooking" report.
Here is what I taught my merge-fix machinery to apply after
mechanical merge of the two topics.
t/t7814-grep-recurse-submodules.sh | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/t/t7814-grep-recurse-submodules.sh b/t/t7814-grep-recurse-submodules.sh
index 14eeb54b4b..7184113b9b 100755
--- a/t/t7814-grep-recurse-submodules.sh
+++ b/t/t7814-grep-recurse-submodules.sh
@@ -36,18 +36,18 @@ test_expect_success 'grep correctly finds patterns in a submodule' '
test_expect_success 'grep finds patterns in a submodule via config' '
test_config submodule.recurse true &&
# expect from previous test
- git grep -e "bar" >actual &&
+ git grep -e "(3|4)" >actual &&
test_cmp expect actual
'
test_expect_success 'grep --no-recurse-submodules overrides config' '
test_config submodule.recurse true &&
cat >expect <<-\EOF &&
- a:foobar
- b/b:bar
+ a:(1|2)d(3|4)
+ b/b:(3|4)
EOF
- git grep -e "bar" --no-recurse-submodules >actual &&
+ git grep -e "(3|4)" --no-recurse-submodules >actual &&
test_cmp expect actual
'
--
2.13.0-491-g71cfeddc25
^ permalink raw reply related [relevance 2%]
* [PATCH v4 0/8] rebase: make reflog messages independent of the backend
2022-10-12 9:35 2% ` [PATCH v3 " Phillip Wood via GitGitGadget
@ 2022-10-21 9:21 2% ` Phillip Wood via GitGitGadget
2022-10-21 9:21 2% ` [PATCH v4 3/8] rebase --merge: fix reflog when continuing Phillip Wood via GitGitGadget
2022-10-21 9:21 2% ` [PATCH v4 4/8] rebase --merge: fix reflog message after skipping Phillip Wood via GitGitGadget
2022-10-12 9:35 2% ` [PATCH v3 " Phillip Wood via GitGitGadget
2022-10-12 9:35 2% ` [PATCH v3 3/8] rebase --merge: fix reflog when continuing Phillip Wood via GitGitGadget
2 siblings, 2 replies; 200+ results
From: Phillip Wood via GitGitGadget @ 2022-10-21 9:21 UTC (permalink / raw)
To: git
Cc: Phillip Wood, Christian Couder, Elijah Newren,
Ævar Arnfjörð Bjarmason, Calvin Wan, Emily Shaffer,
Glen Choo, Victoria Dye, Phillip Wood
This series fixes some bugs in the reflog messages when rebasing and changes
the reflog messages of "rebase --apply" to match "rebase --merge" with the
aim of making the reflog easier to parse.
Thanks to Junio for his comments, here are the changes since V3:
* Patch 1: Swapped with patch 2. Small change to fast-forward tests to make
them pass
* Patch 2: Swapped with patch 1. Reworded commit message and added a change
to the fast-forward test to reflect the change in reflog message
introduced by this patch
The rest of the patches are unchanged.
V2 Cover Letter
Thanks to everyone who commented on V2, I've added the review club
participants that I've got address for to the cc list. I've rebased onto
pw/rebase-keep-base-fixes.
Change since V2:
* Patch 1: Reworded the commit message to address the concerns in [1,2]
about the behavior when head_name is NULL. There is also a small change
due to being rebased.
* Patch 2: Unchanged. There wasn't much love for parameterized tests in
review club but we want to ensure both backends produce the same messages
I think this is the safest way to achieve that. Using separate tests
makes it too easy to introduce subtle differences in the testing of the
two backends.
* Patch 3: Added a note to the commit message to address the concerns in
[1] about not resetting GIT_REFLOG_ACTION when we return early.
* Patches 4 & 5: Unchanged.
* Patch 6: Reworded the commit message to make a stronger argument for this
change. There are concerns about backwards compatibility in [1,3,4] but
(i) we have made similar changes in the past without complaints and (ii)
we're changing the message to an existing format. There is also a small
change due to being rebased.
* Patches 7 & 8: Small changes due to rebase.
[1]
https://docs.google.com/document/d/14L8BAumGTpsXpjDY8VzZ4rRtpAjuGrFSRqn3stCuS_w/edit?pli=1#heading=h.t6g5l2t5ibzw
[2] https://lore.kernel.org/git/xmqq35i7r4rj.fsf@gitster.g/ [3]
https://lore.kernel.org/git/xmqq4k2nmmeg.fsf@gitster.g/ [4]
https://lore.kernel.org/git/220420.865yn4833u.gmgdl@evledraar.gmail.com/
V2 Cover Letter:
Thanks to Christian and Elijah for their comments on V1.
I've updated commit message for patch 1 to try and be clearer about the
removal of a call to strbuf_release() and spilt out the test changes from
the old patch 2 into a separate preparatory patch.
V1 Cover Letter:
This is a series of rebase reflog related patches with the aim of unifying
the reflog messages from the two rebase backends.
* improve rebase reflog test coverage
* rebase --merge: fix reflog messages for --continue and --skip
* rebase --apply: respect GIT_REFLOG_ACTION
* rebase --abort: improve reflog message
* unify reflog messages between the two rebase backends
This series is based on pw/use-inprocess-checkout-in-rebase
Phillip Wood (8):
t3406: rework rebase reflog tests
rebase --apply: improve fast-forward reflog message
rebase --merge: fix reflog when continuing
rebase --merge: fix reflog message after skipping
rebase --apply: respect GIT_REFLOG_ACTION
rebase --apply: make reflog messages match rebase --merge
rebase --abort: improve reflog message
rebase: cleanup action handling
builtin/rebase.c | 146 ++++++++++++------------------
sequencer.c | 5 ++
t/t3406-rebase-message.sh | 185 +++++++++++++++++++++++++++++++-------
3 files changed, 215 insertions(+), 121 deletions(-)
base-commit: aa1df8146d70bb85c63b0999868fe29aebc1173e
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1150%2Fphillipwood%2Fwip%2Frebase-reflog-fixes-v4
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1150/phillipwood/wip/rebase-reflog-fixes-v4
Pull-Request: https://github.com/gitgitgadget/git/pull/1150
Range-diff vs v3:
2: b9255ad35d2 ! 1: 8d5ae067ce3 t3406: rework rebase reflog tests
@@ Commit message
the "merge" and "apply" backends. The test coverage for the "apply"
backend now includes setting GIT_REFLOG_ACTION.
- Note that rebasing the "conflicts" branch does not create any
- conflicts yet. A commit to do that will be added in the next commit
- and the diff ends up smaller if we have don't rename the branch when
- it is added.
+ Note that rebasing the "conflicts" branch does not create any conflicts
+ yet. A commit to do that will be added shortly and the diff ends up
+ smaller if we have don't rename the branch when it is added.
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
@@ t/t3406-rebase-message.sh: test_expect_success 'error out early upon -C<n> or --
+ ) &&
+
+ git log -g --format=%gs -2 >actual &&
++ if test "$mode" = "--apply"
++ then
++ finish_msg="refs/heads/fast-forward onto $(git rev-parse main)"
++ else
++ finish_msg="returning to refs/heads/fast-forward"
++ fi &&
+ write_reflog_expect <<-EOF &&
-+ ${reflog_action:-rebase} (finish): returning to refs/heads/fast-forward
++ ${reflog_action:-rebase} (finish): $finish_msg
+ ${reflog_action:-rebase} (start): checkout main
EOF
test_cmp expect actual &&
1: a84cf971a75 ! 2: 12701ef7c7c rebase --apply: remove duplicated code
@@ Metadata
Author: Phillip Wood <phillip.wood@dunelm.org.uk>
## Commit message ##
- rebase --apply: remove duplicated code
+ rebase --apply: improve fast-forward reflog message
- Use move_to_original_branch() when reattaching HEAD after a fast-forward
- rather than open coding a copy of that code. move_to_original_branch()
- does not call reset_head() if head_name is NULL but there should be no
- user visible changes even though we currently call reset_head() in that
- case. The reason for this is that the reset_head() call does not add a
- message to the reflog because we're not changing the commit that HEAD
- points to and so lock_ref_for_update() elides the update. When head_name
- is not NULL then reset_head() behaves like "git symbolic-ref" and so the
- reflog is updated.
+ Using move_to_original_branch() when reattaching HEAD after a
+ fast-forward improves HEAD's reflog message when rebasing a branch. This
+ is because it uses separate reflog messages for "HEAD" and
+ "branch". HEAD's reflog will now record which branch we're returning to.
- Note that the removal of "strbuf_release(&msg)" is safe as there is an
- identical call just above this hunk which can be seen by viewing the
- diff with -U6.
+ When rebasing a detached HEAD there is no change in behavior. We
+ currently call reset_head() when head_name is NULL but
+ move_to_original_branch() does not. However the existing call does not
+ add a message to the reflog because we're not changing the commit that
+ HEAD points to and so lock_ref_for_update() skips the update.
+ Note that the removal of "strbuf_reset(&msg)" is safe as there is a call
+ to strbuf_release(&msf) just above this hunk which can be seen by
+ viewing the diff with -U6.
+
+ Helped-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
## builtin/rebase.c ##
@@ builtin/rebase.c: int cmd_rebase(int argc, const char **argv, const char *prefix
ret = finish_rebase(&options);
goto cleanup;
}
+
+ ## t/t3406-rebase-message.sh ##
+@@ t/t3406-rebase-message.sh: test_reflog () {
+ ) &&
+
+ git log -g --format=%gs -2 >actual &&
+- if test "$mode" = "--apply"
+- then
+- finish_msg="refs/heads/fast-forward onto $(git rev-parse main)"
+- else
+- finish_msg="returning to refs/heads/fast-forward"
+- fi &&
+ write_reflog_expect <<-EOF &&
+- ${reflog_action:-rebase} (finish): $finish_msg
++ ${reflog_action:-rebase} (finish): returning to refs/heads/fast-forward
+ ${reflog_action:-rebase} (start): checkout main
+ EOF
+ test_cmp expect actual &&
3: ea4da25a19c = 3: 2c965f4b97c rebase --merge: fix reflog when continuing
4: 225ff4baef7 = 4: 17138d910f0 rebase --merge: fix reflog message after skipping
5: 1094681eb11 = 5: 0c71c732904 rebase --apply: respect GIT_REFLOG_ACTION
6: a5338e6bdd8 = 6: 3f6b2e39f40 rebase --apply: make reflog messages match rebase --merge
7: aa808725fb8 = 7: c8fa57f129d rebase --abort: improve reflog message
8: f9c8664b883 = 8: ed800844ba1 rebase: cleanup action handling
--
gitgitgadget
^ permalink raw reply [relevance 2%]
* Re: [RFC] Rebasing merges: a jorney to the ultimate solution (Road Clear)
@ 2018-03-06 16:56 2% ` Junio C Hamano
0 siblings, 1 reply; 200+ results
From: Junio C Hamano @ 2018-03-06 16:56 UTC (permalink / raw)
To: Phillip Wood
Cc: Sergey Organov, Igor Djordjevic, phillip.wood, Git mailing list,
Jacob Keller, Johannes Schindelin, Johannes Sixt
Phillip Wood <phillip.wood@talktalk.net> writes:
> I wonder if just having a predicable result rather than forcing the
> rebase to stop if the user just squashes a fixup commit into a topic
> branch that is the parent of a merge might be more convenient in practice.
Unless I am misunderstanding what you are saying, that is pretty
much what I have automated for my daily rebuild of the 'pu' branch
Non-textual semantic conflicts are made (in the best case just once)
as a separate commit on top of mechanical auto-merge whose focus is
predictability (rather than cleverness) done by Git, and then that
separate commit is kept outside the history. When replaying these
merges to rebuild the 'pu' branch, after resetting the tip to
'master', each topic is merged mechanically, and if such a fix-up
commit is present, "cherry-pick --no-commit" applies it and then
"commit --amend --no-edit" to adjust the merge. I find it quite
valuable to have a separate record of what "evil" non-mechanical
adjustment was done, which I know won't be lost in the noise when
these merges need to be redone daily or more often.
The Appendix in Documentation/howto/maintain-git.txt talks about
this process. You can see what topics have such merge-fix defined
by peeking https://github.com/gitster/git/ repository.
^ permalink raw reply [relevance 2%]
* Re: [PATCH v2 1/2] commit-graph write: add progress output
@ 2018-09-21 21:57 2% ` Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2018-09-21 21:57 UTC (permalink / raw)
To: Derrick Stolee
Cc: Ævar Arnfjörð Bjarmason, git, Jeff King,
Eric Sunshine, Nguyễn Thái Ngọc Duy
Junio C Hamano <gitster@pobox.com> writes:
>> The above prototype change seems to have created a semantic conflict
>> with ds/commit-graph-tests (859fdc "commit-graph: define
>> GIT_TEST_COMMIT_GRAPH") because when GIT_TEST_COMMIT_GRAPH is set, we
>> call write_commit_graph_reachable() but the final parameter was
>> resolved to be "1" instead of "0".
>
> Hmph. That's unfortunate.
>
> Perhaps one of the topics should have yielded and waited until the
> other one passes through.
Nah, I see where things went wrong. I'll queue a single-liner
"mismerge fix" to 'next', and then correct the seed for the evil
merge kept in merge-fix/ab/commit-graph-progress, and rebuild 'pu'.
Things will straighten out by themselves after that happens.
Thanks for noticing.
^ permalink raw reply [relevance 2%]
* Re: [PATCH v3] merge: fix cache_entry use-after-free
2015-10-15 20:51 2% ` Junio C Hamano
@ 2015-10-16 7:05 2% ` David Turner
2015-10-16 16:04 2% ` Junio C Hamano
0 siblings, 1 reply; 200+ results
From: David Turner @ 2015-10-16 7:05 UTC (permalink / raw)
To: Junio C Hamano; +Cc: René Scharfe, git, Keith McGuigan
On Thu, 2015-10-15 at 13:51 -0700, Junio C Hamano wrote:
> David Turner <dturner@twopensource.com> writes:
>
> >> > +static inline void drop_ce_ref(struct cache_entry *ce)
> >> > +{
> >> > + if (ce != NULL) {
> >> > + assert(ce->ref_count >= 0);
> >>
> >> Shouldn't this be "> 0" to prevent double frees?
> >
> > No. If the ref_count is 1, then there is still some reference to the
> > ce. If it is 0, there is no reference to it, and the next check (< 1)
> > will succeed and the ce will get freed.
> >
> >> > + if (--ce->ref_count < 1) {
> >> > + free(ce);
> >> > + }
> >> > + }
> >> > +}
>
> Hmm, but it still feels fuzzy, no? I cannot tell from the above
> exchange if a ce with ref_count==0 upon entry to this function is
> supposed to have somebody pointing at it, somebody just assigned
> NULL (or another pointer) to the last pointer that was pointing at
> it, or what else. If the expected calling sequence were:
>
> drop_ce_ref(thing->ce);
> thing->ce = NULL;
>
> and the original thing->ce were the last reference to the cache
> entry about to be freed, its refcnt is better be 1 not 0. And when
> this function decrements refcnt down to 0, the cache entry is freed.
>
> Admittedly, if the original refcnt were 0, with signed refcnt, it
> will decrement to -1 and it will be freed, too, but I do not think
> that is what was intended---refcnt is initialized to 0 upon creating
> an unreferenced cache entry, and set_index_entry() and friends that
> store a pointer to anything calls add_ce_ref(), so I read the code
> as intending to make "0 means no pointer points at it".
>
> As far as I can tell, the only effect of this assert() that uses >=0
> not >0 is to avoid triggering it on this calling sequence:
>
> new_ce = new_cache_entry();
> drop_ce_ref(new_ce);
>
> that is, you create because you _might_ use it, and then later
> decide not to use it (and the free() part wouldn't have worked
> correctly with unsigned refcnt ;-).
You and René are right: there is an off-by-one here. Will fix and
re-roll. Thanks.
> By the way, the log message says "During merges, we would previously
> free entries that we no longer need in the destination index. But
> those entries might also be stored in the dir_entry cache," as if
> this issue were present and waiting to trigger for all merges for
> all people. Given that Linus does hundreds of merges in a day
> during the merge window (and I do several dozens a day), I am quite
> surprised that nobody noticed this issue. If there is a more
> specific condition that allows this bug to trigger (e.g. "dir-entry
> cache is used only under such and such conditions") that the log
> message does not talk about to explain why this bug was not seen
> widely, it would be a good thing to add. It is very puzzling
> otherwise.
We also do dozens or hundreds of merges per day and only saw this quite
rarely. Interestingly, we could only trigger it with an alternate
hashing function for git's hashmap implementation, and only once a
certain bug in that implementation was *fixed*. But that was just a
trigger; it was certainly not the cause. The bug would, in general,
have caused more hash collisions due to worse mixing, but I believe it
is possible that some particular collision would have been present in
the non-bugged version of the code but not in the bugged version.
It may have also had something to do with a case-insensitive filesystem;
we never saw anyone reproduce it on anything but OS X, and even there it
was quite difficult to reproduce.
In short, I don't think we know why the bug was not seen widely.
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (Jun 2014, #04; Tue, 17)
@ 2014-06-18 17:25 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2014-06-18 17:25 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
Many topics that have been cooking in 'next' during the previous
cycle, totalling close to 300 individual patches, are in 'master'
now. We have also accumulated some fixes we need to merge down to
'maint' and cut a v2.0.1 sometime next week.
You can find the changes described here in the integration branches
of the repositories listed at
http://git-blame.blogspot.com/p/git-public-repositories.html
--------------------------------------------------
[Graduated to "master"]
* mt/patch-id-stable (2014-06-10) 1 commit
- patch-id: change default to stable
Teaches "git patch-id" to compute the patch ID that does not change
when the files in a single patch is reordered. As this new algorithm
is backward incompatible, the last bit to flip it to be the default
is left out of 'master' for now.
* as/pretty-truncate (2014-05-21) 5 commits
(merged to 'next' on 2014-06-10 at d8147a2)
+ pretty.c: format string with truncate respects logOutputEncoding
+ t4205, t6006: add tests that fail with i18n.logOutputEncoding set
+ t4205 (log-pretty-format): use `tformat` rather than `format`
+ t4041, t4205, t6006, t7102: don't hardcode tested encoding value
+ t4205 (log-pretty-formats): don't hardcode SHA-1 in expected outputs
Originally merged to 'next' on 2014-05-23
* bg/xcalloc-nmemb-then-size (2014-05-27) 12 commits
(merged to 'next' on 2014-06-10 at eddb5bc)
+ transport-helper.c: rearrange xcalloc arguments
+ remote.c: rearrange xcalloc arguments
+ reflog-walk.c: rearrange xcalloc arguments
+ pack-revindex.c: rearrange xcalloc arguments
+ notes.c: rearrange xcalloc arguments
+ imap-send.c: rearrange xcalloc arguments
+ http-push.c: rearrange xcalloc arguments
+ diff.c: rearrange xcalloc arguments
+ config.c: rearrange xcalloc arguments
+ commit.c: rearrange xcalloc arguments
+ builtin/remote.c: rearrange xcalloc arguments
+ builtin/ls-remote.c: rearrange xcalloc arguments
Originally merged to 'next' on 2014-06-06
Like calloc(3), xcalloc() takes nmemb and then size.
* cb/byte-order (2014-05-30) 3 commits
(merged to 'next' on 2014-06-10 at 63db8ee)
+ compat/bswap.h: fix endianness detection
+ compat/bswap.h: restore preference __BIG_ENDIAN over BIG_ENDIAN
+ compat/bswap.h: detect endianness on more platforms that don't use BYTE_ORDER
Originally merged to 'next' on 2014-05-30
Compatibility enhancement for Solaris.
* cc/replace-edit (2014-05-19) 10 commits
(merged to 'next' on 2014-06-10 at ff69722)
+ Documentation: replace: describe new --edit option
+ replace: add --edit to usage string
+ replace: add tests for --edit
+ replace: die early if replace ref already exists
+ replace: refactor checking ref validity
+ replace: make sure --edit results in a different object
+ replace: add --edit option
+ replace: factor object resolution out of replace_object
+ replace: use OPT_CMDMODE to handle modes
+ replace: refactor command-mode determination
(this branch is used by cc/replace-graft.)
Originally merged to 'next' on 2014-05-19
"git replace" learns a new "--edit" option.
* dt/refs-check-refname-component-optim (2014-06-05) 1 commit
(merged to 'next' on 2014-06-10 at 4560669)
+ refs.c: optimize check_refname_component()
(this branch is used by dt/refs-check-refname-component-sse42.)
Originally merged to 'next' on 2014-06-06
* fc/remote-helper-refmap (2014-04-21) 8 commits
(merged to 'next' on 2014-06-10 at 8cd8cf8)
+ transport-helper: remove unnecessary strbuf resets
+ transport-helper: add support to delete branches
+ fast-export: add support to delete refs
+ fast-import: add support to delete refs
+ transport-helper: add support to push symbolic refs
+ transport-helper: add support for old:new refspec
+ fast-export: add new --refspec option
+ fast-export: improve argument parsing
Originally merged to 'next' on 2014-04-22
Allow remote-helper/fast-import based transport to rename the refs
while transferring the history.
* ib/test-selectively-run (2014-06-06) 4 commits
(merged to 'next' on 2014-06-10 at 1235570)
+ t0000-*.sh: fix the GIT_SKIP_TESTS sub-tests
+ test-lib: '--run' to run only specific tests
+ test-lib: tests skipped by GIT_SKIP_TESTS say so
+ test-lib: document short options in t/README
Originally merged to 'next' on 2014-06-06
Allow specifying only certain individual test pieces to be run
using a range notation (e.g. "t1234-test.sh --run='1-4 6 8 9-'").
* jk/argv-array-for-child-process (2014-05-15) 7 commits
(merged to 'next' on 2014-06-10 at 07a167b)
+ argv-array: drop "detach" code
+ get_importer: use run-command's internal argv_array
+ get_exporter: use argv_array
+ get_helper: use run-command's internal argv_array
+ git_connect: use argv_array
+ run_column_filter: use argv_array
+ run-command: store an optional argv_array
Originally merged to 'next' on 2014-05-21
* jk/complete-merge-pull (2014-05-27) 2 commits
(merged to 'next' on 2014-06-10 at d1524c5)
+ completion: add missing options for git-merge
+ completion: add a note that merge options are shared
Originally merged to 'next' on 2014-06-06
The completion code did not know about quite a few options that are
common between "git merge" and "git pull", and a couple of options
unique to "git merge".
* jk/daemon-tolower (2014-05-23) 1 commit
(merged to 'next' on 2014-06-10 at f3c549d)
+ daemon/config: factor out duplicate xstrdup_tolower
Originally merged to 'next' on 2014-05-23
* jk/diff-files-assume-unchanged (2014-05-15) 1 commit
(merged to 'next' on 2014-06-10 at 984862b)
+ run_diff_files: do not look at uninitialized stat data
Originally merged to 'next' on 2014-05-21
* jk/diff-follow-must-take-one-pathspec (2014-05-20) 1 commit
(merged to 'next' on 2014-06-10 at 0cd28d7)
+ move "--follow needs one pathspec" rule to diff_setup_done
Originally merged to 'next' on 2014-05-23
* jk/do-not-run-httpd-tests-as-root (2014-05-12) 1 commit
(merged to 'next' on 2014-06-10 at 745b05c)
+ t/lib-httpd: require SANITY prereq
Originally merged to 'next' on 2014-05-21
* jk/error-resolve-conflict-advice (2014-06-03) 2 commits
(merged to 'next' on 2014-06-10 at 713ebe0)
+ error_resolve_conflict: drop quotations around operation
+ error_resolve_conflict: rewrap advice message
Originally merged to 'next' on 2014-06-06
* jk/http-errors (2014-05-27) 8 commits
(merged to 'next' on 2014-06-10 at 30e9212)
+ http: default text charset to iso-8859-1
+ remote-curl: reencode http error messages
+ strbuf: add strbuf_reencode helper
+ http: optionally extract charset parameter from content-type
+ http: extract type/subtype portion of content-type
+ t5550: test display of remote http error messages
+ t/lib-httpd: use write_script to copy CGI scripts
+ test-lib: preserve GIT_CURL_VERBOSE from the environment
Originally merged to 'next' on 2014-06-06
Propagate the error messages from the webserver better to the
client coming over the HTTP transport.
* jk/report-fail-to-read-objects-better (2014-05-15) 1 commit
(merged to 'next' on 2014-06-10 at 299ea28)
+ open_sha1_file: report "most interesting" errno
Originally merged to 'next' on 2014-05-21
* jk/strbuf-tolower (2014-05-23) 1 commit
(merged to 'next' on 2014-06-10 at 01e6983)
+ strbuf: add strbuf_tolower function
Originally merged to 'next' on 2014-05-23
* jl/remote-rm-prune (2014-05-27) 3 commits
(merged to 'next' on 2014-06-10 at 13259ff)
+ remote prune: optimize "dangling symref" check/warning
+ remote: repack packed-refs once when deleting multiple refs
+ remote rm: delete remote configuration as the last
Originally merged to 'next' on 2014-06-06
"git remote rm" and "git remote prune" can involve removing many
refs at once, which is not a very efficient thing to do when very
many refs exist in the packed-refs file.
* jl/status-added-submodule-is-never-ignored (2014-04-07) 2 commits
(merged to 'next' on 2014-06-10 at fc63847)
+ commit -m: commit staged submodules regardless of ignore config
+ status/commit: show staged submodules regardless of ignore config
Originally merged to 'next' on 2014-06-06
submodule.*.ignore and diff.ignoresubmodules are used to ignore all
submodule changes in "diff" output, but it can be confusing to
apply these configuration values to status and commit.
This is a backward-incompatible change, but should be so in a good
way (aka bugfix).
* jm/dedup-test-config (2014-06-05) 1 commit
(merged to 'next' on 2014-06-10 at 8966f54)
+ t/t7810-grep.sh: remove duplicate test_config()
Originally merged to 'next' on 2014-06-06
* jm/doc-wording-tweaks (2014-05-28) 1 commit
(merged to 'next' on 2014-06-10 at 5f2e094)
+ Documentation: wording fixes in the user manual and glossary
Originally merged to 'next' on 2014-06-06
* jm/format-patch-mail-sig (2014-05-27) 2 commits
(merged to 'next' on 2014-06-10 at 310f59e)
+ format-patch: add "--signature-file=<file>" option
+ format-patch: make newline after signature conditional
Originally merged to 'next' on 2014-06-06
* jm/instaweb-apache-24 (2014-05-27) 1 commit
(merged to 'next' on 2014-06-10 at ecf2048)
+ git-instaweb: add support for Apache 2.4
Originally merged to 'next' on 2014-06-06
* jm/t9138-style-fix (2014-05-27) 1 commit
(merged to 'next' on 2014-06-10 at 034f13d)
+ t9138-git-svn-authors-prog.sh fixups
Originally merged to 'next' on 2014-06-06
* lt/log-auto-decorate (2014-05-30) 1 commit
(merged to 'next' on 2014-06-10 at f149f4a)
+ git log: support "auto" decorations
Originally merged to 'next' on 2014-06-06
* nd/daemonize-gc (2014-05-27) 1 commit
(merged to 'next' on 2014-06-10 at 6fae7b0)
+ gc --auto: do not lock refs in the background
Originally merged to 'next' on 2014-06-06
"git gc --auto" was recently changed to run in the background to
give control back early to the end-user sitting in front of the
terminal, but it forgot that housekeeping involving reflogs should
be done without other processes competing for accesses to the refs.
* ow/config-mailmap-pathname (2014-05-27) 1 commit
(merged to 'next' on 2014-06-10 at aba4ca2)
+ config: respect '~' and '~user' in mailmap.file
Originally merged to 'next' on 2014-06-06
mailmap.file configuration names a pathname, hence should honor
~/path and ~user/path as its value.
* rr/rebase-autostash-fix (2014-05-20) 2 commits
(merged to 'next' on 2014-06-10 at afd0c29)
+ rebase -i: test "Nothing to do" case with autostash
+ rebase -i: handle "Nothing to do" case with autostash
Originally merged to 'next' on 2014-05-21
* rs/pack-objects-no-unnecessary-realloc (2014-06-02) 1 commit
(merged to 'next' on 2014-06-10 at abae695)
+ pack-objects: use free()+xcalloc() instead of xrealloc()+memset()
Originally merged to 'next' on 2014-06-06
Avoid unnecessary copy of previous contents when extending the
hashtable used in pack-objects.
* rs/read-ref-at (2014-06-03) 1 commit
(merged to 'next' on 2014-06-10 at f58f2fc)
+ refs.c: change read_ref_at to use the reflog iterators
Originally merged to 'next' on 2014-06-06
* sh/enable-preloadindex (2014-06-03) 1 commit
(merged to 'next' on 2014-06-10 at 7cedf2d)
+ environment.c: enable core.preloadindex by default
Originally merged to 'next' on 2014-06-06
* sk/test-cmp-bin (2014-06-04) 1 commit
(merged to 'next' on 2014-06-10 at 020a475)
+ t5000, t5003: do not use test_cmp to compare binary files
Originally merged to 'next' on 2014-06-06
* sk/wincred (2014-05-14) 2 commits
(merged to 'next' on 2014-06-10 at 8d03e5a)
+ wincred: avoid overwriting configured variables
+ wincred: add install target
Originally merged to 'next' on 2014-05-21
* sk/windows-unc-path (2014-06-10) 1 commit
(merged to 'next' on 2014-06-10 at 3598cc6)
+ Windows: allow using UNC path for git repository
(this branch is used by sk/mingw-main, sk/mingw-uni-console and sk/mingw-unicode-spawn-args.)
Originally merged to 'next' on 2014-05-21
* ta/string-list-init (2014-06-06) 1 commit
(merged to 'next' on 2014-06-10 at bf209ff)
+ string-list: spell all values out that are given to a string_list initializer
Originally merged to 'next' on 2014-06-06
--------------------------------------------------
[New Topics]
* fr/sequencer-fail-with-not-one-upon-no-ff (2014-06-09) 1 commit
(merged to 'next' on 2014-06-16 at 29734cc)
+ sequencer: signal failed ff as an aborted, not a conflicted merge
Will merge to 'master'.
* hv/submodule-config (2014-06-13) 6 commits
- SQUASH compilation fix
- do not die on error of parsing fetchrecursesubmodules option
- use new config API for worktree configurations of submodules
- extract functions for submodule config set and lookup
- implement submodule config cache for lookup of submodule names
- hashmap: add enum for hashmap free_entries option
* mc/git-p4-prepare-p4-only (2014-06-13) 1 commit
(merged to 'next' on 2014-06-16 at 3c05e19)
+ git-p4: fix submit in non --prepare-p4-only mode
Will merge to 'master'.
* sk/mingw-unicode-spawn-args (2014-06-16) 6 commits
- Win32: Unicode arguments (incoming)
- Win32: Unicode arguments (outgoing)
- MinGW: disable CRT command line globbing
- Win32: fix potential multi-threading issue
- Win32: simplify internal mingw_spawn* APIs
- Win32: let mingw_execve() return an int
(this branch uses sk/mingw-main and sk/mingw-uni-console.)
* sp/complete-ext-alias (2014-06-13) 1 commit
(merged to 'next' on 2014-06-16 at 399679e)
+ completion: handle '!f() { ... }; f' and "!sh -c '...' -" aliases
Will merge to 'master'.
* bc/fix-rebase-merge-skip (2014-06-16) 1 commit
- rebase--merge: fix --skip with two conflicts in a row
"git rebase --skip" did not work well when it stopped due to a
conflict twice in a row.
Will merge to 'next'.
* jl/submodule-tests (2014-06-16) 16 commits
- revert: add t3513 for submodule updates
- stash: add t3906 for submodule updates
- am: add t4255 for submodule updates
- cherry-pick: add t3512 for submodule updates
- pull: add t5572 for submodule updates
- SQUASH???
- rebase: add t3426 for submodule updates
- merge: add t7613 for submodule updates
- bisect: add t6041 for submodule updates
- reset: add t7112 for submodule updates
- read-tree: add t1013 for submodule updates
- apply: add t4137 for submodule updates
- checkout: call the new submodule update test framework
- submodules: Add the lib-submodule-update.sh test library
- SQUASH???
- test-lib: add test_dir_is_empty()
Expecting a reroll.
* mc/doc-submodule-sync-recurse (2014-06-13) 1 commit
- submodule: document "sync --recursive"
Will merge to 'next'.
* pb/trim-trailing-spaces (2014-06-13) 1 commit
- t0008: do not depend on 'echo' handling backslashes specially
Will merge to 'next'.
* po/error-message-style (2014-06-16) 1 commit
- doc: state coding guideline for error message punctuation
Expecting a reroll.
* rs/blame-refactor (2014-06-13) 2 commits
- blame: simplify prepare_lines()
- blame: factor out get_next_line()
Will merge to 'next'.
* rs/ref-transaction (2014-06-17) 48 commits
- refs.c: make write_ref_sha1 static
- fetch.c: change s_update_ref to use a ref transaction
- refs.c: propagate any errno==ENOTDIR from _commit back to the callers
- refs.c: pass a skip list to name_conflict_fn
- refs.c: call lock_ref_sha1_basic directly from commit
- refs.c: move the check for valid refname to lock_ref_sha1_basic
- refs.c: pass NULL as *flags to read_ref_full
- refs.c: pass the ref log message to _create/delete/update instead of _commit
- refs.c: make delete_ref use a transaction
- refs.c: make prune_ref use a transaction to delete the ref
- refs.c: remove lock_ref_sha1
- refs.c: remove the update_ref_write function
- refs.c: remove the update_ref_lock function
- refs.c: make lock_ref_sha1 static
- walker.c: use ref transaction for ref updates
- fast-import.c: use a ref transaction when dumping tags
- receive-pack.c: use a reference transaction for updating the refs
- refs.c: change update_ref to use a transaction
- branch.c: use ref transaction for all ref updates
- fast-import.c: change update_branch to use ref transactions
- sequencer.c: use ref transactions for all ref updates
- commit.c: use ref transactions for updates
- replace.c: use the ref transaction functions for updates
- tag.c: use ref transactions when doing updates
- refs.c: add transaction.status and track OPEN/CLOSED/ERROR
- refs.c: make ref_transaction_begin take an err argument
- refs.c: update ref_transaction_delete to check for error and return status
- refs.c: change ref_transaction_create to do error checking and return status
- refs.c: change ref_transaction_update() to do error checking and return status
- refs.c: remove the onerr argument to ref_transaction_commit
- update-ref: use err argument to get error from ref_transaction_commit
- refs.c: make update_ref_write update a strbuf on failure
- refs.c: add an err argument to delete_ref_loose
- refs.c: make ref_update_reject_duplicates take a strbuf argument for errors
- refs.c: log_ref_write should try to return meaningful errno
- refs.c: make resolve_ref_unsafe set errno to something meaningful on error
- refs.c: commit_packed_refs to return a meaningful errno on failure
- refs.c: make remove_empty_directories alwasy set errno to something sane
- refs.c: verify_lock should set errno to something meaningful
- refs.c: make sure log_ref_setup returns a meaningful errno
- refs.c: add an err argument to repack_without_refs
- lockfile.c: make lock_file return a meaningful errno on failurei
- lockfile.c: add a new public function unable_to_lock_message
- refs.c: add a strbuf argument to ref_transaction_commit for error logging
- refs.c: allow passing NULL to ref_transaction_free
- refs.c: constify the sha arguments for ref_transaction_create|delete|update
- refs.c: ref_transaction_commit should not free the transaction
- refs.c: remove ref_transaction_rollback
* ye/doc-http-proto (2014-06-16) 1 commit
- http-protocol.txt: Basic Auth is defined in RFC 2617, not RFC 2616
Will merge to 'next'.
* jk/pretty-G-format-fixes (2014-06-17) 5 commits
- pretty: avoid reading past end-of-string with "%G"
- t7510: check %G* pretty-format output
- t7510: test a commit signed by an unknown key
- t7510: use consistent &&-chains in loop
- t7510: stop referring to master in later tests
* tb/unicode-7.0 (2014-06-17) 1 commit
- Update of unicode_width.h to Unicode Version 7.0
--------------------------------------------------
[Stalled]
* cc/replace-graft (2014-06-09) 5 commits
- DONTMERGE: wise to wait for peff's commit->buffer length series
- contrib: add convert-grafts-to-replace-refs.sh
- Documentation: replace: add --graft option
- replace: add test for --graft
- replace: add --graft option
"git replace" learned a "--graft" option to rewrite parents of a
commit.
* ab/add-interactive-show-diff-func-name (2014-05-12) 2 commits
- SQUASH??? git-add--interactive: Preserve diff heading when splitting hunks
- git-add--interactive: Preserve diff heading when splitting hunks
Waiting for a reroll.
* jn/gitweb-utf8-in-links (2014-05-27) 1 commit
- gitweb: Harden UTF-8 handling in generated links
$gmane/250758?
* rh/prompt-tests (2014-06-05) 11 commits
- t9904: new __git_ps1 tests for Zsh
- test-lib: make it possible to override how test code is eval'd
- lib-prompt-tests.sh: add variable for string that encodes percent in PS1
- lib-prompt-tests.sh: put all tests inside a function
- t9903: move prompt tests to a new lib-prompt-tests.sh file
- t9903: move PS1 color code variable definitions to lib-bash.sh
- t9903: include "Bash" in test names via new $shellname var
- t9903: run pc mode tests again with PS1 expansion disabled
- t9903: move test name prefix to a separate variable
- t9903: put the Bash pc mode prompt test cases in a function
- t9903: remove Zsh test from the suite of Bash prompt tests
Expecting a reroll to limit the damage to test_eval_; also reported
to be broken with older zsh that are still in the field ($gmane/251231).
* ss/userdiff-update-csharp-java (2014-06-02) 2 commits
- userdiff: support Java try keyword
- userdiff: support C# async methods and correct C# keywords
Reviews sent; waiting for a response.
* cc/interpret-trailers (2014-05-28) 11 commits
- Documentation: add documentation for 'git interpret-trailers'
- trailer: add tests for commands in config file
- trailer: execute command from 'trailer.<name>.command'
- trailer: add tests for "git interpret-trailers"
- trailer: add interpret-trailers command
- trailer: put all the processing together and print
- trailer: parse trailers from file or stdin
- trailer: process command line trailer arguments
- trailer: read and process config information
- trailer: process trailers from input message and arguments
- trailer: add data structures and basic functions
A new filter to programatically edit the tail end of the commit log
messages.
What is the status of this one? I think I saw reviews by Michael
but after that I do not recall seeing any updates.
* jh/submodule-tests (2014-04-17) 1 commit
- t7410: 210 tests for various 'git submodule update' scenarios
More or less abandoned. Will drop.
* nd/multiple-work-trees (2014-03-25) 28 commits
- count-objects: report unused files in $GIT_DIR/repos/...
- gc: support prune --repos
- gc: style change -- no SP before closing bracket
- prune: strategies for linked checkouts
- checkout: detach if the branch is already checked out elsewhere
- checkout: clean up half-prepared directories in --to mode
- checkout: support checking out into a new working directory
- use new wrapper write_file() for simple file writing
- wrapper.c: wrapper to open a file, fprintf then close
- setup.c: support multi-checkout repo setup
- setup.c: detect $GIT_COMMON_DIR check_repository_format_gently()
- setup.c: convert check_repository_format_gently to use strbuf
- setup.c: detect $GIT_COMMON_DIR in is_git_directory()
- setup.c: convert is_git_directory() to use strbuf
- git-stash: avoid hardcoding $GIT_DIR/logs/....
- *.sh: avoid hardcoding $GIT_DIR/hooks/...
- git-sh-setup.sh: use rev-parse --git-path to get $GIT_DIR/objects
- $GIT_COMMON_DIR: a new environment variable
- commit: use SEQ_DIR instead of hardcoding "sequencer"
- fast-import: use git_path() for accessing .git dir instead of get_git_dir()
- reflog: avoid constructing .lock path with git_path
- *.sh: respect $GIT_INDEX_FILE
- git_path(): be aware of file relocation in $GIT_DIR
- path.c: group git_path(), git_pathdup() and strbuf_git_path() together
- path.c: rename vsnpath() to do_git_path()
- git_snpath(): retire and replace with strbuf_git_path()
- path.c: make get_pathname() call sites return const char *
- path.c: make get_pathname() return strbuf instead of static buffer
A replacement for contrib/workdir/git-new-workdir that does not
rely on symbolic links and make sharing of objects and refs safer
by making the borrowee and borrowers aware of each other.
* mh/lockfile (2014-04-15) 25 commits
- trim_last_path_elm(): replace last_path_elm()
- resolve_symlink(): take a strbuf parameter
- resolve_symlink(): use a strbuf for internal scratch space
- change lock_file::filename into a strbuf
- commit_lock_file(): use a strbuf to manage temporary space
- try_merge_strategy(): use a statically-allocated lock_file object
- try_merge_strategy(): remove redundant lock_file allocation
- struct lock_file: declare some fields volatile
- lockfile: avoid transitory invalid states
- commit_lock_file(): die() if called for unlocked lockfile object
- commit_lock_file(): inline temporary variable
- remove_lock_file(): call rollback_lock_file()
- lock_file(): exit early if lockfile cannot be opened
- write_packed_entry_fn(): convert cb_data into a (const int *)
- prepare_index(): declare return value to be (const char *)
- delete_ref_loose(): don't muck around in the lock_file's filename
- cache.h: define constants LOCK_SUFFIX and LOCK_SUFFIX_LEN
- lockfile.c: document the various states of lock_file objects
- lock_file(): always add lock_file object to lock_file_list
- hold_lock_file_for_append(): release lock on errors
- lockfile: unlock file if lockfile permissions cannot be adjusted
- rollback_lock_file(): set fd to -1
- rollback_lock_file(): do not clear filename redundantly
- api-lockfile: expand the documentation
- unable_to_lock_die(): rename function from unable_to_lock_index_die()
Refactor and fix corner-case bugs in the lockfile API, all looked
sensible.
Expecting a reroll.
* bg/rebase-off-of-previous-branch (2014-04-16) 1 commit
- git-rebase: print name of rev when using shorthand
Teach "git rebase -" to report the concrete name of the branch
(i.e. the previous one).
But it stops short and does not do the same for "git rebase @{-1}".
Expecting a reroll.
* tr/merge-recursive-index-only (2014-02-05) 3 commits
- merge-recursive: -Xindex-only to leave worktree unchanged
- merge-recursive: internal flag to avoid touching the worktree
- merge-recursive: remove dead conditional in update_stages()
(this branch is used by tr/remerge-diff.)
Will hold.
* tr/remerge-diff (2014-02-26) 5 commits
. log --remerge-diff: show what the conflict resolution changed
. name-hash: allow dir hashing even when !ignore_case
. merge-recursive: allow storing conflict hunks in index
. revision: fold all merge diff variants into an enum merge_diff_mode
. combine-diff: do not pass revs->dense_combined_merges redundantly
(this branch uses tr/merge-recursive-index-only.)
"log -p" output learns a new way to let users inspect a merge
commit by showing the differences between the automerged result
with conflicts the person who recorded the merge would have seen
and the final conflict resolution that was recorded in the merge.
Needs to be rebased, now kb/fast-hashmap topic is in.
* jk/makefile (2014-02-05) 16 commits
. FIXUP
. move LESS/LV pager environment to Makefile
. Makefile: teach scripts to include make variables
. FIXUP
. Makefile: auto-build C strings from make variables
. Makefile: drop *_SQ variables
. FIXUP
. Makefile: add c-quote helper function
. Makefile: introduce sq function for shell-quoting
. Makefile: always create files via make-var
. Makefile: store GIT-* sentinel files in MAKE/
. Makefile: prefer printf to echo for GIT-*
. Makefile: use tempfile/mv strategy for GIT-*
. Makefile: introduce make-var helper function
. Makefile: fix git-instaweb dependency on gitweb
. Makefile: drop USE_GETTEXT_SCHEME from GIT-CFLAGS
Simplify the Makefile rules and macros that exist primarily for
quoting purposes, and make it easier to robustly express the
dependency rules.
Expecting a reroll.
* po/everyday-doc (2014-01-27) 1 commit
- Make 'git help everyday' work
This may make the said command to emit something, but the source is
not meant to be formatted into a manual pages to begin with, and
also its contents are a bit stale. It may be a good first step in
the right direction, but needs more work to at least get the
mark-up right before public consumption.
Will hold.
* jk/branch-at-publish-rebased (2014-01-17) 5 commits
. t1507 (rev-parse-upstream): fix typo in test title
. implement @{publish} shorthand
. branch_get: provide per-branch pushremote pointers
. branch_get: return early on error
. sha1_name: refactor upstream_mark
Give an easier access to the tracking branches from "other" side in
a triangular workflow by introducing B@{publish} that works in a
similar way to how B@{upstream} does.
Meant to be used as a basis for whatever Ram wants to build on.
Ejected from 'pu' to unclutter.
* fc/publish-vs-upstream (2014-04-21) 8 commits
. sha1_name: add support for @{publish} marks
. sha1_name: simplify track finding
. sha1_name: cleanup interpret_branch_name()
. branch: display publish branch
. push: add --set-publish option
. branch: add --set-publish-to option
. Add concept of 'publish' branch
. t5516 (fetch-push): fix test restoration
Add branch@{publish}; it seems that this is somewhat different from
Ram and Peff started working on. At least the tip needs to be
rerolled not to squat on @{p} which @{push} and possibly @{pull}
may want to share.
* rb/merge-prepare-commit-msg-hook (2014-01-10) 4 commits
- merge: drop unused arg from abort_commit method signature
- merge: make prepare_to_commit responsible for write_merge_state
- t7505: ensure cleanup after hook blocks merge
- t7505: add missing &&
Expose more merge states (e.g. $GIT_DIR/MERGE_MODE) to hooks that
run during "git merge". The log message stresses too much on one
hook, prepare-commit-msg, but it would equally apply to other hooks
like post-merge, I think.
Waiting for a reroll.
* jc/graph-post-root-gap (2013-12-30) 3 commits
- WIP: document what we want at the end
- graph: remove unused code a bit
- graph: stuff the current commit into graph->columns[]
This was primarily a RFH ($gmane/239580).
* np/pack-v4 (2013-09-18) 90 commits
. packv4-parse.c: add tree offset caching
. t1050: replace one instance of show-index with verify-pack
. index-pack, pack-objects: allow creating .idx v2 with .pack v4
. unpack-objects: decode v4 trees
. unpack-objects: allow to save processed bytes to a buffer
- ...
Nico and Duy advancing the eternal vaporware pack-v4. This is here
primarily for wider distribution of the preview edition.
Needs to be rebased, now the pack-bitmap series is in.
* tg/perf-lib-test-perf-cleanup (2013-09-19) 2 commits
- perf-lib: add test_perf_cleanup target
- perf-lib: split starting the test from the execution
Add test_perf_cleanup shell function to the perf suite, that allows
the script writers to define a test with a clean-up action.
Will hold.
* jc/show-branch (2014-03-24) 5 commits
- show-branch: use commit slab to represent bitflags of arbitrary width
- show-branch.c: remove "all_mask"
- show-branch.c: abstract out "flags" operation
- show-branch.c: lift all_mask/all_revs to a global static
- show-branch.c: update comment style
Waiting for the final step to lift the hard-limit before sending it out.
--------------------------------------------------
[Cooking]
* jc/fetch-pull-refmap (2014-06-12) 10 commits
(merged to 'next' on 2014-06-12 at 5428530)
+ docs: Explain the purpose of fetch's and pull's <refspec> parameter.
(merged to 'next' on 2014-06-10 at 13c13ae)
+ fetch: allow explicit --refmap to override configuration
+ fetch doc: add a section on configured remote-tracking branches
+ fetch doc: remove "short-cut" section
+ fetch doc: update refspec format description
+ fetch doc: on pulling multiple refspecs
+ fetch doc: remove notes on outdated "mixed layout"
+ fetch doc: update note on '+' in front of the refspec
+ fetch doc: move FETCH_HEAD material lower and add an example
+ fetch doc: update introductory part for clarity
Will merge to 'master'.
* nd/split-index (2014-06-13) 32 commits
- t1700: new tests for split-index mode
- t2104: make sure split index mode is off for the version test
- read-cache: force split index mode with GIT_TEST_SPLIT_INDEX
- read-tree: note about dropping split-index mode or index version
- read-tree: force split-index mode off on --index-output
- rev-parse: add --shared-index-path to get shared index path
- update-index --split-index: do not split if $GIT_DIR is read only
- update-index: new options to enable/disable split index mode
- split-index: strip pathname of on-disk replaced entries
- split-index: do not invalidate cache-tree at read time
- split-index: the reading part
- split-index: the writing part
- read-cache: mark updated entries for split index
- read-cache: save deleted entries in split index
- read-cache: mark new entries for split index
- read-cache: split-index mode
- read-cache: save index SHA-1 after reading
- entry.c: update cache_changed if refresh_cache is set in checkout_entry()
- cache-tree: mark istate->cache_changed on prime_cache_tree()
- cache-tree: mark istate->cache_changed on cache tree update
- cache-tree: mark istate->cache_changed on cache tree invalidation
- unpack-trees: be specific what part of the index has changed
- resolve-undo: be specific what part of the index has changed
- update-index: be specific what part of the index has changed
- read-cache: be specific what part of the index has changed
- read-cache: be strict about "changed" in remove_marked_cache_entries()
- read-cache: store in-memory flags in the first 12 bits of ce_flags
- read-cache: relocate and unexport commit_locked_index()
- read-cache: new API write_locked_index instead of write_index/write_cache
- sequencer: do not update/refresh index if the lock cannot be held
- ewah: delete unused ewah_read_mmap_native declaration
- ewah: fix constness of ewah_read_mmap
* ep/avoid-test-a-o (2014-06-10) 21 commits
- git-submodule.sh: avoid "echo" path-like values
- SQUASH: misconversion breakage fix
- git-submodule.sh: avoid "test <cond> -a/-o <cond>"
- t/test-lib-functions.sh: avoid "test <cond> -a/-o <cond>"
- t/t9814-git-p4-rename.sh: avoid "test <cond> -a/-o <cond>"
- t/t5538-push-shallow.sh: avoid "test <cond> -a/-o <cond>"
- t/t5403-post-checkout-hook.sh: avoid "test <cond> -a/-o <cond>"
- t/t5000-tar-tree.sh: avoid "test <cond> -a/-o <cond>"
- t/t4102-apply-rename.sh: avoid "test <cond> -a/-o <cond>"
- t/t0026-eol-config.sh: avoid "test <cond> -a/-o <cond>"
- t/t0025-crlf-auto.sh: avoid "test <cond> -a/-o <cond>"
- t/lib-httpd.sh: avoid "test <cond> -a/-o <cond>"
- git-rebase--interactive.sh: avoid "test <cond> -a/-o <cond>"
- git-mergetool.sh: avoid "test <cond> -a/-o <cond>"
- git-bisect.sh: avoid "test <cond> -a/-o <cond>"
- contrib/examples/git-resolve.sh: avoid "test <cond> -a/-o <cond>"
- contrib/examples/git-repack.sh: avoid "test <cond> -a/-o <cond>"
- contrib/examples/git-merge.sh: avoid "test <cond> -a/-o <cond>"
- contrib/examples/git-commit.sh: avoid "test <cond> -a/-o <cond>"
- contrib/examples/git-clone.sh: avoid "test <cond> -a/-o <cond>"
- check_bindir: avoid "test <cond> -a/-o <cond>"
* jc/revision-dash-count-parsing (2014-06-09) 1 commit
(merged to 'next' on 2014-06-10 at 1aeca19)
+ revision: parse "git log -<count>" more carefully
"git log -2master" is a common typo that shows two commits starting
from whichever random branch that is not 'master' that happens to
be checked out currently.
Will merge to 'master'.
* jc/test-lazy-prereq (2014-06-13) 7 commits
- tests: drop GIT_*_TIMING_TESTS environment variable support
(merged to 'next' on 2014-06-10 at 4f774f7)
+ t3419: drop unnecessary NOT_EXPENSIVE pseudo-prerequisite
+ t3302: drop unnecessary NOT_EXPENSIVE pseudo-prerequisite
+ t3302: do not chdir around in the primary test process
+ t3302: coding style updates
+ test: turn USR_BIN_TIME into a lazy prerequisite
+ test: turn EXPENSIVE into a lazy prerequisite
Test-script clean-up. The last step might be controversial.
Will merge to 'master' except for the last one.
* jk/commit-buffer-length (2014-06-13) 18 commits
(merged to 'next' on 2014-06-16 at b2d2d7b)
+ reuse cached commit buffer when parsing signatures
+ commit: record buffer length in cache
+ commit: convert commit->buffer to a slab
+ commit-slab: provide a static initializer
+ use get_commit_buffer everywhere
+ convert logmsg_reencode to get_commit_buffer
+ use get_commit_buffer to avoid duplicate code
+ use get_cached_commit_buffer where appropriate
+ provide helpers to access the commit buffer
+ provide a helper to set the commit buffer
+ provide a helper to free commit buffer
+ sequencer: use logmsg_reencode in get_message
+ logmsg_reencode: return const buffer
+ do not create "struct commit" with xcalloc
+ commit: push commit_index update into alloc_commit_node
+ alloc: include any-object allocations in alloc_report
+ replace dangerous uses of strbuf_attach
+ commit_tree: take a pointer/len pair rather than a const strbuf
Move "commit->buffer" out of the in-core commit object and keep
track of their lengths. Use this to optimize the code paths to
validate GPG signatures in commit objects.
Will merge to 'master'.
* jm/api-strbuf-doc (2014-06-09) 1 commit
(merged to 'next' on 2014-06-10 at 831aa30)
+ api-strbuf.txt minor typos
Will merge to 'master'.
* rs/more-starts-with (2014-06-09) 1 commit
(merged to 'next' on 2014-06-10 at efcd02e)
+ Use starts_with() for C strings instead of memcmp()
Will merge to 'master'.
* sk/mingw-dirent (2014-06-09) 5 commits
- Win32 dirent: improve dirent implementation
- Win32 dirent: clarify #include directives
- Win32 dirent: change FILENAME_MAX to MAX_PATH
- Win32 dirent: remove unused dirent.d_reclen member
- Win32 dirent: remove unused dirent.d_ino member
* sk/mingw-main (2014-06-10) 2 commits
- mingw: avoid const warning
- Win32: move main macro to a function
(this branch is used by sk/mingw-uni-console and sk/mingw-unicode-spawn-args.)
* sk/mingw-uni-console (2014-06-16) 7 commits
- Win32: reliably detect console pipe handles
- Win32: fix broken pipe detection
- Win32: Thread-safe windows console output
- Win32: add Unicode conversion functions
- Win32: warn if the console font doesn't support Unicode
- Win32: detect console streams more reliably
- Win32: support Unicode console output
(this branch is used by sk/mingw-unicode-spawn-args; uses sk/mingw-main.)
Now, are Windows folks happy with all four mingw topics?
* tb/t5551-clone-notice-to-stderr (2014-06-09) 1 commit
(merged to 'next' on 2014-06-10 at 374082c)
+ t5551: fix the 50,000 tag test
Will merge to 'master'.
* jk/repack-pack-keep-objects (2014-06-10) 3 commits
(merged to 'next' on 2014-06-16 at 89716c9)
+ repack: s/write_bitmap/&s/ in code
+ repack: respect pack.writebitmaps
+ repack: do not accidentally pack kept objects by default
(this branch is used by jk/repack-pack-writebitmaps-config.)
Recent updates to "git repack" started to duplicate objects that
are in packfiles marked with .keep flag into the new packfile by
mistake.
Will merge to 'master'.
* jk/repack-pack-writebitmaps-config (2014-06-12) 4 commits
(merged to 'next' on 2014-06-16 at 777005d)
+ t7700: drop explicit --no-pack-kept-objects from .keep test
+ repack: introduce repack.writeBitmaps config option
+ repack: simplify handling of --write-bitmap-index
+ pack-objects: stop respecting pack.writebitmaps
(this branch uses jk/repack-pack-keep-objects.)
Will merge to 'master'.
* mg/verify-commit (2014-06-10) 3 commits
- verify-commit: scriptable commit signature verification
- gpg-interface: provide access to the payload
- pretty: free the gpg status buf
What is queued here is v1; v2 exists but I skipped it.
Expecting a reroll.
* nd/init-restore-env (2014-06-10) 1 commit
(merged to 'next' on 2014-06-16 at ecbbfca)
+ git potty: restore environments after alias expansion
Will merge to 'master'.
* jl/git-gui-show-added-submodule-changes (2014-04-15) 1 commit
- git-gui: show staged submodules regardless of ignore config
Tentatively queued what I expect to receive via Pat Thoyts.
* jl/gitk-show-added-submodule-changes (2014-04-15) 3 commits
- gitk: show staged submodules regardless of ignore config
- gitk: Merge branch 'new' of https://github.com/vnwildman/gitk
- l10n: Init Vietnamese translation
Will drop, as I heard from Paul that these are queued in his tree.
* mt/send-email-cover-to-cc (2014-06-10) 3 commits
(merged to 'next' on 2014-06-10 at 6bb1465)
+ t9001: avoid non-portable '\n' with sed
+ test/send-email: to-cover, cc-cover tests
+ git-send-email: two new options: to-cover, cc-cover
Originally merged to 'next' on 2014-06-10
Will merge to 'master'.
* mt/patch-id-stable (2014-06-10) 1 commit
- patch-id: change default to stable
--------------------------------------------------
[Discarded]
* jl/submodule-recursive-checkout (2013-12-26) 5 commits
. Teach checkout to recursively checkout submodules
. submodule: teach unpack_trees() to update submodules
. submodule: teach unpack_trees() to repopulate submodules
. submodule: teach unpack_trees() to remove submodule contents
. submodule: prepare for recursive checkout of submodules
Dropped for now to make room for another topic ($gmane/251521)
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (Oct 2015, #07; Fri, 30)
@ 2015-10-30 22:07 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2015-10-30 22:07 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
At tinyurl.com/gitCal, I drew a 14-week schedule for this cycle. I
plan to be offline during weeks #7-#9 myself; hopefully we'll have
capable interim maintainers to take care of the list traffic in the
meantime as in past years.
You can find the changes described here in the integration branches
of the repositories listed at
http://git-blame.blogspot.com/p/git-public-repositories.html
--------------------------------------------------
[Graduated to "master"]
* ar/clone-dissociate (2015-10-22) 1 commit
(merged to 'next' on 2015-10-23 at 6bf746f)
+ clone: allow "--dissociate" without reference
"git clone --dissociate" used to require that "--reference" was
used at the same time, but you can create a new repository that
borrows objects from another without using "--reference", namely
with "clone --local" from a repository that borrows objects from
other repositories.
* dt/name-hash-dir-entry-fix (2015-10-21) 1 commit
(merged to 'next' on 2015-10-22 at 15eb519)
+ name-hash: don't reuse cache_entry in dir_entry
The name-hash subsystem that is used to cope with case insensitive
filesystems keeps track of directories and their on-filesystem
cases for all the paths in the index by holding a pointer to a
randomly chosen cache entry that is inside the directory (for its
ce->ce_name component). This pointer was not updated even when the
cache entry was removed from the index, leading to use after free.
This was fixed by recording the path for each directory instead of
borrowing cache entries and restructuring the API somewhat.
* gr/rebase-i-drop-warn (2015-10-28) 2 commits
(merged to 'next' on 2015-10-29 at 4bfda25)
+ rebase-i: work around Windows CRLF line endings
+ t3404: "rebase -i" gets broken when insn sheet uses CR/LF line endings
Recent update to "rebase -i" that tries to sanity check the edited
insn sheet before it uses it has become too picky on Windows where
CRLF left by the editor is turned into a trailing CR on the line
read via the "read" built-in command.
* jc/add-u-A-default-to-top (2015-10-24) 1 commit
(merged to 'next' on 2015-10-29 at 15aea9c)
+ add: simplify -u/-A without pathspec
"git --literal-pathspecs add -u/-A" without any command line
argument misbehaved ever since Git 2.0.
* jc/am-mailinfo-direct (2015-10-21) 1 commit
(merged to 'next' on 2015-10-22 at ca15014)
+ am: make direct call to mailinfo
(this branch is used by jc/mailinfo; uses jc/mailinfo-lib.)
"git am" used to spawn "git mailinfo" via run_command() API once
per each patch, but learned to make a direct call to mailinfo()
instead.
* jc/em-dash-in-doc (2015-10-22) 1 commit
(merged to 'next' on 2015-10-23 at 31a08ce)
+ Documentation: AsciiDoc spells em-dash as double-dashes, not triple
AsciiDoc markup fixes.
* jc/everyday-markup (2015-10-22) 1 commit
(merged to 'next' on 2015-10-22 at 0a2702d)
+ Documentation/everyday: match undefline with the text
AsciiDoc markup fixes.
* jc/mailinfo-lib (2015-10-21) 34 commits
(merged to 'next' on 2015-10-22 at 405bd66)
+ mailinfo: remove calls to exit() and die() deep in the callchain
+ mailinfo: handle charset conversion errors in the caller
+ mailinfo: libify
+ mailinfo: keep the parsed log message in a strbuf
+ mailinfo: handle_commit_msg() shouldn't be called after finding patchbreak
+ mailinfo: move content/content_top to struct mailinfo
+ mailinfo: move [ps]_hdr_data to struct mailinfo
+ mailinfo: move cmitmsg and patchfile to struct mailinfo
+ mailinfo: move charset to struct mailinfo
+ mailinfo: move transfer_encoding to struct mailinfo
+ mailinfo: move check for metainfo_charset to convert_to_utf8()
+ mailinfo: move metainfo_charset to struct mailinfo
+ mailinfo: move use_scissors and use_inbody_headers to struct mailinfo
+ mailinfo: move add_message_id and message_id to struct mailinfo
+ mailinfo: move patch_lines to struct mailinfo
+ mailinfo: move filter/header stage to struct mailinfo
+ mailinfo: move global "FILE *fin, *fout" to struct mailinfo
+ mailinfo: move keep_subject & keep_non_patch_bracket to struct mailinfo
+ mailinfo: introduce "struct mailinfo" to hold globals
+ mailinfo: move global "line" into mailinfo() function
+ mailinfo: do not let find_boundary() touch global "line" directly
+ mailinfo: do not let handle_boundary() touch global "line" directly
+ mailinfo: do not let handle_body() touch global "line" directly
+ mailinfo: get rid of function-local static states
+ mailinfo: move definition of MAX_HDR_PARSED closer to its use
+ mailinfo: move cleanup_space() before its users
+ mailinfo: move check_header() after the helpers it uses
+ mailinfo: move read_one_header_line() closer to its callers
+ mailinfo: move handle_boundary() lower
+ mailinfo: plug strbuf leak during continuation line handling
+ mailinfo: explicitly close file handle to the patch output
+ mailinfo: fix an off-by-one error in the boundary stack
+ mailinfo: fold decode_header_bq() into decode_header()
+ mailinfo: remove a no-op call convert_to_utf8(it, "")
(this branch is used by jc/am-mailinfo-direct and jc/mailinfo.)
The implementation of "git mailinfo" was refactored so that a
mailinfo() function can be directly called from inside a process.
* jk/delete-modechange-conflict (2015-10-26) 3 commits
(merged to 'next' on 2015-10-29 at 59ce69d)
+ merge: detect delete/modechange conflict
+ t6031: generalize for recursive and resolve strategies
+ t6031: move triple-rename test to t3030
Merging a branch that removes a path and another that changes the
mode bits on the same path should have conflicted at the path, but
it didn't and silently favoured the removal.
* jk/merge-file-exit-code (2015-10-29) 1 commit
(merged to 'next' on 2015-10-29 at 6ae613f)
+ merge-file: clamp exit code to maximum 127
"git merge-file" tried to signal how many conflicts it found, which
obviously would not work well when there are too many of them.
* jk/war-on-sprintf (2015-10-23) 2 commits
(merged to 'next' on 2015-10-23 at 3a94851)
+ compat/mingw.c: remove printf format warning
+ read_branches_file: plug a FILE* leak
* js/imap-send-curl-compilation-fix (2015-10-26) 1 commit
(merged to 'next' on 2015-10-29 at 9c4f3eb)
+ imap-send: only use CURLOPT_LOGIN_OPTIONS if it is actually available
"git imap-send" did not compile well with older version of cURL library.
* js/misc-fixes (2015-10-26) 3 commits
(merged to 'next' on 2015-10-29 at 8990f29)
+ Correct fscanf formatting string for I64u values
+ Silence GCC's "cast of pointer to integer of a different size" warning
+ Squelch warning about an integer overflow
Various compilation fixes and squelching of warnings.
* mk/blame-error-message (2015-10-26) 1 commit
(merged to 'next' on 2015-10-29 at 82a1b18)
+ blame: fix option name in error message
The error message from "git blame --contents --reverse" incorrectly
talked about "--contents --children".
* rp/link-curl-before-ssl (2015-10-21) 3 commits
(merged to 'next' on 2015-10-22 at dad4fc6)
+ configure.ac: detect ssl need with libcurl
+ Makefile: make curl-config path configurable
+ Makefile: link libcurl before zlib
The linkage order of libraries was wrong in places around libcurl.
* rs/pop-commit (2015-10-26) 1 commit
(merged to 'next' on 2015-10-29 at f24d8ed)
+ use pop_commit() for consuming the first entry of a struct commit_list
Code simplification.
* tk/sigchain-unnecessary-post-tempfile (2015-10-22) 4 commits
(merged to 'next' on 2015-10-22 at b049f0a)
+ shallow: remove unused #include "sigchain.h"
+ read-cache: remove unused #include "sigchain.h"
+ diff: remove unused #include "sigchain.h"
+ credential-cache--daemon: remove unused #include "sigchain.h"
Remove no-longer used #include.
* xf/user-manual-ff (2015-10-26) 1 commit
(merged to 'next' on 2015-10-29 at 488c4f8)
+ user-manual: fix the description of fast-forward
* xf/user-manual-markup (2015-10-22) 3 commits
(merged to 'next' on 2015-10-22 at cd33c83)
+ Documentation: match undefline with the text in old release notes
+ Documentation: match underline with the text
+ Documentation: fix header markup
AsciiDoc markup fixes.
--------------------------------------------------
[New Topics]
* sb/submodule-parallel-update (2015-10-29) 9 commits
- clone: allow an explicit argument for parallel submodule clones
- submodule update: expose parallelism to the user
- git submodule update: have a dedicated helper for cloning
- fetching submodules: respect `submodule.jobs` config option
- submodule config: update parse_config()
- submodule config: remove name_and_item_from_var
- submodule config: keep update strategy around
- run_processes_parallel: add output to tracing messages
- Merge branch 'sb/submodule-parallel-fetch' into sb/submodule-parallel-update
(this branch uses sb/submodule-parallel-fetch.)
Builds on top of the "fetch --recurse-submodules" work to introduce
parallel downloading into multiple submodules for "submodule update".
Waiting for reviews.
* jc/strbuf-gets (2015-10-28) 17 commits
- test-sha1-array: read command stream with strbuf_gets()
- grep: read -f file with strbuf_gets()
- send-pack: read list of refs with strbuf_gets()
- column: read lines with strbuf_gets()
- cat-file: read batch stream with strbuf_gets()
- transport-helper: read helper response with strbuf_gets()
- clone/sha1_file: read info/alternates with strbuf_gets()
- remote.c: read $GIT_DIR/remotes/* with strbuf_gets()
- ident.c: read /etc/mailname with strbuf_gets()
- rev-parse: read parseopt spec with strbuf_gets()
- revision: read --stdin with strbuf_gets()
- hash-object: read --stdin-paths with strbuf_gets()
- mktree: read textual tree representation with strbuf_gets()
- update-index: read list of paths with strbuf_gets() under --stdin
- update-index: read --index-info with strbuf_gets()
- check-attr, check-ignore, checkout-index: read paths with strbuf_gets()
- strbuf: add strbuf_gets()
Teach codepaths that communicate with users by reading text files
to be more lenient to editors that write CRLF-terminated lines.
Note that this is only about communication with Git, like feeding
list of object names from the standard input instead of from the
command line, and does not involve files in the working tree.
Waiting for reviews.
* eg/p4-submit-catch-failure (2015-10-30) 1 commit
- git-p4: clean up after p4 submit failure
Just like the working tree is cleaned up when the user cancelled
submission in P4Submit.applyCommit(), clean up the mess if "p4
submit" fails.
Needs an update to test.
* jk/initialization-fix-to-add-submodule-odb (2015-10-28) 1 commit
- add_submodule_odb: initialize alt_odb list earlier
We peek objects from submodule's object store by linking it to the
list of alternate object databases, but the code to do so forgot to
correctly initialize the list.
Will merge to 'next'.
* ep/ident-with-getaddrinfo (2015-10-30) 1 commit
- (NEEDSWORK $gmane/280507) ident.c: add support for IPv6
A build without NO_IPv6 used to use gethostbyname() when guessing
user's hostname, instead of getaddrinfo() that is used in other
codepaths in such a build.
Waiting for a reroll.
($gmane/280507)
* js/git-gdb (2015-10-30) 1 commit
- test: facilitate debugging Git executables in tests with gdb
Allow easier debugging of a single "git" invocation in our test
scripts.
Will merge to 'next'.
* kn/for-each-branch (2015-10-30) 1 commit
- ref-filter: fallback on alphabetical comparison
Using the timestamp based criteria in "git branch --sort" did not
tiebreak branches that point at commits with the same timestamp (or
the same commit), making the resulting output unstable.
Will merge to 'next' and then quickly to 'master'.
* ea/checkout-progress (2015-10-30) 2 commits
- SQUASH???
- checkout: add --progress option
"git checkout" did not follow the usual "--[no-]progress"
convention and implemented only "--quiet" that is essentially
"--no-progress".
Waiting for a reroll.
* jc/test-must-fail-with-sigpipe (2015-10-30) 1 commit
- test: accept death by SIGPIPE as a valid failure mode
Waiting for reviews.
--------------------------------------------------
[Stalled]
* dk/gc-idx-wo-pack (2015-08-17) 3 commits
- DONTMERGE: log message, grace-period and tests $gmane/276058
- gc: remove stale .idx files without corresponding .pack file
- prepare_packed_git(): refactor garbage reporting in pack directory
Having a leftover .idx file without corresponding .pack file in
the repository hurts performance; "git gc" learned to prune them.
Waiting for a reroll.
* nd/ita-cleanup (2015-09-06) 6 commits
- grep: make it clear i-t-a entries are ignored
- checkout(-index): do not checkout i-t-a entries
- apply: make sure check_preimage() does not leave empty file on error
- apply: fix adding new files on i-t-a entries
- add and use a convenience macro ce_intent_to_add()
- blame: remove obsolete comment
Paths that have been told the index about with "add -N" are not yet
in the index, but various commands behaved as if they already are.
Some commits need better explanation.
Waiting for a reroll.
* ld/p4-detached-head (2015-09-09) 2 commits
- git-p4: work with a detached head
- git-p4: add failing test for submit from detached head
Will be rerolled.
($gmane/277574)
* mg/httpd-tests-update-for-apache-2.4 (2015-04-08) 2 commits
- t/lib-git-svn: check same httpd module dirs as lib-httpd
- t/lib-httpd: load mod_unixd
This is the first two commits in a three-patch series $gmane/266962
Becoming tired of waiting for a reroll.
with updated log message ($gmane/268061).
* wp/sha1-name-negative-match (2015-06-08) 2 commits
- sha1_name.c: introduce '^{/!-<negative pattern>}' notation
- test for '!' handling in rev-parse's named commits
Introduce "branch^{/!-<pattern>}" notation to name a commit
reachable from branch that does not match the given pattern.
Becoming tired of waiting for a reroll.
($gmane/271213).
* ak/format-patch-odir-config (2015-06-19) 1 commit
- format-patch: introduce format.outputDirectory configuration
Reroll exists but didn't pick it up as it seemed to be still
collecting review comments.
Becoming tired of waiting for a reroll.
($gmane/272180).
* jc/diff-b-m (2015-02-23) 5 commits
. WIPWIP
. WIP: diff-b-m
- diffcore-rename: allow easier debugging
- diffcore-rename.c: add locate_rename_src()
- diffcore-break: allow debugging
"git diff -B -M" produced incorrect patch when the postimage of a
completely rewritten file is similar to the preimage of a removed
file; such a resulting file must not be expressed as a rename from
other place.
The fix in this patch is broken, unfortunately.
--------------------------------------------------
[Cooking]
* pt/http-socks-proxy (2015-10-26) 1 commit
- remote-http(s): support SOCKS proxies
Add support for talking http/https over socks proxy.
Will merge to 'next'.
* da/difftool (2015-10-29) 1 commit
- difftool: ignore symbolic links in use_wt_file
The code to prepare the working tree side of temporary directory
for the "dir-diff" feature forgot that symbolic links need not be
copied (or symlinked) to the temporary area, as the code already
special cases and overwrites them. Besides, it was wrong to try
computing the object name of the target of symbolic link, which may
not even exist or may be a directory.
Waiting for response.
* mh/notes-allow-reading-treeish (2015-10-08) 3 commits
(merged to 'next' on 2015-10-23 at 8a697f0)
+ notes: allow treeish expressions as notes ref
+ Merge branch 'jk/notes-dwim-doc' into next
+ Merge branch 'jc/merge-drop-old-syntax' into next
(this branch uses jc/merge-drop-old-syntax.)
Some "git notes" operations, e.g. "git log --notes=<note>", should
be able to read notes from any tree-ish that is shaped like a notes
tree, but the notes infrastructure required that the argument must
be a ref under refs/notes/. Loosen it to require a valid ref only
when the operation would update the notes (in which case we must
have a place to store the updated notes tree, iow, a ref).
Will cook in 'next'.
* dt/refs-backend-pre-vtable (2015-10-15) 26 commits
- refs: break out ref conflict checks
- refs: make files_log_ref_write functions public
- initdb: move safe_create_dir into common code
- refs.c: move should_autocreate_reflog to common code
- refs.c: move peel_object to the common code
- refs.c: move copy_msg to the common code
- refs.c: move refname_is_safe to the common code
- refs: move transaction functions into common code
- refs.c: move head_ref_namespaced to the common code
- refs.c: move ref iterators to the common code
- refs.c: move prettify_refname to the common code
- refs.c: move is_branch to the common code
- refs.c: move check_refname_format to the common code
- refs.c: move resolve_refdup to common
- refs.c: move read_ref, read_ref_full and ref_exists to the common code
- refs.c: move warn_if_dangling_symref* to the common code
- refs.c: move dwim and friend functions to the common refs code
- refs.c: move the hidden refs functions to the common code
- refs.c: move read_ref_at to the common refs file
- refs.c: move delete_pseudoref and delete_ref to the common code
- refs.c: move update_ref to refs.c
- refs.c: add a new refs.c file to hold all common refs code
- refs-be-files.c: rename refs to refs-be-files
- refs: make repack_without_refs and is_branch public
- refs.c: create a public version of verify_refname_available
- Merge branch 'jk/war-on-sprintf' into HEAD
The early part of the pluggable ref backend series, which sifts the
ref API functions into two bins: the filesystem backend specific
ones and the generic API functions. The next step will start
introducing the framework to dispatch generic calls to specific
backend implementation(s) and then finally plug a new backend that
is different from the file backend.
Reroll exists, but haven't picked up yet.
* jc/mailinfo (2015-10-21) 1 commit
- mailinfo: ignore in-body header that we do not care about
Some people write arbitrary garbage at the beginning of a piece of
e-mail (or after -- >8 -- scissors -- >8 -- line) in the commit log
message and expect them to be discarded, even though "From:" and
"Subject:" are the only documented in-body headers that you are
supposed to have there. Allow some garbage (specifically, what may
look like RFC2822 headers like "MIME-Version: ...") to be there and
ignore them.
I have a feeling that that this is a step in a wrong direction.
Comments?
* js/am-3-merge-recursive-direct (2015-10-12) 2 commits
(merged to 'next' on 2015-10-23 at dc631e5)
+ am: make a direct call to merge_recursive
+ merge_recursive_options: introduce the "gently" flag
The merge_recursive_generic() function has been made a bit safer to
call from inside a process. "git am -3" was taught to make a direct
call to the function when falling back to three-way merge.
Will keep in 'next' during the 2.7 cycle.
* sg/pretty-more-date-mode-format (2015-10-07) 1 commit
- pretty: add format specifiers for short and raw date formats
Introduce "%as" and "%aR" placeholders for "log --format" to show
the author date in the short and raw formats.
I have a feeling that that this is a step in a wrong direction.
Comments?
* kn/for-each-branch-remainder (2015-10-02) 9 commits
- branch: implement '--format' option
- branch: use ref-filter printing APIs
- ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams
- ref-filter: introduce format_ref_array_item()
- ref-filter: adopt get_head_description() from branch.c
- ref-filter: modify "%(objectname:short)" to take length
- ref-filter: add support for %(path) atom
- ref-filter: implement %(if:equals=<string>) and %(if:notequals=<string>)
- ref-filter: implement %(if), %(then), and %(else) atoms
More unification among "branch -l", "tag -l" and "for-each-ref --format".
Expecting a reroll.
($gmane/278926)
* jk/graph-format-padding (2015-09-14) 1 commit
- pretty: pass graph width to pretty formatting for use in '%>|(N)'
Redefine the way '%>|(N)' padding and the "--graph" option
interacts. It has been that the available columns to display the
log message was measured from the edge of the area the graph ended,
but with this it becomes the beginning of the entire output.
I have a suspicion that 50% of the users would appreciate this
change, and the remainder see this break their expectation. If
that is the case, we might need to introduce a similar but
different alignment operator so that this new behaviour is
available to those who want to use it, without negatively affecting
existing uses.
Undecided.
($gmane/278326)
* sb/submodule-parallel-fetch (2015-10-21) 14 commits
(merged to 'next' on 2015-10-23 at 8f04bbd)
+ run-command: fix missing output from late callbacks
+ test-run-command: increase test coverage
+ test-run-command: test for gracefully aborting
+ run-command: initialize the shutdown flag
+ run-command: clear leftover state from child_process structure
+ run-command: fix early shutdown
(merged to 'next' on 2015-10-15 at df63590)
+ submodules: allow parallel fetching, add tests and documentation
+ fetch_populated_submodules: use new parallel job processing
+ run-command: add an asynchronous parallel child processor
+ sigchain: add command to pop all common signals
+ strbuf: add strbuf_read_once to read without blocking
+ xread_nonblock: add functionality to read from fds without blocking
+ xread: poll on non blocking fds
+ submodule.c: write "Fetching submodule <foo>" to stderr
(this branch is used by sb/submodule-parallel-update.)
Add a framework to spawn a group of processes in parallel, and use
it to run "git fetch --recurse-submodules" in parallel.
Will cook in 'next'.
* ad/cygwin-wants-rename (2015-08-07) 1 commit
- config.mak.uname: Cygwin needs OBJECT_CREATION_USES_RENAMES
Will hold.
($gmane/275680).
* jc/rerere-multi (2015-09-14) 7 commits
- rerere: do use multiple variants
- t4200: rerere a merge with two identical conflicts
- rerere: allow multiple variants to exist
- rerere: delay the recording of preimage
- rerere: handle leftover rr-cache/$ID directory and postimage files
- rerere: scan $GIT_DIR/rr-cache/$ID when instantiating a rerere_id
- rerere: split conflict ID further
"git rerere" can encounter two or more files with the same conflict
signature that have to be resolved in different ways, but there was
no way to record these separate resolutions.
* jc/merge-drop-old-syntax (2015-04-29) 1 commit
(merged to 'next' on 2015-10-07 at 50fed71)
+ merge: drop 'git merge <message> HEAD <commit>' syntax
(this branch is used by mh/notes-allow-reading-treeish.)
Originally merged to 'next' on 2015-05-28
Stop supporting "git merge <message> HEAD <commit>" syntax that has
been deprecated since October 2007. It has been reported that
git-gui still uses the deprecated syntax, which needs to be fixed
before this final step can proceed.
Will keep in 'next' during the 2.7 cycle.
--------------------------------------------------
[Discarded]
* km/cache-entry-refcnt (2015-10-14) 1 commit
. merge: fix cache_entry use-after-free
Made unnecessary with dt/name-hash-dir-entry-fix topic.
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (Nov 2009, #07; Sun, 29)
@ 2009-11-29 10:05 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2009-11-29 10:05 UTC (permalink / raw)
To: git
This will be the last update before deciding what should go in 1.6.6-rc1
and describes my current thinking.
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
marked with '.' do not appear in any of the integration branches, but I am
still holding onto them.
In 1.7.0, we plan to correct handful of warts in the interfaces everybody
agrees that they were mistakes. The resulting system may not be strictly
backward compatible. Currently planned changes are:
* refuse push to update the checked out branch in a non-bare repo by
default
Make "git push" into a repository to update the branch that is checked
out fail by default. You can countermand this default by setting a
configuration variable in the receiving repository.
http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007
* refuse push to delete the current branch by default
Make "git push $there :$killed" to delete the branch that is pointed at
by its HEAD fail by default. You can countermand this default by
setting a configuration variable in the receiving repository.
http://thread.gmane.org/gmane.comp.version-control.git/108862/focus=108936
* "git send-email" won't make deep threads by default
Many people said that by default when sending more than 2 patches the
threading git-send-email makes by default is hard to read, and they
prefer the default be one cover letter and each patch as a direct
follow-up to the cover letter. You can countermand this by setting a
configuration variable.
http://article.gmane.org/gmane.comp.version-control.git/109790
* "git status" won't be "git-commit --dry-run" anymore
http://thread.gmane.org/gmane.comp.version-control.git/125989/focus=125993
* "git diff -w --exit-code" will exit success if only differences it
found are whitespace changes that are stripped away from the output.
http://thread.gmane.org/gmane.comp.version-control.git/119731/focus=119751
* "git diff -w/-b" won't even produce "diff --git" header when all changes
are about whitespaces.
http://thread.gmane.org/gmane.comp.version-control.git/133256
--------------------------------------------------
[New Topics]
* fc/maint-format-patch-pathspec-dashes (2009-11-26) 2 commits.
- format-patch: add test for parsing of "--"
- format-patch: fix parsing of "--" on the command line
* bw/diff-color-hunk-header (2009-11-27) 2 commits
(merged to 'next' on 2009-11-29 at c446977)
+ Give the hunk comment its own color
(merged to 'next' on 2009-11-27 at 42ab131)
+ emit_line(): don't emit an empty <SET><RESET> followed by a newline
* jc/maint-am-keep (2009-11-27) 1 commit.
(merged to 'next' on 2009-11-27 at 7663874)
+ Remove dead code from "git am"
* tr/http-updates (2009-11-27) 2 commits
- Add an option for using any HTTP authentication scheme, not only basic
- http: maintain curl sessions
* jc/diff-whitespace-prepare (2009-11-28) 2 commits
- diff: flip the default diff.bwoutputonly to true
- diff: optionally allow traditional "-b/-w affects only output" semantics
(this branch uses gb/1.7.0-diff-whitespace-only-output and jc/1.7.0-diff-whitespace-only-status; is used by jc/1.7.0-diff-whitespace-prepare.)
This is to redo the two -b/-w semantic changes to prepare the migration of
existing users before 1.7.0 happens.
* jc/1.7.0-diff-whitespace-prepare (2009-11-28) 2 commits
- diff: disable diff.bwoutputonly warning
- diff: flip the diff.bwoutputonly default to false
(this branch uses gb/1.7.0-diff-whitespace-only-output, jc/1.7.0-diff-whitespace-only-status and jc/diff-whitespace-prepare.)
And this is to actually flip the default and eventually remove the warning.
* ns/send-email-no-chain-reply-to (2009-11-29) 1 commit
- prepare send-email for smoother change of --chain-reply-to default
(this branch is used by ns/1.7.0-send-email-no-chain-reply-to.)
Similarly, this is to start warning about the change to --no-chain-reply-to
in 1.7.0 for smoother transition.
* ns/1.7.0-send-email-no-chain-reply-to (2009-08-22) 1 commit
- send-email: make --no-chain-reply-to the default
(this branch uses ns/send-email-no-chain-reply-to.)
And this is to actually flip the default in 1.7.0.
--------------------------------------------------
[Stalled]
* je/send-email-no-subject (2009-08-05) 1 commit.
(merged to 'next' on 2009-10-11 at 1b99c56)
+ send-email: confirm on empty mail subjects
The existing tests cover the positive case (i.e. as long as the user says
"yes" to the "do you really want to send this message that lacks subject",
the message is sent) of this feature, but the feature itself needs its own
test to verify the negative case (i.e. does it correctly stop if the user
says "no"?)
* jn/rfc-pull-rebase-error-message (2009-11-12) 1 commit
- git-pull.sh --rebase: overhaul error handling when no candidates are found
I heard this needs at least retitling among other changes?
* jh/notes (2009-11-20) 10 commits
- Add more testcases to test fast-import of notes
- Rename t9301 to t9350, to make room for more fast-import tests
- fast-import: Proper notes tree manipulation using the notes API
- Refactor notes concatenation into a flexible interface for combining notes
- Notes API: Allow multiple concurrent notes trees with new struct notes_tree
- Notes API: for_each_note(): Traverse the entire notes tree with a callback
- Notes API: get_note(): Return the note annotating the given object
- Notes API: add_note(): Add note objects to the internal notes tree structure
- Notes API: init_notes(): Initialize the notes tree from the given notes ref
- Notes API: get_commit_notes() -> format_note() + remove the commit restriction
Johan waits for an Ack from Shawn on "fast-import" one.
* tr/maint-merge-ours-clarification (2009-11-15) 1 commit
(merged to 'next' on 2009-11-21 at fadaf7b)
+ rebase: refuse to rebase with -s ours
I do not think we reached a concensus for solving conflicts between "give
them rope" and "protect users from clearly meaningless combinations". The
author obviously is for the latter (and I am inclined to agree); Dscho
seems to think otherwise.
* jc/fix-tree-walk (2009-10-22) 8 commits
(merged to 'next' on 2009-10-22 at 10c0c8f)
+ Revert failed attempt since 353c5ee
+ read-tree --debug-unpack
(merged to 'next' on 2009-10-11 at 0b058e2)
+ unpack-trees.c: look ahead in the index
+ unpack-trees.c: prepare for looking ahead in the index
+ Aggressive three-way merge: fix D/F case
+ traverse_trees(): handle D/F conflict case sanely
+ more D/F conflict tests
+ tests: move convenience regexp to match object names to test-lib.sh
This has some stupid bugs and reverted from 'next' until I can fix it, but
the "temporarily" turned out to be very loooong. Sigh...
* sr/gfi-options (2009-09-06) 6 commits.
- fast-import: test the new option command
- fast-import: add option command
- fast-import: test the new feature command
- fast-import: add feature command
- fast-import: put marks reading in it's own function
- fast-import: put option parsing code in separate functions
Sverre is working on a re-roll to address comments from Shawn.
--------------------------------------------------
[Cooking]
* sr/vcs-helper (2009-11-18) 12 commits
(merged to 'next' on 2009-11-27 at 83268ab)
+ Add Python support library for remote helpers
+ Basic build infrastructure for Python scripts
+ Allow helpers to report in "list" command that the ref is unchanged
+ Fix various memory leaks in transport-helper.c
+ Allow helper to map private ref names into normal names
+ Add support for "import" helper command
+ Allow specifying the remote helper in the url
+ Add a config option for remotes to specify a foreign vcs
+ Allow fetch to modify refs
+ Use a function to determine whether a remote is valid
+ Allow programs to not depend on remotes having urls
+ Fix memory leak in helper method for disconnect
* jc/grep-full-tree (2009-11-24) 1 commit.
- grep: --full-tree
The interaction with this option and pathspecs need to be worked out
better. I _think_ "grep --full-tree -e pattern -- '*.h'" should find from
all the header files in the tree, for example.
* uk/maint-shortlog-encoding (2009-11-25) 1 commit.
- shortlog: respect commit encoding
The fix is a maint material but the patch was against next, so I
back-rebased it myself. I tried to be careful but please double check the
result.
Perhaps merge it to 'master' before 1.6.6-rc1?
* fc/send-email-envelope (2009-11-26) 2 commits.
(merged to 'next' on 2009-11-27 at 2d0257d)
+ send-email: automatic envelope sender
+ t9001: test --envelope-sender option of send-email
Perhaps merge it to 'master' before 1.6.6-rc1?
* jc/mailinfo-remove-brackets (2009-07-15) 1 commit.
(merged to 'next' on 2009-11-25 at 09d498f)
+ mailinfo: -b option keeps [bracketed] strings that is not a [PATCH] marker
Jim Meyering sent a patch to do a subset of what this does; to allow
keeping '[SECURITY]' when the subject says '[SECURITY][PATCH]', you need
to also teach "am" to pass the new -b option, but that is independent of
what Jim showed the need in real-world, so I think this can go in as-is.
Perhaps merge it to 'master' before 1.6.6-rc1?
* jc/checkout-merge-base (2009-11-20) 2 commits
- "rebase --onto A...B" replays history on the merge base between A and B
- "checkout A...B" switches to the merge base between A and B
I've been using the first one for a while myself but do not see many users
want this (yet); the new feature is not urgent anyway.
* tr/reset-checkout-patch (2009-11-19) 1 commit.
(merged to 'next' on 2009-11-22 at b224950)
+ {checkout,reset} -p: make patch direction configurable
I do not particularly like a configuration like this that changes the
behaviour of a command in a drastic way---it will make helping others much
harder.
Perhaps merge it to 'master' before 1.6.6-rc1?
* jn/gitweb-blame (2009-11-24) 8 commits.
(merged to 'next' on 2009-11-25 at 0a5b649)
+ gitweb.js: fix padLeftStr() and its usage
+ gitweb.js: Harden setting blamed commit info in incremental blame
+ gitweb.js: fix null object exception in initials calculation
+ gitweb: Minify gitweb.js if JSMIN is defined
+ gitweb: Create links leading to 'blame_incremental' using JavaScript
(merged to 'next' on 2009-10-11 at 73c4a83)
+ gitweb: Colorize 'blame_incremental' view during processing
+ gitweb: Incremental blame (using JavaScript)
+ gitweb: Add optional "time to generate page" info in footer
Ajax-y blame, with further fixes. As this does not seem to break existing
features, I am inclined to say that we push this out early, as a new
feature with known breakages, to give it wider audience.
* em/commit-claim (2009-11-04) 1 commit
(merged to 'next' on 2009-11-23 at b5df6fd)
+ commit -c/-C/--amend: reset timestamp and authorship to committer with --reset-author
I am not sure if the option name does a good job at explaining it to the
end users, but I think the code and feature is solid.
Perhaps merge it to 'master' before 1.6.6-rc1?
* cc/bisect-doc (2009-11-08) 1 commit
(merged to 'next' on 2009-11-27 at c46d648)
+ Documentation: add "Fighting regressions with git bisect" article
Perhaps merge it to 'master' before 1.6.6-rc1?
* nd/sparse (2009-11-25) 20 commits.
(merged to 'next' on 2009-11-25 at 71380f5)
+ tests: rename duplicate t1009
(merged to 'next' on 2009-11-23 at f712a41)
+ sparse checkout: inhibit empty worktree
+ Add tests for sparse checkout
+ read-tree: add --no-sparse-checkout to disable sparse checkout support
+ unpack-trees(): ignore worktree check outside checkout area
+ unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index
+ unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout
+ unpack-trees.c: generalize verify_* functions
+ unpack-trees(): add CE_WT_REMOVE to remove on worktree alone
+ Introduce "sparse checkout"
+ dir.c: export excluded_1() and add_excludes_from_file_1()
+ excluded_1(): support exclude files in index
+ unpack-trees(): carry skip-worktree bit over in merged_entry()
+ Read .gitignore from index if it is skip-worktree
+ Avoid writing to buffer in add_excludes_from_file_1()
+ Teach Git to respect skip-worktree bit (writing part)
+ Teach Git to respect skip-worktree bit (reading part)
+ Introduce "skip-worktree" bit in index, teach Git to get/set this bit
+ Add test-index-version
+ update-index: refactor mark_valid() in preparation for new options
* jc/pretty-lf (2009-10-04) 1 commit.
(merged to 'next' on 2009-11-27 at 73651c4)
+ Pretty-format: %[+-]x to tweak inter-item newlines
Perhaps merge it to 'master' before 1.6.6-rc1?
--------------------------------------------------
[For 1.7.0]
* jk/1.7.0-status (2009-11-27) 7 commits.
(merged to 'next' on 2009-11-27 at 91691ec)
+ t7508-status.sh: Add tests for status -s
+ status -s: respect the status.relativePaths option
(merged to 'next' on 2009-11-21 at 884bb56)
+ docs: note that status configuration affects only long format
(merged to 'next' on 2009-10-11 at 65c8513)
+ commit: support alternate status formats
+ status: add --porcelain output format
+ status: refactor format option parsing
+ status: refactor short-mode printing to its own function
(this branch uses jc/1.7.0-status.)
Gives the --short output format to post 1.7.0 "git commit --dry-run" that
is similar to that of post 1.7.0 "git status".
Immediately after 1.6.6 while rebuilding 'next', we may want to reorder a
few commits at the tip, as "docs: affects only long format" describes a
limitation that will disappear soon.
* jc/1.7.0-status (2009-09-05) 4 commits.
(merged to 'next' on 2009-10-11 at 9558627)
+ status: typo fix in usage
+ git status: not "commit --dry-run" anymore
+ git stat -s: short status output
+ git stat: the beginning of "status that is not a dry-run of commit"
(this branch is used by jk/1.7.0-status.)
With this, "git status" is no longer "git commit --dry-run".
* jc/1.7.0-send-email-no-thread-default (2009-08-22) 1 commit.
(merged to 'next' on 2009-10-11 at 043acdf)
+ send-email: make --no-chain-reply-to the default
* jc/1.7.0-diff-whitespace-only-status (2009-08-30) 4 commits.
(merged to 'next' on 2009-10-11 at 546c74d)
+ diff.c: fix typoes in comments
+ Make test case number unique
+ diff: Rename QUIET internal option to QUICK
+ diff: change semantics of "ignore whitespace" options
(this branch is used by jc/1.7.0-diff-whitespace-prepare and jc/diff-whitespace-prepare.)
This changes exit code from "git diff --ignore-whitespace" and friends
when there is no actual output. It is a backward incompatible change,
and jc/diff-whitespace-prepare topic is meant to ease the transition.
* gb/1.7.0-diff-whitespace-only-output (2009-11-19) 1 commit
(merged to 'next' on 2009-11-21 at 3375bf4)
+ No diff -b/-w output for all-whitespace changes
(this branch is used by jc/1.7.0-diff-whitespace-prepare and jc/diff-whitespace-prepare.)
Likewise.
* jc/1.7.0-push-safety (2009-02-09) 2 commits.
(merged to 'next' on 2009-10-11 at 81b8128)
+ Refuse deleting the current branch via push
+ Refuse updating the current branch in a non-bare repository via push
--------------------------------------------------
[Reverted from 'next']
* jc/botched-maint-cygwin-count-objects (2009-11-24) 2 commits
(merged to 'next' on 2009-11-25 at 8aa62a0)
+ Revert "ST_BLOCKS_COUNTS_IN_BLKSIZE to say on-disk size is (st_blksize * st_blocks)"
(merged to 'next' on 2009-11-22 at 4ba5880)
+ ST_BLOCKS_COUNTS_IN_BLKSIZE to say on-disk size is (st_blksize * st_blocks)
This is a revert of the tip one I merged prematurely to 'next'. The real
fix from Ramsay is already in 'master'.
* ks/precompute-completion (2009-11-15) 4 commits.
(merged to 'next' on 2009-11-15 at 23cdb96)
+ Revert ks/precompute-completion series
(merged to 'next' on 2009-10-28 at cd5177f)
+ completion: ignore custom merge strategies when pre-generating
(merged to 'next' on 2009-10-22 at f46a28a)
+ bug: precomputed completion includes scripts sources
(merged to 'next' on 2009-10-14 at adf722a)
+ Speedup bash completion loading
Reverted out of 'next', to be replaced with jn/faster-completion-startup
topic.
--------------------------------------------------
[I have been too busy to purge these]
* jc/log-tz (2009-03-03) 1 commit.
- Allow --date=local --date=other-format to work as expected
Maybe some people care about this. I dunno.
* jc/1.7.0-no-commit-no-ff-2 (2009-10-22) 1 commit.
. git-merge: forbid fast-forward and up-to-date when --no-commit is given
This makes "git merge --no-commit" fail when it results in fast-forward or
up-to-date. It appears nobody wants to have this, so I dropped it.
* ne/rev-cache (2009-10-19) 7 commits.
. support for commit grafts, slight change to general mechanism
. support for path name caching in rev-cache
. full integration of rev-cache into git, completed test suite
. administrative functions for rev-cache, start of integration into git
. support for non-commit object caching in rev-cache
. basic revision cache system, no integration or features
. man page and technical discussion for rev-cache
The author indicated that there is another round coming. Does not seem to
pass the tests when merged to 'pu', so it has been ejected for now.
* pb/gitweb-no-project-list (2009-11-06) 3 commits.
. gitweb: Polish the content tags support
. gitweb: Support for no project list on gitweb front page
. gitweb: Refactor project list routines
I picked these up but didn't queue as Warthog9's comments made certain
amount of sense to me.
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (Mar 2017, #05; Mon, 13)
@ 2017-03-13 22:43 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2017-03-13 22:43 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'. The ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.
A handful of topics are ready to be merged to 'next'. Giving them a
final round of reviewing and testing is greatly appreciated:
- bc/object-id
- bw/attr-pathspec
- js/early-config
You can find the changes described here in the integration branches
of the repositories listed at
http://git-blame.blogspot.com/p/git-public-repositories.html
--------------------------------------------------
[Graduated to "master"]
* ah/doc-ls-files-quotepath (2017-03-02) 1 commit
(merged to 'next' on 2017-03-10 at 5dfa78423a)
+ Documentation: improve description for core.quotePath
Documentation for "git ls-files" did not refer to core.quotePath
* ax/line-log-range-merge-fix (2017-03-03) 1 commit
(merged to 'next' on 2017-03-10 at 201073f113)
+ line-log.c: prevent crash during union of too many ranges
The code to parse "git log -L..." command line was buggy when there
are many ranges specified with -L; overrun of the allocated buffer
has been fixed.
* jc/diff-populate-filespec-size-only-fix (2017-03-02) 1 commit
(merged to 'next' on 2017-03-10 at 9b2d1ca50f)
+ diff: do not short-cut CHECK_SIZE_ONLY check in diff_populate_filespec()
"git diff --quiet" relies on the size field in diff_filespec to be
correctly populated, but diff_populate_filespec() helper function
made an incorrect short-cut when asked only to populate the size
field for paths that need to go through convert_to_git() (e.g. CRLF
conversion).
* jh/mingw-openssl-sha1 (2017-02-09) 1 commit
(merged to 'next' on 2017-03-10 at 8a1aa07def)
+ mingw: use OpenSSL's SHA-1 routines
Windows port wants to use OpenSSL's implementation of SHA-1
routines, so let them.
* jk/add-i-patch-do-prompt (2017-03-02) 1 commit
(merged to 'next' on 2017-03-10 at 891ec6f5ba)
+ add--interactive: fix missing file prompt for patch mode with "-i"
The patch subcommand of "git add -i" was meant to have paths
selection prompt just like other subcommand, unlike "git add -p"
directly jumps to hunk selection. Recently, this was broken and
"add -i" lost the paths selection dialog, but it now has been
fixed.
* jk/ewah-use-right-type-in-sizeof (2017-03-06) 1 commit
(merged to 'next' on 2017-03-10 at ad66adacda)
+ ewah: fix eword_t/uint64_t confusion
Code clean-up.
* js/realpath-pathdup-fix (2017-03-08) 2 commits
(merged to 'next' on 2017-03-10 at 5a84dbbd1d)
+ real_pathdup(): fix callsites that wanted it to die on error
+ t1501: demonstrate NULL pointer access with invalid GIT_WORK_TREE
Git v2.12 was shipped with an embarrassing breakage where various
operations that verify paths given from the user stopped dying when
seeing an issue, and instead later triggering segfault.
... and then to down to 'maint'.
* ss/remote-bzr-hg-placeholder-wo-python (2017-03-03) 1 commit
(merged to 'next' on 2017-03-10 at c8c4bb78a2)
+ contrib: git-remote-{bzr,hg} placeholders don't need Python
There is no need for Python only to give a few messages to the
standard error stream, but we somehow did.
* vn/line-log-memcpy-size-fix (2017-03-06) 1 commit
(merged to 'next' on 2017-03-10 at 2e65ff89b7)
+ line-log: use COPY_ARRAY to fix mis-sized memcpy
The command-line parsing of "git log -L" copied internal data
structures using incorrect size on ILP32 systems.
--------------------------------------------------
[New Topics]
* ab/ref-filter-no-contains (2017-03-11) 1 commit
- ref-filter: add --no-contains option to tag/branch/for-each-ref
(this branch uses jk/ref-filter-flags-cleanup.)
"git tag/branch/for-each-ref" family of commands long allowed to
filter the refs by "--contains X" (show only the refs that are
descendants of X), "--merged X" (show only the refs that are
ancestors of X), "--no-merged X" (show only the refs that are not
ancestors of X). One curious omission, "--no-contains X" (show
only the refs that are not descendants of X) has been added to
them.
Expecting a reroll.
cf. <CACBZZX4v49zfyGVpcxGSKsxbMfVaUcGHtitpfaZMUtG82YzW-g@mail.gmail.com>
The topic is almost there.
* bc/sha1-header-selection-with-cpp-macros (2017-03-11) 1 commit
- Move SHA-1 implementation selection into a header file
Our source code has used the SHA1_HEADER cpp macro after "#include"
in the C code to switch among the SHA-1 implementations. Instead,
list the exact header file names and switch among implementations
using "#ifdef BLK_SHA1/#include "block-sha1/sha1.h"/.../#endif";
this helps some IDE tools.
Expecting a reroll.
* bw/attr-pathspec (2017-03-13) 2 commits
- pathspec: allow escaped query values
- pathspec: allow querying for attributes
The pathspec mechanism learned to further limit the paths that
match the pattern to those that have specified attributes attached
via the gitattributes mechanism.
Will merge to 'next'.
* jk/http-walker-buffer-underflow-fix (2017-03-13) 1 commit
- http-walker: fix buffer underflow processing remote alternates
"Dumb http" transport used to misparse a nonsense http-alternates
response, which has been fixed.
Will merge to 'next'.
* rs/blame-code-cleanup (2017-03-11) 1 commit
(merged to 'next' on 2017-03-12 at 8fd4bf325a)
+ blame: move blame_entry duplication to add_blame_entry()
Code clean-up.
Will merge to 'master'.
* dl/credential-cache-socket-in-xdg-cache (2017-03-13) 1 commit
- path.c: add xdg_cache_home
The default location "~/.git-credential-cache/socket" for the
socket used to communicate with the credential-cache daemon has
been moved to "~/.cache/git/credential/socket".
Waiting for a reroll.
The patches do not yet match the above description without
the second one that is not queued here.
--------------------------------------------------
[Stalled]
* nd/prune-in-worktree (2017-02-19) 15 commits
. rev-list: expose and document --single-worktree
. revision.c: --reflog add HEAD reflog from all worktrees
. files-backend: make reflog iterator go through per-worktree reflog
. refs: add refs_for_each_reflog[_ent]()
. revision.c: --all adds HEAD from all worktrees
. refs: remove dead for_each_*_submodule()
. revision.c: use refs_for_each*() instead of for_each_*_submodule()
. refs: add a refs_for_each_in() and friends
. refs: add refs_for_each_ref()
. refs: add refs_head_ref()
. refs: add refs_read_ref[_full]()
. refs: move submodule slash stripping code to get_submodule_ref_store
. revision.c: --indexed-objects add objects from all worktrees
. revision.c: refactor add_index_objects_to_pending()
. revision.h: new flag in struct rev_info wrt. worktree-related refs
(this branch uses nd/worktree-kill-parse-ref; is tangled with nd/files-backend-git-dir.)
"git gc" and friends when multiple worktrees are used off of a
single repository did not consider the index and per-worktree refs
of other worktrees as the root for reachability traversal, making
objects that are in use only in other worktrees to be subject to
garbage collection.
* nd/worktree-kill-parse-ref (2017-02-19) 22 commits
. refs: kill set_worktree_head_symref()
. refs: add refs_create_symref()
. worktree.c: kill parse_ref() in favor of refs_resolve_ref_unsafe()
. refs.c: add refs_resolve_ref_unsafe()
. refs: introduce get_worktree_ref_store()
. refs: rename get_ref_store() to get_submodule_ref_store() and make it public
. files-backend: remove submodule_allowed from files_downcast()
. refs: move submodule code out of files-backend.c
. path.c: move some code out of strbuf_git_path_submodule()
. refs.c: make get_main_ref_store() public and use it
. refs.c: kill register_ref_store(), add register_submodule_ref_store()
. refs.c: flatten get_ref_store() a bit
. refs: rename lookup_ref_store() to lookup_submodule_ref_store()
. refs.c: introduce get_main_ref_store()
. files-backend: remove the use of git_path()
. refs.c: share is_per_worktree_ref() to files-backend.c
. files-backend: replace *git_path*() with files_path()
. files-backend: add files_path()
. files-backend: convert git_path() to strbuf_git_path()
. refs-internal.c: make files_log_ref_write() static
. Merge branch 'mh/ref-remove-empty-directory' into nd/files-backend-git-dir
. Merge branch 'mh/submodule-hash' into nd/files-backend-git-dir
(this branch is used by nd/prune-in-worktree; is tangled with nd/files-backend-git-dir.)
(hopefully) a beginning of safer "git worktree" that is resistant
to "gc".
Waiting for nd/files-backend-git-dir to settle.
* nd/files-backend-git-dir (2017-02-22) 26 commits
. t1406: new tests for submodule ref store
. t1405: some basic tests on main ref store
. t/helper: add test-ref-store to test ref-store functions
. refs: delete pack_refs() in favor of refs_pack_refs()
. files-backend: avoid ref api targetting main ref store
. refs: new transaction related ref-store api
. refs: add new ref-store api
. refs: rename get_ref_store() to get_submodule_ref_store() and make it public
. files-backend: replace submodule_allowed check in files_downcast()
. refs: move submodule code out of files-backend.c
. path.c: move some code out of strbuf_git_path_submodule()
. refs.c: make get_main_ref_store() public and use it
. refs.c: kill register_ref_store(), add register_submodule_ref_store()
. refs.c: flatten get_ref_store() a bit
. refs: rename lookup_ref_store() to lookup_submodule_ref_store()
. refs.c: introduce get_main_ref_store()
. files-backend: remove the use of git_path()
. files-backend: add and use files_refname_path()
. files-backend: add and use files_reflog_path()
. files-backend: move "logs/" out of TMP_RENAMED_LOG
. files-backend: convert git_path() to strbuf_git_path()
. files-backend: add and use files_packed_refs_path()
. files-backend: make files_log_ref_write() static
. refs.h: add forward declaration for structs used in this file
. Merge branch 'mh/ref-remove-empty-directory' into nd/files-backend-git-dir
. Merge branch 'mh/submodule-hash' into nd/files-backend-git-dir
(this branch is tangled with nd/prune-in-worktree and nd/worktree-kill-parse-ref.)
The "submodule" specific field in the ref_store structure is
replaced with a more generic "gitdir" that can later be used also
when dealing with ref_store that represents the set of refs visible
from the other worktrees.
* nd/worktree-move (2017-01-27) 7 commits
. fixup! worktree move: new command
. worktree remove: new command
. worktree move: refuse to move worktrees with submodules
. worktree move: accept destination as directory
. worktree move: new command
. worktree.c: add update_worktree_location()
. worktree.c: add validate_worktree()
"git worktree" learned move and remove subcommands.
Tentatively ejected as it seems to break 'pu' when merged.
* pb/bisect (2017-02-18) 28 commits
- fixup! bisect--helper: `bisect_next_check` & bisect_voc shell function in C
- bisect--helper: remove the dequote in bisect_start()
- bisect--helper: retire `--bisect-auto-next` subcommand
- bisect--helper: retire `--bisect-autostart` subcommand
- bisect--helper: retire `--bisect-write` subcommand
- bisect--helper: `bisect_replay` shell function in C
- bisect--helper: `bisect_log` shell function in C
- bisect--helper: retire `--write-terms` subcommand
- bisect--helper: retire `--check-expected-revs` subcommand
- bisect--helper: `bisect_state` & `bisect_head` shell function in C
- bisect--helper: `bisect_autostart` shell function in C
- bisect--helper: retire `--next-all` subcommand
- bisect--helper: retire `--bisect-clean-state` subcommand
- bisect--helper: `bisect_next` and `bisect_auto_next` shell function in C
- t6030: no cleanup with bad merge base
- bisect--helper: `bisect_start` shell function partially in C
- bisect--helper: `get_terms` & `bisect_terms` shell function in C
- bisect--helper: `bisect_next_check` & bisect_voc shell function in C
- bisect--helper: `check_and_set_terms` shell function in C
- bisect--helper: `bisect_write` shell function in C
- bisect--helper: `is_expected_rev` & `check_expected_revs` shell function in C
- bisect--helper: `bisect_reset` shell function in C
- wrapper: move is_empty_file() and rename it as is_empty_or_missing_file()
- t6030: explicitly test for bisection cleanup
- bisect--helper: `bisect_clean_state` shell function in C
- bisect--helper: `write_terms` shell function in C
- bisect: rewrite `check_term_format` shell function in C
- bisect--helper: use OPT_CMDMODE instead of OPT_BOOL
Move more parts of "git bisect" to C.
Expecting a reroll.
cf. <CAFZEwPPXPPHi8KiEGS9ggzNHDCGhuqMgH9Z8-Pf9GLshg8+LPA@mail.gmail.com>
cf. <CAFZEwPM9RSTGN54dzaw9gO9iZmsYjJ_d1SjUD4EzSDDbmh-XuA@mail.gmail.com>
cf. <CAFZEwPNUXcNY9Qdz=_B7q2kQuaecPzJtTMGdv8YMUPEz2vnp8A@mail.gmail.com>
* sh/grep-tree-obj-tweak-output (2017-01-20) 2 commits
- grep: use '/' delimiter for paths
- grep: only add delimiter if there isn't one already
"git grep", when fed a tree-ish as an input, shows each hit
prefixed with "<tree-ish>:<path>:<lineno>:". As <tree-ish> is
almost always either a commit or a tag that points at a commit, the
early part of the output "<tree-ish>:<path>" can be used as the
name of the blob and given to "git show". When <tree-ish> is a
tree given in the extended SHA-1 syntax (e.g. "<commit>:", or
"<commit>:<dir>"), however, this results in a string that does not
name a blob (e.g. "<commit>::<path>" or "<commit>:<dir>:<path>").
"git grep" has been taught to be a bit more intelligent about these
cases and omit a colon (in the former case) or use slash (in the
latter case) to produce "<commit>:<path>" and
"<commit>:<dir>/<path>" that can be used as the name of a blob.
Expecting a reroll? Is this good enough with known limitations?
* jc/diff-b-m (2015-02-23) 5 commits
. WIPWIP
. WIP: diff-b-m
- diffcore-rename: allow easier debugging
- diffcore-rename.c: add locate_rename_src()
- diffcore-break: allow debugging
"git diff -B -M" produced incorrect patch when the postimage of a
completely rewritten file is similar to the preimage of a removed
file; such a resulting file must not be expressed as a rename from
other place.
The fix in this patch is broken, unfortunately.
Will discard.
--------------------------------------------------
[Cooking]
* jk/ref-filter-flags-cleanup (2017-03-10) 4 commits
- ref-filter: use separate cache for contains_tag_algo
- ref-filter: die on parse_commit errors
- ref-filter: use contains_result enum consistently
- ref-filter: move ref_cbdata definition into ref-filter.c
(this branch is used by ab/ref-filter-no-contains.)
"git tag --contains" used to (ab)use the object bits to keep track
of the state of object reachability without clearing them after
use; this has been cleaned up and made to use the newer commit-slab
facility.
Will merge to 'next'.
* ew/http-alternates-as-redirects-warning (2017-03-06) 2 commits
(merged to 'next' on 2017-03-10 at 23be072a07)
+ http: release strbuf on disabled alternates
+ http: inform about alternates-as-redirects behavior
Recent versions of Git treats http alternates (used in dumb http
transport) just like HTTP redirects and requires the client to
enable following it, due to security concerns. But we forgot to
give a warning when we decide not to honor the alternates.
Will merge to 'master'.
* jk/push-deadlock-regression-fix (2017-03-07) 6 commits
(merged to 'next' on 2017-03-10 at ceb0b819bf)
+ send-pack: report signal death of pack-objects
+ send-pack: read "unpack" status even on pack-objects failure
+ send-pack: improve unpack-status error messages
+ send-pack: use skip_prefix for parsing unpack status
+ send-pack: extract parsing of "unpack" response
+ receive-pack: fix deadlock when we cannot create tmpdir
"git push" had a handful of codepaths that could lead to a deadlock
when unexpected error happened, which has been fixed.
Will merge to 'master'.
* kn/ref-filter-branch-list (2017-03-10) 1 commit
(merged to 'next' on 2017-03-10 at 73b43443f1)
+ branch: honor --abbrev/--no-abbrev in --list mode
"git branch --list" takes the "--abbrev" and "--no-abbrev" options
to control the output of the object name in its "-v"(erbose)
output, but a recent update started ignoring them; this fixes it
before the breakage reaches to any released version.
Will merge to 'master'.
* sb/rev-parse-show-superproject-root (2017-03-08) 1 commit
- rev-parse: add --show-superproject-working-tree
From a working tree of a repository, a new option of "rev-parse"
lets you ask if the repository is used as a submodule of another
project, and where the root level of the working tree of that
project (i.e. your superproject) is.
Almost there, but documentation needs a bit more work.
* ls/filter-process-delayed (2017-03-06) 1 commit
- convert: add "status=delayed" to filter process protocol
What's the status of this one???
cf. <xmqq60jmnmef.fsf@junio-linux.mtv.corp.google.com>
* js/early-config (2017-03-13) 12 commits
- setup.c: mention unresolved problems
- t1309: document cases where we would want early config not to die()
- setup_git_directory_gently_1(): avoid die()ing
- t1309: test read_early_config()
- read_early_config(): really discover .git/
- read_early_config(): avoid .git/config hack when unneeded
- setup: make read_early_config() reusable
- setup: introduce the discover_git_directory() function
- setup_git_directory_1(): avoid changing global state
- setup: do not append '/' to root in setup_discovered_git_dir()
- setup_git_directory(): use is_dir_sep() helper
- t7006: replace dubious test
The start-up sequence of "git" needs to figure out some configured
settings before it finds and set itself up in the location of the
repository and was quite messy due to its "chicken-and-egg" nature.
The code has been restructured.
Will merge to 'next'.
* jt/perf-updates (2017-03-03) 3 commits
(merged to 'next' on 2017-03-10 at 0c0b124ed4)
+ t/perf: add fallback for pre-bin-wrappers versions of git
+ t/perf: use $MODERN_GIT for all repo-copying steps
+ t/perf: export variable used in other blocks
The t/perf performance test suite was not prepared to test not so
old versions of Git, but now it covers versions of Git that are not
so ancient.
Will merge to 'master'.
* jk/interpret-branch-name (2017-03-02) 9 commits
(merged to 'next' on 2017-03-10 at 95cc55f9a3)
+ checkout: restrict @-expansions when finding branch
+ strbuf_check_ref_format(): expand only local branches
+ branch: restrict @-expansions when deleting
+ t3204: test git-branch @-expansion corner cases
+ interpret_branch_name: allow callers to restrict expansions
+ strbuf_branchname: add docstring
+ strbuf_branchname: drop return value
+ interpret_branch_name: move docstring to header file
+ interpret_branch_name(): handle auto-namelen for @{-1}
"git branch @" created refs/heads/@ as a branch, and in general the
code that handled @{-1} and @{upstream} was a bit too loose in
disambiguating.
Will merge to 'master'.
* jk/sha1dc (2017-03-01) 7 commits
- Put sha1dc on a diet
- sha1dc: avoid 'for' loop initial decl
- sha1dc: resurrect LICENSE file
- sha1dc: avoid c99 declaration-after-statement
- Makefile: add USE_SHA1DC knob
- sha1dc: adjust header includes for git
- add collision-detecting sha1 implementation
Borrow "detect attempt to create collisions" variant of SHA-1
implementation by Marc Stevens (CWI) and Dan Shumow (Microsoft).
Expecting a cleaned-up reroll after discussion settles.
cf. <CA+55aFxTWqsTTiDKo4DBZT-8Z9t80bGMD3uijzKONa_bYEZABQ@mail.gmail.com>
* js/travis-32bit-linux (2017-03-06) 1 commit
(merged to 'next' on 2017-03-10 at 4cb69d0f77)
+ Travis: also test on 32-bit Linux
Add 32-bit Linux variant to the set of platforms to be tested with
Travis CI.
Will merge to 'master'.
* jt/mark-tree-uninteresting-for-uninteresting-commit (2017-02-28) 3 commits
- upload-pack: compute blob reachability correctly
- revision: exclude trees/blobs given commit
- revision: unify {tree,blob}_objects in rev_info
The revision/object traversal machinery did not mark all tree and
blob objects that are contained in an uninteresting commit as
uninteresting, because that is quite costly. Instead, it only
marked those that are contained in an uninteresting boundary commit
as uninteresting.
Retracted?
cf. <20170228215937.yd4juycjf7y3vish@sigill.intra.peff.net>
* nd/conditional-config-include (2017-03-11) 3 commits
- config: add conditional include
- config.txt: reflow the second include.path paragraph
- config.txt: clarify multiple key values in include.path
The configuration file learned a new "includeIf.<condition>.path"
that includes the contents of the given path only when the
condition holds. This allows you to say "include this work-related
bit only in the repositories under my ~/work/ directory".
Will merge to 'next' after squashing niggle-fixes in.
* cc/split-index-config (2017-03-06) 22 commits
(merged to 'next' on 2017-03-12 at 53cdc2016d)
+ Documentation/git-update-index: explain splitIndex.*
+ Documentation/config: add splitIndex.sharedIndexExpire
+ read-cache: use freshen_shared_index() in read_index_from()
+ read-cache: refactor read_index_from()
+ t1700: test shared index file expiration
+ read-cache: unlink old sharedindex files
+ config: add git_config_get_expiry() from gc.c
+ read-cache: touch shared index files when used
+ sha1_file: make check_and_freshen_file() non static
+ Documentation/config: add splitIndex.maxPercentChange
+ t1700: add tests for splitIndex.maxPercentChange
+ read-cache: regenerate shared index if necessary
+ config: add git_config_get_max_percent_split_change()
+ Documentation/git-update-index: talk about core.splitIndex config var
+ Documentation/config: add information for core.splitIndex
+ t1700: add tests for core.splitIndex
+ update-index: warn in case of split-index incoherency
+ read-cache: add and then use tweak_split_index()
+ split-index: add {add,remove}_split_index() functions
+ config: add git_config_get_split_index()
+ t1700: change here document style
+ config: mark an error message up for translation
The experimental "split index" feature has gained a few
configuration variables to make it easier to use.
Will merge to 'master'.
* dp/filter-branch-prune-empty (2017-03-03) 4 commits
(merged to 'next' on 2017-03-10 at 9317e24cd3)
+ p7000: add test for filter-branch with --prune-empty
+ filter-branch: fix --prune-empty on parentless commits
+ t7003: ensure --prune-empty removes entire branch when applicable
+ t7003: ensure --prune-empty can prune root commit
"git filter-branch --prune-empty" drops a single-parent commit that
becomes a no-op, but did not drop a root commit whose tree is empty.
Will merge to 'master'.
* ab/cond-skip-tests (2017-03-01) 3 commits
(merged to 'next' on 2017-03-10 at 38124fb5ce)
+ gitweb tests: skip tests when we don't have Time::HiRes
+ gitweb tests: change confusing "skip_all" phrasing
+ cvs tests: skip tests that call "cvs commit" when running as root
A few tests were run conditionally under (rare) conditions where
they cannot be run (like running cvs tests under 'root' account).
Will merge to 'master'.
* jk/interop-test (2017-03-10) 2 commits
(merged to 'next' on 2017-03-12 at 704b328022)
+ t/interop: add test of old clients against modern git-daemon
+ t: add an interoperability test harness
Picking two versions of Git and running tests to make sure the
older one and the newer one interoperate happily has now become
possible.
Will merge to 'master'.
* sg/clone-refspec-from-command-line-config (2017-02-27) 1 commit
- clone: respect configured fetch respecs during initial fetch
Expecting a reroll.
cf. <20170227211217.73gydlxb2qu2sp3m@sigill.intra.peff.net>
cf. <CAM0VKj=rsAfKvVccOMOoo5==Q1yW1U0zJBbUV=faKppWFm-u+g@mail.gmail.com>
* sk/dash-is-previous (2017-03-01) 5 commits
- revert.c: delegate handling of "-" shorthand to setup_revisions
- sha1_name.c: teach get_sha1_1 "-" shorthand for "@{-1}"
- revision.c: args starting with "-" might be a revision
- revision.c: swap if/else blocks
- revision.c: do not update argv with unknown option
A dash "-" can be written to mean "the branch that was previously
checked out" in more places.
Needs review.
cf. <1488007487-12965-1-git-send-email-kannan.siddharth12@gmail.com>
* jh/memihash-opt (2017-02-17) 5 commits
- name-hash: remember previous dir_entry during lazy_init_name_hash
- name-hash: specify initial size for istate.dir_hash table
- name-hash: precompute hash values during preload-index
- hashmap: allow memihash computation to be continued
- name-hash: eliminate duplicate memihash call
Expecting an update for perf.
cf. <MWHPR03MB29581B0EDDEDCA7D51EC396F8A280@MWHPR03MB2958.namprd03.prod.outlook.com>
* mm/fetch-show-error-message-on-unadvertised-object (2017-03-02) 3 commits
(merged to 'next' on 2017-03-10 at 69e2023804)
+ fetch-pack: add specific error for fetching an unadvertised object
+ fetch_refs_via_pack: call report_unmatched_refs
+ fetch-pack: move code to report unmatched refs to a function
"git fetch" that requests a commit by object name, when the other
side does not allow such an request, failed without much
explanation.
Will merge to 'master'.
* sb/checkout-recurse-submodules (2017-03-11) 18 commits
- submodule--helper.c: remove duplicate code
- builtin/read-tree: add --recurse-submodules switch
- builtin/checkout: add --recurse-submodules switch
- entry.c: create submodules when interesting
- unpack-trees: check if we can perform the operation for submodules
- unpack-trees: pass old oid to verify_clean_submodule
- update submodules: add submodule_move_head
- update submodules: move up prepare_submodule_repo_env
- submodules: introduce check to see whether to touch a submodule
- update submodules: add a config option to determine if submodules are updated
- update submodules: add submodule config parsing
- connect_work_tree_and_git_dir: safely create leading directories
- make is_submodule_populated gently
- lib-submodule-update.sh: define tests for recursing into submodules
- lib-submodule-update.sh: replace sha1 by hash
- lib-submodule-update: teach test_submodule_content the -C <dir> flag
- lib-submodule-update.sh: do not use ./. as submodule remote
- lib-submodule-update.sh: reorder create_lib_submodule_repo
"git checkout" is taught --recurse-submodules option.
* bc/object-id (2017-02-22) 19 commits
- wt-status: convert to struct object_id
- builtin/merge-base: convert to struct object_id
- Convert object iteration callbacks to struct object_id
- sha1_file: introduce an nth_packed_object_oid function
- refs: simplify parsing of reflog entries
- refs: convert each_reflog_ent_fn to struct object_id
- reflog-walk: convert struct reflog_info to struct object_id
- builtin/replace: convert to struct object_id
- Convert remaining callers of resolve_refdup to object_id
- builtin/merge: convert to struct object_id
- builtin/clone: convert to struct object_id
- builtin/branch: convert to struct object_id
- builtin/grep: convert to struct object_id
- builtin/fmt-merge-message: convert to struct object_id
- builtin/fast-export: convert to struct object_id
- builtin/describe: convert to struct object_id
- builtin/diff-tree: convert to struct object_id
- builtin/commit: convert to struct object_id
- hex: introduce parse_oid_hex
"uchar [40]" to "struct object_id" conversion continues.
Will merge to 'next'.
* sg/completion-refs-speedup (2017-02-13) 13 commits
- squash! completion: fill COMPREPLY directly when completing refs
- completion: fill COMPREPLY directly when completing refs
- completion: list only matching symbolic and pseudorefs when completing refs
- completion: let 'for-each-ref' sort remote branches for 'checkout' DWIMery
- completion: let 'for-each-ref' filter remote branches for 'checkout' DWIMery
- completion: let 'for-each-ref' strip the remote name from remote branches
- completion: let 'for-each-ref' and 'ls-remote' filter matching refs
- completion: don't disambiguate short refs
- completion: don't disambiguate tags and branches
- completion: support excluding full refs
- completion: support completing full refs after '--option=refs/<TAB>'
- completion: wrap __git_refs() for better option parsing
- completion: remove redundant __gitcomp_nl() options from _git_commit()
The refs completion for large number of refs has been sped up,
partly by giving up disambiguating ambiguous refs and partly by
eliminating most of the shell processing between 'git for-each-ref'
and 'ls-remote' and Bash's completion facility.
What's the donness of this topic?
* jk/no-looking-at-dotgit-outside-repo-final (2016-10-26) 1 commit
(merged to 'next' on 2017-02-27 at 7373a1b73d)
+ setup_git_env: avoid blind fall-back to ".git"
This is the endgame of the topic to avoid blindly falling back to
".git" when the setup sequence said we are _not_ in Git repository.
A corner case that happens to work right now may be broken by a
call to die("BUG").
Will cook in 'next'.
* jc/merge-drop-old-syntax (2015-04-29) 1 commit
(merged to 'next' on 2017-02-27 at 2c0f5f73d8)
+ merge: drop 'git merge <message> HEAD <commit>' syntax
Stop supporting "git merge <message> HEAD <commit>" syntax that has
been deprecated since October 2007, and issues a deprecation
warning message since v2.5.0.
Will cook in 'next'.
* jc/bundle (2016-03-03) 6 commits
- index-pack: --clone-bundle option
- Merge branch 'jc/index-pack' into jc/bundle
- bundle v3: the beginning
- bundle: keep a copy of bundle file name in the in-core bundle header
- bundle: plug resource leak
- bundle doc: 'verify' is not about verifying the bundle
The beginning of "split bundle", which could be one of the
ingredients to allow "git clone" traffic off of the core server
network to CDN.
--------------------------------------------------
[Discarded]
* jk/auto-namelen-in-interpret-branch-name (2017-02-27) 1 commit
. interpret_branch_name(): handle auto-namelen for @{-1}
A small bug in the code that parses @{...} has been fixed.
This is now a part of jk/interpret-branch-name topic.
^ permalink raw reply [relevance 2%]
* What's in git.git (Feb 2009, #01; Sun, 01)
@ 2009-02-02 8:05 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2009-02-02 8:05 UTC (permalink / raw)
To: git
There are yet more fixes that have been cooking in next and then master
that have been merged to 'maint' in preparation for the next 1.6.1.X
maintenance release.
On the 'master' front, I think we are ready to plan for 1.6.2 release.
Tonight's "What's cooking" should be a pretty good guide for estimating
what will be in -rc0, in addition to what we already have in 'master'.
* The 'maint' branch has these fixes since the last announcement.
Björn Steinbrink (1):
Rename detection: Avoid repeated filespec population
Jeff King (1):
avoid 31-bit truncation in write_loose_object
Junio C Hamano (3):
ls-tree: add --full-tree option
Teach format-patch to handle output directory relative to cwd
GIT 1.6.1.2
Marcel M. Cary (1):
git-sh-setup: Fix scripts whose PWD is a symlink to a work-dir on OS X
Markus Heidelberg (2):
git-commit: color status output when color.ui is set
git-status -v: color diff output when color.ui is set
Nanako Shiraishi (1):
Document git-ls-tree --full-tree
Nguyễn Thái Ngọc Duy (2):
grep: support --no-ext-grep to test builtin grep
grep: grep cache entries if they are "assume unchanged"
Nicolas Pitre (1):
objects to be pruned immediately don't have to be loosened
René Scharfe (1):
merge: fix out-of-bounds memory access
* The 'master' branch has these since the last announcement
in addition to the above.
Anders Melchiorsen (2):
Documentation: more git push examples
Documentation: rework src/dst description in git push
David Aguilar (1):
contrib/difftool: Don't repeat merge tool candidates
Giuseppe Bilotta (3):
gitweb: make static files accessible with PATH_INFO
gitweb: webserver config for PATH_INFO
gitweb: align comments to code
Jake Goulding (3):
Make opt_parse_with_commit() non-static
Make has_commit() non-static
git-tag: Add --contains option
Jakub Narebski (1):
gitweb: Update README that gitweb works better with PATH_INFO
Jeff King (5):
diff: refactor tempfile cleanup handling
chain kill signals for cleanup functions
refactor signal handling for cleanup functions
pager: do wait_for_pager on signal death
t0005: use SIGTERM for sigchain test
Johannes Gilger (1):
mergetool: Don't repeat merge tool candidates
Johannes Schindelin (8):
Fix submodule squashing into unrelated commit
t3404 & t3411: undo copy&paste
lib-rebase.sh: Document what set_fake_editor() does
test-lib.sh: introduce test_commit() and test_merge() helpers
Simplify t3410
Simplify t3411
Simplify t3412
Fix 'git diff --no-index' with a non-existing symlink target
Johannes Sixt (1):
Windows: Fix signal numbers
Junio C Hamano (6):
Documentation: simplify refspec format description
diff.c: output correct index lines for a split diff
revision traversal: allow UNINTERESTING objects to be missing
rebase -i squashes submodule changes into unrelated commit
builtin-apply.c: do not set bogus mode in check_preimage() for deleted
path
Update draft release notes to 1.6.2
Kirill Smelkov (5):
mailinfo: correctly handle multiline 'Subject:' header
mailinfo: 'From:' header should be unfold as well
mailinfo: add explicit test for mails like '<a.u.thor@example.com> (A U
Thor)'
mailinfo: tests for RFC2047 examples
mailinfo: cleanup extra spaces for complex 'From:'
Markus Heidelberg (1):
contrib/difftool: add support for Kompare
Michele Ballabio (1):
git-shortlog.txt: fix example about .mailmap
Stefan Karpinski (2):
git-cvsserver: handle CVS 'noop' command.
git-cvsserver: run post-update hook *after* update.
Steffen Prohaska (6):
Move computation of absolute paths from Makefile to runtime (in
preparation for RUNTIME_PREFIX)
git_extract_argv0_path(): Move check for valid argv0 from caller to
callee
Add calls to git_extract_argv0_path() in programs that call git_config_*
Modify setup_path() to only add git_exec_path() to PATH
Compute prefix at runtime if RUNTIME_PREFIX is set
Windows: Revert to default paths and convert them by RUNTIME_PREFIX
Steve Haslam (1):
Refactor git_set_argv0_path() to git_extract_argv0_path()
Thomas Rast (2):
t3412: clean up GIT_EDITOR usage
t3412: use log|name-rev instead of log --graph
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (Dec 2009, #06; Thu, 31)
@ 2010-01-01 0:10 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2010-01-01 0:10 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
marked with '.' do not appear in any of the integration branches, but I am
still holding onto them.
The tip of 'next' will soon be rebuilt on top of the current 'master'.
This will be the last "What's cooking" message in year 2009 ;-)
--------------------------------------------------
[New Topics]
* cc/reset-more (2009-12-30) 4 commits
- reset: use "unpack_trees()" directly instead of "git read-tree"
- reset: add a few tests for "git reset --merge"
- Documentation: reset: add some tables to describe the different options
- reset: improve mixed reset error message when in a bare repo
Resurrected from "Ejected" category. Haven't looked at it yet myself,
though...
* bg/maint-remote-update-default (2009-12-31) 1 commit
- Fix "git remote update" with remotes.defalt set
* jc/branch-d (2009-12-29) 1 commit
- branch -d: base the "already-merged" safety on the branch it merges with
* jc/rerere (2009-12-04) 1 commit
- Teach --[no-]rerere-autoupdate option to merge, revert and friends
* jk/maint-1.6.5-reset-hard (2009-12-30) 1 commit
(merged to 'next' on 2009-12-30 at de97679)
+ reset: unbreak hard resets with GIT_WORK_TREE
* jk/push-to-delete (2009-12-30) 1 commit
- builtin-push: add --delete as syntactic sugar for :foo
* jk/run-command-use-shell (2009-12-30) 6 commits
- diff: run external diff helper with shell
- textconv: use shell to run helper
- editor: use run_command's shell feature
- run-command: optimize out useless shell calls
- run-command: convert simple callsites to use_shell
- run-command: add "use shell" option
* mm/config-path (2009-12-30) 1 commit
- builtin-config: add --path option doing ~ and ~user expansion.
* pm/cvs-environ (2009-12-30) 1 commit
- CVS Server: Support reading base and roots from environment
* rs/maint-archive-match-pathspec (2009-12-12) 1 commit
- archive: complain about path specs that don't match anything
* so/cvsserver-update (2009-12-07) 1 commit
- cvsserver: make the output of 'update' more compatible with cvs.
* tc/clone-v-progress (2009-12-26) 4 commits
- clone: use --progress to force progress reporting
- clone: set transport->verbose when -v/--verbose is used
- git-clone.txt: reword description of progress behaviour
- check stderr with isatty() instead of stdout when deciding to show progress
* tc/smart-http-restrict (2009-12-30) 3 commits
- Smart-http tests: Test http-backend without curl or a webserver
- Smart-http tests: Break test t5560-http-backend into pieces
- Smart-http: check if repository is OK to export before serving it
* tr/maint-1.6.5-bash-prompt-show-submodule-changes (2009-12-31) 1 commit
- bash completion: factor submodules into dirty state
--------------------------------------------------
[Cooking]
* jc/cache-unmerge (2009-12-25) 9 commits
- rerere forget path: forget recorded resolution
- rerere: refactor rerere logic to make it independent from I/O
- rerere: remove silly 1024-byte line limit
- resolve-undo: teach "update-index --unresolve" to use resolve-undo info
- resolve-undo: "checkout -m path" uses resolve-undo information
- resolve-undo: allow plumbing to clear the information
- resolve-undo: basic tests
- resolve-undo: record resolved conflicts in a new index extension section
- builtin-merge.c: use standard active_cache macros
* js/filter-branch-prime (2009-12-15) 1 commit
- filter-branch: remove an unnecessary use of 'git read-tree'
* mg/tag-d-show (2009-12-10) 1 commit
- tag -d: print sha1 of deleted tag
* sb/maint-octopus (2009-12-11) 3 commits
- octopus: remove dead code
- octopus: reenable fast-forward merges
- octopus: make merge process simpler to follow
* jh/commit-status (2009-12-07) 1 commit
- [test?] Add commit.status, --status, and --no-status
* jc/checkout-merge-base (2009-11-20) 2 commits
(merged to 'next' on 2009-12-24 at ff4d1d4)
+ "rebase --onto A...B" replays history on the merge base between A and B
+ "checkout A...B" switches to the merge base between A and B
* tr/http-push-ref-status (2009-12-24) 6 commits
- transport-helper.c::push_refs(): emit "no refs" error message
- transport-helper.c::push_refs(): ignore helper-reported status if ref is not to be pushed
- transport.c::transport_push(): make ref status affect return value
- refactor ref status logic for pushing
- t5541-http-push.sh: add test for unmatched, non-fast-forwarded refs
- t5541-http-push.sh: add tests for non-fast-forward pushes
* bg/maint-add-all-doc (2009-12-07) 4 commits
- squash! rm documentation--also mention add-u where we mention commit-a
- git-rm doc: Describe how to sync index & work tree
- git-add/rm doc: Consistently back-quote
- Documentation: 'git add -A' can remove files
I didn't like the existing documentation for "add -u" myself (especially
because I wrote the initial version) and this neatly fix it as well.
* il/vcs-helper (2009-12-09) 8 commits
- Remove special casing of http, https and ftp
- Support remote archive from all smart transports
- Support remote helpers implementing smart transports
- Support taking over transports
- Refactor git transport options parsing
- Pass unknown protocols to external protocol handlers
- Support mandatory capabilities
- Add remote helper debug mode
* mm/diag-path-in-treeish (2009-12-07) 1 commit
- Detailed diagnosis when parsing an object name fails.
* mh/rebase-fixup (2009-12-07) 2 commits
- Add a command "fixup" to rebase --interactive
- t3404: Use test_commit to set up test repository
(this branch is used by ns/rebase-auto-squash.)
Initial round of "fixup" action that is similar to "squash" action in
"rebase -i" that excludes the commit log message from follow-up commits
when composing the log message for the updated one. Expected is a further
improvement to skip opening the editor if a pick is followed only by
"fixup" and no "squash".
* ns/rebase-auto-squash (2009-12-08) 2 commits
- fixup! rebase -i --autosquash
- rebase -i --autosquash: auto-squash commits
(this branch uses mh/rebase-fixup.)
* jh/notes (2009-12-07) 11 commits
- Refactor notes concatenation into a flexible interface for combining notes
- Notes API: Allow multiple concurrent notes trees with new struct notes_tree
- Notes API: for_each_note(): Traverse the entire notes tree with a callback
- Notes API: get_note(): Return the note annotating the given object
- Notes API: add_note(): Add note objects to the internal notes tree structure
- Notes API: init_notes(): Initialize the notes tree from the given notes ref
- Notes API: get_commit_notes() -> format_note() + remove the commit restriction
- Minor style fixes to notes.c
(merged to 'next' on 2009-12-29 at c89a730)
+ Add more testcases to test fast-import of notes
+ Rename t9301 to t9350, to make room for more fast-import tests
+ fast-import: Proper notes tree manipulation
* fc/opt-quiet-gc-reset (2009-12-02) 1 commit
- General --quiet improvements
* mv/commit-date (2009-12-03) 2 commits
- Document date formats accepted by parse_date()
- builtin-commit: add --date option
* sr/gfi-options (2009-12-04) 7 commits
- fast-import: add (non-)relative-marks feature
- fast-import: allow for multiple --import-marks= arguments
- fast-import: test the new option command
- fast-import: add option command
- fast-import: add feature command
- fast-import: put marks reading in its own function
- fast-import: put option parsing code in separate functions
* ap/merge-backend-opts (2008-07-18) 6 commits
- Document that merge strategies can now take their own options
- Extend merge-subtree tests to test -Xsubtree=dir.
- Make "subtree" part more orthogonal to the rest of merge-recursive.
- Teach git-pull to pass -X<option> to git-merge
- git merge -X<option>
- git-merge-file --ours, --theirs
"git pull" patch needs sq-then-eval fix to protect it from $IFS
but otherwise seemed good.
* mo/bin-wrappers (2009-12-02) 3 commits
- INSTALL: document a simpler way to run uninstalled builds
- run test suite without dashed git-commands in PATH
- build dashless "bin-wrappers" directory similar to installed bindir
* tr/http-updates (2009-12-28) 4 commits
(merged to 'next' on 2009-12-30 at e143bc9)
+ Remove http.authAny
(merged to 'next' on 2009-12-07 at f08d447)
+ Allow curl to rewind the RPC read buffer
+ Add an option for using any HTTP authentication scheme, not only basic
+ http: maintain curl sessions
* nd/sparse (2009-12-30) 23 commits
(merged to 'next' on 2009-12-31 at 442ff22)
+ grep: do not do external grep on skip-worktree entries
(merged to 'next' on 2009-12-24 at 1fa9ff3)
+ commit: correctly respect skip-worktree bit
+ ie_match_stat(): do not ignore skip-worktree bit with CE_MATCH_IGNORE_VALID
(merged to 'next' on 2009-11-25 at 71380f5)
+ tests: rename duplicate t1009
(merged to 'next' on 2009-11-23 at f712a41)
+ sparse checkout: inhibit empty worktree
+ Add tests for sparse checkout
+ read-tree: add --no-sparse-checkout to disable sparse checkout support
+ unpack-trees(): ignore worktree check outside checkout area
+ unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index
+ unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout
+ unpack-trees.c: generalize verify_* functions
+ unpack-trees(): add CE_WT_REMOVE to remove on worktree alone
+ Introduce "sparse checkout"
+ dir.c: export excluded_1() and add_excludes_from_file_1()
+ excluded_1(): support exclude files in index
+ unpack-trees(): carry skip-worktree bit over in merged_entry()
+ Read .gitignore from index if it is skip-worktree
+ Avoid writing to buffer in add_excludes_from_file_1()
+ Teach Git to respect skip-worktree bit (writing part)
+ Teach Git to respect skip-worktree bit (reading part)
+ Introduce "skip-worktree" bit in index, teach Git to get/set this bit
+ Add test-index-version
+ update-index: refactor mark_valid() in preparation for new options
--------------------------------------------------
[Ejected]
* il/exec-error-report (2009-12-30) 2 commits
. Improve transport helper exec failure reporting
. Report exec errors from run-command
Freezes "git log" or anything that uses pager; J6t made quite a many good
suggestions. Expecting more rounds of reroll.
* je/send-email-no-subject (2009-08-05) 1 commit
(merged to 'next' on 2009-10-11 at 1b99c56)
+ send-email: confirm on empty mail subjects
* jc/fix-tree-walk (2009-10-22) 8 commits
(merged to 'next' on 2009-10-22 at 10c0c8f)
+ Revert failed attempt since 353c5ee
+ read-tree --debug-unpack
(merged to 'next' on 2009-10-11 at 0b058e2)
+ unpack-trees.c: look ahead in the index
+ unpack-trees.c: prepare for looking ahead in the index
+ Aggressive three-way merge: fix D/F case
+ traverse_trees(): handle D/F conflict case sanely
+ more D/F conflict tests
+ tests: move convenience regexp to match object names to test-lib.sh
This has some stupid bugs and reverted from 'next' until I can fix it, but
the "temporarily" turned out to be very loooong.
* jc/grep-full-tree (2009-11-24) 1 commit
. grep: --full-tree
The interaction with this option and pathspecs need to be worked out
better. I _think_ "grep --full-tree -e pattern -- '*.h'" should find from
all the header files in the tree, for example.
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (Jan 2010, #05; Sat, 16)
@ 2010-01-17 2:46 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2010-01-17 2:46 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
marked with '.' do not appear in any of the integration branches, but I am
still holding onto them.
I am expecting that the next week we will see quite a busy 'master', as I
would really like to close the merge window for 1.7.0 and tag -rc0 by the
end of it.
--------------------------------------------------
[New Topics]
* dp/maint-1.6.5-fast-import-non-commit-tag (2010-01-14) 1 commit
(merged to 'next' on 2010-01-16 at f95ea8e)
+ fast-import: tag may point to any object type
* il/push-set-upstream (2010-01-16) 1 commit
(merged to 'next' on 2010-01-16 at e3a7a60)
+ Add push --set-upstream
* js/windows (2010-01-15) 7 commits
- Do not use date.c:tm_to_time_t() from compat/mingw.c
- MSVC: Windows-native implementation for subset of Pthreads API
- MSVC: Fix an "incompatible pointer types" compiler warning
- Windows: avoid the "dup dance" when spawning a child process
- Windows: simplify the pipe(2) implementation
- Windows: boost startup by avoiding a static dependency on shell32.dll
- Windows: disable Python
* nd/status-partial-refresh (2010-01-14) 1 commit
(merged to 'next' on 2010-01-16 at f77bc8f)
+ status: only touch path we may need to check
* rr/core-tutorial (2010-01-16) 1 commit
(merged to 'next' on 2010-01-16 at d9dd8bd)
+ Documentation: Update git core tutorial clarifying reference to scripts
* jc/conflict-mark-len-attr (2010-01-16) 3 commits
. WIP : honor conflict-marker-lenght in rerere (does not work yet)
. rerere: use ll_merge() instead of using xdl_merge()
. conflict-marker-length: new attribute
(this branch uses jc/cache-unmerge.)
I am attempting to introduce a new per-path attribute to specify
non-default conflict marker length to help rerere grok conflicts in
Documentation/git-merge.txt, but the series is not yet in a presentable
state yet.
--------------------------------------------------
[Stalled]
* ap/merge-backend-opts (2008-07-18) 6 commits
- Document that merge strategies can now take their own options
- Extend merge-subtree tests to test -Xsubtree=dir.
- Make "subtree" part more orthogonal to the rest of merge-recursive.
- Teach git-pull to pass -X<option> to git-merge
- git merge -X<option>
- git-merge-file --ours, --theirs
"git pull" patch needs sq-then-eval fix to protect it from $IFS
but otherwise seemed good.
* js/refer-upstream (2009-09-10) 1 commit
- Introduce <branch>@{upstream} notation
This does not teach the public interface about the new syntax; callers
that care about distinction between name vs SHA-1 might not work as well
as they should.
* jh/notes (2009-12-07) 11 commits
- Refactor notes concatenation into a flexible interface for combining notes
- Notes API: Allow multiple concurrent notes trees with new struct notes_tree
- Notes API: for_each_note(): Traverse the entire notes tree with a callback
- Notes API: get_note(): Return the note annotating the given object
- Notes API: add_note(): Add note objects to the internal notes tree structure
- Notes API: init_notes(): Initialize the notes tree from the given notes ref
- Notes API: get_commit_notes() -> format_note() + remove the commit restriction
- Minor style fixes to notes.c
(merged to 'next' on 2010-01-02 at ae42130)
+ Add more testcases to test fast-import of notes
+ Rename t9301 to t9350, to make room for more fast-import tests
+ fast-import: Proper notes tree manipulation
http://thread.gmane.org/gmane.comp.version-control.git/134738
What's the status of the fourth and later patches on this topic? Overall
it looked reasonable, if I recall correctly what I thought when I reviewed
it last time, and I am tempted to merge it to 'next' soonish. Please
file complaints before I do so if people have objections.
Hold: JH on 2010-01-05, http://article.gmane.org/gmane.comp.version-control.git/136183
--------------------------------------------------
[Will merge to 'master' soon unless somebody complains]
* jk/warn-author-committer-after-commit (2010-01-13) 4 commits
(merged to 'next' on 2010-01-16 at f22c077)
+ commit: allow suppression of implicit identity advice
+ commit: show interesting ident information in summary
+ strbuf: add strbuf_addbuf_percentquote
+ strbuf_expand: convert "%%" to "%"
* tr/http-push-ref-status (2010-01-08) 6 commits
(merged to 'next' on 2010-01-16 at 7e872ac)
+ transport-helper.c::push_refs(): emit "no refs" error message
+ transport-helper.c::push_refs(): ignore helper-reported status if ref is not to be pushed
+ transport.c::transport_push(): make ref status affect return value
+ refactor ref status logic for pushing
+ t5541-http-push.sh: add test for unmatched, non-fast-forwarded refs
+ t5541-http-push.sh: add tests for non-fast-forward pushes
* sr/gfi-options (2009-12-04) 7 commits
(merged to 'next' on 2010-01-10 at 8b305fb)
+ fast-import: add (non-)relative-marks feature
+ fast-import: allow for multiple --import-marks= arguments
+ fast-import: test the new option command
+ fast-import: add option command
+ fast-import: add feature command
+ fast-import: put marks reading in its own function
+ fast-import: put option parsing code in separate functions
* tc/smart-http-restrict (2010-01-14) 5 commits
(merged to 'next' on 2010-01-16 at 71fc84c)
+ Test t5560: Fix test when run with dash
(merged to 'next' on 2010-01-06 at 82736cb)
+ Smart-http tests: Test http-backend without curl or a webserver
+ Smart-http tests: Break test t5560-http-backend into pieces
+ Smart-http tests: Improve coverage in test t5560
+ Smart-http: check if repository is OK to export before serving it
* tc/clone-v-progress (2009-12-26) 4 commits
(merged to 'next' on 2010-01-10 at ec2bfd7)
+ clone: use --progress to force progress reporting
+ clone: set transport->verbose when -v/--verbose is used
+ git-clone.txt: reword description of progress behaviour
+ check stderr with isatty() instead of stdout when deciding to show progress
Perhaps needs an entry in the Release Notes, but otherwise looked Ok.
* jk/run-command-use-shell (2010-01-01) 8 commits
(merged to 'next' on 2010-01-10 at 7479e2a)
+ t4030, t4031: work around bogus MSYS bash path conversion
+ diff: run external diff helper with shell
+ textconv: use shell to run helper
+ editor: use run_command's shell feature
+ run-command: optimize out useless shell calls
+ run-command: convert simple callsites to use_shell
+ t0021: use $SHELL_PATH for the filter script
+ run-command: add "use shell" option
Shuffled the commits in the topic, following J6t's suggestion in
http://thread.gmane.org/gmane.comp.version-control.git/136128
* jn/makefile (2010-01-06) 4 commits
(merged to 'next' on 2010-01-10 at f5a5d42)
+ Makefile: consolidate .FORCE-* targets
+ Makefile: learn to generate listings for targets requiring special flags
+ Makefile: use target-specific variable to pass flags to cc
+ Makefile: regenerate assembler listings when asked
* jc/maint-1.6.1-checkout-m-custom-merge (2010-01-06) 1 commit
(merged to 'next' on 2010-01-10 at df14116)
+ checkout -m path: fix recreating conflicts
* bk/fix-relative-gitdir-file (2010-01-08) 2 commits
(merged to 'next' on 2010-01-16 at cc4ae57)
+ Handle relative paths in submodule .git files
+ Test update-index for a gitlink to a .git file
* jh/commit-status (2010-01-13) 2 commits
(merged to 'next' on 2010-01-13 at 0905d59)
+ t7502: test commit.status, --status and --no-status
+ commit: support commit.status, --status, and --no-status
I have already given ample time for people to react, but ended up getting
tired of waiting for tests to materialize and doing it myself, as I want
to close merge window for 1.7.0-rc0 by the end of next week to have the
final release early next month.
* sd/cd-p-show-toplevel (2010-01-12) 2 commits
(merged to 'next' on 2010-01-16 at 57d6d31)
+ Use $(git rev-parse --show-toplevel) in cd_to_toplevel().
+ Add 'git rev-parse --show-toplevel' option.
Avoid having to use "cd -P" that may not be available on some platforms'
shells.
* tc/test-locate-httpd (2010-01-02) 1 commit
(merged to 'next' on 2010-01-06 at 9d913e5)
+ t/lib-http.sh: Restructure finding of default httpd location
--------------------------------------------------
[Will merge to 'master' after a bit more cooking in 'next']
* mh/rebase-fixup (2010-01-14) 21 commits
(merged to 'next' on 2010-01-16 at 7ccb228)
+ rebase -i: Retain user-edited commit messages after squash/fixup conflicts
+ t3404: Set up more of the test repo in the "setup" step
+ rebase -i: For fixup commands without squashes, do not start editor
+ rebase -i: Change function make_squash_message into update_squash_message
+ rebase -i: Extract function do_with_author
+ rebase -i: Handle the author script all in one place in do_next
+ rebase -i: Extract a function "commit_message"
+ rebase -i: Simplify commit counting for generated commit messages
+ rebase -i: Improve consistency of commit count in generated commit messages
+ t3404: Test the commit count in commit messages generated by "rebase -i"
+ rebase -i: Introduce a constant AMEND
+ rebase -i: Introduce a constant AUTHOR_SCRIPT
+ rebase -i: Document how temporary files are used
+ rebase -i: Use symbolic constant $MSG consistently
+ rebase -i: Use "test -n" instead of "test ! -z"
+ rebase -i: Inline expression
+ rebase -i: Remove dead code
+ rebase -i: Make the condition for an "if" more transparent
(merged to 'next' on 2010-01-12 at e84eab0)
+ rebase-i: Ignore comments and blank lines in peek_next_command
+ lib-rebase: Allow comments and blank lines to be added to the rebase script
+ lib-rebase: Provide clearer debugging info about what the editor did
+ Add a command "fixup" to rebase --interactive
+ t3404: Use test_commit to set up test repository
(this branch is used by ns/rebase-auto-squash.)
* ns/rebase-auto-squash (2009-12-08) 1 commit
(merged to 'next' on 2010-01-06 at da4e2f5)
+ rebase -i --autosquash: auto-squash commits
(this branch uses mh/rebase-fixup.)
* da/difftool (2010-01-15) 10 commits
(merged to 'next' on 2010-01-16 at 609f0da)
+ difftool: Update copyright notices to list each year separately
+ difftool: Use eval to expand '--extcmd' expressions
+ difftool: Add '-x' and as an alias for '--extcmd'
+ t7800-difftool.sh: Simplify the --extcmd test
(merged to 'next' on 2010-01-10 at 749c870)
+ git-diff.txt: Link to git-difftool
+ difftool: Allow specifying unconfigured commands with --extcmd
+ difftool--helper: Remove use of the GIT_MERGE_TOOL variable
+ difftool--helper: Update copyright and remove distracting comments
(merged to 'next' on 2010-01-06 at e957395)
+ git-difftool: Add '--gui' for selecting a GUI tool
+ t7800-difftool: Set a bogus tool for use by tests
* mm/conflict-advice (2010-01-12) 1 commit
(merged to 'next' on 2010-01-16 at b83be11)
+ Be more user-friendly when refusing to do something because of conflict.
* jc/maint-strbuf-add-fix-doubling (2010-01-12) 1 commit
(merged to 'next' on 2010-01-16 at 5959eee)
+ strbuf_addbuf(): allow passing the same buf to dst and src
* jc/maint-1.6.4-grep-lookahead (2010-01-10) 1 commit
(merged to 'next' on 2010-01-13 at 20f8f4b)
+ grep: optimize built-in grep by skipping lines that do not hit
(this branch is used by jc/grep-lookahead and jc/maint-grep-lookahead.)
Optimize the "line-by-line" internal grep by skiping en masse over lines
that cannot possibly match.
* jc/maint-grep-lookahead (2010-01-12) 0 commits
(this branch uses jc/maint-1.6.4-grep-lookahead; is used by jc/grep-lookahead.)
Early conflict resolution for the above for recent git.
* jc/grep-lookahead (2010-01-15) 4 commits
- grep --no-index: allow use of "git grep" outside a git repository
- grep: prepare to run outside of a work tree
(merged to 'next' on 2010-01-13 at 20f8f4b)
+ grep: rip out pessimization to use fixmatch()
+ grep: rip out support for external grep
(this branch uses jc/maint-1.6.4-grep-lookahead and jc/maint-grep-lookahead.)
* nd/include-termios-for-osol (2010-01-11) 1 commit
(merged to 'next' on 2010-01-16 at 3160c76)
+ Add missing #include to support TIOCGWINSZ on Solaris
* pc/uninteresting-submodule-disappear-upon-switch-branches (2010-01-11) 1 commit
(merged to 'next' on 2010-01-16 at b06ca1a)
+ Remove empty directories when checking out a commit with fewer submodules
Instead of using unlink(2) that will never succeed, use rmdir(2) to remove
an empty directory, knowing that this won't harm a populated directory.
* jl/submodule-diff (2010-01-16) 2 commits
(merged to 'next' on 2010-01-16 at 0a99e3c)
+ Teach diff that modified submodule directory is dirty
+ Show submodules as modified when they contain a dirty work tree
* jc/ls-files-ignored-pathspec (2010-01-08) 4 commits
(merged to 'next' on 2010-01-16 at d36016a)
+ ls-files: fix overeager pathspec optimization
+ read_directory(): further split treat_path()
+ read_directory_recursive(): refactor handling of a single path into a separate function
+ t3001: test ls-files -o ignored/dir
* js/exec-error-report (2010-01-12) 4 commits
(merged to 'next' on 2010-01-16 at 0e28d02)
+ Improve error message when a transport helper was not found
+ start_command: detect execvp failures early
+ run-command: move wait_or_whine earlier
+ start_command: report child process setup errors to the parent's stderr
* jc/fix-tree-walk (2009-09-14) 7 commits
(merged to 'next' on 2010-01-13 at 1c01b87)
+ read-tree --debug-unpack
+ unpack-trees.c: look ahead in the index
+ unpack-trees.c: prepare for looking ahead in the index
+ Aggressive three-way merge: fix D/F case
+ traverse_trees(): handle D/F conflict case sanely
+ more D/F conflict tests
+ tests: move convenience regexp to match object names to test-lib.sh
Resurrected from "Ejected" category. This is fix for a tricky codepath
and testing and improving before it hits 'master' is greatly appreciated.
(I have been using this in my private build for some time).
* jc/cache-unmerge (2009-12-25) 9 commits
(merged to 'next' on 2010-01-13 at 2290c44)
+ rerere forget path: forget recorded resolution
+ rerere: refactor rerere logic to make it independent from I/O
+ rerere: remove silly 1024-byte line limit
+ resolve-undo: teach "update-index --unresolve" to use resolve-undo info
+ resolve-undo: "checkout -m path" uses resolve-undo information
+ resolve-undo: allow plumbing to clear the information
+ resolve-undo: basic tests
+ resolve-undo: record resolved conflicts in a new index extension section
+ builtin-merge.c: use standard active_cache macros
(this branch is used by jc/conflict-mark-len-attr.)
* jc/rerere (2009-12-04) 1 commit
(merged to 'next' on 2010-01-10 at e295b7f)
+ Teach --[no-]rerere-autoupdate option to merge, revert and friends
--------------------------------------------------
[Cooking]
* jc/symbol-static (2010-01-11) 17 commits
- symlinks.c: remove unused functions
- object.c: remove unused functions
- blob.c: remove unused function
- strbuf.c: remove unused function
- sha1_file.c: remove unused function
- mailmap.c: remove unused function
- utf8.c: mark file-local function static
- submodule.c: mark file-local function static
- quote.c: mark file-local function static
- remote-curl.c: mark file-local function static
- read-cache.c: mark file-local functions static
- parse-options.c: mark file-local function static
- entry.c: mark file-local function static
- http.c: mark file-local functions static
- pretty.c: mark file-local function static
- builtin-rev-list.c: mark file-local function static
- bisect.c: mark file-local function static
Mark file-local symbols "static", and remove unused functions. Daniel
suggests to leave some comment for blob.c and I agree in principle, but
I don't think of a good description myself.
* jh/gitweb-cached (2010-01-13) 9 commits
- gitweb: File based caching layer (from git.kernel.org)
- gitweb: Convert output to using indirect file handle
- gitweb: cleanup error message produced by undefined $site_header
- gitweb: add a get function to compliment print_sort_th
- gitweb: add a get function to compliment print_local_time
- gitweb: Makefile improvements
- gitweb: Add option to force version match
- gitweb: change die_error to take "extra" argument for extended die information
- gitweb: Load checking
Replaced with a re-roll. Update to t9500 is probably needed.
* jc/ident (2010-01-08) 3 commits
- ident.c: treat $EMAIL as giving user.email identity explicitly
(merged to 'next' on 2010-01-10 at f1f9ded)
+ ident.c: check explicit identity for name and email separately
+ ident.c: remove unused variables
Opinions on the topmost one?
* jc/branch-d (2009-12-29) 1 commit
(merged to 'next' on 2010-01-10 at 61a14b7)
+ branch -d: base the "already-merged" safety on the branch it merges with
^ permalink raw reply [relevance 2%]
* [PATCH 2/4] merge: fix Yoda conditions
@ 2021-06-13 22:58 2% ` Felipe Contreras
0 siblings, 0 replies; 200+ results
From: Felipe Contreras @ 2021-06-13 22:58 UTC (permalink / raw)
To: git; +Cc: Jeff King, Junio C Hamano, Felipe Contreras
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
builtin/merge-file.c | 2 +-
xdiff/xmerge.c | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/builtin/merge-file.c b/builtin/merge-file.c
index 0186f4156a..6affccaf19 100644
--- a/builtin/merge-file.c
+++ b/builtin/merge-file.c
@@ -51,7 +51,7 @@ int cmd_merge_file(int argc, const char **argv, const char *prefix)
if (startup_info->have_repository) {
/* Read the configuration file */
git_config(git_xmerge_config, NULL);
- if (0 <= git_xmerge_style)
+ if (git_xmerge_style >= 0)
xmp.style = git_xmerge_style;
}
diff --git a/xdiff/xmerge.c b/xdiff/xmerge.c
index 1659edb453..ab3448ca88 100644
--- a/xdiff/xmerge.c
+++ b/xdiff/xmerge.c
@@ -487,7 +487,7 @@ static int xdl_do_merge(xdfenv_t *xe1, xdchange_t *xscr1,
* "diff3 -m" output does not make sense for anything
* more aggressive than XDL_MERGE_EAGER.
*/
- if (XDL_MERGE_EAGER < level)
+ if (level > XDL_MERGE_EAGER)
level = XDL_MERGE_EAGER;
}
@@ -603,10 +603,10 @@ static int xdl_do_merge(xdfenv_t *xe1, xdchange_t *xscr1,
if (!changes)
changes = c;
/* refine conflicts */
- if (XDL_MERGE_ZEALOUS <= level &&
+ if (level >= XDL_MERGE_ZEALOUS &&
(xdl_refine_conflicts(xe1, xe2, changes, xpp) < 0 ||
xdl_simplify_non_conflicts(xe1, changes,
- XDL_MERGE_ZEALOUS < level) < 0)) {
+ level > XDL_MERGE_ZEALOUS) < 0)) {
xdl_cleanup_merge(changes);
return -1;
}
--
2.32.0
^ permalink raw reply related [relevance 2%]
* What's cooking in git.git (Oct 2015, #04; Tue, 20)
@ 2015-10-20 22:10 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2015-10-20 22:10 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
With somewhat reduced review bandwidth, I'd expect that the upcoming
cycle would be slower than usual. At tinyurl.com/gitCal, I
tentatively drew a 14-week schedule for this cycle (I plan to be
offline during weeks #7-#9 myself---hopefully we'll have capable
interim maintainers to take care of the list traffic in the meantime
as in past years).
You can find the changes described here in the integration branches
of the repositories listed at
http://git-blame.blogspot.com/p/git-public-repositories.html
--------------------------------------------------
[Graduated to "master"]
* cc/quote-comments (2015-10-07) 2 commits
(merged to 'next' on 2015-10-09 at fc8a359)
+ quote: move comment before sq_quote_buf()
+ quote: fix broken sq_quote_buf() related comment
A no-op code-health maintenance.
* dt/log-follow-config (2015-10-07) 1 commit
(merged to 'next' on 2015-10-09 at 64a30d2)
+ log: Update log.follow doc and add to config.txt
Description of the "log.follow" configuration variable in "git log"
documentation is now also copied to "git config" documentation.
* es/worktree-add-cleanup (2015-10-07) 1 commit
(merged to 'next' on 2015-10-09 at 6ffd721)
+ t2026: rename worktree prune test
A no-op code-health maintenance.
* gr/rebase-i-drop-warn (2015-10-05) 2 commits
(merged to 'next' on 2015-10-09 at 0626b96)
+ rebase-i: loosen over-eager check_bad_cmd check
+ rebase-i: explicitly accept tab as separator in commands
"git rebase -i" had a minor regression recently, which stopped
considering a line that begins with an indented '#' in its insn
sheet not a comment, which is now fixed.
* jc/doc-gc-prune-now (2015-10-14) 1 commit
(merged to 'next' on 2015-10-15 at 5c07566)
+ Documentation/gc: warn against --prune=<now>
"git gc" is safe to run anytime only because it has the built-in
grace period to protect young objects. In order to run with no
grace period, the user must make sure that the repository is
quiescent.
* jc/fsck-dropped-errors (2015-09-23) 1 commit
(merged to 'next' on 2015-10-09 at 887fcac)
+ fsck: exit with non-zero when problems are found
There were some classes of errors that "git fsck" diagnosed to its
standard error that did not cause it to exit with non-zero status.
* jk/filter-branch-use-of-sed-on-incomplete-line (2015-10-12) 1 commit
(merged to 'next' on 2015-10-15 at 9e7c032)
+ filter-branch: remove multi-line headers in msg filter
A recent "filter-branch --msg-filter" broke skipping of the commit
object header, which is fixed.
* js/clone-dissociate (2015-10-07) 4 commits
(merged to 'next' on 2015-10-09 at ba30393)
+ clone --dissociate: avoid locking pack files
+ sha1_file.c: add a function to release all packs
+ sha1_file: consolidate code to close a pack's file descriptor
+ t5700: demonstrate a Windows file locking issue with `git clone --dissociate`
"git clone --dissociate" runs a big "git repack" process at the
end, and it helps to close file descriptors that are open on the
packs and their idx files before doing so on filesystems that
cannot remove a file that is still open.
* js/gc-with-stale-symref (2015-10-08) 2 commits
(merged to 'next' on 2015-10-09 at 8b89576)
+ pack-objects: do not get distracted by broken symrefs
+ gc: demonstrate failure with stale remote HEAD
"git gc" used to barf when a symbolic ref has gone dangling
(e.g. the branch that used to be your upstream's default when you
cloned from it is now gone, and you did "fetch --prune").
* js/icase-wt-detection (2015-09-28) 1 commit
(merged to 'next' on 2015-10-09 at 78ff500)
+ setup: fix "inside work tree" detection on case-insensitive filesystems
On a case insensitive filesystems, setting GIT_WORK_TREE variable
using a random cases that does not agree with what the filesystem
thinks confused Git that it wasn't inside the working tree.
* kn/for-each-branch (2015-09-25) 8 commits
(merged to 'next' on 2015-10-09 at 45723ce)
+ branch: add '--points-at' option
+ branch.c: use 'ref-filter' APIs
+ branch.c: use 'ref-filter' data structures
+ branch: drop non-commit error reporting
+ branch: move 'current' check down to the presentation layer
+ branch: roll show_detached HEAD into regular ref_list
+ branch: bump get_head_description() to the top
+ branch: refactor width computation
(this branch is used by kn/for-each-branch-remainder.)
Update "git branch" that list existing branches, using the
ref-filter API that is shared with "git tag" and "git
for-each-ref".
* ls/p4-lfs (2015-10-03) 7 commits
(merged to 'next' on 2015-10-14 at 4b8c365)
+ git-p4: add Git LFS backend for large file system
+ git-p4: add support for large file systems
+ git-p4: check free space during streaming
+ git-p4: add file streaming progress in verbose mode
+ git-p4: return an empty list if a list config has no values
+ git-p4: add gitConfigInt reader
+ git-p4: add optional type specifier to gitConfig reader
Teach "git p4" to send large blobs outside the repository by
talking to Git LFS.
* ls/p4-translation-failure (2015-09-22) 2 commits
(merged to 'next' on 2015-10-09 at b462387)
+ git-p4: handle "Translation of file content failed"
+ git-p4: add test case for "Translation of file content failed" error
Work around "git p4" failing when the P4 depot records the contents
in UTF-16 without UTF-16 BOM.
* mk/submodule-gitdir-path (2015-09-14) 2 commits
(merged to 'next' on 2015-10-09 at cf8768e)
+ path: implement common_dir handling in git_pathdup_submodule()
+ submodule refactor: use strbuf_git_path_submodule() in add_submodule_odb()
The submodule code has been taught to work better with separate
work trees created via "git worktree add".
* mm/detach-at-HEAD-reflog (2015-10-02) 2 commits
(merged to 'next' on 2015-10-09 at 624bc87)
+ status: don't say 'HEAD detached at HEAD'
+ t3203: test 'detached at' after checkout --detach
After "git checkout --detach", "git status" reported a fairly
useless "HEAD detached at HEAD", instead of saying at which exact
commit.
* nd/clone-linked-checkout (2015-09-28) 6 commits
(merged to 'next' on 2015-10-09 at a93973f)
+ clone: better error when --reference is a linked checkout
+ clone: allow --local from a linked checkout
+ enter_repo: allow .git files in strict mode
+ enter_repo: avoid duplicating logic, use is_git_directory() instead
+ t0002: add test for enter_repo(), non-strict mode
+ path.c: delete an extra space
It was not possible to use a repository-lookalike created by "git
worktree add" as a local source of "git clone".
* nd/gc-auto-background-fix (2015-09-21) 1 commit
(merged to 'next' on 2015-10-09 at 1f0fc60)
+ gc: save log from daemonized gc --auto and print it next time
When "git gc --auto" is backgrounded, its diagnosis message is
lost. Save it to a file in $GIT_DIR and show it next time the "gc
--auto" is run.
* pt/am-builtin (2015-09-30) 1 commit
(merged to 'next' on 2015-10-09 at 396def8)
+ am: configure gpg at startup
When "git am" was rewritten as a built-in, it stopped paying
attention to user.signingkey, which was fixed.
* rd/test-path-utils (2015-10-08) 1 commit
(merged to 'next' on 2015-10-15 at 827a271)
+ test-path-utils.c: remove incorrect assumption
The normalize_ceiling_entry() function does not muck with the end
of the path it accepts, and the real world callers do rely on that,
but a test insisted that the function drops a trailing slash.
* sa/send-email-smtp-batch-data-limit (2015-09-30) 1 commit
(merged to 'next' on 2015-10-09 at c021fdf)
+ git-send-email.perl: Fixed sending of many/huge changes/patches
When "git send-email" wanted to talk over Net::SMTP::SSL,
Net::Cmd::datasend() did not like to be fed too many bytes at the
same time and failed to send messages. Send the payload one line
at a time to work around the problem.
* sb/http-flaky-test-fix (2015-09-25) 1 commit
(merged to 'next' on 2015-10-09 at 9dc37f3)
+ t5561: get rid of racy appending to logfile
A test script for the HTTP service had a timing dependent bug,
which was fixed.
* sb/perf-without-installed-git (2015-09-25) 1 commit
(merged to 'next' on 2015-10-09 at 7a1ed05)
+ t/perf: make runner work even if Git is not installed
Performance-measurement tests did not work without an installed Git.
* sb/submodule-config-parse (2015-10-12) 1 commit
(merged to 'next' on 2015-10-15 at 6fea79d)
+ submodule-config: "goto" removal in parse_config()
Code simplification.
* tk/doc-interpret-trailers-grammo (2015-10-07) 1 commit
(merged to 'next' on 2015-10-09 at 37888a2)
+ Documentation/interpret-trailers: Grammar fix
--------------------------------------------------
[New Topics]
* dt/refs-backend-pre-vtable (2015-10-15) 27 commits
- introduce "extensions" form of core.repositoryformatversion
- refs: break out ref conflict checks
- refs: make files_log_ref_write functions public
- initdb: move safe_create_dir into common code
- refs.c: move should_autocreate_reflog to common code
- refs.c: move peel_object to the common code
- refs.c: move copy_msg to the common code
- refs.c: move refname_is_safe to the common code
- refs: move transaction functions into common code
- refs.c: move head_ref_namespaced to the common code
- refs.c: move ref iterators to the common code
- refs.c: move prettify_refname to the common code
- refs.c: move is_branch to the common code
- refs.c: move check_refname_format to the common code
- refs.c: move resolve_refdup to common
- refs.c: move read_ref, read_ref_full and ref_exists to the common code
- refs.c: move warn_if_dangling_symref* to the common code
- refs.c: move dwim and friend functions to the common refs code
- refs.c: move the hidden refs functions to the common code
- refs.c: move read_ref_at to the common refs file
- refs.c: move delete_pseudoref and delete_ref to the common code
- refs.c: move update_ref to refs.c
- refs.c: add a new refs.c file to hold all common refs code
- refs-be-files.c: rename refs to refs-be-files
- refs: make repack_without_refs and is_branch public
- refs.c: create a public version of verify_refname_available
- Merge branch 'jk/war-on-sprintf' into HEAD
(this branch uses jk/war-on-sprintf; is tangled with dt/refs-backend-lmdb.)
The early part of the pluggable ref backend series, which sifts the
ref API functions into two bins: the filesystem backend specific
ones and the generic API functions. The next step will start
introducing the framework to dispatch generic calls to specific
backend implementation(s) and then finally plug a new backend that
is different from the file backend.
Expecting a reroll after an review of the remainder.
($gmane/279897).
* jc/usage-stdin (2015-10-16) 1 commit
- usage: do not insist that standard input must come from a file
The synopsys text and the usage string of subcommands that read
list of things from the standard input are often shown as if they
only take input from a file on a filesystem, which was misleading.
Will merge to 'next'.
* rt/placeholder-in-usage (2015-10-16) 1 commit
- am, credential-cache: add angle brackets to usage string
A couple of commands still showed "[options]" in their usage string
to note where options should come on their command line, but we
spell that "[<options>]" in most places these days.
Will merge to 'next'.
* tk/stripspace (2015-10-16) 2 commits
- stripspace: use parse-options for command-line parsing
- strbuf: make stripspace() part of strbuf
The internal stripspace() function has been moved to where it
logically belongs to, i.e. strbuf API, and the command line parser
of "git stripspace" has been updated to use the parse_options API.
Will merge to 'next'.
* dk/p4-import-ctypes (2015-10-20) 1 commit
- git-p4: import the ctypes module
"git-p4" tried to use from ctypes module without first importing
it.
Will merge to 'next'.
* dt/t7063-fix-flaky-test (2015-10-19) 1 commit
- t7063: fix flaky untracked-cache test
Will merge to 'next'.
* es/worktree-add (2015-10-18) 1 commit
- worktree: usage: denote <branch> as optional with 'add'
Will merge to 'next'.
* kn/for-each-tag (2015-10-18) 1 commit
- tag.c: use the correct algorithm for the '--contains' option
Recent update to "git tag --contains" caused a performance
regression.
Will merge to 'next'.
--------------------------------------------------
[Stalled]
* dk/gc-idx-wo-pack (2015-08-17) 3 commits
- DONTMERGE: log message, grace-period and tests $gmane/276058
- gc: remove stale .idx files without corresponding .pack file
- prepare_packed_git(): refactor garbage reporting in pack directory
Having a leftover .idx file without correspoinding .pack file in
the repository hurts performance; "git gc" learned to prune them.
Waiting for a reroll.
* nd/ita-cleanup (2015-09-06) 6 commits
- grep: make it clear i-t-a entries are ignored
- checkout(-index): do not checkout i-t-a entries
- apply: make sure check_preimage() does not leave empty file on error
- apply: fix adding new files on i-t-a entries
- add and use a convenience macro ce_intent_to_add()
- blame: remove obsolete comment
Paths that have been told the index about with "add -N" are not yet
in the index, but various commands behaved as if they already are.
Some commits need better explanation.
Waiting for a reroll.
* ld/p4-detached-head (2015-09-09) 2 commits
- git-p4: work with a detached head
- git-p4: add failing test for submit from detached head
Will be rerolled.
($gmane/277574)
* mg/httpd-tests-update-for-apache-2.4 (2015-04-08) 2 commits
- t/lib-git-svn: check same httpd module dirs as lib-httpd
- t/lib-httpd: load mod_unixd
This is the first two commits in a three-patch series $gmane/266962
Becoming tired of waiting for a reroll.
with updated log message ($gmane/268061).
* wp/sha1-name-negative-match (2015-06-08) 2 commits
- sha1_name.c: introduce '^{/!-<negative pattern>}' notation
- test for '!' handling in rev-parse's named commits
Introduce "branch^{/!-<pattern>}" notation to name a commit
reachable from branch that does not match the given pattern.
Becoming tired of waiting for a reroll.
($gmane/271213).
* ak/format-patch-odir-config (2015-06-19) 1 commit
- format-patch: introduce format.outputDirectory configuration
Reroll exists but didn't pick it up as it seemed to be still
collecting review comments.
Becoming tired of waiting for a reroll.
($gmane/272180).
* mh/notes-allow-reading-treeish (2015-10-08) 3 commits
- notes: allow treeish expressions as notes ref
+ Merge branch 'jk/notes-dwim-doc' into next
+ Merge branch 'jc/merge-drop-old-syntax' into next
(this branch uses jc/merge-drop-old-syntax.)
Some "git notes" operations, e.g. "git log --notes=<note>", should
be able to read notes from any tree-ish that is shaped like a notes
tree, but the notes infrastructure required that the argument must
be a ref under refs/notes/. Loosen it to require a valid ref only
when the operation would update the notes (in which case we must
have a place to store the updated notes tree, iow, a ref).
* jc/diff-b-m (2015-02-23) 5 commits
. WIPWIP
. WIP: diff-b-m
- diffcore-rename: allow easier debugging
- diffcore-rename.c: add locate_rename_src()
- diffcore-break: allow debugging
"git diff -B -M" produced incorrect patch when the postimage of a
completely rewritten file is similar to the preimage of a removed
file; such a resulting file must not be expressed as a rename from
other place.
The fix in this patch is broken, unfortunately.
--------------------------------------------------
[Cooking]
* mr/worktree-list (2015-10-08) 5 commits
- worktree: add 'list' command
- worktree: add details to the worktree struct
- worktree: add a function to get worktree details
- worktree: refactor find_linked_symref function
- worktree: add top-level worktree.c
Add the "list" subcommand to "git worktree".
Will merge to 'next'.
* jc/mailinfo (2015-10-20) 1 commit
- mailinfo: ignore in-body header that we do not care about
(this branch uses jc/am-mailinfo-direct and jc/mailinfo-lib.)
Some people write arbitrary garbage at the beginning of a piece of
e-mail (or after -- >8 -- scissors -- >8 -- line) in the commit log
message and expect them to be discarded, even though "From:" and
"Subject:" are the only documented in-body headers that you are
supposed to have there. Allow some garbage (specifically, what may
look like RFC2822 headers like "MIME-Version: ...") to be there and
ignore them.
I have a feeling that that this is a step in a wrong direction.
Comments?
* jc/am-mailinfo-direct (2015-10-20) 2 commits
- mailinfo: plug strbuf leak during continuation line handling
- am: make direct call to mailinfo
(this branch is used by jc/mailinfo; uses jc/mailinfo-lib.)
"git am" used to spawn "git mailinfo" via run_command() API once
per each patch, but learned to make a direct call to mailinfo()
instead.
Needs benchmark on platforms with slow run_command().
* jc/mailinfo-lib (2015-10-19) 33 commits
- mailinfo: remove calls to exit() and die() deep in the callchain
- mailinfo: handle charset conversion errors in the caller
- mailinfo: libify
- mailinfo: move definition of MAX_HDR_PARSED closer to its use
- mailinfo: move cleanup_space() before its users
- mailinfo: move check_header() after the helpers it uses
- mailinfo: move read_one_header_line() closer to its callers
- mailinfo: keep the parsed log message in a strbuf
- mailinfo: handle_commit_msg() shouldn't be called after finding patchbreak
- mailinfo: move content/content_top to struct mailinfo
- mailinfo: move [ps]_hdr_data to struct mailinfo
- mailinfo: move cmitmsg and patchfile to struct mailinfo
- mailinfo: move charset to struct mailinfo
- mailinfo: move transfer_encoding to struct mailinfo
- mailinfo: move check for metainfo_charset to convert_to_utf8()
- mailinfo: move metainfo_charset to struct mailinfo
- mailinfo: move use_scissors and use_inbody_headers to struct mailinfo
- mailinfo: move add_message_id and message_id to struct mailinfo
- mailinfo: move patch_lines to struct mailinfo
- mailinfo: move filter/header stage to struct mailinfo
- mailinfo: move global "FILE *fin, *fout" to struct mailinfo
- mailinfo: move keep_subject & keep_non_patch_bracket to struct mailinfo
- mailinfo: introduce "struct mailinfo" to hold globals
- mailinfo: move global "line" into mailinfo() function
- mailinfo: do not let find_boundary() touch global "line" directly
- mailinfo: do not let handle_boundary() touch global "line" directly
- mailinfo: do not let handle_body() touch global "line" directly
- mailinfo: get rid of function-local static states
- mailinfo: move handle_boundary() lower
- mailinfo: explicitly close file handle to the patch output
- mailinfo: fix an off-by-one error in the boundary stack
- mailinfo: fold decode_header_bq() into decode_header()
- mailinfo: remove a no-op call convert_to_utf8(it, "")
(this branch is used by jc/am-mailinfo-direct and jc/mailinfo.)
The implementation of "git mailinfo" was refactored so that a
mailinfo() function can be directly called from inside a process.
* jc/am-3-fallback-regression-fix (2015-10-09) 1 commit
(merged to 'next' on 2015-10-15 at 7dde994)
+ am -3: do not let failed merge from completing the error codepath
(this branch is used by js/am-3-merge-recursive-direct.)
"git am -3" had a small regression where it is aborted in its error
handling codepath when underlying merge-recursive failed in certain
ways, as it assumed that the internal call to merge-recursive will
never die, which is not the case (yet).
* js/am-3-merge-recursive-direct (2015-10-12) 2 commits
- am: make a direct call to merge_recursive
- merge_recursive_options: introduce the "gently" flag
(this branch uses jc/am-3-fallback-regression-fix.)
The merge_recursive_generic() function has been made a bit safer to
call from inside a process. "git am -3" was taught to make a direct
call to the function when falling back to three-way merge.
* km/cache-entry-refcnt (2015-10-14) 1 commit
- merge: fix cache_entry use-after-free
Sometimes we discarded a cache-entry that is still referenced from
name-hash (used only to hold the pathname there), leading to use
after free errors. Reference-count cache entries to work it
around.
* ls/p4-test-updates (2015-10-12) 2 commits
(merged to 'next' on 2015-10-15 at 3c94932)
+ git-p4: skip t9819 test case on case insensitive file systems
+ git-p4: avoid "stat" command in t9815 git-p4-submit-fail
A few test scripts around "git p4" have been improved for
portability.
Will merge to 'master'.
* tb/t0027-crlf (2015-10-12) 1 commit
(merged to 'next' on 2015-10-15 at 7ab4f31)
+ t0027: improve test for not-normalized files
The test for various line-ending conversions has been enhanced.
Will merge to 'master'.
* sg/pretty-more-date-mode-format (2015-10-07) 1 commit
- pretty: add format specifiers for short and raw date formats
Introduce "%as" and "%aR" placeholders for "log --format" to show
the author date in the short and raw formats.
I have a feeling that that this is a step in a wrong direction.
Comments?
* kn/for-each-branch-remainder (2015-10-02) 9 commits
- branch: implement '--format' option
- branch: use ref-filter printing APIs
- ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams
- ref-filter: introduce format_ref_array_item()
- ref-filter: adopt get_head_description() from branch.c
- ref-filter: modify "%(objectname:short)" to take length
- ref-filter: add support for %(path) atom
- ref-filter: implement %(if:equals=<string>) and %(if:notequals=<string>)
- ref-filter: implement %(if), %(then), and %(else) atoms
More unification among "branch -l", "tag -l" and "for-each-ref --format".
Expecting a reroll.
($gmane/278926)
* jk/war-on-sprintf (2015-10-05) 70 commits
(merged to 'next' on 2015-10-15 at 27a1ae5)
+ name-rev: use strip_suffix to avoid magic numbers
+ use strbuf_complete to conditionally append slash
+ fsck: use for_each_loose_file_in_objdir
+ Makefile: drop D_INO_IN_DIRENT build knob
+ fsck: drop inode-sorting code
+ convert strncpy to memcpy
+ notes: document length of fanout path with a constant
+ color: add color_set helper for copying raw colors
+ prefer memcpy to strcpy
+ help: clean up kfmclient munging
+ receive-pack: simplify keep_arg computation
+ avoid sprintf and strcpy with flex arrays
+ use alloc_ref rather than hand-allocating "struct ref"
+ color: add overflow checks for parsing colors
+ drop strcpy in favor of raw sha1_to_hex
+ use sha1_to_hex_r() instead of strcpy
+ daemon: use cld->env_array when re-spawning
+ stat_tracking_info: convert to argv_array
+ http-push: use an argv_array for setup_revisions
+ fetch-pack: use argv_array for index-pack / unpack-objects
+ diagnose_invalid_index_path: use strbuf to avoid strcpy/strcat
+ write_loose_object: convert to strbuf
+ remove_leading_path: use a strbuf for internal storage
+ enter_repo: convert fixed-size buffers to strbufs
+ merge-recursive: convert malloc / strcpy to strbuf
+ transport: use strbufs for status table "quickref" strings
+ apply: convert root string to strbuf
+ init: use strbufs to store paths
+ probe_utf8_pathname_composition: use internal strbuf
+ precompose_utf8: drop unused variable
+ sha1_get_pack_name: use a strbuf
+ http-walker: store url in a strbuf
+ http-push: use strbuf instead of fwrite_buffer
+ remote-ext: simplify git pkt-line generation
+ upload-archive: convert sprintf to strbuf
+ resolve_ref: use strbufs for internal buffers
+ read_remotes_file: simplify string handling
+ read_branches_file: simplify string handling
+ mailmap: replace strcpy with xstrdup
+ help: drop prepend function in favor of xstrfmt
+ ref-filter: drop sprintf and strcpy calls
+ use strip_suffix and xstrfmt to replace suffix
+ fetch: replace static buffer with xstrfmt
+ config: use xstrfmt in normalize_value
+ replace trivial malloc + sprintf / strcpy calls with xstrfmt
+ receive-pack: convert strncpy to xsnprintf
+ http-push: replace strcat with xsnprintf
+ add_packed_git: convert strcpy into xsnprintf
+ entry.c: convert strcpy to xsnprintf
+ grep: use xsnprintf to format failure message
+ compat/hstrerror: convert sprintf to snprintf
+ stop_progress_msg: convert sprintf to xsnprintf
+ find_short_object_filename: convert sprintf to xsnprintf
+ use xsnprintf for generating git object headers
+ archive-tar: use xsnprintf for trivial formatting
+ convert trivial sprintf / strcpy calls to xsnprintf
+ compat/inet_ntop: fix off-by-one in inet_ntop4
+ test-dump-cache-tree: avoid overflow of cache-tree name
+ progress: store throughput display in a strbuf
+ trace: use strbuf for quote_crnl output
+ mailsplit: make PATH_MAX buffers dynamic
+ fsck: use strbuf to generate alternate directories
+ add reentrant variants of sha1_to_hex and find_unique_abbrev
+ strbuf: make strbuf_complete_line more generic
+ add git_path_buf helper function
+ add xsnprintf helper function
+ fsck: don't fsck alternates for connectivity-only check
+ archive-tar: fix minor indentation violation
+ mailsplit: fix FILE* leak in split_maildir
+ show-branch: avoid segfault with --reflog of unborn branch
(this branch is used by dt/refs-backend-lmdb and dt/refs-backend-pre-vtable.)
Many allocations that is manually counted (correctly) that are
followed by strcpy/sprintf have been replaced with a less error
prone constructs such as xstrfmt.
Macintosh-specific breakage was noticed and corrected in this
reroll.
Will merge to 'master'.
* rp/link-curl-before-ssl (2015-09-25) 3 commits
- configure: make curl-config path configurable
- configure.ac: detect ssl need with libcurl
- Makefile: link libcurl before openssl and crypto
Waiting for the (hopefully) final submission.
* jk/graph-format-padding (2015-09-14) 1 commit
- pretty: pass graph width to pretty formatting for use in '%>|(N)'
Redefine the way '%>|(N)' padding and the "--graph" option
interacts. It has been that the available columns to display the
log message was measured from the edge of the area the graph ended,
but with this it becomes the beginning of the entire output.
I have a suspicion that 50% of the users would appreciate this
change, and the remainder see this break their expectation. If
that is the case, we might need to introduce a similar but
different alignment operator so that this new behaviour is
available to those who want to use it, without negatively affecting
existing uses.
Undecided.
($gmane/278326)
* sb/submodule-parallel-fetch (2015-10-20) 14 commits
- run-command: fix missing output from late callbacks
- test-run-command: increase test coverage
- test-run-command: test for gracefully aborting
- run-command: initialize the shutdown flag
- run-command: call get_next_task with a clean child process.
- run-command: fix early shutdown
(merged to 'next' on 2015-10-15 at df63590)
+ submodules: allow parallel fetching, add tests and documentation
+ fetch_populated_submodules: use new parallel job processing
+ run-command: add an asynchronous parallel child processor
+ sigchain: add command to pop all common signals
+ strbuf: add strbuf_read_once to read without blocking
+ xread_nonblock: add functionality to read from fds without blocking
+ xread: poll on non blocking fds
+ submodule.c: write "Fetching submodule <foo>" to stderr
Add a framework to spawn a group of processes in parallel, and use
it to run "git fetch --recurse-submodules" in parallel.
Will cook in 'next'.
* ad/cygwin-wants-rename (2015-08-07) 1 commit
- config.mak.uname: Cygwin needs OBJECT_CREATION_USES_RENAMES
Will hold.
($gmane/275680).
* jc/rerere-multi (2015-09-14) 7 commits
- rerere: do use multiple variants
- t4200: rerere a merge with two identical conflicts
- rerere: allow multiple variants to exist
- rerere: delay the recording of preimage
- rerere: handle leftover rr-cache/$ID directory and postimage files
- rerere: scan $GIT_DIR/rr-cache/$ID when instantiating a rerere_id
- rerere: split conflict ID further
"git rerere" can encounter two or more files with the same conflict
signature that have to be resolved in different ways, but there was
no way to record these separate resolutions.
* jc/merge-drop-old-syntax (2015-04-29) 1 commit
(merged to 'next' on 2015-10-07 at 50fed71)
+ merge: drop 'git merge <message> HEAD <commit>' syntax
(this branch is used by mh/notes-allow-reading-treeish.)
Originally merged to 'next' on 2015-05-28
Stop supporting "git merge <message> HEAD <commit>" syntax that
has been deprecated since October 2007.
Will keep in 'next' during the 2.7 cycle.
--------------------------------------------------
[Discarded]
* dt/refs-backend-lmdb (2015-10-12) 45 commits
. refs: tests for db backend
. refs: add LMDB refs backend
. introduce "extensions" form of core.repositoryformatversion
. refs: add register_refs_backend
. refs: allow ref backend to be set for clone
. refs: always handle non-normal refs in files backend
. refs: move duplicate check to common code
. refs: break out a ref conflict check
. refs: make files_log_ref_write functions public
. refs: make lock generic
. refs-be-files.c: add method to rename refs
. refs.c: add method for initializing refs db
. initdb: move safe_create_dir into common code
. refs.c: add method for initial ref transaction commit
. refs.c: add methods for reflog
. refs.c: add ref backend init function
. refs.c: move should_autocreate_reflog to common code
. refs.c: move peel_object to the common code
. refs.c: move copy_msg to the common code
. refs.h: document make refname_is_safe and add it to header
. refs.c: move refname_is_safe to the common code
. refs-be-files.c: add do_for_each_per_worktree_ref
. refs-be-files.c: add method for for_each_reftype_...
. refs-be-files.c: add methods for the ref iterators
. refs-be-files.c: add methods for misc ref operations
. refs: add a backend method structure with transaction functions
. refs: move transaction functions into common code
. refs.c: move head_ref_namespaced to the common code
. refs.c: move ref iterators to the common code
. refs.c: move prettify_refname to the common code
. refs.c: move is_branch to the common code
. refs.c: move check_refname_format to the common code
. refs.c: move resolve_refdup to common
. refs.c: move read_ref, read_ref_full and ref_exists to the common code
. refs.c: move warn_if_dangling_symref* to the common code
. refs.c: move dwim and friend functions to the common refs code
. refs.c: move the hidden refs functions to the common code
. refs.c: move read_ref_at to the common refs file
. refs.c: move delete_ref and delete_refs to the common code
. refs.c: move update_ref to refs.c
. refs.c: add a new refs.c file to hold all common refs code
. refs-be-files.c: rename refs to refs-be-files
. refs: make repack_without_refs and is_branch public
. refs.c: create a public version of verify_refname_available
- Merge branch 'jk/war-on-sprintf' into HEAD
(this branch uses jk/war-on-sprintf; is tangled with dt/refs-backend-pre-vtable.)
Being rerolled separately.
^ permalink raw reply [relevance 2%]
* Re: [PATCH 0/1] merge: fix cache_entry use-after-free
2015-10-08 18:47 1% ` David Turner
@ 2015-10-08 20:00 2% ` Junio C Hamano
2015-10-09 22:16 2% ` David Turner
0 siblings, 1 reply; 200+ results
From: Junio C Hamano @ 2015-10-08 20:00 UTC (permalink / raw)
To: David Turner; +Cc: git, Keith McGuigan
David Turner <dturner@twopensource.com> writes:
> From: Keith McGuigan <kmcguigan@twitter.com>
>
> During merges, we would previously free entries that we no longer need
> in the destination index. But those entries might also be stored in
> the dir_entry cache, and when a later call to add_to_index found them,
> they would be used after being freed.
>
> To prevent this, add a ref count for struct cache_entry. Whenever
> a cache entry is added to a data structure, the ref count is incremented;
> when it is removed from the data structure, it is decremented. When
> it hits zero, the cache_entry is freed.
>
> Signed-off-by: David Turner <dturner@twopensource.com>
> Signed-off-by: Keith McGuigan <kmcguigan@twitter.com>
> ---
Thanks.
> @@ -213,6 +214,32 @@ struct cache_entry {
> struct pathspec;
>
> /*
> + * Increment the cache_entry reference count. Should be called
> + * whenever a pointer to a cache_entry is retained in a data structure,
> + * thus marking it as alive.
> + */
> +static inline void add_ce_ref(struct cache_entry *ce)
> +{
> + assert(ce != NULL && ce->ref_count >= 0);
> + ++ce->ref_count;
> +}
We tend to prefer post-increment when the distinction between pre-
or post- does not make any difference, which is the case here.
> diff --git a/name-hash.c b/name-hash.c
> index 702cd05..f12c919 100644
> --- a/name-hash.c
> +++ b/name-hash.c
> @@ -92,7 +93,9 @@ static void remove_dir_entry(struct index_state *istate, struct cache_entry *ce)
> struct dir_entry *dir = hash_dir_entry(istate, ce, ce_namelen(ce));
> while (dir && !(--dir->nr)) {
> struct dir_entry *parent = dir->parent;
> - hashmap_remove(&istate->dir_hash, dir, NULL);
> + struct dir_entry *removed = hashmap_remove(&istate->dir_hash, dir, NULL);
> + assert(removed == dir);
> + drop_ce_ref(dir->ce);
This is curious. In remove_name_hash() you do not have the
corresponding assert. Why is it necessary here (or is it
unnecessary over there)?
> @@ -147,6 +151,7 @@ void remove_name_hash(struct index_state *istate, struct cache_entry *ce)
> return;
> ce->ce_flags &= ~CE_HASHED;
> hashmap_remove(&istate->name_hash, ce, ce);
> + drop_ce_ref(ce);
>
> if (ignore_case)
> remove_dir_entry(istate, ce);
> diff --git a/read-cache.c b/read-cache.c
> index 87204a5..442de34 100644
> --- a/read-cache.c
> +++ b/read-cache.c
> @@ -53,6 +53,7 @@ static const char *alternate_index_output;
> static void set_index_entry(struct index_state *istate, int nr, struct cache_entry *ce)
> {
> istate->cache[nr] = ce;
> + add_ce_ref(ce);
> add_name_hash(istate, ce);
> }
What happens to the existing entry that used to be istate->cache[nr],
which may or may not be 'ce' that is replacing it?
It turns out that all three calling sites are safe, but it is not
immediately obvious why. Perhaps some comment in front of the
function is in order, to warn those who may have to add a new caller
or restructure the existing calling chain, that istate->cache[nr] is
expected not to hold a live reference when the function is called,
or something?
> @@ -314,8 +314,10 @@ void replace_index_entry_in_base(struct index_state *istate,
> istate->split_index->base &&
> old->index <= istate->split_index->base->cache_nr) {
> new->index = old->index;
> - if (old != istate->split_index->base->cache[new->index - 1])
> - free(istate->split_index->base->cache[new->index - 1]);
> + if (old != istate->split_index->base->cache[new->index - 1]) {
> + struct cache_entry *ce = istate->split_index->base->cache[new->index - 1];
> + drop_ce_ref(ce);
> + }
> istate->split_index->base->cache[new->index - 1] = new;
Does 'new' already have the right refcount at this point?
^ permalink raw reply [relevance 2%]
* Re: [PATCH v4 3/8] rebase --merge: fix reflog when continuing
@ 2022-10-25 10:08 2% ` Phillip Wood
0 siblings, 0 replies; 200+ results
From: Phillip Wood @ 2022-10-25 10:08 UTC (permalink / raw)
To: Junio C Hamano, Phillip Wood via GitGitGadget
Cc: git, Phillip Wood, Christian Couder, Elijah Newren,
Ævar Arnfjörð Bjarmason, Calvin Wan, Emily Shaffer,
Glen Choo, Victoria Dye
Hi Junio
On 21/10/2022 18:37, Junio C Hamano wrote:
> "Phillip Wood via GitGitGadget" <gitgitgadget@gmail.com> writes:
>
>> ... This
>> introduces a memory leak similar to the one leaking GIT_REFLOG_ACTION
>> in pick_commits().
>
> Is it just the matter of freeing previous_reflog_action after you
> call setenv(), or does it take much more involved changes?
We should be freeing previous_reflog_action - I had misremembered a
previous discussion about setenv() but the manual page makes it quite
clear that it copies the strings passed to it. However we call setenv()
each time we pick a commit and that leaks the previous value. The
solution is to avoid calling setenv() at all and instead use the env
member of struct child_process when we run "git commit".
>> Both of these will be fixed in a future series that
>> stops the sequencer calling setenv().
>
> If it gets fixed in a future step in the same series, that is a
> different matter, but if it is easy enough not to deliberately
> introduce a new leak, we'd prefer to do so.
It's a couple of patches to fix which are more or less finished, I'm
planning to send them once this series is in next.
Best Wishes
Phillip
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (Jan 2010, #01; Mon, 04)
@ 2010-01-04 8:39 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2010-01-04 8:39 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
marked with '.' do not appear in any of the integration branches, but I am
still holding onto them.
The tip of 'next' has been rebuilt on top of the current 'master'.
--------------------------------------------------
[New Topics]
* da/difftool (2009-12-22) 2 commits
- git-difftool: Add '--gui' for selecting a GUI tool
- t7800-difftool: Set a bogus tool for use by tests
* jh/gitweb-cached (2010-01-03) 4 commits
- gitweb: Makefile improvements
- gitweb: Optionally add "git" links in project list page
- gitweb: Add option to force version match
- gitweb: Load checking
* tc/test-locate-httpd (2010-01-02) 1 commit
- t/lib-http.sh: Restructure finding of default httpd location
* jc/fix-tree-walk (2009-09-14) 7 commits
- read-tree --debug-unpack
- unpack-trees.c: look ahead in the index
- unpack-trees.c: prepare for looking ahead in the index
- Aggressive three-way merge: fix D/F case
- traverse_trees(): handle D/F conflict case sanely
- more D/F conflict tests
- tests: move convenience regexp to match object names to test-lib.sh
Resurrected from "Ejected" category.
--------------------------------------------------
[Cooking]
* cc/reset-more (2010-01-04) 6 commits
(merged to 'next' on 2010-01-04 at 8802c2c)
+ Fix bit assignment for CE_CONFLICTED
(merged to 'next' on 2010-01-03 at f83d4c6)
+ "reset --merge": fix unmerged case
+ reset: use "unpack_trees()" directly instead of "git read-tree"
+ reset: add a few tests for "git reset --merge"
+ Documentation: reset: add some tables to describe the different options
+ reset: improve mixed reset error message when in a bare repo
* bg/maint-remote-update-default (2009-12-31) 1 commit
(merged to 'next' on 2010-01-03 at 113009e)
+ Fix "git remote update" with remotes.defalt set
* jc/branch-d (2009-12-29) 1 commit
- branch -d: base the "already-merged" safety on the branch it merges with
* jc/rerere (2009-12-04) 1 commit
- Teach --[no-]rerere-autoupdate option to merge, revert and friends
* jk/maint-1.6.5-reset-hard (2009-12-30) 1 commit
(merged to 'next' on 2010-01-02 at 190d63b)
+ reset: unbreak hard resets with GIT_WORK_TREE
* jk/push-to-delete (2009-12-30) 1 commit
(merged to 'next' on 2010-01-03 at 9ee293b)
+ builtin-push: add --delete as syntactic sugar for :foo
* jk/run-command-use-shell (2010-01-01) 8 commits
- t4030, t4031: work around bogus MSYS bash path conversion
- t0021: use $SHELL_PATH for the filter script
- diff: run external diff helper with shell
- textconv: use shell to run helper
- editor: use run_command's shell feature
- run-command: optimize out useless shell calls
- run-command: convert simple callsites to use_shell
- run-command: add "use shell" option
* mm/config-path (2009-12-30) 1 commit
(merged to 'next' on 2010-01-03 at 9c0e81a)
+ builtin-config: add --path option doing ~ and ~user expansion.
* pm/cvs-environ (2009-12-30) 1 commit
(merged to 'next' on 2010-01-03 at 4c22932)
+ CVS Server: Support reading base and roots from environment
* rs/maint-archive-match-pathspec (2009-12-12) 1 commit
(merged to 'next' on 2010-01-03 at 92d7d15)
+ archive: complain about path specs that don't match anything
* so/cvsserver-update (2009-12-07) 1 commit
(merged to 'next' on 2010-01-03 at 99959b6)
+ cvsserver: make the output of 'update' more compatible with cvs.
* tc/clone-v-progress (2009-12-26) 4 commits
- clone: use --progress to force progress reporting
- clone: set transport->verbose when -v/--verbose is used
- git-clone.txt: reword description of progress behaviour
- check stderr with isatty() instead of stdout when deciding to show progress
* tc/smart-http-restrict (2010-01-02) 4 commits
- Smart-http tests: Test http-backend without curl or a webserver
- Smart-http tests: Break test t5560-http-backend into pieces
- Smart-http tests: Improve coverage in test t5560
- Smart-http: check if repository is OK to export before serving it
* tr/maint-1.6.5-bash-prompt-show-submodule-changes (2009-12-31) 1 commit
(merged to 'next' on 2010-01-03 at b785974)
+ bash completion: factor submodules into dirty state
* jc/cache-unmerge (2009-12-25) 9 commits
- rerere forget path: forget recorded resolution
- rerere: refactor rerere logic to make it independent from I/O
- rerere: remove silly 1024-byte line limit
- resolve-undo: teach "update-index --unresolve" to use resolve-undo info
- resolve-undo: "checkout -m path" uses resolve-undo information
- resolve-undo: allow plumbing to clear the information
- resolve-undo: basic tests
- resolve-undo: record resolved conflicts in a new index extension section
- builtin-merge.c: use standard active_cache macros
* js/filter-branch-prime (2009-12-15) 1 commit
(merged to 'next' on 2010-01-03 at 7c90319)
+ filter-branch: remove an unnecessary use of 'git read-tree'
* mg/tag-d-show (2009-12-10) 1 commit
(merged to 'next' on 2010-01-03 at 87657d2)
+ tag -d: print sha1 of deleted tag
* sb/maint-octopus (2009-12-11) 3 commits
(merged to 'next' on 2010-01-03 at ffe77d6)
+ octopus: remove dead code
+ octopus: reenable fast-forward merges
+ octopus: make merge process simpler to follow
* jh/commit-status (2009-12-07) 1 commit
- [test?] Add commit.status, --status, and --no-status
* jc/checkout-merge-base (2009-11-20) 2 commits
(merged to 'next' on 2010-01-02 at 6a8f6fc)
+ "rebase --onto A...B" replays history on the merge base between A and B
+ "checkout A...B" switches to the merge base between A and B
* tr/http-push-ref-status (2009-12-24) 6 commits
- transport-helper.c::push_refs(): emit "no refs" error message
- transport-helper.c::push_refs(): ignore helper-reported status if ref is not to be pushed
- transport.c::transport_push(): make ref status affect return value
- refactor ref status logic for pushing
- t5541-http-push.sh: add test for unmatched, non-fast-forwarded refs
- t5541-http-push.sh: add tests for non-fast-forward pushes
* bg/maint-add-all-doc (2009-12-07) 4 commits
(merged to 'next' on 2010-01-03 at b19a323)
+ squash! rm documentation--also mention add-u where we mention commit-a
+ git-rm doc: Describe how to sync index & work tree
+ git-add/rm doc: Consistently back-quote
+ Documentation: 'git add -A' can remove files
* il/vcs-helper (2009-12-09) 8 commits
- Remove special casing of http, https and ftp
- Support remote archive from all smart transports
- Support remote helpers implementing smart transports
- Support taking over transports
- Refactor git transport options parsing
- Pass unknown protocols to external protocol handlers
- Support mandatory capabilities
- Add remote helper debug mode
* mm/diag-path-in-treeish (2009-12-07) 1 commit
- Detailed diagnosis when parsing an object name fails.
* mh/rebase-fixup (2009-12-07) 2 commits
- Add a command "fixup" to rebase --interactive
- t3404: Use test_commit to set up test repository
(this branch is used by ns/rebase-auto-squash.)
Initial round of "fixup" action that is similar to "squash" action in
"rebase -i" that excludes the commit log message from follow-up commits
when composing the log message for the updated one. Expected is a further
improvement to skip opening the editor if a pick is followed only by
"fixup" and no "squash".
* ns/rebase-auto-squash (2009-12-08) 2 commits
- fixup! rebase -i --autosquash
- rebase -i --autosquash: auto-squash commits
(this branch uses mh/rebase-fixup.)
* jh/notes (2009-12-07) 11 commits
- Refactor notes concatenation into a flexible interface for combining notes
- Notes API: Allow multiple concurrent notes trees with new struct notes_tree
- Notes API: for_each_note(): Traverse the entire notes tree with a callback
- Notes API: get_note(): Return the note annotating the given object
- Notes API: add_note(): Add note objects to the internal notes tree structure
- Notes API: init_notes(): Initialize the notes tree from the given notes ref
- Notes API: get_commit_notes() -> format_note() + remove the commit restriction
- Minor style fixes to notes.c
(merged to 'next' on 2010-01-02 at ae42130)
+ Add more testcases to test fast-import of notes
+ Rename t9301 to t9350, to make room for more fast-import tests
+ fast-import: Proper notes tree manipulation
* fc/opt-quiet-gc-reset (2009-12-02) 1 commit
- General --quiet improvements
* mv/commit-date (2009-12-03) 2 commits
(merged to 'next' on 2010-01-03 at 1c45fdf)
+ Document date formats accepted by parse_date()
+ builtin-commit: add --date option
* sr/gfi-options (2009-12-04) 7 commits
- fast-import: add (non-)relative-marks feature
- fast-import: allow for multiple --import-marks= arguments
- fast-import: test the new option command
- fast-import: add option command
- fast-import: add feature command
- fast-import: put marks reading in its own function
- fast-import: put option parsing code in separate functions
* ap/merge-backend-opts (2008-07-18) 6 commits
- Document that merge strategies can now take their own options
- Extend merge-subtree tests to test -Xsubtree=dir.
- Make "subtree" part more orthogonal to the rest of merge-recursive.
- Teach git-pull to pass -X<option> to git-merge
- git merge -X<option>
- git-merge-file --ours, --theirs
"git pull" patch needs sq-then-eval fix to protect it from $IFS
but otherwise seemed good.
* mo/bin-wrappers (2009-12-02) 3 commits
(merged to 'next' on 2010-01-03 at 8c5fa27)
+ INSTALL: document a simpler way to run uninstalled builds
+ run test suite without dashed git-commands in PATH
+ build dashless "bin-wrappers" directory similar to installed bindir
* tr/http-updates (2009-12-28) 4 commits
(merged to 'next' on 2010-01-02 at cf25698)
+ Remove http.authAny
+ Allow curl to rewind the RPC read buffer
+ Add an option for using any HTTP authentication scheme, not only basic
+ http: maintain curl sessions
* nd/sparse (2009-12-30) 23 commits
(merged to 'next' on 2010-01-02 at 5499bbe)
+ grep: do not do external grep on skip-worktree entries
+ commit: correctly respect skip-worktree bit
+ ie_match_stat(): do not ignore skip-worktree bit with CE_MATCH_IGNORE_VALID
+ tests: rename duplicate t1009
+ sparse checkout: inhibit empty worktree
+ Add tests for sparse checkout
+ read-tree: add --no-sparse-checkout to disable sparse checkout support
+ unpack-trees(): ignore worktree check outside checkout area
+ unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index
+ unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout
+ unpack-trees.c: generalize verify_* functions
+ unpack-trees(): add CE_WT_REMOVE to remove on worktree alone
+ Introduce "sparse checkout"
+ dir.c: export excluded_1() and add_excludes_from_file_1()
+ excluded_1(): support exclude files in index
+ unpack-trees(): carry skip-worktree bit over in merged_entry()
+ Read .gitignore from index if it is skip-worktree
+ Avoid writing to buffer in add_excludes_from_file_1()
+ Teach Git to respect skip-worktree bit (writing part)
+ Teach Git to respect skip-worktree bit (reading part)
+ Introduce "skip-worktree" bit in index, teach Git to get/set this bit
+ Add test-index-version
+ update-index: refactor mark_valid() in preparation for new options
^ permalink raw reply [relevance 2%]
* Re: [PATCH 0/1] merge: fix cache_entry use-after-free
2015-10-08 20:00 2% ` Junio C Hamano
@ 2015-10-09 22:16 2% ` David Turner
2015-10-09 22:51 2% ` Junio C Hamano
0 siblings, 1 reply; 200+ results
From: David Turner @ 2015-10-09 22:16 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git mailing list, Duy Nguyen
+Duy Nguyen, who knows the split index better.
On Thu, 2015-10-08 at 13:00 -0700, Junio C Hamano wrote:
> David Turner <dturner@twopensource.com> writes:
>
> > From: Keith McGuigan <kmcguigan@twitter.com>
> >
> > During merges, we would previously free entries that we no longer need
> > in the destination index. But those entries might also be stored in
> > the dir_entry cache, and when a later call to add_to_index found them,
> > they would be used after being freed.
> >
> > To prevent this, add a ref count for struct cache_entry. Whenever
> > a cache entry is added to a data structure, the ref count is incremented;
> > when it is removed from the data structure, it is decremented. When
> > it hits zero, the cache_entry is freed.
> >
> > Signed-off-by: David Turner <dturner@twopensource.com>
> > Signed-off-by: Keith McGuigan <kmcguigan@twitter.com>
> > ---
>
> Thanks.
>
> > @@ -213,6 +214,32 @@ struct cache_entry {
> > struct pathspec;
> >
> > /*
> > + * Increment the cache_entry reference count. Should be called
> > + * whenever a pointer to a cache_entry is retained in a data structure,
> > + * thus marking it as alive.
> > + */
> > +static inline void add_ce_ref(struct cache_entry *ce)
> > +{
> > + assert(ce != NULL && ce->ref_count >= 0);
> > + ++ce->ref_count;
> > +}
>
> We tend to prefer post-increment when the distinction between pre-
> or post- does not make any difference, which is the case here.
Will fix.
> > diff --git a/name-hash.c b/name-hash.c
> > index 702cd05..f12c919 100644
> > --- a/name-hash.c
> > +++ b/name-hash.c
> > @@ -92,7 +93,9 @@ static void remove_dir_entry(struct index_state *istate, struct cache_entry *ce)
> > struct dir_entry *dir = hash_dir_entry(istate, ce, ce_namelen(ce));
> > while (dir && !(--dir->nr)) {
> > struct dir_entry *parent = dir->parent;
> > - hashmap_remove(&istate->dir_hash, dir, NULL);
> > + struct dir_entry *removed = hashmap_remove(&istate->dir_hash, dir, NULL);
> > + assert(removed == dir);
> > + drop_ce_ref(dir->ce);
>
> This is curious. In remove_name_hash() you do not have the
> corresponding assert. Why is it necessary here (or is it
> unnecessary over there)?
It is unnecessary in any case: it's an assert rather than a check for an
expected (or even unexpected) case. That just happens to be where Keith
first managed to track down the use-after free, so that's where he
happened to put the assert while trying to debug it. I'm in general in
favor of more asserts rather than fewer, so I would prefer to keep it
in. But I can remove it if you like.
> > @@ -147,6 +151,7 @@ void remove_name_hash(struct index_state *istate, struct cache_entry *ce)
> > return;
> > ce->ce_flags &= ~CE_HASHED;
> > hashmap_remove(&istate->name_hash, ce, ce);
> > + drop_ce_ref(ce);
> >
> > if (ignore_case)
> > remove_dir_entry(istate, ce);
> > diff --git a/read-cache.c b/read-cache.c
> > index 87204a5..442de34 100644
> > --- a/read-cache.c
> > +++ b/read-cache.c
> > @@ -53,6 +53,7 @@ static const char *alternate_index_output;
> > static void set_index_entry(struct index_state *istate, int nr, struct cache_entry *ce)
> > {
> > istate->cache[nr] = ce;
> > + add_ce_ref(ce);
> > add_name_hash(istate, ce);
> > }
>
> What happens to the existing entry that used to be istate->cache[nr],
> which may or may not be 'ce' that is replacing it?
>
> It turns out that all three calling sites are safe, but it is not
> immediately obvious why. Perhaps some comment in front of the
> function is in order, to warn those who may have to add a new caller
> or restructure the existing calling chain, that istate->cache[nr] is
> expected not to hold a live reference when the function is called,
> or something?
Happy to add it if you want, but to me it was clear without because if
there were a value in istate->cache[nr], that old value would be leaked.
Let me know.
> > @@ -314,8 +314,10 @@ void replace_index_entry_in_base(struct index_state *istate,
> > istate->split_index->base &&
> > old->index <= istate->split_index->base->cache_nr) {
> > new->index = old->index;
> > - if (old != istate->split_index->base->cache[new->index - 1])
> > - free(istate->split_index->base->cache[new->index - 1]);
> > + if (old != istate->split_index->base->cache[new->index - 1]) {
> > + struct cache_entry *ce = istate->split_index->base->cache[new->index - 1];
> > + drop_ce_ref(ce);
> > + }
> > istate->split_index->base->cache[new->index - 1] = new;
>
> Does 'new' already have the right refcount at this point?
I spoke to Keith, and he thinks we do need an add_ce_ref there. I'll fix
that on the reroll. Duy, do you agree?
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (topics)
@ 2008-07-06 10:04 2% ` Junio C Hamano
2008-07-08 2:46 2% ` Junio C Hamano
0 siblings, 1 reply; 200+ results
From: Junio C Hamano @ 2008-07-06 10:04 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed
with '-' are only in 'pu' while commits prefixed with '+' are
in 'next'.
The topics list the commits in reverse chronological order. The topics
meant to be applied to the maintenance series have "maint-" in their
names.
It already is beginning to become clear what 1.6.0 will look like. What's
already in 'next' all are well intentioned (I do not guarantee they are
already bug-free --- that is what cooking them in 'next' is for) and are
good set of feature enhancements. Bigger changes will be:
* Port for MinGW.
* With the default Makefile settings, most of the programs will be
installed outside your $PATH, except for "git", "gitk", "git-gui" and
some server side programs that need to be accessible for technical
reasons. Invoking a git subcommand as "git-xyzzy" from the command
line has been deprecated since early 2006 (and officially announced in
1.5.4 release notes); use of them from your scripts after adding
output from "git --exec-path" to the $PATH will still be supported in
1.6.0, but users are again strongly encouraged to adjust their
scripts to use "git xyzzy" form, as we will stop installing
"git-xyzzy" hardlinks for built-in commands in later releases.
* git-merge will be rewritten in C.
* default pack and idx versions will be updated as scheduled for some
time ago.
* GIT_CONFIG, which was only documented as affecting "git config", but
actually affected all git commands, now only affects "git config".
GIT_LOCAL_CONFIG, also only documented as affecting "git config" and
not different from GIT_CONFIG in a useful way, is removed.
----------------------------------------------------------------
[New Topics]
* js/maint-daemon-syslog (Thu Jul 3 16:27:24 2008 +0100) 1 commit
- [PARKED improvement suggested not rolled in] git daemon: avoid
calling syslog() from a signal handler
This will eventually appear in 'maint'; currently parked on 'pu', though.
* jc/report-tracking (Sun Jul 6 02:54:56 2008 -0700) 5 commits
- branch -r -v: do not spit out garbage
+ stat_tracking_info(): clear object flags used during counting
+ git-branch -v: show the remote tracking statistics
+ git-status: show the remote tracking statistics
+ Refactor "tracking statistics" code used by "git checkout"
Makes the "your branch is ahead of the tracked one by N commits" logic and
messages available to other commands; status and branch are updated.
* sg/stash-k-i (Fri Jun 27 16:37:15 2008 +0200) 1 commit
- stash: introduce 'stash save --keep-index' option
One weakness of our "partial commit" workflow support used to be that the
user can incrementally build what is to be committed in the index but that
state cannot be tested as a whole in the working tree. This allows you to
temporarily stash the remaining changes in the working tree so that the
index state before running "stash save --keep-index" can be seen in the
working tree to be tested and then committed. A recommended workflow to
use after that commit is made needs to be documented (and support needs to
be added if necessary).
* tr/add-i-e (Thu Jul 3 00:00:00 2008 +0200) 3 commits
+ git-add--interactive: manual hunk editing mode
+ git-add--interactive: remove hunk coalescing
+ git-add--interactive: replace hunk recounting with apply --recount
Adds 'e/dit' action to interactive add command.
* am/stash-branch (Thu Jul 3 11:46:05 2008 +0530) 1 commit
+ Implement "git stash branch <newbranch> <stash>"
Creates a new branch out of the stashed state, after returning from the
interrupt that forced you to create the stash in the first place.
* jc/grafts (Wed Jul 2 17:14:12 2008 -0700) 1 commit
- Ignore graft during object transfer [broken wrt shallow clones]
Cloning or fetching from a repository from grafts did not send objects
that are hidden by grafts, but the commits in the resulting repository do
need these to pass fsck. This fixes object transfer to ignore grafts.
Another fix is needed to git-prune so that it ignores grafts but treats
commits that are mentioned in grafts as reachable.
* jk/pager-config (Thu Jul 3 07:46:57 2008 -0400) 1 commit
- Allow per-command pager config
----------------------------------------------------------------
[Will merge to master soon]
* js/import-zip (Mon Jun 30 19:50:44 2008 +0100) 1 commit
+ Add another fast-import example, this time for .zip files
* js/apply-root (Wed Jul 2 15:28:22 2008 -0700) 2 commits
+ apply --root: thinkofix.
+ Teach "git apply" to prepend a prefix with "--root=<root>"
* db/no-git-config (Mon Jun 30 03:37:47 2008 -0400) 1 commit
+ Only use GIT_CONFIG in "git config", not other programs
* jc/reflog-expire (Sat Jun 28 22:24:49 2008 -0700) 2 commits
+ Make default expiration period of reflog used for stash infinite
+ Per-ref reflog expiry configuration
As 1.6.0 will be a good time to make backward incompatible changes, the
tip commit makes the default expiry period of stash 'never', unless you
configure them to expire explicitly using gc.refs/stash.* variables.
Needs consensus, but I am guessing that enough people would want stash
that does not expire.
* dr/ceiling (Mon May 19 23:49:34 2008 -0700) 4 commits
+ Eliminate an unnecessary chdir("..")
+ Add support for GIT_CEILING_DIRECTORIES
+ Fold test-absolute-path into test-path-utils
+ Implement normalize_absolute_path
This still feels "because we can", not "because we need to", but it came
from somebody who had the need to, and I do not think it hurts people
without the environment variable set.
* jc/rerere (Sun Jun 22 02:04:31 2008 -0700) 5 commits
+ rerere.autoupdate
+ t4200: fix rerere test
+ rerere: remove dubious "tail_optimization"
+ git-rerere: detect unparsable conflicts
+ rerere: rerere_created_at() and has_resolution() abstraction
A new configuration will allow paths that have been resolved cleanly by
rerere to be updated in the index automatically.
To me, this is "because we can", but was something requested by Ingo, so
presumably some people may feel it useful in their workflow.
----------------------------------------------------------------
[Actively Cooking]
* mv/merge-in-c (Tue Jul 1 04:37:50 2008 +0200) 15 commits
- [REJECT -- over-abuse of path-list] Build in merge
+ Fix t7601-merge-pull-config.sh on AIX
+ git-commit-tree: make it usable from other builtins
+ Add new test case to ensure git-merge prepends the custom merge
message
+ Add new test case to ensure git-merge reduces octopus parents when
possible
+ Introduce reduce_heads()
+ Introduce get_merge_bases_many()
+ Add new test to ensure git-merge handles more than 25 refs.
+ Introduce get_octopus_merge_bases() in commit.c
+ git-fmt-merge-msg: make it usable from other builtins
+ Move read_cache_unmerged() to read-cache.c
+ Add new test to ensure git-merge handles pull.twohead and
pull.octopus
+ Move parse-options's skip_prefix() to git-compat-util.h
+ Move commit_list_count() to commit.c
+ Move split_cmdline() to alias.c
The last one is still not quite there, I am afraid.
----------------------------------------------------------------
[Graduated to "master"]
* j6t/mingw (Sat Nov 17 20:48:14 2007 +0100) 38 commits
+ compat/pread.c: Add a forward declaration to fix a warning
+ Windows: Fix ntohl() related warnings about printf formatting
+ Windows: TMP and TEMP environment variables specify a temporary
directory.
+ Windows: Make 'git help -a' work.
+ Windows: Work around an oddity when a pipe with no reader is
written to.
+ Windows: Make the pager work.
+ When installing, be prepared that template_dir may be relative.
+ Windows: Use a relative default template_dir and ETC_GITCONFIG
+ Windows: Compute the fallback for exec_path from the program
invocation.
+ Turn builtin_exec_path into a function.
+ Windows: Use a customized struct stat that also has the st_blocks
member.
+ Windows: Add a custom implementation for utime().
+ Windows: Add a new lstat and fstat implementation based on Win32
API.
+ Windows: Implement a custom spawnve().
+ Windows: Implement wrappers for gethostbyname(), socket(), and
connect().
+ Windows: Work around incompatible sort and find.
+ Windows: Implement asynchronous functions as threads.
+ Windows: Disambiguate DOS style paths from SSH URLs.
+ Windows: A rudimentary poll() emulation.
+ Windows: Implement start_command().
+ Windows: A pipe() replacement whose ends are not inherited to
children.
+ Windows: Wrap execve so that shell scripts can be invoked.
+ Windows: Implement setitimer() and sigaction().
+ Windows: Fix PRIuMAX definition.
+ Windows: Implement gettimeofday().
+ Make my_mktime() public and rename it to tm_to_time_t()
+ Windows: Work around misbehaved rename().
+ Windows: always chmod(, 0666) before unlink().
+ Windows: A minimal implemention of getpwuid().
+ Windows: Implement a wrapper of the open() function.
+ Windows: Strip ".exe" from the program name.
+ Windows: Handle absolute paths in
safe_create_leading_directories().
+ Windows: Treat Windows style path names.
+ setup.c: Prepare for Windows directory separators.
+ Windows: Use the Windows style PATH separator ';'.
+ Add target architecture MinGW.
+ Compile some programs only conditionally.
+ Add compat/regex.[ch] and compat/fnmatch.[ch].
----------------------------------------------------------------
[On Hold]
* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit
+ merge: remove deprecated summary and diffstat options and config
variables
This was previously in "will be in master soon" category, but it turns out
that the synonyms to the ones this one deletes are fairly new invention
that happend in 1.5.6 timeframe, and we cannot do this just yet. Perhaps
in 1.7.0.
* jc/dashless (Thu Jun 26 16:43:34 2008 -0700) 2 commits
+ Revert "Make clients ask for "git program" over ssh and local
transport"
+ Make clients ask for "git program" over ssh and local transport
This is the "botched" one. Will be resurrected during 1.7.0 or 1.8.0
timeframe.
* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
- diff: enable "too large a rename" warning when -M/-C is explicitly
asked for
This would be the right thing to do for command line use, but gitk will be
hit due to tcl/tk's limitation, so I am holding this back for now.
----------------------------------------------------------------
[Stalled/Needs more work]
* ph/parseopt-step-blame (Tue Jun 24 11:12:12 2008 +0200) 7 commits
- Migrate git-blame to parse-option partially.
+ parse-opt: add PARSE_OPT_KEEP_ARGV0 parser option.
+ parse-opt: fake short strings for callers to believe in.
+ parse-opt: do not print errors on unknown options, return -2
intead.
+ parse-opt: create parse_options_step.
+ parse-opt: Export a non NORETURN usage dumper.
+ parse-opt: have parse_options_{start,end}.
I recall Pierre said something about cleaning up the last one when he
finds time, but other than that vague recollection, I lost track of this
series. I am tempted to fork a few topics off of the penúltimo one to
convert a few more commands as examples and merge the result to 'next'.
* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 7 commits
- blame: show "previous" information in --porcelain/--incremental
format
- git-blame: refactor code to emit "porcelain format" output
+ git-blame --reverse
+ builtin-blame.c: allow more than 16 parents
+ builtin-blame.c: move prepare_final() into a separate function.
+ rev-list --children
+ revision traversal: --children option
The blame that finds where each line in the original lines moved to. This
may help a GSoC project that wants to gather statistical overview of the
history. The final presentation may need tweaking (see the log message of
the commit ""git-blame --reverse" on the series).
The tip two commits are for peeling to see what's behind the blamed
commit, which we should be able to separate out into an independent topic
from the rest.
* jc/merge-theirs (Mon Jun 30 22:18:57 2008 -0700) 5 commits
+ Make "subtree" part more orthogonal to the rest of merge-
recursive.
+ Teach git-pull to pass -X<option> to git-merge
+ Teach git-merge to pass -X<option> to the backend strategy module
+ git-merge-recursive-{ours,theirs}
+ git-merge-file --ours, --theirs
Punting a merge by discarding your own work in conflicting parts but still
salvaging the parts that are cleanly automerged. It is likely that this
will result in nonsense mishmash, but somehow often people want this, so
here they are. The interface to the backends is updated so that you can
say "git merge -Xours -Xsubtree=foo/bar/baz -s recursive other" now.
The -X<option> part may change, Dscho mentions that a single-letter -X
that take stuck option is against syntax rules, and I think he's right.
This is more "because we can", not "because we need to".
^ permalink raw reply [relevance 2%]
* [PATCH] doc: merge: fix mention of `ORIG_HEAD`
@ 2023-05-20 8:44 2% ` Kristoffer Haugsbakk
1 sibling, 0 replies; 200+ results
From: Kristoffer Haugsbakk @ 2023-05-20 8:44 UTC (permalink / raw)
To: minnie.shi, git; +Cc: Kristoffer Haugsbakk
`ORIG_HEAD` before the attempted merge points at the commit that you are
on (the tip of `master`), not the tip of the branch that you are trying
to merge in.
Reported-by: Minnie Shi <minnie.shi@gmail.com>
Signed-off-by: Kristoffer Haugsbakk <code@khaugsbakk.name>
---
Documentation/git-merge.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 0aeff572a59..9019b6a1e50 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -38,7 +38,7 @@ Then "`git merge topic`" will replay the changes made on the
its current commit (`C`) on top of `master`, and record the result
in a new commit along with the names of the two parent commits and
a log message from the user describing the changes. Before the operation,
-`ORIG_HEAD` is set to the tip of the current branch (`C`).
+`ORIG_HEAD` is set to the tip of the current branch (`G`).
------------
A---B---C topic
--
2.41.0.rc1
^ permalink raw reply related [relevance 2%]
* [ANNOUNCE] GIT 1.4.0
@ 2006-06-10 21:16 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2006-06-10 21:16 UTC (permalink / raw)
To: git; +Cc: linux-kernel
The latest feature release GIT 1.4.0 is available at the
usual places:
http://www.kernel.org/pub/software/scm/git/
git-1.4.0.tar.{gz,bz2} (tarball)
git-htmldocs-1.4.0.tar.{gz,bz2} (preformatted documentation)
git-manpages-1.4.0.tar.{gz,bz2} (preformatted documentation)
RPMS/$arch/git-*-1.4.0-1.$arch.rpm (RPM)
This is a significant update since v1.3.0 (and v1.3.3 which is
the same codebase with bugfixes-only). User visible changes
are:
- Many commands are now coded in C instead of implemented as
shell scripts.
- Checkout is more careful not to clobber untracked files.
- You can "alias" git commands with leading arguments in your
configuration file.
- Documentation set, especially the tutorial, has been reworked.
- Comes with the latest gitk, gitweb, and contributed software.
----------------------------------------------------------------
Changes since v1.3.0 are as follows:
Alex Riesen:
make update-index --chmod work with multiple files and --stdin
remove superflous "const"
Aneesh Kumar K.V:
gitview: Add key binding for F5.
gitview: Move the console error messages to message dialog
gitview: Add some useful keybindings.
Ben Clifford:
include header to define uint32_t, necessary on Mac OS X
Björn Engelmann:
remove the artificial restriction tagsize < 8kb
add more informative error messages to git-mktag
Catalin Marinas:
Add a test-case for git-apply trying to add an ending line
Christian Couder:
Builtin git-rev-parse.
Dennis Stosberg:
Fix git-pack-objects for 64-bit platforms
Fix compilation on newer NetBSD systems
git-write-tree writes garbage on sparc64
git-clean fails on files beginning with a dash
Update documentation for git-format-patch
Dmitry V. Levin:
Separate object name errors from usage errors
execv_git_cmd: Fix stack buffer overflow.
git_exec_path, execv_git_cmd: ignore empty environment variables
Elrond:
git-cvsimport: Handle "Removed" from pserver
Eric W. Biederman:
Implement git-quiltimport
Implement a --dry-run option to git-quiltimport
Make read_one_header_line return a flag not a length.
Move B and Q decoding into check header.
Refactor commit messge handling.
In handle_body only read a line if we don't already have one.
More accurately detect header lines in read_one_header_line
Allow in body headers beyond the in body header prefix.
Eric Wong:
git-svn: documentation updates
git-svn 1.0.0
apply: fix infinite loop with multiple patches with --index
send-email: address expansion for common mailers
Install git-send-email by default
send-email: allow sendmail binary to be used instead of SMTP
send-email: quiet some warnings, reject invalid addresses
Install git-send-email by default
commit: allow --pretty= args to be abbreviated
git-svn: starting a 1.1.0-pre development version
git-svn: ignore expansion of svn:keywords
t3300-funny-names: shell portability fixes
tests: Remove heredoc usage inside quotes
t5500-fetch-pack: remove local (bashism) usage.
t6000lib: workaround a possible dash bug
git-svn: t0001: workaround a heredoc bug in old versions of dash
git-svn: remove assertion that broke with older versions of svn
Florian Forster:
git-svnimport: Improved detection of merges.
Francis Daly:
Some doc typo fixes
config.txt grammar, typo, and asciidoc fixes
git-cvsserver asciidoc formatting tweaks
Fredrik Kuivinen:
blame: Fix path pruning
Update the documentation for git-merge-base
Horst H. von Brand:
Documentation: Spelling fixes
Cleanup git-send-email.perl:extract_valid_email
Add example xinetd(8) configuration to Documentation/everyday.txt
Fix Documentation/everyday.txt: Junio's workflow
Fix formatting of Documentation/git-clone.txt
Horst von Brand:
Fix some documentation typoes
Huw Davies:
git-format-patch: Use rfc2822 compliant date.
J. Bruce Fields:
tutorial: replace "whatchanged" by "log"
tutorial: expanded discussion of commit history
tutorial: add discussion of index file, object database
documentation: mention gitk font adjustment in tutorial
documentation: add brief mention of cat-file to tutorial part I
Documentation: retitle the git-core tutorial
Documentation: fix a tutorial-2 typo
Jeff King:
cvsimport: use git-update-index --index-info
cvsimport: cleanup commit function
cvsimport: set up commit environment in perl instead of using env
cat-file: document -p option
cvsimport: avoid "use" with :tag
handle concurrent pruning of packed objects
sha1_file: avoid re-preparing duplicate packs
Jim Meyering:
Don't write directly to a make target ($@).
Johannes Schindelin:
builtin-push: resurrect parsing of Push: lines
cache-tree: replace a sscanf() by two strtol() calls
builtin-push: also ask config for remote information
fetch, pull: ask config for remote information
repo-config: fix segfault with no argument.
repo-config: trim white-space before comment
repo-config: support --get-regexp
repo-config: deconvolute logics
fetch, pull: ask config for remote information
Add a conversion tool to migrate remote information into the config
builtin-push: --all and --tags _are_ explicit refspecs
Teach fmt-patch to write individual files.
fmt-patch: output file names to stdout
fmt-patch: implement -o <dir>
Teach fmt-patch about --numbered
Teach fmt-patch about --keep-subject
repo-config: trim white-space before comment
fmt-patch: understand old <his> notation
Fix users of prefix_path() to free() only when necessary
Fix users of prefix_path() to free() only when necessary
Fix crash when reading the empty tree
diff family: add --check option
fmt-patch: Support --attach
git-format-patch --start-number <n>
send-email: only 'require' instead of 'use' Net::SMTP
format-patch: resurrect extra headers from config
If you have a config containing something like this:
Jon Loeliger:
Alphabetize the glossary.
Added definitions for a few words:
Add a few more words to the glossary.
Refactor git_tcp_connect() functions a little.
Jonas Fonseca:
Fix filename scaling for binary files
Misc doc improvements
Document git-ls-tree --fullname
Josef Weidendorfer:
gitk: Add a visual tag for remote refs
Junio C Hamano:
Fix up default abbrev in setup_revisions() argument parser.
Fix up rev-list option parsing.
Split init_revisions() out of setup_revisions()
rev-list option parser fix.
Built-in git-whatchanged.
Do not fork PAGER=cat
Simplify common default options setup for built-in log family.
log/whatchanged/show - log formatting cleanup.
rev-list --header: output format fix
git.c: LOGSIZE is unused after log printing cleanup.
combine-diff: show diffstat with the first parent.
Fix "git log --stat": make sure to set recursive with --stat.
Tentative built-in format-patch.
sha1_name.c: prepare to make get_tree_entry() reusable from others.
sha1_name.c: no need to include diff.h; tree-walk.h will do.
get_tree_entry(): make it available from tree-walk
Minor tweak on subject line in --pretty=email
git-merge: a bit more readable user guidance.
pre-commit hook: complain about conflict markers.
diff: move diff.c to diff-lib.c to make room.
Add git-unresolve <paths>...
diff --stat: do not drop rename information.
git-update-index --unresolve
git-commit --amend: two fixes.
rename internal format-patch wip
pack-objects: do not stop at object that is "too small"
mailinfo: decode underscore used in "Q" encoding properly.
Makefile: dependency for builtin-help.o
Add colordiff for git to contrib/colordiff.
Fix "git show --stat"
Libify diff-files.
Libify diff-index.
git-fmt-patch: thinkofix to show properly.
Libified diff-index: backward compatibility fix.
read-cache/write-cache: optionally return cache checksum SHA1.
Add cache-tree.
Update write-tree to use cache-tree.
Invalidate cache-tree entries for touched paths in git-apply.
Use cache-tree in update-index.
Add test-dump-cache-tree
cache-tree: protect against "git prune".
index: make the index file format extensible.
Teach fsck-objects about cache-tree.
cache-tree: sort the subtree entries.
test-dump-cache-tree: report number of subtrees.
Makefile: remove and create libgit.a from scratch.
diff --stat: show complete rewrites consistently.
git-cvsserver: typofixes
t0000-basic: Add ls-tree recursive test back.
Makefile: remove and create xdiff library from scratch.
commit-tree: allow generic object name for the tree as well.
rebase: typofix.
commit-tree.c: check_valid() microoptimization.
revision parsing: make "rev -- paths" checks stronger.
t0000-basic: more commit-tree tests.
update-index: when --unresolve, smudge the relevant cache-tree entries.
read-tree: teach 1 and 2 way merges about cache-tree.
read-tree: teach 1-way merege and plain read to prime cache-tree.
diff-index: fix compilation warnings.
verify-pack: check integrity in a saner order.
cache_tree_update: give an option to update cache-tree only.
test-dump-cache-tree: validate the cached data as well.
pack-objects: update size heuristucs.
built-in count-objects.
cache-tree.c: typefix
git-am --resolved: more usable error message.
built-in diff.
built-in diff: assorted updates.
builtin-diff.c: die() formatting type fix.
Fix builtin-push to honor Push: lines in remotes file.
Extended SHA1 -- "rev^@" syntax to mean "all parents"
get_sha1(): :path and :[0-3]:path to extract from index.
built-in "git grep"
Use RFC2822 dates from "git fmt-patch".
builtin-grep: wildcard pathspec fixes
builtin-grep: support '-l' option.
builtin-grep: do not use setup_revisions()
fsck-objects: mark objects reachable from cache-tree
builtin-count-objects: make it official.
builtin-diff: call it "git-diff", really.
builtin-log/whatchanged/show: make them official.
show-branch: omit uninteresting merges.
builtin-push: make it official.
builtin-grep: printf %.*s length is int, not ptrdiff_t.
Revert "fetch, pull: ask config for remote information"
builtin-grep: allow -<n> and -[ABC]<n> notation for context lines.
builtin-grep: allow more than one patterns.
builtin-grep: support -c (--count).
builtin-grep: support -w (--word-regexp).
builtin-grep: tighten path wildcard vs tree traversal.
core.prefersymlinkrefs: use symlinks for .git/HEAD
repo-config: readability fixups.
builtin-count-objects: open packs when running -v
Fix test-dump-cache-tree in one-tree disappeared case.
read-tree: invalidate cache-tree entry when a new index entry is added.
cache-tree: a bit more debugging support.
builtin-grep: terminate correctly at EOF
builtin-grep: binary files -a and -I
fsck-objects: do not segfault on missing tree in cache-tree
builtin-grep: -L (--files-without-match).
Makefile: do not link rev-list any specially.
delta: stricter constness
core.prefersymlinkrefs: use symlinks for .git/HEAD
pack-object: squelch eye-candy on non-tty
binary patch.
binary diff: further updates.
update-index --unresolve: work from a subdirectory.
checkout-index: plug memory leak from prefix_path()
update-index: plug memory leak from prefix_path()
update-index --again
update-index --again: take optional pathspecs
binary diff and apply: testsuite.
repo-config: document what value_regexp does a bit more clearly.
Fix repo-config set-multivar error return path.
Teach -f <file> option to builtin-grep.
builtin-grep: documentation
Documentation: {caret} fixes (git-rev-list.txt)
get_sha1() - fix infinite loop on nonexistent stage.
Teach git-clean optional <paths>... parameters.
builtin-grep: tighten argument parsing.
builtin-grep: typofix
builtin-grep: -w fix
builtin-grep: -F (--fixed-strings)
checkout: use --aggressive when running a 3-way merge (-m).
checkout: use --aggressive when running a 3-way merge (-m).
diffstat rename squashing fix.
read-tree -u one-way merge fix to check out locally modified paths.
apply --numstat: show new name, not old name.
Fix pack-index issue on 64-bit platforms a bit more portably.
builtin-grep: unparse more command line options.
apply --cached: apply a patch without using working tree.
git-am: use apply --cached
builtin-diff: fix comparison between two blobs.
merge-base: Clarify the comments on post processing.
read-tree -m -u: do not overwrite or remove untracked working tree files.
builtin-grep: workaround for non GNU grep.
Revert "builtin-grep: workaround for non GNU grep."
apply --cached: do not check newly added file in the working tree
builtin-add: fix unmatched pathspec warnings.
builtin-diff: do not say files are renamed when blob and file are given
Fix build procedure for builtin-init-db
built-in tar-tree and remote tar-tree
git-format-patch: now built-in.
checkdiff_consume: strtol parameter fix.
git-rebase: use canonical A..B syntax to format-patch
tutorial-2: typofix in examples.
mailinfo: skip bogus UNIX From line inside body
CMIT_FMT_EMAIL: Q-encode Subject: and display-name part of From: fields.
builtin format-patch: squelch content-type for 7-bit ASCII
diff: minor option combination fix.
fetch-pack: output refs in the order they were given on the command line.
Tutorial #2: broken link fix.
builtin-rm: squelch compiler warnings.
cvsimport: do not barf on creation of an empty file.
apply: force matching at the beginning.
fetch.c: remove an unused variable and dead code.
ls-remote: fix rsync:// to report HEAD
mailinfo: More carefully parse header lines in read_one_header_line()
gitk: start-up bugfix
built-in format-patch: various fixups.
format-patch: -n and -k are mutually exclusive.
Let git-clone to pass --template=dir option to git-init-db.
git-fetch: avoid using "case ... in (arm)"
adjust to the rebased series by Linus.
send-email: do not pass bogus address to local sendmail binary
format-patch --signoff
fetch.c: do not pass uninitialized lock to unlock_ref().
fetch.c: do not call process_tree() from process_tree().
fetch: do not report "same" unless -verbose.
read-tree --reset: update working tree file for conflicted paths.
git alias: try alias last.
rev-parse: tighten constness properly.
send-email: be more lenient and just catch obvious mistakes.
send-email: a bit more careful domain regexp.
git-format-patch: add --output-directory long option again
HTTP cleanup
Make index file locking code reusable to others.
refs.c: convert it to use lockfile interface.
ref-log: style fixes.
Documentation: add missing docs make check-docs found.
make clean: remove dist-doc targets.
Documentation: git-ls-tree (typofix)
Documentation: add another example to git-ls-files
git-clone: fix duplicated "master" in $GIT_DIR/remotes/origin
git-rm: honor -n flag.
builtin-init-db: spell the in-program configuration variable in lowercase.
shared repository - add a few missing calls to adjust_shared_perm().
git-clone: fix --bare over dumb-http
GIT 1.4.0
Linus Torvalds:
Common option parsing for "git log --diff" and friends
Tentative built-in "git show"
Fixes for option parsing
Log message printout cleanups
Log message printout cleanups (#2)
Log message printout cleanups (#3): fix --pretty=oneline
Fix uninteresting tags in new revision parsing
get_sha1() shorthands for blob/tree objects
Allow "git repack" users to specify repacking window/depth
git log: don't do merge diffs by default
git-log produces no output
Split up builtin commands into separate files from git.c
Fix filename verification when in a subdirectory
Fix "git help -a" terminal autosizing
git builtin "push"
Fix "git-log --parents" breakage post v1.3.0
sha1_to_hex() usage cleanup
Fix "git diff --stat" with long filenames
revert/cherry-pick: use aggressive merge.
git config syntax updates
git diff: support "-U" and "--unified" options properly
Allow one-way tree merge to remove old files
Simplify "git reset --hard"
builtin-grep: use external grep when we can take advantage of it
read-tree --reset -u fix.
Fix silly typo in new builtin grep
Remove old "git-grep.sh" remnants
libify git-ls-files directory traversal
Clean up git-ls-file directory walking library interface
Do "git add" as a builtin
builtin-add: warn on unmatched pathspecs
builtin-grep: workaround for non GNU grep.
Remove old "git-add.sh" remnants
Prevent bogus paths from being added to the index.
Make "git rev-list" be a builtin
Libify the index refresh logic
Move pathspec matching from builtin-add.c into dir.c
Add builtin "git rm" command
cvsimport: repack every kilo-commits.
apply: treat EOF as proper context.
Clean up sha1 file writing
bogus "fatal: Not a git repository"
t1002: use -U0 instead of --unified=0
Fix "--abbrev=xyz" for revision listing
Fix memory leak in "git rev-list --objects"
Don't use "sscanf()" for tree mode scanning
Add raw tree buffer info to "struct tree"
Make "tree_entry" have a SHA1 instead of a union of object pointers
Switch "read_tree_recursive()" over to tree-walk functionality
Remove "tree->entries" tree-entry list from tree parser
Make "struct tree" contain the pointer to the tree buffer
Make "tree_entry" have a SHA1 instead of a union of object pointers
Switch "read_tree_recursive()" over to tree-walk functionality
builtin-read-tree.c: avoid tree_entry_list in prime_cache_tree_rec()
Remove "tree->entries" tree-entry list from tree parser
fsck-objects: avoid unnecessary tree_entry_list usage
Remove unused "zeropad" entry from tree_list_entry
Convert "mark_tree_uninteresting()" to raw tree walker
Convert fetch.c: process_tree() to raw tree walker
Remove last vestiges of generic tree_entry_list
tree_entry(): new tree-walking helper function
read-tree: fix eye-candy.
Fix typo in tutorial-2.txt
rev-list: fix process_tree() conversion.
pack-objects: improve path grouping heuristics.
Lukas Sandström:
Make git-check-format-ref a builtin.
SubmittingPatches: The download location of External Editor has moved
Martin Langhoff:
git-cvsexportcommit: Add -f(orce) and -m(essage prefix) flags, small cleanups.
git-send-email: fix version string to be valid perl
cvsserver: use git-rev-list instead of git-log
cvsserver: use git-rev-list instead of git-log
cvsimport: minor fixups
cvsimport: replace anonymous sub ref with a normal sub
cvsimport: introduce -L<imit> option to workaround memory leaks
cvsimport: introduce _fetchfile() method and used a 1M buffer to read()
Martin Waitz:
clone: keep --reference even with -l -s
repack: honor -d even when no new pack was created
Transitively read alternatives
test case for transitive info/alternates
clone: don't clone the info/alternates file
git help: remove whatchanged from list of common commands
Documentation/Makefile: remove extra /
Add instructions to commit template.
Martyn Smith:
Added logged warnings for CVS error returns
Many fixes for most operations in Eclipse.
Change to allow subdir updates from Eclipse
Matthias Kestenholz:
annotate: fix warning about uninitialized scalar
annotate: display usage information if no filename was given
fix various typos in documentation
add documentation for update-index --unresolve
Matthias Lederhofer:
core-tutorial.txt: escape asterisk
git status: skip empty directories, and add -u to show all untracked files
Nick Hengeveld:
git-fetch: resolve remote symrefs for HTTP transport
http: prevent segfault during curl handle reuse
builtin-push: don't pass --thin to HTTP transport
HTTP cleanup
http-fetch: fix possible segfault
Nicolas Pitre:
fix pack-object buffer size
split the diff-delta interface
use delta index data when finding best delta matches
replace adler32 with Rabin's polynomial in diff-delta
tiny optimization to diff-delta
improve diff-delta with sparse and/or repetitive data
improve base85 generated assembly code
fix diff-delta bad memory access
simple euristic for further free packing improvements
pack-object: slightly more efficient
improve depth heuristic for maximum delta size
Paul Mackerras:
gitk: Implement multiple views
gitk: Make File->Update work properly again
gitk: Fix various bugs in the view support
gitk: Don't reread git-rev-list output from scratch on view switch
gitk: Remember the view in the history list
gitk: Let git-rev-list do the argument list parsing
gitk: Use git-rev-parse only to identify file/dir names on cmd line
rev-parse: better error message for ambiguous arguments
gitk: Implement "permanent" views (stored in ~/.gitk)
gitk: add menu item for editing the current view
gitk: Use a text widget for the file list
gitk: Add a tree-browsing mode
gitk: Basic support for highlighting one view within another
gitk: Fix file list display when files are renamed
gitk: Allow view to specify arbitrary arguments to git-rev-list
gitk: Fix display of "(...)" for parents/children we haven't drawn
Provide a way to flush git-diff-tree's output
gitk: Make a row of controls for controlling highlighting
gitk: Fix bug where page-up/down wouldn't always work properly
gitk: Highlight entries in the file list as well
gitk: Highlight paths of interest in tree view as well
gitk: First cut at a search function in the patch/file display window
gitk: Improve the text window search function
gitk: Move "pickaxe" find function to highlight facility
gitk: Fix bug in highlight stuff when no line is selected
gitk: show_error fix
gitk: Provide ability to highlight based on relationship to selected commit
Make git-diff-tree indicate when it flushes
gitk: Add a goto next/previous highlighted commit function
gitk: Show nearby tags
gitk: Show branch name(s) as well, if "show nearby tags" is enabled
gitk: Re-read the descendent/ancestor tag & head info on update
Paul T Darga:
check for error return from fork()
Pavel Roskin:
Release config lock if the regex is invalid
Peter Eriksen:
Add git-quiltimport to .gitignore.
Builtin git-ls-files.
Builtin git-ls-tree.
Builtin git-tar-tree.
Builtin git-read-tree.
Builtin git-commit-tree.
Builtin git-apply.
Builtin git-show-branch.
Builtin git-diff-files, git-diff-index, git-diff-stages, and git-diff-tree.
Peter Hagervall:
Sparse fix for builtin-diff
Petr Baudis:
Document git-var -l listing also configuration variables
Document the configuration file
git-repo-config --list support
Deprecate usage of git-var -l for getting config vars list
Call builtin ls-tree in git-cat-file -p
Document git aliases support
Documentation: git aliases
Rene Scharfe:
Off-by-one error in get_path_prefix(), found by Valgrind
Built-in git-get-tar-commit-id
Robert Fitzsimons:
builtin-grep: pass ignore case option to external grep
Robert Shearman:
Give the user a hint for how to continue in the case that git-am fails because it requires user intervention
Ryan Anderson:
git-send-email: Add References: headers to emails, in addition to In-Reply-To:
Add support for --bcc to git-send-email.
Fix a bug in email extraction used in git-send-email.
Add a basic test case for git send-email, and fix some real bugs discovered.
Salikh Zakirov:
Fixed Cygwin CR-munging problem in mailsplit
Santi:
Document that "git add" only adds non-ignored files.
Santi_Béjar:
Reintroduce svn pools to solve the memory leak.
Sean Estabrooks:
Add --continue and --abort options to git-rebase.
Update the git-branch man page to include the "-r" option,
Fix up remaining man pages that use asciidoc "callouts".
Properly render asciidoc "callouts" in git man pages.
Fix trivial typo in git-log man page.
Several trivial documentation touch ups.
Fix up docs where "--" isn't displayed correctly.
Update git-unpack-objects documentation.
Clarify git-cherry documentation.
Fix for config file section parsing.
Another config file parsing fix.
t1300-repo-config: two new config parsing tests.
Another config file parsing fix.
Add "--branches", "--tags" and "--remotes" options to git-rev-parse.
Ensure author & committer before asking for commit message.
Make git rebase interactive help match documentation.
Add "--summary" option to git diff.
Convert some "apply --summary" users to "diff --summary".
Strip useless "tags/" prefix from git-tag -l output
Allow pickaxe and diff-filter options to be used by git log.
Avoid segfault in diff --stat rename output.
Change GIT-VERSION-GEN to call git commands with "git" not "git-".
Install git builtins into gitexecdir rather than bindir.
Remove possible segfault in http-fetch.
--summary output should print immediately after stats.
A Perforce importer for git.
Serge E. Hallyn:
socksetup: don't return on set_reuse_addr() error
socksetup: don't return on set_reuse_addr() error
Sergey Vlasov:
gitk: Display commit messages with word wrap
Shawn Pearce:
Document git-clone --reference
Remove unnecessary local in get_ref_sha1.
Improve abstraction of ref lock/write.
Convert update-ref to use ref_lock API.
Log ref updates to logs/refs/<ref>
Support 'master@2 hours ago' syntax
Fix ref log parsing so it works properly.
General ref log reading improvements.
Added logs/ directory to repository layout.
Force writing ref if it doesn't exist.
Log ref updates made by fetch.
Change 'master@noon' syntax to 'master@{noon}'.
Correct force_write bug in refs.c
Change order of -m option to update-ref.
Include ref log detail in commit, reset, etc.
Create/delete branch ref logs.
Enable ref log creation in git checkout -b.
Reference git-check-ref-format in git-branch.
Elaborate on why ':' is a bad idea in a ref name.
Built git-upload-tar should be ignored.
Verify git-commit provides a reflog message.
Test that git-branch -l works.
Remove unnecessary output from t3600-rm.
Improved pack format documentation.
Allow multiple -m options to git-commit.
Tilman Sauerbeck:
Documentation/Makefile: create tarballs for the man pages and html files
Timo Hirvonen:
Builtin git-init-db
Builtin git-cat-file
gitk: Replace "git-" commands with "git "
Uwe Zeisberger:
Document git-clone --use-separate-remote
Yakov Lerner:
read-cache.c: use xcalloc() not calloc()
NO_INET_NTOP and compat/inet_ntop.c for some systems (e.g. old Cygwin).
Problem: 'trap...exit' causes error message when /bin/sh is ash.
Yann Dirson:
Do not call 'cmp' with non-existant -q flag.
Document current cvsexportcommit limitations.
Make cvsexportcommit create parent directories as needed.
^ permalink raw reply [relevance 2%]
* Re: [PATCH 2/2] merge: fix memory leaks in cmd_merge()
2022-01-20 7:47 2% ` [PATCH 2/2] merge: fix memory leaks in cmd_merge() Elijah Newren via GitGitGadget
@ 2022-01-22 0:05 2% ` Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2022-01-22 0:05 UTC (permalink / raw)
To: Elijah Newren via GitGitGadget
Cc: git, Ævar Arnfjörð Bjarmason, Elijah Newren
"Elijah Newren via GitGitGadget" <gitgitgadget@gmail.com> writes:
> done:
> + if (!automerge_was_ok) {
> + free_commit_list(common);
> + free_commit_list(remoteheads);
> + }
I wondered what happens upon a successful automerge.
We call finish_automerge() and come here, and I do see a call to
free_commit_list(common) in finish_automerge(), but the way
remoteheads is used looked a bit iffy.
In finish_automerge(), we use a temporary variable parents to point
remoteheads at it, and conditionally prepend the current HEAD at the
beginning of the parents list. This is passed to commit_tree(),
which does pop_commit() to consume all commits on the list.
So after commit_tree() returns, all commit_list instances on
remoteheads list, and possibly the one finish_automerge() prepended
for the current HEAD, are all consumed, and there is no need to
call, and it would be wrong to call, free_commit_list(), at this
point.
So, I agree that this conditional freeing is correct. It was just
it was a bit hard to see.
Thanks.
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (Mar 2017, #03; Wed, 8)
@ 2017-03-08 23:47 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2017-03-08 23:47 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'. The ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.
You can find the changes described here in the integration branches
of the repositories listed at
http://git-blame.blogspot.com/p/git-public-repositories.html
--------------------------------------------------
[New Topics]
* ew/http-alternates-as-redirects-warning (2017-03-06) 2 commits
- http: release strbuf on disabled alternates
- http: inform about alternates-as-redirects behavior
Recent versions of Git treats http alternates (used in dumb http
transport) just like HTTP redirects and requires the client to
enable following it, due to security concerns. But we forgot to
give a warning when we decide not to honor the alternates.
Will merge to 'next'.
* jk/ewah-use-right-type-in-sizeof (2017-03-06) 1 commit
- ewah: fix eword_t/uint64_t confusion
Code clean-up.
Will merge to 'next'.
* jk/push-deadlock-regression-fix (2017-03-07) 6 commits
- send-pack: report signal death of pack-objects
- send-pack: read "unpack" status even on pack-objects failure
- send-pack: improve unpack-status error messages
- send-pack: use skip_prefix for parsing unpack status
- send-pack: extract parsing of "unpack" response
- receive-pack: fix deadlock when we cannot create tmpdir
"git push" had a handful of codepaths that could lead to a deadlock
when unexpected error happened, which has been fixed.
Will merge to 'next'.
* vn/line-log-memcpy-size-fix (2017-03-06) 1 commit
- line-log: use COPY_ARRAY to fix mis-sized memcpy
The command-line parsing of "git log -L" copied internal data
structures using incorrect size on ILP32 systems.
Will merge to 'next'.
* js/realpath-pathdup-fix (2017-03-08) 2 commits
- real_pathdup(): fix callsites that wanted it to die on error
- t1501: demonstrate NULL pointer access with invalid GIT_WORK_TREE
Git v2.12 was shipped with an embarrassing breakage where various
operations that verify paths given from the user stopped dying when
seeing an issue, and instead later triggering segfault.
Will merge to 'next' and then to 'master', eventually down to 'maint'.
* kn/ref-filter-branch-list (2017-03-08) 1 commit
- branch: honor --abbrev/--no-abbrev in --list mode
"git branch --list" takes the "--abbrev" and "--no-abbrev" options
to control the output of the object name in its "-v"(erbose)
output, but a recent update started ignoring them; this fixes it
before the breakage reaches to any released version.
Will merge to 'next'.
* sb/rev-parse-show-superproject-root (2017-03-08) 1 commit
- rev-parse: add --show-superproject-working-tree
From a working tree of a repository, a new option of "rev-parse"
lets you ask if the repository is used as a submodule of another
project, and where the root level of the working tree of that
project (i.e. your superproject) is.
Almost there, but documentation needs a bit more work.
--------------------------------------------------
[Stalled]
* nd/worktree-move (2017-01-27) 7 commits
. fixup! worktree move: new command
. worktree remove: new command
. worktree move: refuse to move worktrees with submodules
. worktree move: accept destination as directory
. worktree move: new command
. worktree.c: add update_worktree_location()
. worktree.c: add validate_worktree()
"git worktree" learned move and remove subcommands.
Tentatively ejected as it seems to break 'pu' when merged.
* pb/bisect (2017-02-18) 28 commits
- fixup! bisect--helper: `bisect_next_check` & bisect_voc shell function in C
- bisect--helper: remove the dequote in bisect_start()
- bisect--helper: retire `--bisect-auto-next` subcommand
- bisect--helper: retire `--bisect-autostart` subcommand
- bisect--helper: retire `--bisect-write` subcommand
- bisect--helper: `bisect_replay` shell function in C
- bisect--helper: `bisect_log` shell function in C
- bisect--helper: retire `--write-terms` subcommand
- bisect--helper: retire `--check-expected-revs` subcommand
- bisect--helper: `bisect_state` & `bisect_head` shell function in C
- bisect--helper: `bisect_autostart` shell function in C
- bisect--helper: retire `--next-all` subcommand
- bisect--helper: retire `--bisect-clean-state` subcommand
- bisect--helper: `bisect_next` and `bisect_auto_next` shell function in C
- t6030: no cleanup with bad merge base
- bisect--helper: `bisect_start` shell function partially in C
- bisect--helper: `get_terms` & `bisect_terms` shell function in C
- bisect--helper: `bisect_next_check` & bisect_voc shell function in C
- bisect--helper: `check_and_set_terms` shell function in C
- bisect--helper: `bisect_write` shell function in C
- bisect--helper: `is_expected_rev` & `check_expected_revs` shell function in C
- bisect--helper: `bisect_reset` shell function in C
- wrapper: move is_empty_file() and rename it as is_empty_or_missing_file()
- t6030: explicitly test for bisection cleanup
- bisect--helper: `bisect_clean_state` shell function in C
- bisect--helper: `write_terms` shell function in C
- bisect: rewrite `check_term_format` shell function in C
- bisect--helper: use OPT_CMDMODE instead of OPT_BOOL
Move more parts of "git bisect" to C.
Expecting a reroll.
cf. <CAFZEwPPXPPHi8KiEGS9ggzNHDCGhuqMgH9Z8-Pf9GLshg8+LPA@mail.gmail.com>
cf. <CAFZEwPM9RSTGN54dzaw9gO9iZmsYjJ_d1SjUD4EzSDDbmh-XuA@mail.gmail.com>
cf. <CAFZEwPNUXcNY9Qdz=_B7q2kQuaecPzJtTMGdv8YMUPEz2vnp8A@mail.gmail.com>
* sh/grep-tree-obj-tweak-output (2017-01-20) 2 commits
- grep: use '/' delimiter for paths
- grep: only add delimiter if there isn't one already
"git grep", when fed a tree-ish as an input, shows each hit
prefixed with "<tree-ish>:<path>:<lineno>:". As <tree-ish> is
almost always either a commit or a tag that points at a commit, the
early part of the output "<tree-ish>:<path>" can be used as the
name of the blob and given to "git show". When <tree-ish> is a
tree given in the extended SHA-1 syntax (e.g. "<commit>:", or
"<commit>:<dir>"), however, this results in a string that does not
name a blob (e.g. "<commit>::<path>" or "<commit>:<dir>:<path>").
"git grep" has been taught to be a bit more intelligent about these
cases and omit a colon (in the former case) or use slash (in the
latter case) to produce "<commit>:<path>" and
"<commit>:<dir>/<path>" that can be used as the name of a blob.
Expecting a reroll? Is this good enough with known limitations?
* jc/diff-b-m (2015-02-23) 5 commits
. WIPWIP
. WIP: diff-b-m
- diffcore-rename: allow easier debugging
- diffcore-rename.c: add locate_rename_src()
- diffcore-break: allow debugging
"git diff -B -M" produced incorrect patch when the postimage of a
completely rewritten file is similar to the preimage of a removed
file; such a resulting file must not be expressed as a rename from
other place.
The fix in this patch is broken, unfortunately.
Will discard.
--------------------------------------------------
[Cooking]
* ls/filter-process-delayed (2017-03-06) 1 commit
- convert: add "status=delayed" to filter process protocol
cf. <xmqq60jmnmef.fsf@junio-linux.mtv.corp.google.com>
* ew/markdown-url-in-readme (2017-03-01) 1 commit
(merged to 'next' on 2017-03-03 at 3d35e3a991)
+ README: create HTTP/HTTPS links from URLs in Markdown
Doc update.
Will merge to 'master'.
* jk/add-i-patch-do-prompt (2017-03-02) 1 commit
- add--interactive: fix missing file prompt for patch mode with "-i"
The patch subcommand of "git add -i" was meant to have paths
selection prompt just like other subcommand, unlike "git add -p"
directly jumps to hunk selection. Recently, this was broken and
"add -i" lost the paths selection dialog, but it now has been
fixed.
Will merge to 'next'.
* ax/line-log-range-merge-fix (2017-03-03) 1 commit
- line-log.c: prevent crash during union of too many ranges
The code to parse "git log -L..." command line was buggy when there
are many ranges specified with -L; overrun of the allocated buffer
has been fixed.
Will merge to 'next'.
* js/early-config (2017-03-07) 10 commits
- setup_git_directory_gently_1(): avoid die()ing
- t1309: test read_early_config()
- read_early_config(): really discover .git/
- read_early_config(): avoid .git/config hack when unneeded
- setup: make read_early_config() reusable
- setup: introduce the discover_git_directory() function
- setup_git_directory_1(): avoid changing global state
- setup: prepare setup_discovered_git_directory() the root directory
- setup_git_directory(): use is_dir_sep() helper
- t7006: replace dubious test
The start-up sequence of "git" needs to figure out some configured
settings before it finds and set itself up in the location of the
repository and was quite messy due to its "chicken-and-egg" nature.
The code has been restructured.
Will merge to 'next' after waiting for a few days.
* jt/perf-updates (2017-03-03) 3 commits
- t/perf: add fallback for pre-bin-wrappers versions of git
- t/perf: use $MODERN_GIT for all repo-copying steps
- t/perf: export variable used in other blocks
The t/perf performance test suite was not prepared to test not so
old versions of Git, but now it covers versions of Git that are not
so ancient.
Will merge to 'next'.
* ss/remote-bzr-hg-placeholder-wo-python (2017-03-03) 1 commit
- contrib: git-remote-{bzr,hg} placeholders don't need Python
There is no need for Python only to give a few messages to the
standard error stream, but we somehow did.
Will merge to 'next'.
* jk/interpret-branch-name (2017-03-02) 9 commits
- checkout: restrict @-expansions when finding branch
- strbuf_check_ref_format(): expand only local branches
- branch: restrict @-expansions when deleting
- t3204: test git-branch @-expansion corner cases
- interpret_branch_name: allow callers to restrict expansions
- strbuf_branchname: add docstring
- strbuf_branchname: drop return value
- interpret_branch_name: move docstring to header file
- interpret_branch_name(): handle auto-namelen for @{-1}
"git branch @" created refs/heads/@ as a branch, and in general the
code that handled @{-1} and @{upstream} was a bit too loose in
disambiguating.
Will merge to 'next'.
* jk/sha1dc (2017-03-01) 7 commits
- Put sha1dc on a diet
- sha1dc: avoid 'for' loop initial decl
- sha1dc: resurrect LICENSE file
- sha1dc: avoid c99 declaration-after-statement
- Makefile: add USE_SHA1DC knob
- sha1dc: adjust header includes for git
- add collision-detecting sha1 implementation
Borrow "detect attempt to create collisions" variant of SHA-1
implementation by Marc Stevens (CWI) and Dan Shumow (Microsoft).
Expecting a cleaned-up reroll after discussion settles.
cf. <CA+55aFxTWqsTTiDKo4DBZT-8Z9t80bGMD3uijzKONa_bYEZABQ@mail.gmail.com>
* js/travis-32bit-linux (2017-03-06) 1 commit
- Travis: also test on 32-bit Linux
Add 32-bit Linux variant to the set of platforms to be tested with
Travis CI.
Will merge to 'next'.
* jt/http-base-url-update-upon-redirect (2017-02-28) 1 commit
(merged to 'next' on 2017-03-03 at 5225bd3ef8)
+ http: attempt updating base URL only if no error
When a redirected http transport gets an error during the
redirected request, we ignored the error we got from the server,
and ended up giving a not-so-useful error message.
Will merge to 'master'.
* jt/mark-tree-uninteresting-for-uninteresting-commit (2017-02-28) 3 commits
- upload-pack: compute blob reachability correctly
- revision: exclude trees/blobs given commit
- revision: unify {tree,blob}_objects in rev_info
The revision/object traversal machinery did not mark all tree and
blob objects that are contained in an uninteresting commit as
uninteresting, because that is quite costly. Instead, it only
marked those that are contained in an uninteresting boundary commit
as uninteresting.
cf. <20170228215937.yd4juycjf7y3vish@sigill.intra.peff.net>
* ps/docs-diffcore (2017-02-28) 2 commits
(merged to 'next' on 2017-03-03 at 9ca5691de2)
+ docs/diffcore: unquote "Complete Rewrites" in headers
+ docs/diffcore: fix grammar in diffcore-rename header
Doc update.
Will merge to 'master'.
* rj/remove-unused-mktemp (2017-02-28) 2 commits
(merged to 'next' on 2017-03-03 at 4512f0c5ab)
+ wrapper.c: remove unused gitmkstemps() function
+ wrapper.c: remove unused git_mkstemp() function
Code cleanup.
Will merge to 'master'.
* sb/submodule-init-url-selection (2017-02-28) 1 commit
(merged to 'next' on 2017-03-03 at 847d1f9a91)
+ submodule init: warn about falling back to a local path
Give a warning when "git submodule init" decides that the submodule
in the working tree is its upstream, as it is not a very common
setup.
Will merge to 'master'.
* jc/diff-populate-filespec-size-only-fix (2017-03-02) 1 commit
- diff: do not short-cut CHECK_SIZE_ONLY check in diff_populate_filespec()
"git diff --quiet" relies on the size field in diff_filespec to be
correctly populated, but diff_populate_filespec() helper function
made an incorrect short-cut when asked only to populate the size
field for paths that need to go through convert_to_git() (e.g. CRLF
conversion).
Will merge to 'next'.
* nd/conditional-config-include (2017-03-03) 5 commits
- SQUASH??? cond config include test
- SQUASH???
- config: add conditional include
- config.txt: reflow the second include.path paragraph
- config.txt: clarify multiple key values in include.path
The configuration file learned a new "includeIf.<condition>.path"
that includes the contents of the given path only when the
condition holds. This allows you to say "include this work-related
bit only in the repositories under my ~/work/ directory".
Will merge to 'next' after squashing niggle-fixes in.
* rs/log-email-subject (2017-03-01) 2 commits
(merged to 'next' on 2017-03-03 at a2ecc84866)
+ pretty: use fmt_output_email_subject()
+ log-tree: factor out fmt_output_email_subject()
Code clean-up.
Will merge to 'master'.
* cc/split-index-config (2017-03-06) 22 commits
- Documentation/git-update-index: explain splitIndex.*
- Documentation/config: add splitIndex.sharedIndexExpire
- read-cache: use freshen_shared_index() in read_index_from()
- read-cache: refactor read_index_from()
- t1700: test shared index file expiration
- read-cache: unlink old sharedindex files
- config: add git_config_get_expiry() from gc.c
- read-cache: touch shared index files when used
- sha1_file: make check_and_freshen_file() non static
- Documentation/config: add splitIndex.maxPercentChange
- t1700: add tests for splitIndex.maxPercentChange
- read-cache: regenerate shared index if necessary
- config: add git_config_get_max_percent_split_change()
- Documentation/git-update-index: talk about core.splitIndex config var
- Documentation/config: add information for core.splitIndex
- t1700: add tests for core.splitIndex
- update-index: warn in case of split-index incoherency
- read-cache: add and then use tweak_split_index()
- split-index: add {add,remove}_split_index() functions
- config: add git_config_get_split_index()
- t1700: change here document style
- config: mark an error message up for translation
The experimental "split index" feature has gained a few
configuration variables to make it easier to use.
I think this is almost ready for 'next'.
* dp/filter-branch-prune-empty (2017-03-03) 4 commits
- p7000: add test for filter-branch with --prune-empty
- filter-branch: fix --prune-empty on parentless commits
- t7003: ensure --prune-empty removes entire branch when applicable
- t7003: ensure --prune-empty can prune root commit
"git filter-branch --prune-empty" drops a single-parent commit that
becomes a no-op, but did not drop a root commit whose tree is empty.
Will merge to 'next'.
* jc/config-case-cmdline-take-2 (2017-02-23) 2 commits
(merged to 'next' on 2017-03-01 at 2e9920eeeb)
+ config: use git_config_parse_key() in git_config_parse_parameter()
+ config: move a few helper functions up
The code to parse "git -c VAR=VAL cmd" and set configuration
variable for the duration of cmd had two small bugs, which have
been fixed.
Will merge to 'master'.
This supersedes jc/config-case-cmdline topic that has been discarded.
* ab/cond-skip-tests (2017-03-01) 3 commits
- gitweb tests: skip tests when we don't have Time::HiRes
- gitweb tests: change confusing "skip_all" phrasing
- cvs tests: skip tests that call "cvs commit" when running as root
A few tests were run conditionally under (rare) conditions where
they cannot be run (like running cvs tests under 'root' account).
Will merge to 'next'.
* jk/interop-test (2017-02-27) 2 commits
- t/interop: add test of old clients against modern git-daemon
- t: add an interoperability test harness
Picking two versions of Git and running tests to make sure the
older one and the newer one interoperate happily has now become
possible.
Needs review.
* jk/parse-config-key-cleanup (2017-02-24) 3 commits
(merged to 'next' on 2017-03-01 at e531d8d3a9)
+ parse_hide_refs_config: tell parse_config_key we don't want a subsection
+ parse_config_key: allow matching single-level config
+ parse_config_key: use skip_prefix instead of starts_with
(this branch uses sb/parse-hide-refs-config-cleanup.)
The "parse_config_key()" API function has been cleaned up.
Will merge to 'master'.
* jk/t6300-cleanup (2017-02-27) 1 commit
(merged to 'next' on 2017-03-02 at 3087521bea)
+ t6300: avoid creating refs/heads/HEAD
A test that creates a confusing branch whose name is HEAD has been
corrected not to do so.
Will merge to 'master'.
* rs/commit-parsing-optim (2017-02-27) 2 commits
(merged to 'next' on 2017-03-02 at 22239f35df)
+ commit: don't check for space twice when looking for header
+ commit: be more precise when searching for headers
The code that parses header fields in the commit object has been
updated for (micro)performance and code hygiene.
Will merge to 'master'.
* rs/sha1-file-plug-fallback-base-leak (2017-02-27) 1 commit
(merged to 'next' on 2017-03-02 at 03344b1119)
+ sha1_file: release fallback base's memory in unpack_entry()
A leak in a codepath to read from a packed object in (rare) cases
has been plugged.
Will merge to 'master'.
* rs/strbuf-add-real-path (2017-02-27) 2 commits
(merged to 'next' on 2017-03-02 at 69191becd6)
+ strbuf: add strbuf_add_real_path()
+ cocci: use ALLOC_ARRAY
An helper function to make it easier to append the result from
real_path() to a strbuf has been added.
Will merge to 'master'.
* sb/parse-hide-refs-config-cleanup (2017-02-24) 1 commit
(merged to 'next' on 2017-03-01 at fd722ba039)
+ refs: parse_hide_refs_config to use parse_config_key
(this branch is used by jk/parse-config-key-cleanup.)
Code clean-up.
Will merge to 'master'.
* sg/clone-refspec-from-command-line-config (2017-02-27) 1 commit
- clone: respect configured fetch respecs during initial fetch
Needs review.
cf. <20170227211217.73gydlxb2qu2sp3m@sigill.intra.peff.net>
* sk/dash-is-previous (2017-03-01) 5 commits
- revert.c: delegate handling of "-" shorthand to setup_revisions
- sha1_name.c: teach get_sha1_1 "-" shorthand for "@{-1}"
- revision.c: args starting with "-" might be a revision
- revision.c: swap if/else blocks
- revision.c: do not update argv with unknown option
A dash "-" can be written to mean "the branch that was previously
checked out" in more places.
Needs review.
cf. <1488007487-12965-1-git-send-email-kannan.siddharth12@gmail.com>
* jh/send-email-one-cc (2017-02-27) 1 commit
(merged to 'next' on 2017-03-02 at 32c0e6ad88)
+ send-email: only allow one address per body tag
"Cc:" on the trailer part does not have to conform to RFC strictly,
unlike in the e-mail header. "git send-email" has been updated to
ignore anything after '>' when picking addresses, to allow non-address
cruft like " # stable 4.4" after the address.
Will merge to 'master'.
* jk/http-auth (2017-02-27) 2 commits
(merged to 'next' on 2017-03-02 at 87f81b4395)
+ http: add an "auto" mode for http.emptyauth
+ http: restrict auth methods to what the server advertises
Reduce authentication round-trip over HTTP when the server supports
just a single authentication method.
Will merge to 'master'.
* jk/ident-empty (2017-02-23) 4 commits
(merged to 'next' on 2017-03-01 at ff80031ce6)
+ ident: do not ignore empty config name/email
+ ident: reject all-crud ident name
+ ident: handle NULL email when complaining of empty name
+ ident: mark error messages for translation
user.email that consists of only cruft chars should consistently
error out, but didn't.
Will merge to 'master'.
* jt/upload-pack-error-report (2017-02-23) 1 commit
(merged to 'next' on 2017-03-01 at aea583dbe5)
+ upload-pack: report "not our ref" to client
"git upload-pack", which is a counter-part of "git fetch", did not
report a request for a ref that was not advertised as invalid.
This is generally not a problem (because "git fetch" will stop
before making such a request), but is the right thing to do.
Will merge to 'master'.
* ah/doc-ls-files-quotepath (2017-03-02) 1 commit
- Documentation: improve description for core.quotePath
Documentation for "git ls-files" did not refer to core.quotePath
Will merge to 'next'.
* jh/memihash-opt (2017-02-17) 5 commits
- name-hash: remember previous dir_entry during lazy_init_name_hash
- name-hash: specify initial size for istate.dir_hash table
- name-hash: precompute hash values during preload-index
- hashmap: allow memihash computation to be continued
- name-hash: eliminate duplicate memihash call
Expecting an update for perf.
cf. <MWHPR03MB29581B0EDDEDCA7D51EC396F8A280@MWHPR03MB2958.namprd03.prod.outlook.com>
* nd/prune-in-worktree (2017-02-19) 15 commits
. rev-list: expose and document --single-worktree
. revision.c: --reflog add HEAD reflog from all worktrees
. files-backend: make reflog iterator go through per-worktree reflog
. refs: add refs_for_each_reflog[_ent]()
. revision.c: --all adds HEAD from all worktrees
. refs: remove dead for_each_*_submodule()
. revision.c: use refs_for_each*() instead of for_each_*_submodule()
. refs: add a refs_for_each_in() and friends
. refs: add refs_for_each_ref()
. refs: add refs_head_ref()
. refs: add refs_read_ref[_full]()
. refs: move submodule slash stripping code to get_submodule_ref_store
. revision.c: --indexed-objects add objects from all worktrees
. revision.c: refactor add_index_objects_to_pending()
. revision.h: new flag in struct rev_info wrt. worktree-related refs
(this branch uses nd/worktree-kill-parse-ref; is tangled with nd/files-backend-git-dir.)
"git gc" and friends when multiple worktrees are used off of a
single repository did not consider the index and per-worktree refs
of other worktrees as the root for reachability traversal, making
objects that are in use only in other worktrees to be subject to
garbage collection.
* mm/fetch-show-error-message-on-unadvertised-object (2017-03-02) 3 commits
- fetch-pack: add specific error for fetching an unadvertised object
- fetch_refs_via_pack: call report_unmatched_refs
- fetch-pack: move code to report unmatched refs to a function
"git fetch" that requests a commit by object name, when the other
side does not allow such an request, failed without much
explanation.
Will merge to 'next'.
* nd/worktree-kill-parse-ref (2017-02-19) 22 commits
. refs: kill set_worktree_head_symref()
. refs: add refs_create_symref()
. worktree.c: kill parse_ref() in favor of refs_resolve_ref_unsafe()
. refs.c: add refs_resolve_ref_unsafe()
. refs: introduce get_worktree_ref_store()
. refs: rename get_ref_store() to get_submodule_ref_store() and make it public
. files-backend: remove submodule_allowed from files_downcast()
. refs: move submodule code out of files-backend.c
. path.c: move some code out of strbuf_git_path_submodule()
. refs.c: make get_main_ref_store() public and use it
. refs.c: kill register_ref_store(), add register_submodule_ref_store()
. refs.c: flatten get_ref_store() a bit
. refs: rename lookup_ref_store() to lookup_submodule_ref_store()
. refs.c: introduce get_main_ref_store()
. files-backend: remove the use of git_path()
. refs.c: share is_per_worktree_ref() to files-backend.c
. files-backend: replace *git_path*() with files_path()
. files-backend: add files_path()
. files-backend: convert git_path() to strbuf_git_path()
. refs-internal.c: make files_log_ref_write() static
. Merge branch 'mh/ref-remove-empty-directory' into nd/files-backend-git-dir
. Merge branch 'mh/submodule-hash' into nd/files-backend-git-dir
(this branch is used by nd/prune-in-worktree; is tangled with nd/files-backend-git-dir.)
(hopefully) a beginning of safer "git worktree" that is resistant
to "gc".
Waiting for nd/files-backend-git-dir to settle.
* nd/files-backend-git-dir (2017-02-22) 26 commits
. t1406: new tests for submodule ref store
. t1405: some basic tests on main ref store
. t/helper: add test-ref-store to test ref-store functions
. refs: delete pack_refs() in favor of refs_pack_refs()
. files-backend: avoid ref api targetting main ref store
. refs: new transaction related ref-store api
. refs: add new ref-store api
. refs: rename get_ref_store() to get_submodule_ref_store() and make it public
. files-backend: replace submodule_allowed check in files_downcast()
. refs: move submodule code out of files-backend.c
. path.c: move some code out of strbuf_git_path_submodule()
. refs.c: make get_main_ref_store() public and use it
. refs.c: kill register_ref_store(), add register_submodule_ref_store()
. refs.c: flatten get_ref_store() a bit
. refs: rename lookup_ref_store() to lookup_submodule_ref_store()
. refs.c: introduce get_main_ref_store()
. files-backend: remove the use of git_path()
. files-backend: add and use files_refname_path()
. files-backend: add and use files_reflog_path()
. files-backend: move "logs/" out of TMP_RENAMED_LOG
. files-backend: convert git_path() to strbuf_git_path()
. files-backend: add and use files_packed_refs_path()
. files-backend: make files_log_ref_write() static
. refs.h: add forward declaration for structs used in this file
. Merge branch 'mh/ref-remove-empty-directory' into nd/files-backend-git-dir
. Merge branch 'mh/submodule-hash' into nd/files-backend-git-dir
(this branch is tangled with nd/prune-in-worktree and nd/worktree-kill-parse-ref.)
The "submodule" specific field in the ref_store structure is
replaced with a more generic "gitdir" that can later be used also
when dealing with ref_store that represents the set of refs visible
from the other worktrees.
* sb/checkout-recurse-submodules (2017-03-07) 18 commits
- builtin/read-tree: add --recurse-submodules switch
- builtin/checkout: add --recurse-submodules switch
- entry.c: update submodules when interesting
- read-cache, remove_marked_cache_entries: wipe selected submodules.
- unpack-trees: check if we can perform the operation for submodules
- unpack-trees: pass old oid to verify_clean_submodule
- update submodules: add submodule_move_head
- update submodules: move up prepare_submodule_repo_env
- submodules: introduce check to see whether to touch a submodule
- update submodules: add a config option to determine if submodules are updated
- update submodules: add submodule config parsing
- connect_work_tree_and_git_dir: safely create leading directories
- make is_submodule_populated gently
- lib-submodule-update.sh: define tests for recursing into submodules
- lib-submodule-update.sh: replace sha1 by hash
- lib-submodule-update: teach test_submodule_content the -C <dir> flag
- lib-submodule-update.sh: do not use ./. as submodule remote
- lib-submodule-update.sh: reorder create_lib_submodule_repo
"git checkout" is taught --recurse-submodules option.
* tg/stash-push (2017-02-28) 6 commits
(merged to 'next' on 2017-03-03 at b50fda0389)
+ stash: allow pathspecs in the no verb form
+ stash: use stash_push for no verb form
+ stash: teach 'push' (and 'create_stash') to honor pathspec
+ stash: refactor stash_create
+ stash: add test for the create command line arguments
+ stash: introduce push verb
Allow "git stash" to take pathspec so that the local changes can be
stashed away only partially.
Will merge to 'master'.
* bc/object-id (2017-02-22) 19 commits
- wt-status: convert to struct object_id
- builtin/merge-base: convert to struct object_id
- Convert object iteration callbacks to struct object_id
- sha1_file: introduce an nth_packed_object_oid function
- refs: simplify parsing of reflog entries
- refs: convert each_reflog_ent_fn to struct object_id
- reflog-walk: convert struct reflog_info to struct object_id
- builtin/replace: convert to struct object_id
- Convert remaining callers of resolve_refdup to object_id
- builtin/merge: convert to struct object_id
- builtin/clone: convert to struct object_id
- builtin/branch: convert to struct object_id
- builtin/grep: convert to struct object_id
- builtin/fmt-merge-message: convert to struct object_id
- builtin/fast-export: convert to struct object_id
- builtin/describe: convert to struct object_id
- builtin/diff-tree: convert to struct object_id
- builtin/commit: convert to struct object_id
- hex: introduce parse_oid_hex
"uchar [40]" to "struct object_id" conversion continues.
Now at v5.
cf. <20170221234737.894681-1-sandals@crustytoothpaste.net>
* jh/mingw-openssl-sha1 (2017-02-09) 1 commit
- mingw: use OpenSSL's SHA-1 routines
Windows port wants to use OpenSSL's implementation of SHA-1
routines, so let them.
Will merge to 'next'.
* sg/completion-refs-speedup (2017-02-13) 13 commits
- squash! completion: fill COMPREPLY directly when completing refs
- completion: fill COMPREPLY directly when completing refs
- completion: list only matching symbolic and pseudorefs when completing refs
- completion: let 'for-each-ref' sort remote branches for 'checkout' DWIMery
- completion: let 'for-each-ref' filter remote branches for 'checkout' DWIMery
- completion: let 'for-each-ref' strip the remote name from remote branches
- completion: let 'for-each-ref' and 'ls-remote' filter matching refs
- completion: don't disambiguate short refs
- completion: don't disambiguate tags and branches
- completion: support excluding full refs
- completion: support completing full refs after '--option=refs/<TAB>'
- completion: wrap __git_refs() for better option parsing
- completion: remove redundant __gitcomp_nl() options from _git_commit()
The refs completion for large number of refs has been sped up,
partly by giving up disambiguating ambiguous refs and partly by
eliminating most of the shell processing between 'git for-each-ref'
and 'ls-remote' and Bash's completion facility.
What's the donness of this topic?
* jk/no-looking-at-dotgit-outside-repo-final (2016-10-26) 1 commit
(merged to 'next' on 2017-02-27 at 7373a1b73d)
+ setup_git_env: avoid blind fall-back to ".git"
This is the endgame of the topic to avoid blindly falling back to
".git" when the setup sequence said we are _not_ in Git repository.
A corner case that happens to work right now may be broken by a
call to die("BUG").
Will cook in 'next'.
* jc/merge-drop-old-syntax (2015-04-29) 1 commit
(merged to 'next' on 2017-02-27 at 2c0f5f73d8)
+ merge: drop 'git merge <message> HEAD <commit>' syntax
Stop supporting "git merge <message> HEAD <commit>" syntax that has
been deprecated since October 2007, and issues a deprecation
warning message since v2.5.0.
Will cook in 'next'.
* jc/bundle (2016-03-03) 6 commits
- index-pack: --clone-bundle option
- Merge branch 'jc/index-pack' into jc/bundle
- bundle v3: the beginning
- bundle: keep a copy of bundle file name in the in-core bundle header
- bundle: plug resource leak
- bundle doc: 'verify' is not about verifying the bundle
The beginning of "split bundle", which could be one of the
ingredients to allow "git clone" traffic off of the core server
network to CDN.
--------------------------------------------------
[Discarded]
* jk/auto-namelen-in-interpret-branch-name (2017-02-27) 1 commit
. interpret_branch_name(): handle auto-namelen for @{-1}
A small bug in the code that parses @{...} has been fixed.
This is now a part of jk/interpret-branch-name topic.
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (Dec 2009, #01; Tue, 01)
@ 2009-12-01 22:10 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2009-12-01 22:10 UTC (permalink / raw)
To: git
I am this close to actually tagging 1.6.6-rc1, but I am reasonably sure
that I missed and did not pick up a few important fixes that should go
into it, so here is the current status.
What's cooking in git.git (Dec 2009, #01; Tue, 01)
--------------------------------------------------
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
marked with '.' do not appear in any of the integration branches, but I am
still holding onto them.
In 1.7.0, we plan to correct handful of warts in the interfaces everybody
agrees that they were mistakes. The resulting system may not be strictly
backward compatible. Currently planned changes are:
* refuse push to update the checked out branch in a non-bare repo by
default
Make "git push" into a repository to update the branch that is checked
out fail by default. You can countermand this default by setting a
configuration variable in the receiving repository.
http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007
* refuse push to delete the current branch by default
Make "git push $there :$killed" to delete the branch that is pointed at
by its HEAD fail by default. You can countermand this default by
setting a configuration variable in the receiving repository.
http://thread.gmane.org/gmane.comp.version-control.git/108862/focus=108936
* "git send-email" won't make deep threads by default
Many people said that by default when sending more than 2 patches the
threading git-send-email makes by default is hard to read, and they
prefer the default be one cover letter and each patch as a direct
follow-up to the cover letter. You can countermand this by setting a
configuration variable.
http://article.gmane.org/gmane.comp.version-control.git/109790
* "git status" won't be "git-commit --dry-run" anymore
http://thread.gmane.org/gmane.comp.version-control.git/125989/focus=125993
* "git diff -w --exit-code" will exit success if only differences it
found are whitespace changes that are stripped away from the output.
http://thread.gmane.org/gmane.comp.version-control.git/119731/focus=119751
* "git diff -w/-b" won't even produce "diff --git" header when all changes
are about whitespaces.
http://thread.gmane.org/gmane.comp.version-control.git/133256
--------------------------------------------------
[Graduated to "master"]
* fc/maint-format-patch-pathspec-dashes (2009-11-26) 2 commits.
+ format-patch: add test for parsing of "--"
+ format-patch: fix parsing of "--" on the command line
* bw/diff-color-hunk-header (2009-11-27) 2 commits
(merged to 'next' on 2009-11-29 at c446977)
+ Give the hunk comment its own color
(merged to 'next' on 2009-11-27 at 42ab131)
+ emit_line(): don't emit an empty <SET><RESET> followed by a newline
* jc/maint-am-keep (2009-11-27) 1 commit.
(merged to 'next' on 2009-11-27 at 7663874)
+ Remove dead code from "git am"
* ns/send-email-no-chain-reply-to (2009-11-29) 1 commit
+ prepare send-email for smoother change of --chain-reply-to default
(this branch is used by ns/1.7.0-send-email-no-chain-reply-to.)
This starts warning about the change to --no-chain-reply-to
in 1.7.0 for smoother transition.
* uk/maint-shortlog-encoding (2009-11-25) 1 commit.
- shortlog: respect commit encoding
* fc/send-email-envelope (2009-11-26) 2 commits.
(merged to 'next' on 2009-11-27 at 2d0257d)
+ send-email: automatic envelope sender
+ t9001: test --envelope-sender option of send-email
* jc/mailinfo-remove-brackets (2009-07-15) 1 commit.
(merged to 'next' on 2009-11-25 at 09d498f)
+ mailinfo: -b option keeps [bracketed] strings that is not a [PATCH] marker
Jim Meyering sent a patch to do a subset of what this does; to allow
keeping '[SECURITY]' when the subject says '[SECURITY][PATCH]', you need
to also teach "am" to pass the new -b option, but that is independent of
what Jim showed the need in real-world, so I think this can go in as-is.
* jn/gitweb-blame (2009-11-24) 8 commits.
(merged to 'next' on 2009-11-25 at 0a5b649)
+ gitweb.js: fix padLeftStr() and its usage
+ gitweb.js: Harden setting blamed commit info in incremental blame
+ gitweb.js: fix null object exception in initials calculation
+ gitweb: Minify gitweb.js if JSMIN is defined
+ gitweb: Create links leading to 'blame_incremental' using JavaScript
(merged to 'next' on 2009-10-11 at 73c4a83)
+ gitweb: Colorize 'blame_incremental' view during processing
+ gitweb: Incremental blame (using JavaScript)
+ gitweb: Add optional "time to generate page" info in footer
With two more changes to disable this by default to make it
suitable as "new feature with known breakages" for 1.6.6
* em/commit-claim (2009-11-04) 1 commit
(merged to 'next' on 2009-11-23 at b5df6fd)
+ commit -c/-C/--amend: reset timestamp and authorship to committer with --reset-author
* cc/bisect-doc (2009-11-08) 1 commit
(merged to 'next' on 2009-11-27 at c46d648)
+ Documentation: add "Fighting regressions with git bisect" article
* jc/pretty-lf (2009-10-04) 1 commit.
(merged to 'next' on 2009-11-27 at 73651c4)
+ Pretty-format: %[+-]x to tweak inter-item newlines
--------------------------------------------------
[New Topics]
* ap/merge-backend-opts (2008-07-18) 6 commits
- Document that merge strategies can now take their own options
- Extend merge-subtree tests to test -Xsubtree=dir.
- Make "subtree" part more orthogonal to the rest of merge-recursive.
- Teach git-pull to pass -X<option> to git-merge
- git merge -X<option>
- git-merge-file --ours, --theirs
"git pull" patch needs sq-then-eval fix but otherwise seemed good.
* mo/bin-wrappers (2009-11-29) 3 commits
- INSTALL: document a simpler way to run uninstalled builds
- run test suite without dashed git-commands in PATH
- build dashless "bin-wrappers" directory similar to installed bindir
--------------------------------------------------
[Stalled]
* je/send-email-no-subject (2009-08-05) 1 commit.
(merged to 'next' on 2009-10-11 at 1b99c56)
+ send-email: confirm on empty mail subjects
The existing tests cover the positive case (i.e. as long as the user says
"yes" to the "do you really want to send this message that lacks subject",
the message is sent) of this feature, but the feature itself needs its own
test to verify the negative case (i.e. does it correctly stop if the user
says "no"?)
* jn/rfc-pull-rebase-error-message (2009-11-12) 1 commit
- git-pull.sh --rebase: overhaul error handling when no candidates are found
I heard this needs at least retitling among other changes?
* jh/notes (2009-11-20) 10 commits
- Add more testcases to test fast-import of notes
- Rename t9301 to t9350, to make room for more fast-import tests
- fast-import: Proper notes tree manipulation using the notes API
- Refactor notes concatenation into a flexible interface for combining notes
- Notes API: Allow multiple concurrent notes trees with new struct notes_tree
- Notes API: for_each_note(): Traverse the entire notes tree with a callback
- Notes API: get_note(): Return the note annotating the given object
- Notes API: add_note(): Add note objects to the internal notes tree structure
- Notes API: init_notes(): Initialize the notes tree from the given notes ref
- Notes API: get_commit_notes() -> format_note() + remove the commit restriction
Johan waits for an Ack from Shawn on "fast-import" one.
* tr/maint-merge-ours-clarification (2009-11-15) 1 commit
(merged to 'next' on 2009-11-21 at fadaf7b)
+ rebase: refuse to rebase with -s ours
I do not think we reached a concensus for solving conflicts between "give
them rope" and "protect users from clearly meaningless combinations". The
author obviously is for the latter (and I am inclined to agree); Dscho
seems to think otherwise.
* jc/fix-tree-walk (2009-10-22) 8 commits
(merged to 'next' on 2009-10-22 at 10c0c8f)
+ Revert failed attempt since 353c5ee
+ read-tree --debug-unpack
(merged to 'next' on 2009-10-11 at 0b058e2)
+ unpack-trees.c: look ahead in the index
+ unpack-trees.c: prepare for looking ahead in the index
+ Aggressive three-way merge: fix D/F case
+ traverse_trees(): handle D/F conflict case sanely
+ more D/F conflict tests
+ tests: move convenience regexp to match object names to test-lib.sh
This has some stupid bugs and reverted from 'next' until I can fix it, but
the "temporarily" turned out to be very loooong. Sigh. We won't have a
proper fix in 1.6.6.
* sr/gfi-options (2009-09-06) 6 commits.
- fast-import: test the new option command
- fast-import: add option command
- fast-import: test the new feature command
- fast-import: add feature command
- fast-import: put marks reading in it's own function
- fast-import: put option parsing code in separate functions
Sverre is working on a re-roll to address comments from Shawn.
--------------------------------------------------
[Cooking]
* tr/http-updates (2009-11-27) 2 commits
- Add an option for using any HTTP authentication scheme, not only basic
- http: maintain curl sessions
It seems that this is still under discussion...
* jc/diff-whitespace-prepare (2009-11-28) 2 commits
- diff: flip the default diff.bwoutputonly to true
- diff: optionally allow traditional "-b/-w affects only output" semantics
(this branch uses gb/1.7.0-diff-whitespace-only-output and jc/1.7.0-diff-whitespace-only-status; is used by jc/1.7.0-diff-whitespace-prepare.)
This is to redo the two -b/-w semantic changes to prepare the migration of
existing users before 1.7.0 happens.
* sr/vcs-helper (2009-11-18) 12 commits
(merged to 'next' on 2009-11-27 at 83268ab)
+ Add Python support library for remote helpers
+ Basic build infrastructure for Python scripts
+ Allow helpers to report in "list" command that the ref is unchanged
+ Fix various memory leaks in transport-helper.c
+ Allow helper to map private ref names into normal names
+ Add support for "import" helper command
+ Allow specifying the remote helper in the url
+ Add a config option for remotes to specify a foreign vcs
+ Allow fetch to modify refs
+ Use a function to determine whether a remote is valid
+ Allow programs to not depend on remotes having urls
+ Fix memory leak in helper method for disconnect
Should be among the first to graduate after 1.6.6 final.
* jc/grep-full-tree (2009-11-24) 1 commit.
- grep: --full-tree
The interaction with this option and pathspecs need to be worked out
better. I _think_ "grep --full-tree -e pattern -- '*.h'" should find from
all the header files in the tree, for example.
* jc/checkout-merge-base (2009-11-20) 2 commits
- "rebase --onto A...B" replays history on the merge base between A and B
- "checkout A...B" switches to the merge base between A and B
I've been using the first one for a while myself but do not see many users
want this (yet); the new feature is not urgent anyway.
* tr/reset-checkout-patch (2009-11-19) 1 commit.
(merged to 'next' on 2009-11-22 at b224950)
+ {checkout,reset} -p: make patch direction configurable
I do not particularly like a configuration like this that changes the
behaviour of a command in a drastic way---it will make helping others
much harder.
* nd/sparse (2009-11-25) 20 commits.
(merged to 'next' on 2009-11-25 at 71380f5)
+ tests: rename duplicate t1009
(merged to 'next' on 2009-11-23 at f712a41)
+ sparse checkout: inhibit empty worktree
+ Add tests for sparse checkout
+ read-tree: add --no-sparse-checkout to disable sparse checkout support
+ unpack-trees(): ignore worktree check outside checkout area
+ unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index
+ unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout
+ unpack-trees.c: generalize verify_* functions
+ unpack-trees(): add CE_WT_REMOVE to remove on worktree alone
+ Introduce "sparse checkout"
+ dir.c: export excluded_1() and add_excludes_from_file_1()
+ excluded_1(): support exclude files in index
+ unpack-trees(): carry skip-worktree bit over in merged_entry()
+ Read .gitignore from index if it is skip-worktree
+ Avoid writing to buffer in add_excludes_from_file_1()
+ Teach Git to respect skip-worktree bit (writing part)
+ Teach Git to respect skip-worktree bit (reading part)
+ Introduce "skip-worktree" bit in index, teach Git to get/set this bit
+ Add test-index-version
+ update-index: refactor mark_valid() in preparation for new options
There were some test glitches reported and at least one test seems to
be broken in the sense that it is not testing what it is trying to.
Fix-up expected.
--------------------------------------------------
[For 1.7.0]
* jk/1.7.0-status (2009-11-27) 7 commits.
(merged to 'next' on 2009-11-27 at 91691ec)
+ t7508-status.sh: Add tests for status -s
+ status -s: respect the status.relativePaths option
(merged to 'next' on 2009-11-21 at 884bb56)
+ docs: note that status configuration affects only long format
(merged to 'next' on 2009-10-11 at 65c8513)
+ commit: support alternate status formats
+ status: add --porcelain output format
+ status: refactor format option parsing
+ status: refactor short-mode printing to its own function
(this branch uses jc/1.7.0-status.)
Gives the --short output format to post 1.7.0 "git commit --dry-run" that
is similar to that of post 1.7.0 "git status".
Immediately after 1.6.6 while rebuilding 'next', we may want to reorder a
few commits at the tip, as "docs: affects only long format" describes a
limitation that will disappear soon.
* jc/1.7.0-status (2009-09-05) 4 commits.
(merged to 'next' on 2009-10-11 at 9558627)
+ status: typo fix in usage
+ git status: not "commit --dry-run" anymore
+ git stat -s: short status output
+ git stat: the beginning of "status that is not a dry-run of commit"
(this branch is used by jk/1.7.0-status.)
With this, "git status" is no longer "git commit --dry-run".
* jc/1.7.0-send-email-no-thread-default (2009-08-22) 1 commit.
(merged to 'next' on 2009-10-11 at 043acdf)
+ send-email: make --no-chain-reply-to the default
As the title says.
* jc/1.7.0-push-safety (2009-02-09) 2 commits.
(merged to 'next' on 2009-10-11 at 81b8128)
+ Refuse deleting the current branch via push
+ Refuse updating the current branch in a non-bare repository via push
* jc/1.7.0-diff-whitespace-only-status (2009-08-30) 4 commits.
(merged to 'next' on 2009-10-11 at 546c74d)
+ diff.c: fix typoes in comments
+ Make test case number unique
+ diff: Rename QUIET internal option to QUICK
+ diff: change semantics of "ignore whitespace" options
(this branch is used by jc/1.7.0-diff-whitespace-prepare and jc/diff-whitespace-prepare.)
This changes exit code from "git diff --ignore-whitespace" and friends
when there is no actual output. It is a backward incompatible change,
and jc/diff-whitespace-prepare topic is meant to ease the transition.
* gb/1.7.0-diff-whitespace-only-output (2009-11-19) 1 commit
(merged to 'next' on 2009-11-21 at 3375bf4)
+ No diff -b/-w output for all-whitespace changes
(this branch is used by jc/1.7.0-diff-whitespace-prepare and jc/diff-whitespace-prepare.)
Likewise but for the output of "diff --git" headers.
* jc/1.7.0-diff-whitespace-prepare (2009-11-28) 2 commits
- diff: disable diff.bwoutputonly warning
- diff: flip the diff.bwoutputonly default to false
(this branch uses gb/1.7.0-diff-whitespace-only-output, jc/1.7.0-diff-whitespace-only-status and jc/diff-whitespace-prepare.)
And this is to actually flip the default and eventually remove the warning.
* ns/1.7.0-send-email-no-chain-reply-to (2009-08-22) 1 commit
- send-email: make --no-chain-reply-to the default
And this is to actually flip the default in 1.7.0.
--------------------------------------------------
[Reverted from 'next']
* jc/botched-maint-cygwin-count-objects (2009-11-24) 2 commits
(merged to 'next' on 2009-11-25 at 8aa62a0)
+ Revert "ST_BLOCKS_COUNTS_IN_BLKSIZE to say on-disk size is (st_blksize * st_blocks)"
(merged to 'next' on 2009-11-22 at 4ba5880)
+ ST_BLOCKS_COUNTS_IN_BLKSIZE to say on-disk size is (st_blksize * st_blocks)
This is a revert of the tip one I merged prematurely to 'next'. The real
fix from Ramsay is already in 'master'.
* ks/precompute-completion (2009-11-15) 4 commits.
(merged to 'next' on 2009-11-15 at 23cdb96)
+ Revert ks/precompute-completion series
(merged to 'next' on 2009-10-28 at cd5177f)
+ completion: ignore custom merge strategies when pre-generating
(merged to 'next' on 2009-10-22 at f46a28a)
+ bug: precomputed completion includes scripts sources
(merged to 'next' on 2009-10-14 at adf722a)
+ Speedup bash completion loading
Reverted out of 'next', to be replaced with jn/faster-completion-startup
topic.
--------------------------------------------------
[I have been too busy to purge these]
* jc/log-tz (2009-03-03) 1 commit.
- Allow --date=local --date=other-format to work as expected
Maybe some people care about this. I dunno.
* jc/1.7.0-no-commit-no-ff-2 (2009-10-22) 1 commit.
. git-merge: forbid fast-forward and up-to-date when --no-commit is given
This makes "git merge --no-commit" fail when it results in fast-forward or
up-to-date. It appears nobody wants to have this, so I dropped it.
* ne/rev-cache (2009-10-19) 7 commits.
. support for commit grafts, slight change to general mechanism
. support for path name caching in rev-cache
. full integration of rev-cache into git, completed test suite
. administrative functions for rev-cache, start of integration into git
. support for non-commit object caching in rev-cache
. basic revision cache system, no integration or features
. man page and technical discussion for rev-cache
The author indicated that there is another round coming. Does not seem to
pass the tests when merged to 'pu', so it has been ejected for now.
* pb/gitweb-no-project-list (2009-11-06) 3 commits.
. gitweb: Polish the content tags support
. gitweb: Support for no project list on gitweb front page
. gitweb: Refactor project list routines
I picked these up but didn't queue as Warthog9's comments made certain
amount of sense to me.
^ permalink raw reply [relevance 2%]
* [ANNOUNCE] Git v2.8.2
@ 2016-04-29 22:04 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2016-04-29 22:04 UTC (permalink / raw)
To: git; +Cc: Linux Kernel
The latest maintenance release Git v2.8.2 is now available at
the usual places.
The tarballs are found at:
https://www.kernel.org/pub/software/scm/git/
The following public repositories all have a copy of the 'v2.8.2'
tag and the 'maint' branch that the tag points at:
url = https://kernel.googlesource.com/pub/scm/git/git
url = git://repo.or.cz/alt-git.git
url = git://git.sourceforge.jp/gitroot/git-core/git.git
url = git://git-core.git.sourceforge.net/gitroot/git-core/git-core
url = https://github.com/gitster/git
----------------------------------------------------------------
Git v2.8.2 Release Notes
========================
Fixes since v2.8.1
------------------
* The embedded args argv-array in the child process is used to build
the command line to run pack-objects instead of using a separate
array of strings.
* Bunch of tests on "git clone" has been renumbered for better
organization.
* The tests that involve running httpd leaked the system-wide
configuration in /etc/gitconfig to the tested environment.
* "index-pack --keep=<msg>" was broken since v2.1.0 timeframe.
* "git config --get-urlmatch", unlike other variants of the "git
config --get" family, did not signal error with its exit status
when there was no matching configuration.
* The "--local-env-vars" and "--resolve-git-dir" options of "git
rev-parse" failed to work outside a repository when the command's
option parsing was rewritten in 1.8.5 era.
* Fetching of history by naming a commit object name directly didn't
work across remote-curl transport.
* A small memory leak in an error codepath has been plugged in xdiff
code.
* strbuf_getwholeline() did not NUL-terminate the buffer on certain
corner cases in its error codepath.
* The startup_info data, which records if we are working inside a
repository (among other things), are now uniformly available to Git
subcommand implementations, and Git avoids attempting to touch
references when we are not in a repository.
* "git mergetool" did not work well with conflicts that both sides
deleted.
* "git send-email" had trouble parsing alias file in mailrc format
when lines in it had trailing whitespaces on them.
* When "git merge --squash" stopped due to conflict, the concluding
"git commit" failed to read in the SQUASH_MSG that shows the log
messages from all the squashed commits.
* "git merge FETCH_HEAD" dereferenced NULL pointer when merging
nothing into an unborn history (which is arguably unusual usage,
which perhaps was the reason why nobody noticed it).
* Build updates for MSVC.
* "git diff -M" used to work better when two originally identical
files A and B got renamed to X/A and X/B by pairing A to X/A and B
to X/B, but this was broken in the 2.0 timeframe.
* "git send-pack --all <there>" was broken when its command line
option parsing was written in the 2.6 timeframe.
* When running "git blame $path" with unnormalized data in the index
for the path, the data in the working tree was blamed, even though
"git add" would not have changed what is already in the index, due
to "safe crlf" that disables the line-end conversion. It has been
corrected.
Also contains minor documentation updates and code clean-ups.
----------------------------------------------------------------
Changes since v2.8.1 are as follows:
Alexander Kuleshov (1):
submodule-config: use hashmap_iter_first()
Christian Couder (1):
Documentation: talk about pager in api-trace.txt
David Aguilar (2):
mergetool: support delete/delete conflicts
mergetool: honor tempfile configuration when resolving delete conflicts
Elia Pinto (1):
api-trace.txt: fix typo
Gabriel Souza Franco (2):
fetch-pack: fix object_id of exact sha1
fetch-pack: update the documentation for "<refs>..." arguments
Jeff King (12):
t1515: add tests for rev-parse out-of-repo helpers
rev-parse: let some options run outside repository
strbuf_getwholeline: NUL-terminate getdelim buffer on error
setup: make startup_info available everywhere
setup: set startup_info->have_repository more reliably
remote: don't resolve HEAD in non-repository
mailmap: do not resolve blobs in a non-repository
grep: turn off gitlink detection for --no-index
use setup_git_directory() in test-* programs
send-email: ignore trailing whitespace in mailrc alias file
credential-cache--daemon: clarify "exit" action semantics
t/lib-httpd: pass through GIT_CONFIG_NOSYSTEM env
Johannes Sixt (1):
Windows: shorten code by re-using convert_slashes()
John Keeping (3):
config: fail if --get-urlmatch finds no value
Documentation/git-config: use bulleted list for exit codes
Documentation/git-config: fix --get-all description
Junio C Hamano (7):
index-pack: correct --keep[=<msg>]
index-pack: add a helper function to derive .idx/.keep filename
merge: fix NULL pointer dereference when merging nothing into void
Makefile: fix misdirected redirections
Start preparing for 2.8.2
Prepare for 2.8.2
Git 2.8.2
Matthieu Moy (2):
lockfile: mark strings for translation
lockfile: improve error message when lockfile exists
Michael Procter (1):
upload-pack: use argv_array for pack_objects
Nguyễn Thái Ngọc Duy (2):
git-apply.txt: remove a space
git-apply.txt: mention the behavior inside a subdir
Ori Avtalion (1):
Documentation: git diff --check detects conflict markers
Pranit Bauva (2):
t/t7502 : drop duplicate test
api-parse-options.txt: document OPT_CMDMODE()
Ramsay Jones (2):
xdiff/xprepare: use the XDF_DIFF_ALG() macro to access flag bits
xdiff/xprepare: fix a memory leak
SZEDER Gábor (1):
diffcore: fix iteration order of identical files during rename detection
Saurav Sachidanand (1):
dir: store EXC_FLAG_* values in unsigned integers
Stanislav Kolotinskiy (1):
git-send-pack: fix --all option when used with directory
Stefan Beller (1):
clone tests: rename t57* => t56*
Sven Strickroth (3):
commit: do not lose SQUASH_MSG contents
MSVC: vsnprintf in Visual Studio 2015 doesn't need SNPRINTF_SIZE_CORR any more
MSVC: use shipped headers instead of fallback definitions
Torsten Bögershausen (1):
correct blame for files commited with CRLF
Vasco Almeida (4):
l10n: fr: fix transcation of "dir"
l10n: fr: fix wrongly translated option name
l10n: fr: change "id de clé" to match "id-clé"
l10n: fr: don't translate "merge" as a parameter
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (Jan 2010, #06; Wed, 20)
@ 2010-01-21 0:52 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2010-01-21 0:52 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
marked with '.' do not appear in any of the integration branches, but I am
still holding onto them.
--------------------------------------------------
[Graduated to "master"]
* sr/gfi-options (2009-12-04) 7 commits
(merged to 'next' on 2010-01-10 at 8b305fb)
+ fast-import: add (non-)relative-marks feature
+ fast-import: allow for multiple --import-marks= arguments
+ fast-import: test the new option command
+ fast-import: add option command
+ fast-import: add feature command
+ fast-import: put marks reading in its own function
+ fast-import: put option parsing code in separate functions
* tc/smart-http-restrict (2010-01-14) 5 commits
(merged to 'next' on 2010-01-16 at 71fc84c)
+ Test t5560: Fix test when run with dash
(merged to 'next' on 2010-01-06 at 82736cb)
+ Smart-http tests: Test http-backend without curl or a webserver
+ Smart-http tests: Break test t5560-http-backend into pieces
+ Smart-http tests: Improve coverage in test t5560
+ Smart-http: check if repository is OK to export before serving it
* tc/clone-v-progress (2009-12-26) 4 commits
(merged to 'next' on 2010-01-10 at ec2bfd7)
+ clone: use --progress to force progress reporting
+ clone: set transport->verbose when -v/--verbose is used
+ git-clone.txt: reword description of progress behaviour
+ check stderr with isatty() instead of stdout when deciding to show progress
* jk/run-command-use-shell (2010-01-01) 8 commits
(merged to 'next' on 2010-01-10 at 7479e2a)
+ t4030, t4031: work around bogus MSYS bash path conversion
+ diff: run external diff helper with shell
+ textconv: use shell to run helper
+ editor: use run_command's shell feature
+ run-command: optimize out useless shell calls
+ run-command: convert simple callsites to use_shell
+ t0021: use $SHELL_PATH for the filter script
+ run-command: add "use shell" option
* jn/makefile (2010-01-06) 4 commits
(merged to 'next' on 2010-01-10 at f5a5d42)
+ Makefile: consolidate .FORCE-* targets
+ Makefile: learn to generate listings for targets requiring special flags
+ Makefile: use target-specific variable to pass flags to cc
+ Makefile: regenerate assembler listings when asked
* jc/maint-1.6.1-checkout-m-custom-merge (2010-01-06) 1 commit
(merged to 'next' on 2010-01-10 at df14116)
+ checkout -m path: fix recreating conflicts
* jh/commit-status (2010-01-13) 2 commits
(merged to 'next' on 2010-01-13 at 0905d59)
+ t7502: test commit.status, --status and --no-status
+ commit: support commit.status, --status, and --no-status
* tc/test-locate-httpd (2010-01-02) 1 commit
(merged to 'next' on 2010-01-06 at 9d913e5)
+ t/lib-http.sh: Restructure finding of default httpd location
* js/windows (2010-01-15) 7 commits
+ Do not use date.c:tm_to_time_t() from compat/mingw.c
+ MSVC: Windows-native implementation for subset of Pthreads API
+ MSVC: Fix an "incompatible pointer types" compiler warning
+ Windows: avoid the "dup dance" when spawning a child process
+ Windows: simplify the pipe(2) implementation
+ Windows: boost startup by avoiding a static dependency on shell32.dll
+ Windows: disable Python
* dp/maint-1.6.5-fast-import-non-commit-tag (2010-01-14) 1 commit
(merged to 'next' on 2010-01-16 at f95ea8e)
+ fast-import: tag may point to any object type
* nd/include-termios-for-osol (2010-01-11) 1 commit
(merged to 'next' on 2010-01-16 at 3160c76)
+ Add missing #include to support TIOCGWINSZ on Solaris
* pc/uninteresting-submodule-disappear-upon-switch-branches (2010-01-11) 1 commit
(merged to 'next' on 2010-01-16 at b06ca1a)
+ Remove empty directories when checking out a commit with fewer submodules
* jc/rerere (2009-12-04) 1 commit
(merged to 'next' on 2010-01-10 at e295b7f)
+ Teach --[no-]rerere-autoupdate option to merge, revert and friends
* rr/core-tutorial (2010-01-16) 1 commit
(merged to 'next' on 2010-01-16 at d9dd8bd)
+ Documentation: Update git core tutorial clarifying reference to scripts
* il/push-set-upstream (2010-01-16) 1 commit
(merged to 'next' on 2010-01-16 at e3a7a60)
+ Add push --set-upstream
* jk/warn-author-committer-after-commit (2010-01-17) 6 commits
(merged to 'next' on 2010-01-17 at c2bb7fd)
+ user_ident_sufficiently_given(): refactor the logic to be usable from elsewhere
+ commit.c::print_summary: do not release the format string too early
(merged to 'next' on 2010-01-16 at f22c077)
+ commit: allow suppression of implicit identity advice
+ commit: show interesting ident information in summary
+ strbuf: add strbuf_addbuf_percentquote
+ strbuf_expand: convert "%%" to "%"
* jc/ident (2010-01-17) 5 commits
(merged to 'next' on 2010-01-19 at 9fba1c0)
+ ident.c: replace fprintf with fputs to suppress compiler warning
(merged to 'next' on 2010-01-17 at 625670d)
+ user_ident_sufficiently_given(): refactor the logic to be usable from elsewhere
+ ident.c: treat $EMAIL as giving user.email identity explicitly
(merged to 'next' on 2010-01-10 at f1f9ded)
+ ident.c: check explicit identity for name and email separately
+ ident.c: remove unused variables
* tr/http-push-ref-status (2010-01-08) 6 commits
(merged to 'next' on 2010-01-16 at 7e872ac)
+ transport-helper.c::push_refs(): emit "no refs" error message
+ transport-helper.c::push_refs(): ignore helper-reported status if ref is not to be pushed
+ transport.c::transport_push(): make ref status affect return value
+ refactor ref status logic for pushing
+ t5541-http-push.sh: add test for unmatched, non-fast-forwarded refs
+ t5541-http-push.sh: add tests for non-fast-forward pushes
* bk/fix-relative-gitdir-file (2010-01-08) 2 commits
(merged to 'next' on 2010-01-16 at cc4ae57)
+ Handle relative paths in submodule .git files
+ Test update-index for a gitlink to a .git file
* sd/cd-p-show-toplevel (2010-01-12) 2 commits
(merged to 'next' on 2010-01-16 at 57d6d31)
+ Use $(git rev-parse --show-toplevel) in cd_to_toplevel().
+ Add 'git rev-parse --show-toplevel' option.
* jc/symbol-static (2010-01-18) 17 commits
(merged to 'next' on 2010-01-18 at d063267)
+ Replace parse_blob() with an explanatory comment
+ symlinks.c: remove unused functions
+ object.c: remove unused functions
+ strbuf.c: remove unused function
+ sha1_file.c: remove unused function
+ mailmap.c: remove unused function
(merged to 'next' on 2010-01-17 at d7346b1)
+ utf8.c: mark file-local function static
+ submodule.c: mark file-local function static
+ quote.c: mark file-local function static
+ remote-curl.c: mark file-local function static
+ read-cache.c: mark file-local functions static
+ parse-options.c: mark file-local function static
+ entry.c: mark file-local function static
+ http.c: mark file-local functions static
+ pretty.c: mark file-local function static
+ builtin-rev-list.c: mark file-local function static
+ bisect.c: mark file-local function static
* mh/rebase-fixup (2010-01-14) 23 commits
(merged to 'next' on 2010-01-16 at 7ccb228)
+ rebase -i: Retain user-edited commit messages after squash/fixup conflicts
+ t3404: Set up more of the test repo in the "setup" step
+ rebase -i: For fixup commands without squashes, do not start editor
+ rebase -i: Change function make_squash_message into update_squash_message
+ rebase -i: Extract function do_with_author
+ rebase -i: Handle the author script all in one place in do_next
+ rebase -i: Extract a function "commit_message"
+ rebase -i: Simplify commit counting for generated commit messages
+ rebase -i: Improve consistency of commit count in generated commit messages
+ t3404: Test the commit count in commit messages generated by "rebase -i"
+ rebase -i: Introduce a constant AMEND
+ rebase -i: Introduce a constant AUTHOR_SCRIPT
+ rebase -i: Document how temporary files are used
+ rebase -i: Use symbolic constant $MSG consistently
+ rebase -i: Use "test -n" instead of "test ! -z"
+ rebase -i: Inline expression
+ rebase -i: Remove dead code
+ rebase -i: Make the condition for an "if" more transparent
(merged to 'next' on 2010-01-12 at e84eab0)
+ rebase-i: Ignore comments and blank lines in peek_next_command
+ lib-rebase: Allow comments and blank lines to be added to the rebase script
+ lib-rebase: Provide clearer debugging info about what the editor did
+ Add a command "fixup" to rebase --interactive
+ t3404: Use test_commit to set up test repository
(this branch is used by ns/rebase-auto-squash.)
* ns/rebase-auto-squash (2009-12-08) 1 commit
(merged to 'next' on 2010-01-06 at da4e2f5)
+ rebase -i --autosquash: auto-squash commits
(this branch uses mh/rebase-fixup.)
* da/difftool (2010-01-15) 10 commits
(merged to 'next' on 2010-01-16 at 609f0da)
+ difftool: Update copyright notices to list each year separately
+ difftool: Use eval to expand '--extcmd' expressions
+ difftool: Add '-x' and as an alias for '--extcmd'
+ t7800-difftool.sh: Simplify the --extcmd test
(merged to 'next' on 2010-01-10 at 749c870)
+ git-diff.txt: Link to git-difftool
+ difftool: Allow specifying unconfigured commands with --extcmd
+ difftool--helper: Remove use of the GIT_MERGE_TOOL variable
+ difftool--helper: Update copyright and remove distracting comments
(merged to 'next' on 2010-01-06 at e957395)
+ git-difftool: Add '--gui' for selecting a GUI tool
+ t7800-difftool: Set a bogus tool for use by tests
* mm/conflict-advice (2010-01-12) 1 commit
(merged to 'next' on 2010-01-16 at b83be11)
+ Be more user-friendly when refusing to do something because of conflict.
* jc/maint-strbuf-add-fix-doubling (2010-01-12) 1 commit
(merged to 'next' on 2010-01-16 at 5959eee)
+ strbuf_addbuf(): allow passing the same buf to dst and src
* jc/maint-1.6.4-grep-lookahead (2010-01-10) 1 commit
(merged to 'next' on 2010-01-13 at 20f8f4b)
+ grep: optimize built-in grep by skipping lines that do not hit
(this branch is used by jc/grep-lookahead and jc/maint-grep-lookahead.)
* jc/maint-grep-lookahead (2010-01-12) 0 commits
(this branch uses jc/maint-1.6.4-grep-lookahead; is used by jc/grep-lookahead.)
* jc/grep-lookahead (2010-01-15) 4 commits
(merged to 'next' on 2010-01-17 at 4a5be2d)
+ grep --no-index: allow use of "git grep" outside a git repository
+ grep: prepare to run outside of a work tree
(merged to 'next' on 2010-01-13 at 20f8f4b)
+ grep: rip out pessimization to use fixmatch()
+ grep: rip out support for external grep
(this branch uses jc/maint-1.6.4-grep-lookahead and jc/maint-grep-lookahead.)
* jc/ls-files-ignored-pathspec (2010-01-08) 4 commits
(merged to 'next' on 2010-01-16 at d36016a)
+ ls-files: fix overeager pathspec optimization
+ read_directory(): further split treat_path()
+ read_directory_recursive(): refactor handling of a single path into a separate function
+ t3001: test ls-files -o ignored/dir
* js/exec-error-report (2010-01-12) 4 commits
(merged to 'next' on 2010-01-16 at 0e28d02)
+ Improve error message when a transport helper was not found
+ start_command: detect execvp failures early
+ run-command: move wait_or_whine earlier
+ start_command: report child process setup errors to the parent's stderr
* jc/cache-unmerge (2009-12-25) 9 commits
(merged to 'next' on 2010-01-13 at 2290c44)
+ rerere forget path: forget recorded resolution
+ rerere: refactor rerere logic to make it independent from I/O
+ rerere: remove silly 1024-byte line limit
+ resolve-undo: teach "update-index --unresolve" to use resolve-undo info
+ resolve-undo: "checkout -m path" uses resolve-undo information
+ resolve-undo: allow plumbing to clear the information
+ resolve-undo: basic tests
+ resolve-undo: record resolved conflicts in a new index extension section
+ builtin-merge.c: use standard active_cache macros
(this branch is used by jc/conflict-marker-size.)
--------------------------------------------------
[New Topics]
* jc/conflict-marker-size (2010-01-16) 8 commits
(merged to 'next' on 2010-01-18 at f1f6023)
+ rerere: honor conflict-marker-size attribute
+ rerere: prepare for customizable conflict marker length
+ conflict-marker-size: new attribute
+ rerere: use ll_merge() instead of using xdl_merge()
+ merge-tree: use ll_merge() not xdl_merge()
+ xdl_merge(): allow passing down marker_size in xmparam_t
+ xdl_merge(): introduce xmparam_t for merge specific parameters
+ git_attr(): fix function signature
* ag/maint-apply-too-large-p (2010-01-17) 1 commit
(merged to 'next' on 2010-01-18 at 8bd106a)
+ builtin-apply.c: Skip filenames without enough components
* jc/grep-author-all-match-implicit (2010-01-17) 1 commit
- "log --author=me --grep=it" should find intersection, not union
* ag/patch-header-verify (2010-01-18) 1 commit
(merged to 'next' on 2010-01-18 at 2cd0ddc)
+ builtin-apply.c: fix the --- and +++ header filename consistency check
* il/branch-set-upstream (2010-01-18) 2 commits
(merged to 'next' on 2010-01-18 at b9b0993)
+ branch: warn and refuse to set a branch as a tracking branch of itself.
+ Add branch --set-upstream
* il/remote-updates (2010-01-18) 1 commit
(merged to 'next' on 2010-01-18 at 5c3e805)
+ Add git remote set-url
* bw/cvsimport (2010-01-19) 3 commits
(merged to 'next' on 2010-01-19 at 63f4c8d)
+ cvsimport: standarize system() calls to external git tools
+ cvsimport: standarize open() calls to external git tools
+ cvsimport: modernize callouts to git subcommands
* jc/checkout-merge-base (2010-01-19) 1 commit
(merged to 'next' on 2010-01-19 at 3665110)
+ Fix "checkout A..." synonym for "checkout A...HEAD" on Windows
* jc/maint-refresh-index-is-optional-for-status (2010-01-19) 1 commit
- status: don't require the repository to be writable
* il/rev-glob (2010-01-20) 2 commits
- rev-parse --branches/--tags/--remotes=pattern
- rev-parse --glob
This is a re-rolled "--namespace=" one.
--------------------------------------------------
[Will merge to 'master' after a bit more cooking in 'next']
* nd/status-partial-refresh (2010-01-17) 2 commits
(merged to 'next' on 2010-01-19 at 64f0c0b)
+ rm: only refresh entries that we may touch
(merged to 'next' on 2010-01-16 at f77bc8f)
+ status: only touch path we may need to check
* jl/submodule-diff (2010-01-18) 4 commits
(merged to 'next' on 2010-01-20 at 95cb513)
+ Performance optimization for detection of modified submodules
(merged to 'next' on 2010-01-17 at 525075b)
+ git status: Show uncommitted submodule changes too when enabled
(merged to 'next' on 2010-01-16 at 0a99e3c)
+ Teach diff that modified submodule directory is dirty
+ Show submodules as modified when they contain a dirty work tree
* jc/fix-tree-walk (2009-09-14) 7 commits
(merged to 'next' on 2010-01-13 at 1c01b87)
+ read-tree --debug-unpack
+ unpack-trees.c: look ahead in the index
+ unpack-trees.c: prepare for looking ahead in the index
+ Aggressive three-way merge: fix D/F case
+ traverse_trees(): handle D/F conflict case sanely
+ more D/F conflict tests
+ tests: move convenience regexp to match object names to test-lib.sh
Resurrected from "Ejected" category. This is fix for a tricky codepath
and testing and improving before it hits 'master' is greatly appreciated.
(I have been using this in my private build for some time).
* ap/merge-backend-opts (2008-07-18) 7 commits
(merged to 'next' on 2010-01-18 at cb1f6b7)
+ Document that merge strategies can now take their own options
+ Extend merge-subtree tests to test -Xsubtree=dir.
+ Make "subtree" part more orthogonal to the rest of merge-recursive.
+ pull: Fix parsing of -X<option>
+ Teach git-pull to pass -X<option> to git-merge
+ git merge -X<option>
+ git-merge-file --ours, --theirs
--------------------------------------------------
[Cooking]
* js/refer-upstream (2010-01-19) 3 commits
(merged to 'next' on 2010-01-20 at 5a5547a)
+ Teach @{upstream} syntax to strbuf_branchanme()
+ t1506: more test for @{upstream} syntax
+ Introduce <branch>@{upstream} notation
Updated to teach the new syntax to commands like "checkout" and "merge"
that want to behave better when they know what were given was a branch
name, not a random SHA-1.
* jh/notes (2010-01-17) 23 commits
- builtin-gc: Teach the new --notes option to garbage-collect notes
- Notes API: gc_notes(): Prune notes that belong to non-existing objects
- t3305: Verify that removing notes triggers automatic fanout consolidation
- builtin-notes: Teach -d option for deleting existing notes
- Teach builtin-notes to remove empty notes
- Teach notes code to properly preserve non-notes in the notes tree
- t3305: Verify that adding many notes with git-notes triggers increased fanout
- t3301: Verify successful annotation of non-commits
- Builtin-ify git-notes
- Refactor notes concatenation into a flexible interface for combining notes
- Notes API: Allow multiple concurrent notes trees with new struct notes_tree
- Notes API: write_notes_tree(): Store the notes tree in the database
- Notes API: for_each_note(): Traverse the entire notes tree with a callback
- Notes API: get_note(): Return the note annotating the given object
- Notes API: remove_note(): Remove note objects from the notes tree structure
- Notes API: add_note(): Add note objects to the internal notes tree structure
- Notes API: init_notes(): Initialize the notes tree from the given notes ref
- Add tests for checking correct handling of $GIT_NOTES_REF and core.notesRef
- Notes API: get_commit_notes() -> format_note() + remove the commit restriction
- Minor non-functional fixes to notes.c
(merged to 'next' on 2010-01-02 at ae42130)
+ Add more testcases to test fast-import of notes
+ Rename t9301 to t9350, to make room for more fast-import tests
+ fast-import: Proper notes tree manipulation
Updated with a re-roll.
* jh/gitweb-cached (2010-01-13) 9 commits
- gitweb: File based caching layer (from git.kernel.org)
- gitweb: Convert output to using indirect file handle
- gitweb: cleanup error message produced by undefined $site_header
- gitweb: add a get function to compliment print_sort_th
- gitweb: add a get function to compliment print_local_time
- gitweb: Makefile improvements
- gitweb: Add option to force version match
- gitweb: change die_error to take "extra" argument for extended die information
- gitweb: Load checking
Replaced with a re-roll. Update to t9500 is probably needed.
* jc/branch-d (2009-12-29) 1 commit
(merged to 'next' on 2010-01-10 at 61a14b7)
+ branch -d: base the "already-merged" safety on the branch it merges with
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (topics)
@ 2008-07-16 3:33 2% ` Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2008-07-16 3:33 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed
with '-' are only in 'pu' while commits prefixed with '+' are
in 'next'.
The topics list the commits in reverse chronological order. The topics
meant to be merged to the maintenance series have "maint-" in their names.
It so happens that the topics clearly separated between the ones that are
obviously ready for 1.6.0 and the others that aren't yet as of tonight.
It seems that it is a good time to draw that line and tag -rc0 tomorrow,
after merging the remaining topics in 'next'.
----------------------------------------------------------------
[New Topics]
I could apply these directly to master, but I am just playing it safe.
* sp/maint-index-pack (Tue Jul 15 04:45:34 2008 +0000) 4 commits
+ index-pack: Honor core.deltaBaseCacheLimit when resolving deltas
+ index-pack: Track the object_entry that creates each base_data
+ index-pack: Chain the struct base_data on the stack for traversal
+ index-pack: Refactor base arguments of resolve_delta into a struct
* rs/rebase-checkout-not-so-quiet (Mon Jul 14 14:05:35 2008 -0700) 1 commit
+ git-rebase: report checkout failure
* ag/blame (Wed Jul 16 02:00:58 2008 +0400) 2 commits
+ Do not try to detect move/copy for entries below threshold.
+ Avoid rescanning unchanged entries in search for copies.
This gives a drastic performance improvement to "git-blame -C -C" with
quite straightforward and obvious code change.
* rs/archive (Mon Jul 14 21:22:05 2008 +0200) 6 commits
+ archive: remove extra arguments parsing code
+ archive: unify file attribute handling
+ archive: centralize archive entry writing
+ archive: add baselen member to struct archiver_args
+ add context pointer to read_tree_recursive()
+ archive: remove args member from struct archiver
----------------------------------------------------------------
[Will merge to master soon]
* sb/dashless (Sun Jul 13 15:36:15 2008 +0200) 3 commits
+ Make usage strings dash-less
+ t/: Use "test_must_fail git" instead of "! git"
+ t/test-lib.sh: exit with small negagive int is ok with
test_must_fail
* mv/dashless (Fri Jul 11 02:12:06 2008 +0200) 4 commits
+ make remove-dashes: apply to scripts and programs as well, not
just to builtins
+ git-bisect: use dash-less form on git bisect log
+ t1007-hash-object.sh: use quotes for the test description
+ t0001-init.sh: change confusing directory name
* ls/mailinfo (Sun Jul 13 20:30:12 2008 +0200) 3 commits
+ git-mailinfo: use strbuf's instead of fixed buffers
+ Add some useful functions for strbuf manipulation.
+ Make some strbuf_*() struct strbuf arguments const.
----------------------------------------------------------------
[Graduated to "master"]
* sp/maint-bash-completion-optim (Mon Jul 14 00:22:03 2008 +0000) 1 commit
+ bash completion: Append space after file names have been completed
Early parts were already merged to 'master' and need to be merged down to
maint as well, as this is about a "performance bug" that has been with us
almost forever.
* ag/rewrite_one (Sat Jul 12 22:00:57 2008 +0400) 1 commit
+ Fix quadratic performance in rewrite_one.
* sp/win (Fri Jul 11 18:52:42 2008 +0200) 3 commits
+ We need to check for msys as well as Windows in add--interactive.
+ Convert CR/LF to LF in tag signatures
+ Fixed text file auto-detection: treat EOF character 032 at the end
of file as printable
* js/merge-rr (Sat Jul 12 15:56:19 2008 +0100) 2 commits
+ Move MERGE_RR from .git/rr-cache/ into .git/
+ builtin-rerere: more carefully find conflict markers
* sb/rerere-lib (Wed Jul 9 14:58:57 2008 +0200) 2 commits
+ rerere: Separate libgit and builtin functions
+ builtin-rerere: more carefully find conflict markers
* js/maint-pretty-mailmap (Sat Jul 12 00:28:18 2008 +0100) 1 commit
+ Add pretty format %aN which gives the author name, respecting
.mailmap
* js/more-win (Sun Jul 13 22:31:23 2008 +0200) 3 commits
+ help (Windows): Display HTML in default browser using Windows'
shell API
+ help.c: Add support for htmldir relative to git_exec_path()
+ Move code interpreting path relative to exec-dir to new function
system_path()
* jc/rebase-orig-head (Tue Jul 8 00:12:22 2008 -0400) 2 commits
+ Documentation: mention ORIG_HEAD in am, merge, and rebase
+ Teach "am" and "rebase" to mark the original position with
ORIG_HEAD
* jc/branch-merged (Tue Jul 8 17:55:47 2008 -0700) 3 commits
+ branch --merged/--no-merged: allow specifying arbitrary commit
+ branch --contains: default to HEAD
+ parse-options: add PARSE_OPT_LASTARG_DEFAULT flag
* om/rerere-careful (Mon Jul 7 14:42:48 2008 +0200) 1 commit
+ builtin-rerere: more carefully find conflict markers
* ls/maint-mailinfo-patch-label (Thu Jul 10 23:41:33 2008 +0200) 1 commit
+ git-mailinfo: Fix getting the subject from the in-body [PATCH]
line
* mv/merge-in-c (Mon Jul 14 00:09:41 2008 -0700) 20 commits
+ reduce_heads(): protect from duplicate input
+ reduce_heads(): thinkofix
+ Add a new test for git-merge-resolve
+ t6021: add a new test for git-merge-resolve
+ Teach merge.log to "git-merge" again
+ Build in merge
+ Fix t7601-merge-pull-config.sh on AIX
+ git-commit-tree: make it usable from other builtins
+ Add new test case to ensure git-merge prepends the custom merge
message
+ Add new test case to ensure git-merge reduces octopus parents when
possible
+ Introduce reduce_heads()
+ Introduce get_merge_bases_many()
+ Add new test to ensure git-merge handles more than 25 refs.
+ Introduce get_octopus_merge_bases() in commit.c
+ git-fmt-merge-msg: make it usable from other builtins
+ Move read_cache_unmerged() to read-cache.c
+ Add new test to ensure git-merge handles pull.twohead and
pull.octopus
+ Move parse-options's skip_prefix() to git-compat-util.h
+ Move commit_list_count() to commit.c
+ Move split_cmdline() to alias.c
----------------------------------------------------------------
[On Hold]
* rs/imap (Wed Jul 9 22:29:02 2008 +0100) 5 commits
- Documentation: Improve documentation for git-imap-send(1)
- imap-send.c: more style fixes
- imap-send.c: style fixes
- git-imap-send: Support SSL
- git-imap-send: Allow the program to be run from subdirectories of
a git tree
Some people seem to prefer having this feature available also with gnutls.
If such a patch materializes soon, that would be good, but otherwise I'll
merge this as-is to 'next'. Such an enhancement can be done in-tree on
top of this series.
* xx/merge-in-c-into-next (Wed Jul 9 13:51:46 2008 -0700) 4 commits
+ Teach git-merge -X<option> again.
+ Merge branch 'jc/merge-theirs' into xx/merge-in-c-into-next
+ builtin-merge.c: use parse_options_step() "incremental parsing"
machinery
+ Merge branch 'ph/parseopt-step-blame' into xx/merge-in-c-into-next
This needs to be merged to master iff/when merge-theirs gets merged,
but I do not think this series is widely supported, so both are on hold.
* jc/merge-theirs (Mon Jun 30 22:18:57 2008 -0700) 5 commits
+ Make "subtree" part more orthogonal to the rest of merge-
recursive.
+ Teach git-pull to pass -X<option> to git-merge
+ Teach git-merge to pass -X<option> to the backend strategy module
+ git-merge-recursive-{ours,theirs}
+ git-merge-file --ours, --theirs
Punting a merge by discarding your own work in conflicting parts but still
salvaging the parts that are cleanly automerged. It is likely that this
will result in nonsense mishmash, but somehow often people want this, so
here they are. The interface to the backends is updated so that you can
say "git merge -Xours -Xsubtree=foo/bar/baz -s recursive other" now.
* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit
+ merge: remove deprecated summary and diffstat options and config
variables
This was previously in "will be in master soon" category, but it turns out
that the synonyms to the ones this one deletes are fairly new invention
that happend in 1.5.6 timeframe, and we cannot do this just yet. Perhaps
in 1.7.0.
* jc/dashless (Thu Jun 26 16:43:34 2008 -0700) 2 commits
+ Revert "Make clients ask for "git program" over ssh and local
transport"
+ Make clients ask for "git program" over ssh and local transport
This is the "botched" one. Will be resurrected during 1.7.0 or 1.8.0
timeframe.
* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
- diff: enable "too large a rename" warning when -M/-C is explicitly
asked for
This would be the right thing to do for command line use, but gitk will be
hit due to tcl/tk's limitation, so I am holding this back for now.
----------------------------------------------------------------
[Stalled/Needs more work]
* gi/cherry-cache (Sat Jul 12 20:14:51 2008 -0700) 1 commit
. cherry: cache patch-ids to avoid repeating work
* lw/gitweb (Fri Jul 11 03:11:48 2008 +0200) 3 commits
. gitweb: use new Git::Repo API, and add optional caching
. Add new Git::Repo API
. gitweb: add test suite with Test::WWW::Mechanize::CGI
* sb/sequencer (Tue Jul 1 04:38:34 2008 +0200) 4 commits
. Migrate git-am to use git-sequencer
. Add git-sequencer test suite (t3350)
. Add git-sequencer prototype documentation
. Add git-sequencer shell prototype
* jc/grafts (Wed Jul 2 17:14:12 2008 -0700) 1 commit
- [BROKEN wrt shallow clones] Ignore graft during object transfer
Cloning or fetching from a repository from grafts did not send objects
that are hidden by grafts, but the commits in the resulting repository do
need these to pass fsck. This fixes object transfer to ignore grafts.
Another fix is needed to git-prune so that it ignores grafts but treats
commits that are mentioned in grafts as reachable.
* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
- blame: show "previous" information in --porcelain/--incremental
format
- git-blame: refactor code to emit "porcelain format" output
This is for peeling to see what's behind the blamed commit, which may or
may not help applications like gitweb.
^ permalink raw reply [relevance 2%]
* [PATCH 0/6] per branch options for git-merge
@ 2007-09-23 22:51 2% Lars Hjemli
0 siblings, 1 reply; 200+ results
From: Lars Hjemli @ 2007-09-23 22:51 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
This patch-series implements support for per branch configuration of
git-merge, using entries (branch.<name>.mergeoptions) in .git/config.
Since this makes it possible to specify --no-commit and --squash as
default options for git-merge, the new options --commit and --no-squash
are added to enable users to override such defaults.
There is also a new option, --no-ff, which can be used to force git-merge
to create a merge commit even when the merge was a fast-forward (and a
matching --ff option to allow overrides).
Shortlog:
Add test-script for git-merge porcelain
git-merge: fix faulty SQUASH_MSG
git-merge: refactor option parsing
git-merge: add support for branch.<name>.mergeoptions
git-merge: add support for --commit and --no-squash
git-merge: add --ff and --no-ff options
Diffstat:
Documentation/config.txt | 6 +
Documentation/git-merge.txt | 4 +
Documentation/merge-options.txt | 17 ++
git-merge.sh | 65 +++++-
t/t7600-merge.sh | 440 +++++++++++++++++++++++++++++++++++++++
5 files changed, 521 insertions(+), 11 deletions(-)
^ permalink raw reply [relevance 2%]
* Re: [PATCH] git-svn: merge: fix rooturl/branchurl match check
2014-10-15 12:39 2% [PATCH] git-svn: merge: fix rooturl/branchurl match check Tommaso Colombo
@ 2014-10-20 6:24 2% ` Eric Wong
0 siblings, 0 replies; 200+ results
From: Eric Wong @ 2014-10-20 6:24 UTC (permalink / raw)
To: Tommaso Colombo; +Cc: git, Tommaso Colombo
Tommaso Colombo <tommaso.colombo@outlook.com> wrote:
> When populating svn:mergeinfo, git-svn merge checks if the merge parent
> of the merged branch is under the same root as the git-svn repository.
> This was implemented comparing $gs->repos_root with the return value of
> of cmt_metadata for the merge parent. However, the first may contain a
> username, whereas the second does not. In this case the comparison
> fails.
>
> Remove the username from $gs->repos_root before performing the
> comparison.
Thanks. Commit makes sense, but one of the test cases fails for me,
can you check it out?
$ make && make t9161-git-svn-mergeinfo-push.sh -C t GIT_TEST_OPTS='-i -v'
<snip successes>
ok 11 - reintegration merge
expecting success:
mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb4)
test "$mergeinfo" = "/branches/svnb1:2-4,7-9,13-18
/branches/svnb2:3,8,16-17
/branches/svnb3:4,9
/branches/svnb5:6,11"
not ok 12 - check reintegration mergeinfo
#
# mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb4)
# test "$mergeinfo" = "/branches/svnb1:2-4,7-9,13-18
# /branches/svnb2:3,8,16-17
# /branches/svnb3:4,9
# /branches/svnb5:6,11"
#
make: *** [t9161-git-svn-mergeinfo-push.sh] Error 1
make: Leaving directory `/home/ew/git-core/t'
You'll also need to sign-off (see Documentation/SubmittingPatches)
It is required (project policy, not mine)
> @@ -729,7 +730,7 @@ sub populate_merge_info {
> }
> my $branchpath = $1;
>
> - my $ra = Git::SVN::Ra->new($branchurl);
> + my $ra = Git::SVN::Ra->new(add_path_to_url($gs->repos_root, $branchpath));
Also, please keep long lines wrapped to <= 80 columns.
Thanks again.
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (topics)
@ 2007-10-02 5:53 2% ` Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2007-10-02 5:53 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed
with '-' are only in 'pu' while commits prefixed with '+' are
in 'next'. The topics list the commits in reverse chronological
order.
----------------------------------------------------------------
* ph/strbuf (Thu Sep 27 13:33:19 2007 +0200) 44 commits
+ Make read_patch_file work on a strbuf.
+ strbuf_read_file enhancement, and use it.
+ strbuf change: be sure ->buf is never ever NULL.
+ double free in builtin-update-index.c
+ Clean up stripspace a bit, use strbuf even more.
+ Add strbuf_read_file().
...
Will be in 'master' soon. We've seen nice linecount reduction
and the end result is rather pleasant to read.
* jc/am-quiet (Mon Oct 1 00:27:51 2007 -0700) 2 commits
+ git-am: fix typo in the previous one.
+ git-am: make the output quieter.
Response against recent "rebase being too chatty" complaints.
This should be a 'master' material.
* ap/dateformat (Fri Sep 28 15:17:45 2007 +0100) 3 commits
+ Make for-each-ref's grab_date() support per-atom formatting
+ Make for-each-ref allow atom names like "<name>:<something>"
+ parse_date_format(): convert a format name to an enum date_mode
With some test suite additions, this could go to 'master' soon.
Yes, that's a HINT, people ;-).
* je/hooks (Wed Sep 26 15:31:01 2007 -0600) 1 commit
+ post-checkout hook, tests, and docs
Will be in 'master' soon.
* db/fetch-pack (Mon Oct 1 00:59:39 2007 +0100) 49 commits
+ fetch/push: readd rsync support
+ Introduce remove_dir_recursively()
+ bundle transport: fix an alloc_ref() call
+ Allow abbreviations in the first refspec to be merged
+ Prevent send-pack from segfaulting when a branch doesn't match
+ Cleanup unnecessary break in remote.c
...
Has been cooking for quite long time.
There was a regression that made me quite unhappy about the
rewrite, but Daniel fixed it, so I should be happy. There is
another usability regression: http transport is now totally
silent. Even when you fetch daily, if the other end frequently
repacks everything into one big ball of wax like repo.or.cz
does, you will end up transferring quite a large pack every
time, and the total lack of progress report is unacceptably
unnerving. At least we should reinstate "Fetching blah from URL
using http", and preferrably "walk $object_name" lines. The
latter could be replaced with just series of CR + "walked N
commits..." if we do not like many output from the current "walk
$object_name" lines scrolling the other information away.
I am not sure the quality of "rsync" transport near the tip,
either, but at least the change should not affect other
transports. Nobody should using about rsync transport these
days anyway. Perhaps we should put a deprecation notice in the
release notes to 1.5.4, and remove it three months later.
* jc/autogc (Mon Sep 17 00:55:13 2007 -0700) 10 commits
+ git-gc --auto: run "repack -A -d -l" as necessary.
+ git-gc --auto: restructure the way "repack" command line is built.
+ git-gc --auto: protect ourselves from accumulated cruft
+ git-gc --auto: add documentation.
+ git-gc --auto: move threshold check to need_to_gc() function.
+ repack -A -d: use --keep-unreachable when repacking
+ pack-objects --keep-unreachable
+ Export matches_pack_name() and fix its return value
+ Invoke "git gc --auto" from commit, merge, am and rebase.
+ Implement git gc --auto
I think this one is reasonably sane, but I was the one who wrote
it so people should take that with a grain of salt. What it is
and isn't:
- "gc --auto" is a way to prevent you from keeping your
repository _grossly_ inefficient. Ideally, if you ever
rapacked your repository once, and do the regular repository
maintenance ("'git gc' before you leave for lunch every other
day"), it should never trigger.
- "gc --auto" is not something you can background. We do not
want to lock the repository and worry about associated stale
lock, expiry etc. The complexity is not worth it, compared
to the stated purpose above (I suspect it might already be
safe to run multiple instances at the same time, but the
effort to analyze if it is is not even worth, compared to the
stated purpose above. Just let it run synchronously if it
triggers, but it should not trigger for you).
* js/rebase-i (Tue Sep 25 16:43:15 2007 +0100) 1 commits
+ rebase -i: work on a detached HEAD
Will be in 'master', together with "gc --auto", soon.
* mv/unknown (Tue Sep 25 16:38:46 2007 +0200) 1 commit
+ Don't use "<unknown>" for placeholders and suppress printing of
empty user formats.
Will be in 'master' soon.
* lh/merge (Mon Sep 24 00:51:45 2007 +0200) 6 commits
+ git-merge: add --ff and --no-ff options
+ git-merge: add support for --commit and --no-squash
+ git-merge: add support for branch.<name>.mergeoptions
+ git-merge: refactor option parsing
+ git-merge: fix faulty SQUASH_MSG
+ Add test-script for git-merge porcelain
Will be in 'master' soon.
* jc/stash-create (Mon Jul 9 00:51:23 2007 -0700) 2 commits
+ rebase: allow starting from a dirty tree.
+ stash: implement "stash create"
Instead of refusing to rebase, telling you that your work tree
is dirty, this stashes your local changes, runs rebase and then
unstashes automatically. That _sounds_ nicer and easier to use,
but I am not sure if it is a wise/sane thing to do. We may want
to revert the "autostash" from rebase. Opinions?
* kh/commit (Mon Sep 17 20:06:47 2007 -0400)
+ Export rerere() and launch_editor().
+ Introduce entry point add_interactive and add_files_to_cache
+ Clean up stripspace a bit, use strbuf even more.
+ Add strbuf_read_file().
+ rerere: Fix use of an empty strbuf.buf
+ Small cache_tree_write refactor.
...
Stalled.
* jc/pathspec (Thu Sep 13 13:38:19 2007 -0700) 3 commits
- pathspec_can_match(): move it from builtin-ls-tree.c to tree.c
- ls-tree.c: refactor show_recursive() and rename it.
- tree-diff.c: split out a function to match a single pattern.
Stalled. This is about my pet-peeve that log (diff-tree) family
has much limited pathspec semantics. It should learn to glob
like ls-files and grep do.
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (Jan 2010, #06 draft)
@ 2010-01-20 10:24 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2010-01-20 10:24 UTC (permalink / raw)
To: git
This is a draft copy of the real one I would send out after my git
Wednesday is over.
But before that day begins, I need to go to sleep ;-)
---
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
marked with '.' do not appear in any of the integration branches, but I am
still holding onto them.
--------------------------------------------------
[Graduated to "master"]
* sr/gfi-options (2009-12-04) 7 commits
(merged to 'next' on 2010-01-10 at 8b305fb)
+ fast-import: add (non-)relative-marks feature
+ fast-import: allow for multiple --import-marks= arguments
+ fast-import: test the new option command
+ fast-import: add option command
+ fast-import: add feature command
+ fast-import: put marks reading in its own function
+ fast-import: put option parsing code in separate functions
* tc/smart-http-restrict (2010-01-14) 5 commits
(merged to 'next' on 2010-01-16 at 71fc84c)
+ Test t5560: Fix test when run with dash
(merged to 'next' on 2010-01-06 at 82736cb)
+ Smart-http tests: Test http-backend without curl or a webserver
+ Smart-http tests: Break test t5560-http-backend into pieces
+ Smart-http tests: Improve coverage in test t5560
+ Smart-http: check if repository is OK to export before serving it
* tc/clone-v-progress (2009-12-26) 4 commits
(merged to 'next' on 2010-01-10 at ec2bfd7)
+ clone: use --progress to force progress reporting
+ clone: set transport->verbose when -v/--verbose is used
+ git-clone.txt: reword description of progress behaviour
+ check stderr with isatty() instead of stdout when deciding to show progress
Perhaps needs an entry in the Release Notes, but otherwise looked Ok.
* jk/run-command-use-shell (2010-01-01) 8 commits
(merged to 'next' on 2010-01-10 at 7479e2a)
+ t4030, t4031: work around bogus MSYS bash path conversion
+ diff: run external diff helper with shell
+ textconv: use shell to run helper
+ editor: use run_command's shell feature
+ run-command: optimize out useless shell calls
+ run-command: convert simple callsites to use_shell
+ t0021: use $SHELL_PATH for the filter script
+ run-command: add "use shell" option
Shuffled the commits in the topic, following J6t's suggestion in
http://thread.gmane.org/gmane.comp.version-control.git/136128
* jn/makefile (2010-01-06) 4 commits
(merged to 'next' on 2010-01-10 at f5a5d42)
+ Makefile: consolidate .FORCE-* targets
+ Makefile: learn to generate listings for targets requiring special flags
+ Makefile: use target-specific variable to pass flags to cc
+ Makefile: regenerate assembler listings when asked
* jc/maint-1.6.1-checkout-m-custom-merge (2010-01-06) 1 commit
(merged to 'next' on 2010-01-10 at df14116)
+ checkout -m path: fix recreating conflicts
* jh/commit-status (2010-01-13) 2 commits
(merged to 'next' on 2010-01-13 at 0905d59)
+ t7502: test commit.status, --status and --no-status
+ commit: support commit.status, --status, and --no-status
I have already given ample time for people to react, but ended up getting
tired of waiting for tests to materialize and doing it myself, as I want
to close merge window for 1.7.0-rc0 by the end of next week to have the
final release early next month.
* tc/test-locate-httpd (2010-01-02) 1 commit
(merged to 'next' on 2010-01-06 at 9d913e5)
+ t/lib-http.sh: Restructure finding of default httpd location
* js/windows (2010-01-15) 7 commits
- Do not use date.c:tm_to_time_t() from compat/mingw.c
- MSVC: Windows-native implementation for subset of Pthreads API
- MSVC: Fix an "incompatible pointer types" compiler warning
- Windows: avoid the "dup dance" when spawning a child process
- Windows: simplify the pipe(2) implementation
- Windows: boost startup by avoiding a static dependency on shell32.dll
- Windows: disable Python
* dp/maint-1.6.5-fast-import-non-commit-tag (2010-01-14) 1 commit
(merged to 'next' on 2010-01-16 at f95ea8e)
+ fast-import: tag may point to any object type
* nd/include-termios-for-osol (2010-01-11) 1 commit
(merged to 'next' on 2010-01-16 at 3160c76)
+ Add missing #include to support TIOCGWINSZ on Solaris
* pc/uninteresting-submodule-disappear-upon-switch-branches (2010-01-11) 1 commit
(merged to 'next' on 2010-01-16 at b06ca1a)
+ Remove empty directories when checking out a commit with fewer submodules
Instead of using unlink(2) that will never succeed, use rmdir(2) to remove
an empty directory, knowing that this won't harm a populated directory.
* jc/rerere (2009-12-04) 1 commit
(merged to 'next' on 2010-01-10 at e295b7f)
+ Teach --[no-]rerere-autoupdate option to merge, revert and friends
--------------------------------------------------
[New Topics]
* jc/conflict-marker-size (2010-01-16) 8 commits
(merged to 'next' on 2010-01-18 at f1f6023)
+ rerere: honor conflict-marker-size attribute
+ rerere: prepare for customizable conflict marker length
+ conflict-marker-size: new attribute
+ rerere: use ll_merge() instead of using xdl_merge()
+ merge-tree: use ll_merge() not xdl_merge()
+ xdl_merge(): allow passing down marker_size in xmparam_t
+ xdl_merge(): introduce xmparam_t for merge specific parameters
+ git_attr(): fix function signature
(this branch uses jc/cache-unmerge.)
* ag/maint-apply-too-large-p (2010-01-17) 1 commit
(merged to 'next' on 2010-01-18 at 8bd106a)
+ builtin-apply.c: Skip filenames without enough components
* il/rev-namespace (2010-01-19) 2 commits
(merged to 'next' on 2010-01-19 at 2dbc665)
+ Fix errors in t6018
(merged to 'next' on 2010-01-18 at 3e68978)
+ rev-parse --namespace
This probably will be dropped and replaced with the --glob one, perhaps
with minor tweaks.
* jc/grep-author-all-match-implicit (2010-01-17) 1 commit
- "log --author=me --grep=it" should find intersection, not union
* ag/patch-header-verify (2010-01-18) 1 commit
(merged to 'next' on 2010-01-18 at 2cd0ddc)
+ builtin-apply.c: fix the --- and +++ header filename consistency check
* il/branch-set-upstream (2010-01-18) 2 commits
(merged to 'next' on 2010-01-18 at b9b0993)
+ branch: warn and refuse to set a branch as a tracking branch of itself.
+ Add branch --set-upstream
* il/remote-updates (2010-01-18) 1 commit
(merged to 'next' on 2010-01-18 at 5c3e805)
+ Add git remote set-url
* bw/cvsimport (2010-01-19) 3 commits
(merged to 'next' on 2010-01-19 at 63f4c8d)
+ cvsimport: standarize system() calls to external git tools
+ cvsimport: standarize open() calls to external git tools
+ cvsimport: modernize callouts to git subcommands
* jc/checkout-merge-base (2010-01-19) 1 commit
(merged to 'next' on 2010-01-19 at 3665110)
+ Fix "checkout A..." synonym for "checkout A...HEAD" on Windows
* jc/maint-refresh-index-is-optional-for-status (2010-01-19) 1 commit
- status: don't require the repository to be writable
--------------------------------------------------
[Will merge to 'master' soon unless somebody complains]
* rr/core-tutorial (2010-01-16) 1 commit
(merged to 'next' on 2010-01-16 at d9dd8bd)
+ Documentation: Update git core tutorial clarifying reference to scripts
* il/push-set-upstream (2010-01-16) 1 commit
(merged to 'next' on 2010-01-16 at e3a7a60)
+ Add push --set-upstream
* jk/warn-author-committer-after-commit (2010-01-17) 6 commits
(merged to 'next' on 2010-01-17 at c2bb7fd)
+ user_ident_sufficiently_given(): refactor the logic to be usable from elsewhere
+ commit.c::print_summary: do not release the format string too early
(merged to 'next' on 2010-01-16 at f22c077)
+ commit: allow suppression of implicit identity advice
+ commit: show interesting ident information in summary
+ strbuf: add strbuf_addbuf_percentquote
+ strbuf_expand: convert "%%" to "%"
* jc/ident (2010-01-17) 5 commits
(merged to 'next' on 2010-01-19 at 9fba1c0)
+ ident.c: replace fprintf with fputs to suppress compiler warning
(merged to 'next' on 2010-01-17 at 625670d)
+ user_ident_sufficiently_given(): refactor the logic to be usable from elsewhere
+ ident.c: treat $EMAIL as giving user.email identity explicitly
(merged to 'next' on 2010-01-10 at f1f9ded)
+ ident.c: check explicit identity for name and email separately
+ ident.c: remove unused variables
* tr/http-push-ref-status (2010-01-08) 6 commits
(merged to 'next' on 2010-01-16 at 7e872ac)
+ transport-helper.c::push_refs(): emit "no refs" error message
+ transport-helper.c::push_refs(): ignore helper-reported status if ref is not to be pushed
+ transport.c::transport_push(): make ref status affect return value
+ refactor ref status logic for pushing
+ t5541-http-push.sh: add test for unmatched, non-fast-forwarded refs
+ t5541-http-push.sh: add tests for non-fast-forward pushes
* bk/fix-relative-gitdir-file (2010-01-08) 2 commits
(merged to 'next' on 2010-01-16 at cc4ae57)
+ Handle relative paths in submodule .git files
+ Test update-index for a gitlink to a .git file
* sd/cd-p-show-toplevel (2010-01-12) 2 commits
(merged to 'next' on 2010-01-16 at 57d6d31)
+ Use $(git rev-parse --show-toplevel) in cd_to_toplevel().
+ Add 'git rev-parse --show-toplevel' option.
Avoid having to use "cd -P" that may not be available on some platforms'
shells.
* jc/symbol-static (2010-01-18) 17 commits
(merged to 'next' on 2010-01-18 at d063267)
+ Replace parse_blob() with an explanatory comment
+ symlinks.c: remove unused functions
+ object.c: remove unused functions
+ strbuf.c: remove unused function
+ sha1_file.c: remove unused function
+ mailmap.c: remove unused function
(merged to 'next' on 2010-01-17 at d7346b1)
+ utf8.c: mark file-local function static
+ submodule.c: mark file-local function static
+ quote.c: mark file-local function static
+ remote-curl.c: mark file-local function static
+ read-cache.c: mark file-local functions static
+ parse-options.c: mark file-local function static
+ entry.c: mark file-local function static
+ http.c: mark file-local functions static
+ pretty.c: mark file-local function static
+ builtin-rev-list.c: mark file-local function static
+ bisect.c: mark file-local function static
Mark file-local symbols "static", and remove unused functions.
--------------------------------------------------
[Will merge to 'master' after a bit more cooking in 'next']
* nd/status-partial-refresh (2010-01-17) 2 commits
(merged to 'next' on 2010-01-19 at 64f0c0b)
+ rm: only refresh entries that we may touch
(merged to 'next' on 2010-01-16 at f77bc8f)
+ status: only touch path we may need to check
* mh/rebase-fixup (2010-01-14) 23 commits
(merged to 'next' on 2010-01-16 at 7ccb228)
+ rebase -i: Retain user-edited commit messages after squash/fixup conflicts
+ t3404: Set up more of the test repo in the "setup" step
+ rebase -i: For fixup commands without squashes, do not start editor
+ rebase -i: Change function make_squash_message into update_squash_message
+ rebase -i: Extract function do_with_author
+ rebase -i: Handle the author script all in one place in do_next
+ rebase -i: Extract a function "commit_message"
+ rebase -i: Simplify commit counting for generated commit messages
+ rebase -i: Improve consistency of commit count in generated commit messages
+ t3404: Test the commit count in commit messages generated by "rebase -i"
+ rebase -i: Introduce a constant AMEND
+ rebase -i: Introduce a constant AUTHOR_SCRIPT
+ rebase -i: Document how temporary files are used
+ rebase -i: Use symbolic constant $MSG consistently
+ rebase -i: Use "test -n" instead of "test ! -z"
+ rebase -i: Inline expression
+ rebase -i: Remove dead code
+ rebase -i: Make the condition for an "if" more transparent
(merged to 'next' on 2010-01-12 at e84eab0)
+ rebase-i: Ignore comments and blank lines in peek_next_command
+ lib-rebase: Allow comments and blank lines to be added to the rebase script
+ lib-rebase: Provide clearer debugging info about what the editor did
+ Add a command "fixup" to rebase --interactive
+ t3404: Use test_commit to set up test repository
(this branch is used by ns/rebase-auto-squash.)
* ns/rebase-auto-squash (2009-12-08) 1 commit
(merged to 'next' on 2010-01-06 at da4e2f5)
+ rebase -i --autosquash: auto-squash commits
(this branch uses mh/rebase-fixup.)
* da/difftool (2010-01-15) 10 commits
(merged to 'next' on 2010-01-16 at 609f0da)
+ difftool: Update copyright notices to list each year separately
+ difftool: Use eval to expand '--extcmd' expressions
+ difftool: Add '-x' and as an alias for '--extcmd'
+ t7800-difftool.sh: Simplify the --extcmd test
(merged to 'next' on 2010-01-10 at 749c870)
+ git-diff.txt: Link to git-difftool
+ difftool: Allow specifying unconfigured commands with --extcmd
+ difftool--helper: Remove use of the GIT_MERGE_TOOL variable
+ difftool--helper: Update copyright and remove distracting comments
(merged to 'next' on 2010-01-06 at e957395)
+ git-difftool: Add '--gui' for selecting a GUI tool
+ t7800-difftool: Set a bogus tool for use by tests
* mm/conflict-advice (2010-01-12) 1 commit
(merged to 'next' on 2010-01-16 at b83be11)
+ Be more user-friendly when refusing to do something because of conflict.
* jc/maint-strbuf-add-fix-doubling (2010-01-12) 1 commit
(merged to 'next' on 2010-01-16 at 5959eee)
+ strbuf_addbuf(): allow passing the same buf to dst and src
* jc/maint-1.6.4-grep-lookahead (2010-01-10) 1 commit
(merged to 'next' on 2010-01-13 at 20f8f4b)
+ grep: optimize built-in grep by skipping lines that do not hit
(this branch is used by jc/grep-lookahead and jc/maint-grep-lookahead.)
Optimize the "line-by-line" internal grep by skiping en masse over lines
that cannot possibly match.
* jc/maint-grep-lookahead (2010-01-12) 0 commits
(this branch uses jc/maint-1.6.4-grep-lookahead; is used by jc/grep-lookahead.)
Early conflict resolution for the above for recent git.
* jc/grep-lookahead (2010-01-15) 4 commits
(merged to 'next' on 2010-01-17 at 4a5be2d)
+ grep --no-index: allow use of "git grep" outside a git repository
+ grep: prepare to run outside of a work tree
(merged to 'next' on 2010-01-13 at 20f8f4b)
+ grep: rip out pessimization to use fixmatch()
+ grep: rip out support for external grep
(this branch uses jc/maint-1.6.4-grep-lookahead and jc/maint-grep-lookahead.)
* jl/submodule-diff (2010-01-18) 4 commits
- Performance optimization for detection of modified submodules
(merged to 'next' on 2010-01-17 at 525075b)
+ git status: Show uncommitted submodule changes too when enabled
(merged to 'next' on 2010-01-16 at 0a99e3c)
+ Teach diff that modified submodule directory is dirty
+ Show submodules as modified when they contain a dirty work tree
* jc/ls-files-ignored-pathspec (2010-01-08) 4 commits
(merged to 'next' on 2010-01-16 at d36016a)
+ ls-files: fix overeager pathspec optimization
+ read_directory(): further split treat_path()
+ read_directory_recursive(): refactor handling of a single path into a separate function
+ t3001: test ls-files -o ignored/dir
* js/exec-error-report (2010-01-12) 4 commits
(merged to 'next' on 2010-01-16 at 0e28d02)
+ Improve error message when a transport helper was not found
+ start_command: detect execvp failures early
+ run-command: move wait_or_whine earlier
+ start_command: report child process setup errors to the parent's stderr
* jc/fix-tree-walk (2009-09-14) 7 commits
(merged to 'next' on 2010-01-13 at 1c01b87)
+ read-tree --debug-unpack
+ unpack-trees.c: look ahead in the index
+ unpack-trees.c: prepare for looking ahead in the index
+ Aggressive three-way merge: fix D/F case
+ traverse_trees(): handle D/F conflict case sanely
+ more D/F conflict tests
+ tests: move convenience regexp to match object names to test-lib.sh
Resurrected from "Ejected" category. This is fix for a tricky codepath
and testing and improving before it hits 'master' is greatly appreciated.
(I have been using this in my private build for some time).
* jc/cache-unmerge (2009-12-25) 9 commits
(merged to 'next' on 2010-01-13 at 2290c44)
+ rerere forget path: forget recorded resolution
+ rerere: refactor rerere logic to make it independent from I/O
+ rerere: remove silly 1024-byte line limit
+ resolve-undo: teach "update-index --unresolve" to use resolve-undo info
+ resolve-undo: "checkout -m path" uses resolve-undo information
+ resolve-undo: allow plumbing to clear the information
+ resolve-undo: basic tests
+ resolve-undo: record resolved conflicts in a new index extension section
+ builtin-merge.c: use standard active_cache macros
(this branch is used by jc/conflict-marker-size.)
* ap/merge-backend-opts (2008-07-18) 7 commits
(merged to 'next' on 2010-01-18 at cb1f6b7)
+ Document that merge strategies can now take their own options
+ Extend merge-subtree tests to test -Xsubtree=dir.
+ Make "subtree" part more orthogonal to the rest of merge-recursive.
+ pull: Fix parsing of -X<option>
+ Teach git-pull to pass -X<option> to git-merge
+ git merge -X<option>
+ git-merge-file --ours, --theirs
--------------------------------------------------
[Cooking]
* js/refer-upstream (2010-01-19) 3 commits
- Teach @{upstream} syntax to strbuf_branchanme()
- t1506: more test for @{upstream} syntax
- Introduce <branch>@{upstream} notation
Updated to teach the new syntax to commands like "checkout" and "merge"
that want to behave better when they know what were given was a branch
name, not a random SHA-1 or a full refname.
* jh/notes (2010-01-17) 23 commits
- builtin-gc: Teach the new --notes option to garbage-collect notes
- Notes API: gc_notes(): Prune notes that belong to non-existing objects
- t3305: Verify that removing notes triggers automatic fanout consolidation
- builtin-notes: Teach -d option for deleting existing notes
- Teach builtin-notes to remove empty notes
- Teach notes code to properly preserve non-notes in the notes tree
- t3305: Verify that adding many notes with git-notes triggers increased fanout
- t3301: Verify successful annotation of non-commits
- Builtin-ify git-notes
- Refactor notes concatenation into a flexible interface for combining notes
- Notes API: Allow multiple concurrent notes trees with new struct notes_tree
- Notes API: write_notes_tree(): Store the notes tree in the database
- Notes API: for_each_note(): Traverse the entire notes tree with a callback
- Notes API: get_note(): Return the note annotating the given object
- Notes API: remove_note(): Remove note objects from the notes tree structure
- Notes API: add_note(): Add note objects to the internal notes tree structure
- Notes API: init_notes(): Initialize the notes tree from the given notes ref
- Add tests for checking correct handling of $GIT_NOTES_REF and core.notesRef
- Notes API: get_commit_notes() -> format_note() + remove the commit restriction
- Minor non-functional fixes to notes.c
(merged to 'next' on 2010-01-02 at ae42130)
+ Add more testcases to test fast-import of notes
+ Rename t9301 to t9350, to make room for more fast-import tests
+ fast-import: Proper notes tree manipulation
Updated with a re-roll.
* jh/gitweb-cached (2010-01-13) 9 commits
- gitweb: File based caching layer (from git.kernel.org)
- gitweb: Convert output to using indirect file handle
- gitweb: cleanup error message produced by undefined $site_header
- gitweb: add a get function to compliment print_sort_th
- gitweb: add a get function to compliment print_local_time
- gitweb: Makefile improvements
- gitweb: Add option to force version match
- gitweb: change die_error to take "extra" argument for extended die information
- gitweb: Load checking
Replaced with a re-roll. Update to t9500 is probably needed.
* jc/branch-d (2009-12-29) 1 commit
(merged to 'next' on 2010-01-10 at 61a14b7)
+ branch -d: base the "already-merged" safety on the branch it merges with
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (Dec 2009, #05; Mon, 28)
@ 2009-12-28 9:57 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2009-12-28 9:57 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
marked with '.' do not appear in any of the integration branches, but I am
still holding onto them.
--------------------------------------------------
[Graduated to "master"]
* sr/vcs-helper (2009-12-07) 14 commits
(merged to 'next' on 2009-12-07 at 8f041bc)
+ tests: handle NO_PYTHON setting
(merged to 'next' on 2009-12-03 at e45b562)
+ builtin-push: don't access freed transport->url
(merged to 'next' on 2009-11-27 at 83268ab)
+ Add Python support library for remote helpers
+ Basic build infrastructure for Python scripts
+ Allow helpers to report in "list" command that the ref is unchanged
+ Fix various memory leaks in transport-helper.c
+ Allow helper to map private ref names into normal names
+ Add support for "import" helper command
+ Allow specifying the remote helper in the url
+ Add a config option for remotes to specify a foreign vcs
+ Allow fetch to modify refs
+ Use a function to determine whether a remote is valid
+ Allow programs to not depend on remotes having urls
+ Fix memory leak in helper method for disconnect
* jc/1.7.0-send-email-no-thread-default (2009-08-22) 1 commit
(merged to 'next' on 2009-10-11 at 043acdf)
+ send-email: make --no-chain-reply-to the default
* jc/1.7.0-push-safety (2009-02-09) 2 commits
(merged to 'next' on 2009-10-11 at 81b8128)
+ Refuse deleting the current branch via push
+ Refuse updating the current branch in a non-bare repository via push
* jc/1.7.0-diff-whitespace-only-status (2009-08-30) 4 commits
(merged to 'next' on 2009-10-11 at 546c74d)
+ diff.c: fix typoes in comments
+ Make test case number unique
+ diff: Rename QUIET internal option to QUICK
+ diff: change semantics of "ignore whitespace" options
(this branch is used by jc/1.7.0-diff-whitespace-prepare and jc/diff-whitespace-prepare.)
This changes exit code from "git diff --ignore-whitespace" and friends
when there is no actual output.
* gb/1.7.0-diff-whitespace-only-output (2009-11-19) 1 commit
(merged to 'next' on 2009-11-21 at 3375bf4)
+ No diff -b/-w output for all-whitespace changes
(this branch is used by jc/1.7.0-diff-whitespace-prepare and jc/diff-whitespace-prepare.)
Likewise but for the output of "diff --git" headers.
* jk/1.7.0-status (2009-12-11) 16 commits
(merged to 'next' on 2009-12-24 at e9929b3)
+ status/commit: do not suggest "reset HEAD <path>" while merging
+ commit/status: "git add <path>" is not necessarily how to resolve
+ commit/status: check $GIT_DIR/MERGE_HEAD only once
(merged to 'next' on 2009-12-08 at 9b57d84)
+ t7508-status: test all modes with color
+ t7508-status: status --porcelain ignores relative paths setting
(merged to 'next' on 2009-12-07 at 7723acf)
+ status: reduce duplicated setup code
+ status: disable color for porcelain format
(merged to 'next' on 2009-12-05 at 44dcefd)
+ status -s: obey color.status
+ builtin-commit: refactor short-status code into wt-status.c
(merged to 'next' on 2009-11-27 at 91691ec)
+ t7508-status.sh: Add tests for status -s
+ status -s: respect the status.relativePaths option
(merged to 'next' on 2009-11-21 at 884bb56)
+ docs: note that status configuration affects only long format
(merged to 'next' on 2009-10-11 at 65c8513)
+ commit: support alternate status formats
+ status: add --porcelain output format
+ status: refactor format option parsing
+ status: refactor short-mode printing to its own function
(this branch uses jc/1.7.0-status.)
Gives the --short output format to post 1.7.0 "git commit --dry-run" that
is similar to that of post 1.7.0 "git status".
* jc/1.7.0-status (2009-09-05) 4 commits
(merged to 'next' on 2009-10-11 at 9558627)
+ status: typo fix in usage
+ git status: not "commit --dry-run" anymore
+ git stat -s: short status output
+ git stat: the beginning of "status that is not a dry-run of commit"
(this branch is used by jk/1.7.0-status.)
With this, "git status" is no longer "git commit --dry-run".
--------------------------------------------------
[New Topics]
* jc/cache-unmerge (2009-12-25) 9 commits
- rerere forget path: forget recorded resolution
- rerere: refactor rerere logic to make it independent from I/O
- rerere: remove silly 1024-byte line limit
- resolve-undo: teach "update-index --unresolve" to use resolve-undo info
- resolve-undo: "checkout -m path" uses resolve-undo information
- resolve-undo: allow plumbing to clear the information
- resolve-undo: basic tests
- resolve-undo: record resolved conflicts in a new index extension section
- builtin-merge.c: use standard active_cache macros
* js/filter-branch-prime (2009-12-15) 1 commit
- filter-branch: remove an unnecessary use of 'git read-tree'
* mg/tag-d-show (2009-12-10) 1 commit
- tag -d: print sha1 of deleted tag
* sb/maint-octopus (2009-12-11) 3 commits
- octopus: remove dead code
- octopus: reenable fast-forward merges
- octopus: make merge process simpler to follow
* il/exec-error-report (2009-12-24) 2 commits
- Improve transport helper exec failure reporting
- Report exec errors from run-command
--------------------------------------------------
[Cooking]
* jh/commit-status (2009-12-07) 1 commit
- [test?] Add commit.status, --status, and --no-status
* jc/checkout-merge-base (2009-11-20) 2 commits
(merged to 'next' on 2009-12-24 at ff4d1d4)
+ "rebase --onto A...B" replays history on the merge base between A and B
+ "checkout A...B" switches to the merge base between A and B
* tr/http-push-ref-status (2009-12-24) 6 commits
- transport-helper.c::push_refs(): emit "no refs" error message
- transport-helper.c::push_refs(): ignore helper-reported status if ref is not to be pushed
- transport.c::transport_push(): make ref status affect return value
- refactor ref status logic for pushing
- t5541-http-push.sh: add test for unmatched, non-fast-forwarded refs
- t5541-http-push.sh: add tests for non-fast-forward pushes
* bg/maint-add-all-doc (2009-12-07) 4 commits
- squash! rm documentation--also mention add-u where we mention commit-a
- git-rm doc: Describe how to sync index & work tree
- git-add/rm doc: Consistently back-quote
- Documentation: 'git add -A' can remove files
I didn't like the existing documentation for "add -u" myself (especially
because I wrote the initial version) and this neatly fix it as well.
* il/vcs-helper (2009-12-09) 8 commits
- Remove special casing of http, https and ftp
- Support remote archive from all smart transports
- Support remote helpers implementing smart transports
- Support taking over transports
- Refactor git transport options parsing
- Pass unknown protocols to external protocol handlers
- Support mandatory capabilities
- Add remote helper debug mode
* mm/diag-path-in-treeish (2009-12-07) 1 commit
- Detailed diagnosis when parsing an object name fails.
* mh/rebase-fixup (2009-12-07) 2 commits
- Add a command "fixup" to rebase --interactive
- t3404: Use test_commit to set up test repository
(this branch is used by ns/rebase-auto-squash.)
Initial round of "fixup" action that is similar to "squash" action in
"rebase -i" that excludes the commit log message from follow-up commits
when composing the log message for the updated one. Expected is a further
improvement to skip opening the editor if a pick is followed only by
"fixup" and no "squash".
* ns/rebase-auto-squash (2009-12-08) 2 commits
- fixup! rebase -i --autosquash
- rebase -i --autosquash: auto-squash commits
(this branch uses mh/rebase-fixup.)
* jh/notes (2009-12-07) 11 commits
- Refactor notes concatenation into a flexible interface for combining notes
- Notes API: Allow multiple concurrent notes trees with new struct notes_tree
- Notes API: for_each_note(): Traverse the entire notes tree with a callback
- Notes API: get_note(): Return the note annotating the given object
- Notes API: add_note(): Add note objects to the internal notes tree structure
- Notes API: init_notes(): Initialize the notes tree from the given notes ref
- Notes API: get_commit_notes() -> format_note() + remove the commit restriction
- Minor style fixes to notes.c
- Add more testcases to test fast-import of notes
- Rename t9301 to t9350, to make room for more fast-import tests
- fast-import: Proper notes tree manipulation
* fc/opt-quiet-gc-reset (2009-12-02) 1 commit
- General --quiet improvements
* mv/commit-date (2009-12-03) 2 commits
- Document date formats accepted by parse_date()
- builtin-commit: add --date option
* sr/gfi-options (2009-12-04) 7 commits
- fast-import: add (non-)relative-marks feature
- fast-import: allow for multiple --import-marks= arguments
- fast-import: test the new option command
- fast-import: add option command
- fast-import: add feature command
- fast-import: put marks reading in its own function
- fast-import: put option parsing code in separate functions
* ap/merge-backend-opts (2008-07-18) 6 commits
- Document that merge strategies can now take their own options
- Extend merge-subtree tests to test -Xsubtree=dir.
- Make "subtree" part more orthogonal to the rest of merge-recursive.
- Teach git-pull to pass -X<option> to git-merge
- git merge -X<option>
- git-merge-file --ours, --theirs
"git pull" patch needs sq-then-eval fix to protect it from $IFS
but otherwise seemed good.
* mo/bin-wrappers (2009-12-02) 3 commits
- INSTALL: document a simpler way to run uninstalled builds
- run test suite without dashed git-commands in PATH
- build dashless "bin-wrappers" directory similar to installed bindir
* tr/http-updates (2009-12-01) 3 commits
(merged to 'next' on 2009-12-07 at f08d447)
+ Allow curl to rewind the RPC read buffer
+ Add an option for using any HTTP authentication scheme, not only basic
+ http: maintain curl sessions
* nd/sparse (2009-12-14) 22 commits
(merged to 'next' on 2009-12-24 at 1fa9ff3)
+ commit: correctly respect skip-worktree bit
+ ie_match_stat(): do not ignore skip-worktree bit with CE_MATCH_IGNORE_VALID
(merged to 'next' on 2009-11-25 at 71380f5)
+ tests: rename duplicate t1009
(merged to 'next' on 2009-11-23 at f712a41)
+ sparse checkout: inhibit empty worktree
+ Add tests for sparse checkout
+ read-tree: add --no-sparse-checkout to disable sparse checkout support
+ unpack-trees(): ignore worktree check outside checkout area
+ unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index
+ unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout
+ unpack-trees.c: generalize verify_* functions
+ unpack-trees(): add CE_WT_REMOVE to remove on worktree alone
+ Introduce "sparse checkout"
+ dir.c: export excluded_1() and add_excludes_from_file_1()
+ excluded_1(): support exclude files in index
+ unpack-trees(): carry skip-worktree bit over in merged_entry()
+ Read .gitignore from index if it is skip-worktree
+ Avoid writing to buffer in add_excludes_from_file_1()
+ Teach Git to respect skip-worktree bit (writing part)
+ Teach Git to respect skip-worktree bit (reading part)
+ Introduce "skip-worktree" bit in index, teach Git to get/set this bit
+ Add test-index-version
+ update-index: refactor mark_valid() in preparation for new options
--------------------------------------------------
[Ejected]
* je/send-email-no-subject (2009-08-05) 1 commit
(merged to 'next' on 2009-10-11 at 1b99c56)
+ send-email: confirm on empty mail subjects
* jc/fix-tree-walk (2009-10-22) 8 commits
(merged to 'next' on 2009-10-22 at 10c0c8f)
+ Revert failed attempt since 353c5ee
+ read-tree --debug-unpack
(merged to 'next' on 2009-10-11 at 0b058e2)
+ unpack-trees.c: look ahead in the index
+ unpack-trees.c: prepare for looking ahead in the index
+ Aggressive three-way merge: fix D/F case
+ traverse_trees(): handle D/F conflict case sanely
+ more D/F conflict tests
+ tests: move convenience regexp to match object names to test-lib.sh
This has some stupid bugs and reverted from 'next' until I can fix it, but
the "temporarily" turned out to be very loooong.
* jc/grep-full-tree (2009-11-24) 1 commit
. grep: --full-tree
The interaction with this option and pathspecs need to be worked out
better. I _think_ "grep --full-tree -e pattern -- '*.h'" should find from
all the header files in the tree, for example.
* cc/reset-more (2009-12-08) 6 commits
. Documentation: reset: add some tables to describe the different options
. Documentation: reset: describe new "--keep-local-changes" option
. reset: add test cases for "--keep-local-changes" option
. reset: add option "--keep-local-changes" to "git reset"
. reset: use "unpack_trees()" directly instead of "git read-tree"
. reset: add a few tests for "git reset --merge"
The documentation is much clearer than the previous round in describing
what it does, but I find it a bit unclear in describing what it is _good_
for (iow, scenarios and use cases).
Breaks 'pu' and does not pass test on its own yet.
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (Dec 2009, #02; Sat, 05)
@ 2009-12-06 8:17 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2009-12-06 8:17 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
marked with '.' do not appear in any of the integration branches, but I am
still holding onto them.
In 1.7.0, we plan to correct handful of warts in the interfaces everybody
agrees that they were mistakes. The resulting system may not be strictly
backward compatible. Currently planned changes are:
* refuse push to update the checked out branch in a non-bare repo by
default
Make "git push" into a repository to update the branch that is checked
out fail by default. You can countermand this default by setting a
configuration variable in the receiving repository.
http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007
* refuse push to delete the current branch by default
Make "git push $there :$killed" to delete the branch that is pointed at
by its HEAD fail by default. You can countermand this default by
setting a configuration variable in the receiving repository.
http://thread.gmane.org/gmane.comp.version-control.git/108862/focus=108936
* "git send-email" won't make deep threads by default
Many people said that by default when sending more than 2 patches the
threading git-send-email makes by default is hard to read, and they
prefer the default be one cover letter and each patch as a direct
follow-up to the cover letter. You can countermand this by setting a
configuration variable.
http://article.gmane.org/gmane.comp.version-control.git/109790
* "git status" won't be "git-commit --dry-run" anymore
http://thread.gmane.org/gmane.comp.version-control.git/125989/focus=125993
* "git diff -w --exit-code" will exit success if only differences it
found are whitespace changes that are stripped away from the output.
http://thread.gmane.org/gmane.comp.version-control.git/119731/focus=119751
* "git diff -w/-b" won't even produce "diff --git" header when all changes
are about whitespaces.
http://thread.gmane.org/gmane.comp.version-control.git/133256
--------------------------------------------------
[New Topics]
Note: Ilari's vcs-helper series hasn't been queued yet, as its first round
generated a healthy amount of discussion and he made it clear that the
second round is being prepared, addressing the comments given on the list.
Hopefully trivial coding style issues in the first round will also be
fixed (e.g. keyword "if" lacked a SP after it before opening parenthesis
of the condition) in the second round.
* jn/maint-pull-rebase-error-message (2009-11-27) 1 commit.
(merged to 'next' on 2009-12-03 at 2ced03c)
+ pull: clarify advice for the unconfigured error case
Replaces old 'jn/rfc-pull-rebase-error-message' topic.
* fc/opt-quiet-gc-reset (2009-12-02) 1 commit
- General --quiet improvements
* mv/commit-date (2009-12-03) 2 commits
- Document date formats accepted by parse_date()
- builtin-commit: add --date option
* mh/rebase-fixup (2009-12-05) 4 commits
- [squash to Add a command "fix"] Avoid "\(alternatives\|choices\)" in sed script
- Add a command "fix" to rebase --interactive.
- t3404: set a couple more tags in the original repository
- t3404: Better document the original repository layout
--------------------------------------------------
[Stalled]
* je/send-email-no-subject (2009-08-05) 1 commit.
(merged to 'next' on 2009-10-11 at 1b99c56)
+ send-email: confirm on empty mail subjects
The existing tests cover the positive case (i.e. as long as the user says
"yes" to the "do you really want to send this message that lacks subject",
the message is sent) of this feature, but the feature itself needs its own
test to verify the negative case (i.e. does it correctly stop if the user
says "no"?)
* jc/checkout-merge-base (2009-11-20) 2 commits
- "rebase --onto A...B" replays history on the merge base between A and B
- "checkout A...B" switches to the merge base between A and B
I've been using the first one for a while myself but do not see many users
want this (yet); the new feature is not urgent anyway.
* jh/notes (2009-12-02) 11 commits
- Refactor notes concatenation into a flexible interface for combining notes
- Notes API: Allow multiple concurrent notes trees with new struct notes_tree
- Notes API: for_each_note(): Traverse the entire notes tree with a callback
- Notes API: get_note(): Return the note annotating the given object
- Notes API: add_note(): Add note objects to the internal notes tree structure
- Notes API: init_notes(): Initialize the notes tree from the given notes ref
- Notes API: get_commit_notes() -> format_note() + remove the commit restriction
- Minor style fixes to notes.c
- Add more testcases to test fast-import of notes
- Rename t9301 to t9350, to make room for more fast-import tests
- fast-import: Proper notes tree manipulation
Rerolled (waiting for Acks).
* tr/maint-merge-ours-clarification (2009-11-15) 1 commit
(merged to 'next' on 2009-11-21 at fadaf7b)
+ rebase: refuse to rebase with -s ours
I do not think we reached a concensus for solving conflicts between "give
them rope" and "protect users from clearly meaningless combinations". The
author obviously is for the latter (and I am inclined to agree); Dscho
seems to think otherwise.
* jc/fix-tree-walk (2009-10-22) 8 commits
(merged to 'next' on 2009-10-22 at 10c0c8f)
+ Revert failed attempt since 353c5ee
+ read-tree --debug-unpack
(merged to 'next' on 2009-10-11 at 0b058e2)
+ unpack-trees.c: look ahead in the index
+ unpack-trees.c: prepare for looking ahead in the index
+ Aggressive three-way merge: fix D/F case
+ traverse_trees(): handle D/F conflict case sanely
+ more D/F conflict tests
+ tests: move convenience regexp to match object names to test-lib.sh
This has some stupid bugs and reverted from 'next' until I can fix it, but
the "temporarily" turned out to be very loooong. Sigh. We won't have a
proper fix in 1.6.6.
* jc/grep-full-tree (2009-11-24) 1 commit.
- grep: --full-tree
The interaction with this option and pathspecs need to be worked out
better. I _think_ "grep --full-tree -e pattern -- '*.h'" should find from
all the header files in the tree, for example.
--------------------------------------------------
[Cooking]
* sr/gfi-options (2009-12-04) 7 commits
- fast-import: add (non-)relative-marks feature
- fast-import: allow for multiple --import-marks= arguments
- fast-import: test the new option command
- fast-import: add option command
- fast-import: add feature command
- fast-import: put marks reading in its own function
- fast-import: put option parsing code in separate functions
Rerolled.
* ap/merge-backend-opts (2008-07-18) 6 commits
- Document that merge strategies can now take their own options
- Extend merge-subtree tests to test -Xsubtree=dir.
- Make "subtree" part more orthogonal to the rest of merge-recursive.
- Teach git-pull to pass -X<option> to git-merge
- git merge -X<option>
- git-merge-file --ours, --theirs
"git pull" patch needs sq-then-eval fix to protect it from $IFS
but otherwise seemed good.
* mo/bin-wrappers (2009-12-02) 3 commits
- INSTALL: document a simpler way to run uninstalled builds
- run test suite without dashed git-commands in PATH
- build dashless "bin-wrappers" directory similar to installed bindir
Rerolled.
* tr/http-updates (2009-12-01) 3 commits
- Allow curl to rewind the RPC read buffer
- Add an option for using any HTTP authentication scheme, not only basic
- http: maintain curl sessions
There was a discussion on a better structure not to require rewinding in
the first place? I didn't follow it closely...
* jc/diff-whitespace-prepare (2009-11-28) 2 commits
- diff: flip the default diff.bwoutputonly to true
- diff: optionally allow traditional "-b/-w affects only output" semantics
(this branch uses gb/1.7.0-diff-whitespace-only-output and jc/1.7.0-diff-whitespace-only-status; is used by jc/1.7.0-diff-whitespace-prepare.)
This is to redo the two -b/-w semantic changes to prepare the migration of
existing users before 1.7.0 happens.
* sr/vcs-helper (2009-12-04) 13 commits
(merged to 'next' on 2009-12-03 at e45b562)
+ builtin-push: don't access freed transport->url
(merged to 'next' on 2009-11-27 at 83268ab)
+ Add Python support library for remote helpers
+ Basic build infrastructure for Python scripts
+ Allow helpers to report in "list" command that the ref is unchanged
+ Fix various memory leaks in transport-helper.c
+ Allow helper to map private ref names into normal names
+ Add support for "import" helper command
+ Allow specifying the remote helper in the url
+ Add a config option for remotes to specify a foreign vcs
+ Allow fetch to modify refs
+ Use a function to determine whether a remote is valid
+ Allow programs to not depend on remotes having urls
+ Fix memory leak in helper method for disconnect
Should be among the first to graduate after 1.6.6 final.
* tr/reset-checkout-patch (2009-11-19) 1 commit.
(merged to 'next' on 2009-11-22 at b224950)
+ {checkout,reset} -p: make patch direction configurable
I do not particularly like a configuration like this that changes the
behaviour of a command in a drastic way---it will make helping others
much harder.
* nd/sparse (2009-11-25) 20 commits.
(merged to 'next' on 2009-11-25 at 71380f5)
+ tests: rename duplicate t1009
(merged to 'next' on 2009-11-23 at f712a41)
+ sparse checkout: inhibit empty worktree
+ Add tests for sparse checkout
+ read-tree: add --no-sparse-checkout to disable sparse checkout support
+ unpack-trees(): ignore worktree check outside checkout area
+ unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index
+ unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout
+ unpack-trees.c: generalize verify_* functions
+ unpack-trees(): add CE_WT_REMOVE to remove on worktree alone
+ Introduce "sparse checkout"
+ dir.c: export excluded_1() and add_excludes_from_file_1()
+ excluded_1(): support exclude files in index
+ unpack-trees(): carry skip-worktree bit over in merged_entry()
+ Read .gitignore from index if it is skip-worktree
+ Avoid writing to buffer in add_excludes_from_file_1()
+ Teach Git to respect skip-worktree bit (writing part)
+ Teach Git to respect skip-worktree bit (reading part)
+ Introduce "skip-worktree" bit in index, teach Git to get/set this bit
+ Add test-index-version
+ update-index: refactor mark_valid() in preparation for new options
There were some test glitches reported and at least one test seems to
be broken in the sense that it is not testing what it is trying to.
Fix-up expected.
--------------------------------------------------
[For 1.7.0]
* jk/1.7.0-status (2009-12-05) 9 commits.
(merged to 'next' on 2009-12-05 at 44dcefd)
+ status -s: obey color.status
+ builtin-commit: refactor short-status code into wt-status.c
(merged to 'next' on 2009-11-27 at 91691ec)
+ t7508-status.sh: Add tests for status -s
+ status -s: respect the status.relativePaths option
(merged to 'next' on 2009-11-21 at 884bb56)
+ docs: note that status configuration affects only long format
(merged to 'next' on 2009-10-11 at 65c8513)
+ commit: support alternate status formats
+ status: add --porcelain output format
+ status: refactor format option parsing
+ status: refactor short-mode printing to its own function
(this branch uses jc/1.7.0-status.)
Gives the --short output format to post 1.7.0 "git commit --dry-run" that
is similar to that of post 1.7.0 "git status".
Immediately after 1.6.6 while rebuilding 'next', we may want to reorder a
few commits at the tip, as "docs: affects only long format" describes a
limitation that will disappear soon.
* jc/1.7.0-status (2009-09-05) 4 commits.
(merged to 'next' on 2009-10-11 at 9558627)
+ status: typo fix in usage
+ git status: not "commit --dry-run" anymore
+ git stat -s: short status output
+ git stat: the beginning of "status that is not a dry-run of commit"
(this branch is used by jk/1.7.0-status.)
With this, "git status" is no longer "git commit --dry-run".
* jc/1.7.0-send-email-no-thread-default (2009-08-22) 1 commit.
(merged to 'next' on 2009-10-11 at 043acdf)
+ send-email: make --no-chain-reply-to the default
As the title says.
* jc/1.7.0-push-safety (2009-02-09) 2 commits.
(merged to 'next' on 2009-10-11 at 81b8128)
+ Refuse deleting the current branch via push
+ Refuse updating the current branch in a non-bare repository via push
* jc/1.7.0-diff-whitespace-only-status (2009-08-30) 4 commits.
(merged to 'next' on 2009-10-11 at 546c74d)
+ diff.c: fix typoes in comments
+ Make test case number unique
+ diff: Rename QUIET internal option to QUICK
+ diff: change semantics of "ignore whitespace" options
(this branch is used by jc/1.7.0-diff-whitespace-prepare and jc/diff-whitespace-prepare.)
This changes exit code from "git diff --ignore-whitespace" and friends
when there is no actual output. It is a backward incompatible change,
and jc/diff-whitespace-prepare topic is meant to ease the transition.
* gb/1.7.0-diff-whitespace-only-output (2009-11-19) 1 commit
(merged to 'next' on 2009-11-21 at 3375bf4)
+ No diff -b/-w output for all-whitespace changes
(this branch is used by jc/1.7.0-diff-whitespace-prepare and jc/diff-whitespace-prepare.)
Likewise but for the output of "diff --git" headers.
* jc/1.7.0-diff-whitespace-prepare (2009-11-28) 2 commits
- diff: disable diff.bwoutputonly warning
- diff: flip the diff.bwoutputonly default to false
(this branch uses gb/1.7.0-diff-whitespace-only-output, jc/1.7.0-diff-whitespace-only-status and jc/diff-whitespace-prepare.)
And this is to actually flip the default and eventually remove the warning.
* ns/1.7.0-send-email-no-chain-reply-to (2009-08-22) 1 commit
- send-email: make --no-chain-reply-to the default
And this is to actually flip the default in 1.7.0.
--------------------------------------------------
[Reverted from 'next']
* jc/botched-maint-cygwin-count-objects (2009-11-24) 2 commits.
(merged to 'next' on 2009-11-25 at 8aa62a0)
+ Revert "ST_BLOCKS_COUNTS_IN_BLKSIZE to say on-disk size is (st_blksize * st_blocks)"
(merged to 'next' on 2009-11-22 at 4ba5880)
+ ST_BLOCKS_COUNTS_IN_BLKSIZE to say on-disk size is (st_blksize * st_blocks)
This is a revert of the tip one I merged prematurely to 'next'. The real
fix from Ramsay is already in 'master'.
* ks/precompute-completion (2009-11-15) 4 commits.
(merged to 'next' on 2009-11-15 at 23cdb96)
+ Revert ks/precompute-completion series
(merged to 'next' on 2009-10-28 at cd5177f)
+ completion: ignore custom merge strategies when pre-generating
(merged to 'next' on 2009-10-22 at f46a28a)
+ bug: precomputed completion includes scripts sources
(merged to 'next' on 2009-10-14 at adf722a)
+ Speedup bash completion loading
Reverted out of 'next', to be replaced with jn/faster-completion-startup
topic.
--------------------------------------------------
[I have been too busy to purge these]
* jn/rfc-pull-rebase-error-message (2009-11-12) 1 commit
. git-pull.sh --rebase: overhaul error handling when no candidates are found
Replaced.
* jc/log-tz (2009-03-03) 1 commit.
- Allow --date=local --date=other-format to work as expected
Maybe some people care about this. I dunno.
* jc/1.7.0-no-commit-no-ff-2 (2009-10-22) 1 commit.
. git-merge: forbid fast-forward and up-to-date when --no-commit is given
This makes "git merge --no-commit" fail when it results in fast-forward or
up-to-date. It appears nobody wants to have this, so I dropped it.
* ne/rev-cache (2009-10-19) 7 commits.
. support for commit grafts, slight change to general mechanism
. support for path name caching in rev-cache
. full integration of rev-cache into git, completed test suite
. administrative functions for rev-cache, start of integration into git
. support for non-commit object caching in rev-cache
. basic revision cache system, no integration or features
. man page and technical discussion for rev-cache
The author indicated that there is another round coming. Does not seem to
pass the tests when merged to 'pu', so it has been ejected for now.
* pb/gitweb-no-project-list (2009-11-06) 3 commits.
. gitweb: Polish the content tags support
. gitweb: Support for no project list on gitweb front page
. gitweb: Refactor project list routines
I picked these up but didn't queue as Warthog9's comments made certain
amount of sense to me.
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (Jun 2014, #06; Thu, 26)
@ 2014-06-26 22:02 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2014-06-26 22:02 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
Fixes accumulated on the 'master' front made into 2.0.1. The topics
in flight continue to separate into two distinct layers (i.e.
stalled-and-need-to-be-rerolld vs sure-to-graduate-soon).
Four mingw series are still in limbo--are they in good enough shape
for Windows folks who wanted to upstream them?
You can find the changes described here in the integration branches
of the repositories listed at
http://git-blame.blogspot.com/p/git-public-repositories.html
--------------------------------------------------
[Graduated to "master"]
* ep/avoid-test-a-o (2014-06-19) 20 commits
(merged to 'next' on 2014-06-20 at c47322b)
+ git-submodule.sh: avoid "echo" path-like values
+ git-submodule.sh: avoid "test <cond> -a/-o <cond>"
+ t/test-lib-functions.sh: avoid "test <cond> -a/-o <cond>"
+ t/t9814-git-p4-rename.sh: avoid "test <cond> -a/-o <cond>"
+ t/t5538-push-shallow.sh: avoid "test <cond> -a/-o <cond>"
+ t/t5403-post-checkout-hook.sh: avoid "test <cond> -a/-o <cond>"
+ t/t5000-tar-tree.sh: avoid "test <cond> -a/-o <cond>"
+ t/t4102-apply-rename.sh: avoid "test <cond> -a/-o <cond>"
+ t/t0026-eol-config.sh: avoid "test <cond> -a/-o <cond>"
+ t/t0025-crlf-auto.sh: avoid "test <cond> -a/-o <cond>"
+ t/lib-httpd.sh: avoid "test <cond> -a/-o <cond>"
+ git-rebase--interactive.sh: avoid "test <cond> -a/-o <cond>"
+ git-mergetool.sh: avoid "test <cond> -a/-o <cond>"
+ git-bisect.sh: avoid "test <cond> -a/-o <cond>"
+ contrib/examples/git-resolve.sh: avoid "test <cond> -a/-o <cond>"
+ contrib/examples/git-repack.sh: avoid "test <cond> -a/-o <cond>"
+ contrib/examples/git-merge.sh: avoid "test <cond> -a/-o <cond>"
+ contrib/examples/git-commit.sh: avoid "test <cond> -a/-o <cond>"
+ contrib/examples/git-clone.sh: avoid "test <cond> -a/-o <cond>"
+ check_bindir: avoid "test <cond> -a/-o <cond>"
Update tests and scripts to avoid "test ... -a ...", which is often
more error-prone than "test ... && test ...".
Squashed misconversion fix-up into git-submodule.sh updates.
* fr/sequencer-fail-with-not-one-upon-no-ff (2014-06-09) 1 commit
(merged to 'next' on 2014-06-16 at 29734cc)
+ sequencer: signal failed ff as an aborted, not a conflicted merge
* jk/repack-pack-keep-objects (2014-06-10) 3 commits
(merged to 'next' on 2014-06-16 at 89716c9)
+ repack: s/write_bitmap/&s/ in code
+ repack: respect pack.writebitmaps
+ repack: do not accidentally pack kept objects by default
(this branch is used by jk/repack-pack-writebitmaps-config.)
Recent updates to "git repack" started to duplicate objects that
are in packfiles marked with .keep flag into the new packfile by
mistake.
* jk/repack-pack-writebitmaps-config (2014-06-12) 4 commits
(merged to 'next' on 2014-06-16 at 777005d)
+ t7700: drop explicit --no-pack-kept-objects from .keep test
+ repack: introduce repack.writeBitmaps config option
+ repack: simplify handling of --write-bitmap-index
+ pack-objects: stop respecting pack.writebitmaps
(this branch uses jk/repack-pack-keep-objects.)
* jm/dedup-name-compare (2014-06-20) 2 commits
+ cleanup duplicate name_compare() functions
+ name-hash.c: replace cache_name_compare() with memcmp(3)
* mc/doc-submodule-sync-recurse (2014-06-13) 1 commit
(merged to 'next' on 2014-06-20 at 04815e3)
+ submodule: document "sync --recursive"
* mc/git-p4-prepare-p4-only (2014-06-13) 1 commit
(merged to 'next' on 2014-06-16 at 3c05e19)
+ git-p4: fix submit in non --prepare-p4-only mode
* nd/init-restore-env (2014-06-10) 1 commit
(merged to 'next' on 2014-06-16 at ecbbfca)
+ git potty: restore environments after alias expansion
* pb/trim-trailing-spaces (2014-06-13) 1 commit
(merged to 'next' on 2014-06-20 at 6985153)
+ t0008: do not depend on 'echo' handling backslashes specially
* rs/blame-refactor (2014-06-13) 2 commits
(merged to 'next' on 2014-06-20 at ddaa722)
+ blame: simplify prepare_lines()
+ blame: factor out get_next_line()
* sp/complete-ext-alias (2014-06-13) 1 commit
(merged to 'next' on 2014-06-16 at 399679e)
+ completion: handle '!f() { ... }; f' and "!sh -c '...' -" aliases
* tb/unicode-7.0-display-width (2014-06-18) 1 commit
(merged to 'next' on 2014-06-20 at 111b246)
+ Update of unicode_width.h to Unicode Version 7.0
* ye/doc-http-proto (2014-06-16) 1 commit
(merged to 'next' on 2014-06-20 at 24f347d)
+ http-protocol.txt: Basic Auth is defined in RFC 2617, not RFC 2616
--------------------------------------------------
[New Topics]
* jc/fix-clone-single-starting-at-a-tag (2014-06-23) 1 commit
- builtin/clone.c: detect a clone starting at a tag correctly
Will merge to 'next'.
--------------------------------------------------
[Stalled]
* cc/replace-graft (2014-06-09) 5 commits
- DONTMERGE: wise to wait for peff's commit->buffer length series
- contrib: add convert-grafts-to-replace-refs.sh
- Documentation: replace: add --graft option
- replace: add test for --graft
- replace: add --graft option
"git replace" learned a "--graft" option to rewrite parents of a
commit.
Expecting a reroll on top of jk/commit-buffer-length.
* ab/add-interactive-show-diff-func-name (2014-05-12) 2 commits
- SQUASH??? git-add--interactive: Preserve diff heading when splitting hunks
- git-add--interactive: Preserve diff heading when splitting hunks
Waiting for a reroll.
* jn/gitweb-utf8-in-links (2014-05-27) 1 commit
- gitweb: Harden UTF-8 handling in generated links
$gmane/250758?
* rh/prompt-tests (2014-06-05) 11 commits
- t9904: new __git_ps1 tests for Zsh
- test-lib: make it possible to override how test code is eval'd
- lib-prompt-tests.sh: add variable for string that encodes percent in PS1
- lib-prompt-tests.sh: put all tests inside a function
- t9903: move prompt tests to a new lib-prompt-tests.sh file
- t9903: move PS1 color code variable definitions to lib-bash.sh
- t9903: include "Bash" in test names via new $shellname var
- t9903: run pc mode tests again with PS1 expansion disabled
- t9903: move test name prefix to a separate variable
- t9903: put the Bash pc mode prompt test cases in a function
- t9903: remove Zsh test from the suite of Bash prompt tests
Expecting a reroll to limit the damage to test_eval_; also reported
to be broken with older zsh that are still in the field ($gmane/251231).
* ss/userdiff-update-csharp-java (2014-06-02) 2 commits
- userdiff: support Java try keyword
- userdiff: support C# async methods and correct C# keywords
Reviews sent; waiting for a response.
* cc/interpret-trailers (2014-05-28) 11 commits
- Documentation: add documentation for 'git interpret-trailers'
- trailer: add tests for commands in config file
- trailer: execute command from 'trailer.<name>.command'
- trailer: add tests for "git interpret-trailers"
- trailer: add interpret-trailers command
- trailer: put all the processing together and print
- trailer: parse trailers from file or stdin
- trailer: process command line trailer arguments
- trailer: read and process config information
- trailer: process trailers from input message and arguments
- trailer: add data structures and basic functions
A new filter to programatically edit the tail end of the commit log
messages.
What is the status of this one? I think I saw reviews by Michael
but after that I do not recall seeing any updates.
* mh/lockfile (2014-04-15) 25 commits
- trim_last_path_elm(): replace last_path_elm()
- resolve_symlink(): take a strbuf parameter
- resolve_symlink(): use a strbuf for internal scratch space
- change lock_file::filename into a strbuf
- commit_lock_file(): use a strbuf to manage temporary space
- try_merge_strategy(): use a statically-allocated lock_file object
- try_merge_strategy(): remove redundant lock_file allocation
- struct lock_file: declare some fields volatile
- lockfile: avoid transitory invalid states
- commit_lock_file(): die() if called for unlocked lockfile object
- commit_lock_file(): inline temporary variable
- remove_lock_file(): call rollback_lock_file()
- lock_file(): exit early if lockfile cannot be opened
- write_packed_entry_fn(): convert cb_data into a (const int *)
- prepare_index(): declare return value to be (const char *)
- delete_ref_loose(): don't muck around in the lock_file's filename
- cache.h: define constants LOCK_SUFFIX and LOCK_SUFFIX_LEN
- lockfile.c: document the various states of lock_file objects
- lock_file(): always add lock_file object to lock_file_list
- hold_lock_file_for_append(): release lock on errors
- lockfile: unlock file if lockfile permissions cannot be adjusted
- rollback_lock_file(): set fd to -1
- rollback_lock_file(): do not clear filename redundantly
- api-lockfile: expand the documentation
- unable_to_lock_die(): rename function from unable_to_lock_index_die()
Refactor and fix corner-case bugs in the lockfile API, all looked
sensible.
Expecting a reroll.
* bg/rebase-off-of-previous-branch (2014-04-16) 1 commit
- git-rebase: print name of rev when using shorthand
Teach "git rebase -" to report the concrete name of the branch
(i.e. the previous one).
But it stops short and does not do the same for "git rebase @{-1}".
Expecting a reroll.
* tr/merge-recursive-index-only (2014-02-05) 3 commits
- merge-recursive: -Xindex-only to leave worktree unchanged
- merge-recursive: internal flag to avoid touching the worktree
- merge-recursive: remove dead conditional in update_stages()
(this branch is used by tr/remerge-diff.)
* tr/remerge-diff (2014-02-26) 5 commits
. log --remerge-diff: show what the conflict resolution changed
. name-hash: allow dir hashing even when !ignore_case
. merge-recursive: allow storing conflict hunks in index
. revision: fold all merge diff variants into an enum merge_diff_mode
. combine-diff: do not pass revs->dense_combined_merges redundantly
(this branch uses tr/merge-recursive-index-only.)
"log -p" output learns a new way to let users inspect a merge
commit by showing the differences between the automerged result
with conflicts the person who recorded the merge would have seen
and the final conflict resolution that was recorded in the merge.
Needs to be rebased, now kb/fast-hashmap topic is in.
* jk/makefile (2014-02-05) 16 commits
. FIXUP
. move LESS/LV pager environment to Makefile
. Makefile: teach scripts to include make variables
. FIXUP
. Makefile: auto-build C strings from make variables
. Makefile: drop *_SQ variables
. FIXUP
. Makefile: add c-quote helper function
. Makefile: introduce sq function for shell-quoting
. Makefile: always create files via make-var
. Makefile: store GIT-* sentinel files in MAKE/
. Makefile: prefer printf to echo for GIT-*
. Makefile: use tempfile/mv strategy for GIT-*
. Makefile: introduce make-var helper function
. Makefile: fix git-instaweb dependency on gitweb
. Makefile: drop USE_GETTEXT_SCHEME from GIT-CFLAGS
Simplify the Makefile rules and macros that exist primarily for
quoting purposes, and make it easier to robustly express the
dependency rules.
Expecting a reroll.
* po/everyday-doc (2014-01-27) 1 commit
- Make 'git help everyday' work
This may make the said command to emit something, but the source is
not meant to be formatted into a manual pages to begin with, and
also its contents are a bit stale. It may be a good first step in
the right direction, but needs more work to at least get the
mark-up right before public consumption.
Will hold.
* jk/branch-at-publish-rebased (2014-01-17) 5 commits
. t1507 (rev-parse-upstream): fix typo in test title
. implement @{publish} shorthand
. branch_get: provide per-branch pushremote pointers
. branch_get: return early on error
. sha1_name: refactor upstream_mark
Give an easier access to the tracking branches from "other" side in
a triangular workflow by introducing B@{publish} that works in a
similar way to how B@{upstream} does.
Meant to be used as a basis for whatever Ram wants to build on.
Ejected from 'pu' to unclutter.
* fc/publish-vs-upstream (2014-04-21) 8 commits
. sha1_name: add support for @{publish} marks
. sha1_name: simplify track finding
. sha1_name: cleanup interpret_branch_name()
. branch: display publish branch
. push: add --set-publish option
. branch: add --set-publish-to option
. Add concept of 'publish' branch
. t5516 (fetch-push): fix test restoration
Add branch@{publish}; it seems that this is somewhat different from
Ram and Peff started working on. At least the tip needs to be
rerolled not to squat on @{p} which @{push} and possibly @{pull}
may want to share.
* rb/merge-prepare-commit-msg-hook (2014-01-10) 4 commits
- merge: drop unused arg from abort_commit method signature
- merge: make prepare_to_commit responsible for write_merge_state
- t7505: ensure cleanup after hook blocks merge
- t7505: add missing &&
Expose more merge states (e.g. $GIT_DIR/MERGE_MODE) to hooks that
run during "git merge". The log message stresses too much on one
hook, prepare-commit-msg, but it would equally apply to other hooks
like post-merge, I think.
Waiting for a reroll.
* jc/graph-post-root-gap (2013-12-30) 3 commits
- WIP: document what we want at the end
- graph: remove unused code a bit
- graph: stuff the current commit into graph->columns[]
This was primarily a RFH ($gmane/239580).
* np/pack-v4 (2013-09-18) 90 commits
. packv4-parse.c: add tree offset caching
. t1050: replace one instance of show-index with verify-pack
. index-pack, pack-objects: allow creating .idx v2 with .pack v4
. unpack-objects: decode v4 trees
. unpack-objects: allow to save processed bytes to a buffer
- ...
Nico and Duy advancing the eternal vaporware pack-v4. This is here
primarily for wider distribution of the preview edition.
Needs to be rebased, now the pack-bitmap series is in.
* tg/perf-lib-test-perf-cleanup (2013-09-19) 2 commits
- perf-lib: add test_perf_cleanup target
- perf-lib: split starting the test from the execution
Add test_perf_cleanup shell function to the perf suite, that allows
the script writers to define a test with a clean-up action.
Will hold.
* jc/show-branch (2014-03-24) 5 commits
- show-branch: use commit slab to represent bitflags of arbitrary width
- show-branch.c: remove "all_mask"
- show-branch.c: abstract out "flags" operation
- show-branch.c: lift all_mask/all_revs to a global static
- show-branch.c: update comment style
Waiting for the final step to lift the hard-limit before sending it out.
* jh/submodule-tests (2014-04-17) 1 commit
- t7410: 210 tests for various 'git submodule update' scenarios
More or less abandoned. Will drop.
* nd/multiple-work-trees (2014-03-25) 28 commits
. count-objects: report unused files in $GIT_DIR/repos/...
. gc: support prune --repos
. gc: style change -- no SP before closing bracket
. prune: strategies for linked checkouts
. checkout: detach if the branch is already checked out elsewhere
. checkout: clean up half-prepared directories in --to mode
. checkout: support checking out into a new working directory
. use new wrapper write_file() for simple file writing
. wrapper.c: wrapper to open a file, fprintf then close
. setup.c: support multi-checkout repo setup
. setup.c: detect $GIT_COMMON_DIR check_repository_format_gently()
. setup.c: convert check_repository_format_gently to use strbuf
. setup.c: detect $GIT_COMMON_DIR in is_git_directory()
. setup.c: convert is_git_directory() to use strbuf
. git-stash: avoid hardcoding $GIT_DIR/logs/....
. *.sh: avoid hardcoding $GIT_DIR/hooks/...
. git-sh-setup.sh: use rev-parse --git-path to get $GIT_DIR/objects
. $GIT_COMMON_DIR: a new environment variable
. commit: use SEQ_DIR instead of hardcoding "sequencer"
. fast-import: use git_path() for accessing .git dir instead of get_git_dir()
. reflog: avoid constructing .lock path with git_path
. *.sh: respect $GIT_INDEX_FILE
. git_path(): be aware of file relocation in $GIT_DIR
. path.c: group git_path(), git_pathdup() and strbuf_git_path() together
. path.c: rename vsnpath() to do_git_path()
. git_snpath(): retire and replace with strbuf_git_path()
. path.c: make get_pathname() call sites return const char *
. path.c: make get_pathname() return strbuf instead of static buffer
A replacement for contrib/workdir/git-new-workdir that does not
rely on symbolic links and make sharing of objects and refs safer
by making the borrowee and borrowers aware of each other.
--------------------------------------------------
[Cooking]
* mg/verify-commit (2014-06-23) 5 commits
- t7510: test verify-commit
- t7510: exit for loop with test result
- verify-commit: scriptable commit signature verification
- gpg-interface: provide access to the payload
- gpg-interface: provide clear helper for struct signature_check
Add 'verify-commit' to be used in a way similar to 'verify-tag' is
used. Further work on verifying the mergetags might be needed.
Will merge to 'next'.
* dt/refs-check-refname-component-sse (2014-06-18) 1 commit
(merged to 'next' on 2014-06-20 at d286027)
+ refs.c: SSE2 optimizations for check_refname_component
Further micro-optimization of a leaf-function.
Will merge to 'master'.
* ye/http-extract-charset (2014-06-17) 1 commit
(merged to 'next' on 2014-06-20 at 9492bae)
+ http: fix charset detection of extract_content_type()
Will merge to 'master'.
* jk/skip-prefix (2014-06-20) 18 commits
(merged to 'next' on 2014-06-23 at cd387a6)
+ http-push: refactor parsing of remote object names
+ imap-send: use skip_prefix instead of using magic numbers
+ use skip_prefix to avoid repeated calculations
+ git: avoid magic number with skip_prefix
+ fetch-pack: refactor parsing in get_ack
+ fast-import: refactor parsing of spaces
+ stat_opt: check extra strlen call
+ daemon: use skip_prefix to avoid magic numbers
+ fast-import: use skip_prefix for parsing input
+ use skip_prefix to avoid repeating strings
+ use skip_prefix to avoid magic numbers
+ transport-helper: avoid reading past end-of-string
+ fast-import: fix read of uninitialized argv memory
+ apply: use skip_prefix instead of raw addition
+ refactor skip_prefix to return a boolean
+ avoid using skip_prefix as a boolean
+ daemon: mark some strings as const
+ parse_diff_color_slot: drop ofs parameter
Will merge to 'master'.
* jk/xstrfmt (2014-06-25) 11 commits
(merged to 'next' on 2014-06-25 at 5031d4e)
+ setup_git_env(): introduce git_path_from_env() helper
(merged to 'next' on 2014-06-23 at 64f2558)
+ unique_path: fix unlikely heap overflow
+ walker_fetch: fix minor memory leak
+ merge: use argv_array when spawning merge strategy
+ sequencer: use argv_array_pushf
+ setup_git_env: use git_pathdup instead of xmalloc + sprintf
+ use xstrfmt to replace xmalloc + strcpy/strcat
+ use xstrfmt to replace xmalloc + sprintf
+ use xstrdup instead of xmalloc + strcpy
+ use xstrfmt in favor of manual size calculations
+ strbuf: add xstrfmt helper
Will merge to 'master'.
* kb/perf-trace (2014-06-20) 11 commits
- git: add performance tracing for git's main() function to debug scripts
- trace: add trace_performance facility to debug performance issues
- trace: add high resolution timer function to debug performance issues
- trace: add 'file:line' to all trace output
- trace: move code around, in preparation to file:line output
- trace: add current timestamp to all trace output
- trace: add infrastructure to augment trace output with additional info
- trace: factor out printing to the trace file
- trace: remove redundant printf format attribute
- trace: consistently name the format parameter
- trace: move trace declarations from cache.h to new trace.h
Expecting a reroll.
* hv/submodule-config (2014-06-13) 6 commits
- SQUASH compilation fix
- do not die on error of parsing fetchrecursesubmodules option
- use new config API for worktree configurations of submodules
- extract functions for submodule config set and lookup
- implement submodule config cache for lookup of submodule names
- hashmap: add enum for hashmap free_entries option
Expecting a reroll.
* bc/fix-rebase-merge-skip (2014-06-16) 1 commit
(merged to 'next' on 2014-06-20 at 01f81f5)
+ rebase--merge: fix --skip with two conflicts in a row
"git rebase --skip" did not work well when it stopped due to a
conflict twice in a row.
Will merge to 'master'.
* jl/submodule-tests (2014-06-20) 15 commits
- revert: add t3513 for submodule updates
- stash: add t3906 for submodule updates
- am: add t4255 for submodule updates
- cherry-pick: add t3512 for submodule updates
- pull: add t5572 for submodule updates
- rebase: add t3426 for submodule updates
- merge: add t7613 for submodule updates
- bisect: add t6041 for submodule updates
- reset: add t7112 for submodule updates
- read-tree: add t1013 for submodule updates
- apply: add t4137 for submodule updates
- checkout: call the new submodule update test framework
- SQUASH???
- submodules: Add the lib-submodule-update.sh test library
- test-lib: add test_dir_is_empty()
Expecting a reroll.
* po/error-message-style (2014-06-16) 1 commit
- doc: state coding guideline for error message punctuation
Expecting a reroll.
* rs/ref-transaction (2014-06-20) 48 commits
- refs.c: make write_ref_sha1 static
- fetch.c: change s_update_ref to use a ref transaction
- refs.c: propagate any errno==ENOTDIR from _commit back to the callers
- refs.c: pass a skip list to name_conflict_fn
- refs.c: call lock_ref_sha1_basic directly from commit
- refs.c: move the check for valid refname to lock_ref_sha1_basic
- refs.c: pass NULL as *flags to read_ref_full
- refs.c: pass the ref log message to _create/delete/update instead of _commit
- refs.c: add an err argument to delete_ref_loose
- refs.c: make delete_ref use a transaction
- refs.c: make prune_ref use a transaction to delete the ref
- refs.c: remove lock_ref_sha1
- refs.c: remove the update_ref_write function
- refs.c: remove the update_ref_lock function
- refs.c: make lock_ref_sha1 static
- walker.c: use ref transaction for ref updates
- fast-import.c: use a ref transaction when dumping tags
- receive-pack.c: use a reference transaction for updating the refs
- refs.c: change update_ref to use a transaction
- branch.c: use ref transaction for all ref updates
- fast-import.c: change update_branch to use ref transactions
- sequencer.c: use ref transactions for all ref updates
- commit.c: use ref transactions for updates
- replace.c: use the ref transaction functions for updates
- tag.c: use ref transactions when doing updates
- refs.c: add transaction.status and track OPEN/CLOSED/ERROR
- refs.c: make ref_transaction_begin take an err argument
- refs.c: update ref_transaction_delete to check for error and return status
- refs.c: change ref_transaction_create to do error checking and return status
- refs.c: change ref_transaction_update() to do error checking and return status
- refs.c: remove the onerr argument to ref_transaction_commit
- update-ref: use err argument to get error from ref_transaction_commit
- refs.c: make update_ref_write update a strbuf on failure
- refs.c: make ref_update_reject_duplicates take a strbuf argument for errors
- refs.c: log_ref_write should try to return meaningful errno
- refs.c: make resolve_ref_unsafe set errno to something meaningful on error
- refs.c: commit_packed_refs to return a meaningful errno on failure
- refs.c: make remove_empty_directories always set errno to something sane
- refs.c: verify_lock should set errno to something meaningful
- refs.c: make sure log_ref_setup returns a meaningful errno
- refs.c: add an err argument to repack_without_refs
- lockfile.c: make lock_file return a meaningful errno on failurei
- lockfile.c: add a new public function unable_to_lock_message
- refs.c: add a strbuf argument to ref_transaction_commit for error logging
- refs.c: allow passing NULL to ref_transaction_free
- refs.c: constify the sha arguments for ref_transaction_create|delete|update
- refs.c: ref_transaction_commit should not free the transaction
- refs.c: remove ref_transaction_rollback
Updated in response to review comments from Michael.
Portability workaround may be needed on top ($gmane/252496).
Will merge to 'next'.
* jk/pretty-G-format-fixes (2014-06-25) 6 commits
(merged to 'next' on 2014-06-26 at 7138407)
+ move "%G" format test from t7510 to t6006
(merged to 'next' on 2014-06-20 at f504bbc)
+ pretty: avoid reading past end-of-string with "%G"
+ t7510: check %G* pretty-format output
+ t7510: test a commit signed by an unknown key
+ t7510: use consistent &&-chains in loop
+ t7510: stop referring to master in later tests
Will merge to 'master'.
* nd/split-index (2014-06-13) 32 commits
- t1700: new tests for split-index mode
- t2104: make sure split index mode is off for the version test
- read-cache: force split index mode with GIT_TEST_SPLIT_INDEX
- read-tree: note about dropping split-index mode or index version
- read-tree: force split-index mode off on --index-output
- rev-parse: add --shared-index-path to get shared index path
- update-index --split-index: do not split if $GIT_DIR is read only
- update-index: new options to enable/disable split index mode
- split-index: strip pathname of on-disk replaced entries
- split-index: do not invalidate cache-tree at read time
- split-index: the reading part
- split-index: the writing part
- read-cache: mark updated entries for split index
- read-cache: save deleted entries in split index
- read-cache: mark new entries for split index
- read-cache: split-index mode
- read-cache: save index SHA-1 after reading
- entry.c: update cache_changed if refresh_cache is set in checkout_entry()
- cache-tree: mark istate->cache_changed on prime_cache_tree()
- cache-tree: mark istate->cache_changed on cache tree update
- cache-tree: mark istate->cache_changed on cache tree invalidation
- unpack-trees: be specific what part of the index has changed
- resolve-undo: be specific what part of the index has changed
- update-index: be specific what part of the index has changed
- read-cache: be specific what part of the index has changed
- read-cache: be strict about "changed" in remove_marked_cache_entries()
- read-cache: store in-memory flags in the first 12 bits of ce_flags
- read-cache: relocate and unexport commit_locked_index()
- read-cache: new API write_locked_index instead of write_index/write_cache
- sequencer: do not update/refresh index if the lock cannot be held
- ewah: delete unused ewah_read_mmap_native declaration
- ewah: fix constness of ewah_read_mmap
What's the doneness of this one?
* jc/test-lazy-prereq (2014-06-13) 1 commit
- tests: drop GIT_*_TIMING_TESTS environment variable support
Test-script clean-up.
Will hold.
* jk/commit-buffer-length (2014-06-13) 18 commits
(merged to 'next' on 2014-06-16 at b2d2d7b)
+ reuse cached commit buffer when parsing signatures
+ commit: record buffer length in cache
+ commit: convert commit->buffer to a slab
+ commit-slab: provide a static initializer
+ use get_commit_buffer everywhere
+ convert logmsg_reencode to get_commit_buffer
+ use get_commit_buffer to avoid duplicate code
+ use get_cached_commit_buffer where appropriate
+ provide helpers to access the commit buffer
+ provide a helper to set the commit buffer
+ provide a helper to free commit buffer
+ sequencer: use logmsg_reencode in get_message
+ logmsg_reencode: return const buffer
+ do not create "struct commit" with xcalloc
+ commit: push commit_index update into alloc_commit_node
+ alloc: include any-object allocations in alloc_report
+ replace dangerous uses of strbuf_attach
+ commit_tree: take a pointer/len pair rather than a const strbuf
Move "commit->buffer" out of the in-core commit object and keep
track of their lengths. Use this to optimize the code paths to
validate GPG signatures in commit objects.
Will merge to 'master'.
* sk/mingw-unicode-spawn-args (2014-06-16) 6 commits
- Win32: Unicode arguments (incoming)
- Win32: Unicode arguments (outgoing)
- MinGW: disable CRT command line globbing
- Win32: fix potential multi-threading issue
- Win32: simplify internal mingw_spawn* APIs
- Win32: let mingw_execve() return an int
(this branch uses sk/mingw-main and sk/mingw-uni-console.)
Are Windows folks happy with all four mingw topics?
* sk/mingw-dirent (2014-06-09) 5 commits
- Win32 dirent: improve dirent implementation
- Win32 dirent: clarify #include directives
- Win32 dirent: change FILENAME_MAX to MAX_PATH
- Win32 dirent: remove unused dirent.d_reclen member
- Win32 dirent: remove unused dirent.d_ino member
Are Windows folks happy with all four mingw topics?
* sk/mingw-main (2014-06-10) 2 commits
- mingw: avoid const warning
- Win32: move main macro to a function
(this branch is used by sk/mingw-uni-console and sk/mingw-unicode-spawn-args.)
Are Windows folks happy with all four mingw topics?
* sk/mingw-uni-console (2014-06-16) 7 commits
- Win32: reliably detect console pipe handles
- Win32: fix broken pipe detection
- Win32: Thread-safe windows console output
- Win32: add Unicode conversion functions
- Win32: warn if the console font doesn't support Unicode
- Win32: detect console streams more reliably
- Win32: support Unicode console output
(this branch is used by sk/mingw-unicode-spawn-args; uses sk/mingw-main.)
Are Windows folks happy with all four mingw topics?
* mt/patch-id-stable (2014-06-10) 1 commit
- patch-id: change default to stable
Teaches "git patch-id" to compute the patch ID that does not change
when the files in a single patch is reordered. As this new algorithm
is backward incompatible, the last bit to flip it to be the default
is left out of 'master' for now.
Will hold.
--------------------------------------------------
[Discarded]
* jl/git-gui-show-added-submodule-changes (2014-04-15) 1 commit
. git-gui: show staged submodules regardless of ignore config
Merged to the upstream.
* jl/gitk-show-added-submodule-changes (2014-04-15) 1 commit
. gitk: show staged submodules regardless of ignore config
Merged to the upstream.
^ permalink raw reply [relevance 2%]
* [PATCH v2 3/6] merge: fix save_state() to work when there are racy-dirty files
@ 2022-06-19 6:50 2% ` Elijah Newren via GitGitGadget
2022-07-17 16:28 2% ` ZheNing Hu
1 sibling, 1 reply; 200+ results
From: Elijah Newren via GitGitGadget @ 2022-06-19 6:50 UTC (permalink / raw)
To: git; +Cc: ZheNing Hu, Elijah Newren, Elijah Newren
From: Elijah Newren <newren@gmail.com>
When there are racy-dirty files, but no files are modified,
`git stash create` exits with unsuccessful status. This causes merge
to fail. Refresh the index first to avoid this problem.
Signed-off-by: Elijah Newren <newren@gmail.com>
---
builtin/merge.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/builtin/merge.c b/builtin/merge.c
index 00de224a2da..8ce4336dd3f 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -313,8 +313,16 @@ static int save_state(struct object_id *stash)
int len;
struct child_process cp = CHILD_PROCESS_INIT;
struct strbuf buffer = STRBUF_INIT;
+ struct lock_file lock_file = LOCK_INIT;
+ int fd;
int rc = -1;
+ fd = repo_hold_locked_index(the_repository, &lock_file, 0);
+ refresh_cache(REFRESH_QUIET);
+ if (0 <= fd)
+ repo_update_index_if_able(the_repository, &lock_file);
+ rollback_lock_file(&lock_file);
+
strvec_pushl(&cp.args, "stash", "create", NULL);
cp.out = -1;
cp.git_cmd = 1;
--
gitgitgadget
^ permalink raw reply related [relevance 2%]
* [PATCH 2/3] merge: fix incorrect merge message for ambiguous tag/branch
@ 2009-08-09 10:02 2% ` Jeff King
0 siblings, 0 replies; 200+ results
From: Jeff King @ 2009-08-09 10:02 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
If we have both a tag and a branch named "foo", then calling
"git merge foo" will warn about the ambiguous ref, but merge
the tag.
When generating the commit message, though, we simply
checked whether "refs/heads/foo" existed, and if it did,
assumed it was a branch. This led to the statement "Merge
branch 'foo'" in the commit message, which is quite wrong.
Instead, we should use dwim_ref to find the actual ref used,
and describe it appropriately.
In addition to the test in t7608, we must also tweak the
expected output of t4202, which was accidentally triggering
this bug.
Signed-off-by: Jeff King <peff@peff.net>
---
builtin-merge.c | 15 +++++++--------
t/t4202-log.sh | 4 ++--
t/t7608-merge-messages.sh | 2 +-
3 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/builtin-merge.c b/builtin-merge.c
index 82b5466..f7db148 100644
--- a/builtin-merge.c
+++ b/builtin-merge.c
@@ -358,6 +358,7 @@ static void merge_name(const char *remote, struct strbuf *msg)
struct strbuf buf = STRBUF_INIT;
struct strbuf bname = STRBUF_INIT;
const char *ptr;
+ char *found_ref;
int len, early;
strbuf_branchname(&bname, remote);
@@ -368,14 +369,12 @@ static void merge_name(const char *remote, struct strbuf *msg)
if (!remote_head)
die("'%s' does not point to a commit", remote);
- strbuf_addstr(&buf, "refs/heads/");
- strbuf_addstr(&buf, remote);
- resolve_ref(buf.buf, branch_head, 0, NULL);
-
- if (!hashcmp(remote_head->sha1, branch_head)) {
- strbuf_addf(msg, "%s\t\tbranch '%s' of .\n",
- sha1_to_hex(branch_head), remote);
- goto cleanup;
+ if (dwim_ref(remote, strlen(remote), branch_head, &found_ref) > 0) {
+ if (!prefixcmp(found_ref, "refs/heads/")) {
+ strbuf_addf(msg, "%s\t\tbranch '%s' of .\n",
+ sha1_to_hex(branch_head), remote);
+ goto cleanup;
+ }
}
/* See if remote matches <name>^^^.. or <name>~<number> */
diff --git a/t/t4202-log.sh b/t/t4202-log.sh
index 48e0088..1e952ca 100755
--- a/t/t4202-log.sh
+++ b/t/t4202-log.sh
@@ -320,11 +320,11 @@ test_expect_success 'set up more tangled history' '
'
cat > expect <<\EOF
-* Merge branch 'reach'
+* Merge commit 'reach'
|\
| \
| \
-*-. \ Merge branches 'octopus-a' and 'octopus-b'
+*-. \ Merge commit 'octopus-a'; commit 'octopus-b'
|\ \ \
* | | | seventh
| | * | octopus-b
diff --git a/t/t7608-merge-messages.sh b/t/t7608-merge-messages.sh
index 9d10583..81ced8a 100755
--- a/t/t7608-merge-messages.sh
+++ b/t/t7608-merge-messages.sh
@@ -38,7 +38,7 @@ test_expect_success 'merge tag' '
check_oneline "Merge commit Qtag-1Q"
'
-test_expect_failure 'ambiguous tag' '
+test_expect_success 'ambiguous tag' '
git checkout -b ambiguous master &&
test_commit ambiguous &&
git checkout master &&
--
1.6.4.178.g7a987
^ permalink raw reply related [relevance 2%]
* What's cooking in git.git (May 2009, #04; Sun, 31)
@ 2009-06-01 1:24 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2009-06-01 1:24 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
marked with '.' do not appear in any of the branches, but I am still
holding onto them.
The topics list the commits in reverse chronological order. The topics
meant to be merged to the maintenance series have "maint-" in their names.
----------------------------------------------------------------
[New Topics]
All of these are soon to be in 'next'.
* bc/solaris (Wed May 27 21:17:08 2009 -0500) 4 commits
- Makefile: introduce SANE_TOOL_PATH for prepending required
elements to PATH
- Makefile: add section for SunOS 5.7
- Makefile: add NEEDS_RESOLV to optionally add -lresolv to compile
arguments
- Makefile: use /usr/ucb/install on SunOS platforms rather than
ginstall
* nw/maint-cvsexportcommit (Fri May 29 00:23:33 2009 +0100) 1 commit
- git-cvsexportcommit can't commit files which have been removed
from CVS
* tr/maint-doc-stash-pop (Thu May 28 11:40:15 2009 +0200) 1 commit
- Documentation: teach stash/pop workflow instead of stash/apply
* da/pretty-tempname (Sun May 31 01:35:52 2009 -0700) 3 commits
- diff: generate pretty filenames in prep_temp_blob()
- compat: add a basename() compatibility function
- compat: add a mkstemps() compatibility function
* ak/maint-for-each-ref-no-lookup (Wed May 27 15:23:12 2009 -0400) 1 commit
- for-each-ref: Do not lookup objects when they will not be used
* cb/match_refs_internal_tail (Wed May 27 22:13:44 2009 +0200) 1 commit
- match_refs: search ref list tail internally
I need to replace this with the new iteration...
* gb/am-foreign (Wed May 27 11:25:19 2009 +0200) 4 commits
- git-am: refactor 'cleaning up and aborting'
- git-am foreign patch support: StGIT support
- git-am foreign patch support: autodetect some patch formats
- git-am foreign patch support: introduce patch_format
----------------------------------------------------------------
[Graduated to "master"]
* sb/opt-filename (Sat May 23 11:53:13 2009 -0700) 2 commits
+ parse-opts: add OPT_FILENAME and transition builtins
+ parse-opts: prepare for OPT_FILENAME
* rs/maint-grep-word-regexp-fix (Sat May 23 13:45:26 2009 +0200) 1 commit
+ grep: fix word-regexp at the beginning of lines
* mm/apply-double-slash (Thu May 21 14:25:11 2009 +0200) 1 commit
+ apply: handle filenames with double slashes better
* bc/old-iconv (Fri May 22 18:47:06 2009 -0500) 10 commits
+ t8005: convert CP1251 character set to ISO8859-5
+ t8005: use more portable character encoding names
+ t5100: use ancient encoding syntax for backwards compatibility
+ t9301: use ISO8859-1 rather than ISO-8859-1
+ t3901: Use ISO8859-1 instead of ISO-8859-1 for backward
compatibility
+ t3901: avoid negation on right hand side of '|'
+ builtin-mailinfo.c: use "ISO8859-1" instead of "latin1" as
fallback encoding
+ builtin-mailinfo.c: compare character encodings case insensitively
+ Use 'UTF-8' rather than 'utf-8' everywhere for backward
compatibility
+ t3900: use ancient iconv names for backward compatibility
* sb/show-branch-parse-options (Thu May 21 00:33:18 2009 -0700) 3 commits
+ show-branch: migrate to parse-options API
+ Merge branch 'mh/show-branch-color' into sb/show-branch-parse-
options
+ parse-options: add PARSE_OPT_LITERAL_ARGHELP for complicated
argh's
* sb/maint-1.6.2-opt-filename-fix (Sat May 23 11:53:11 2009 -0700) 2 commits
+ apply, fmt-merge-msg: use relative filenames
+ commit: -F overrides -t
* jc/solaris-0811 (Fri May 22 22:55:31 2009 -0700) 2 commits
- OpenSolaris 200811 (SunOS 5.11) does not want OLD_ICONV
- Teach Solaris that _XOPEN_SOURCE=600 really menas XPG6
* mw/send-email (Mon Apr 13 13:23:52 2009 -0500) 6 commits
+ send-email: Remove superfluous `my $editor = ...'
+ send-email: 'References:' should only reference what is sent
+ send-email: Handle "GIT:" rather than "GIT: " during --compose
+ Docs: send-email: --smtp-server-port can take symbolic ports
+ Docs: send-email: Refer to CONFIGURATION section for
sendemail.multiedit
+ Docs: send-email: Put options back into alphabetical order
* jc/mktree (Thu May 14 15:49:10 2009 -0700) 9 commits
+ mktree: validate entry type in input
+ mktree --batch: build more than one tree object
+ mktree --missing: updated usage message and man page
+ mktree --missing: allow missing objects
+ t1010: add mktree test
+ mktree: do not barf on a submodule commit
+ builtin-mktree.c: use a helper function to handle one line of
input
+ mktree: use parse-options
+ build-in git-mktree
* jc/maint-add-p-coalesce-fix (Sat May 16 10:48:23 2009 -0700) 2 commits
+ Revert "git-add--interactive: remove hunk coalescing"
+ Splitting a hunk that adds a line at the top fails in "add -p"
* sb/format-patch-parseopt (Sat May 16 02:24:46 2009 -0700) 1 commit
+ format-patch: migrate to parse-options API
* cc/bisect (Sun May 17 17:36:46 2009 +0200) 3 commits (early part)
+ bisect: check ancestors without forking a "git rev-list" process
+ commit: add function to unparse a commit and its parents
+ bisect: rework some rev related functions to make them more
reusable
----------------------------------------------------------------
[Stalled and may need help and prodding to go forward]
* jh/notes (Sat May 16 13:44:17 2009 +0200) 5 commits
- Teach "-m <msg>" and "-F <file>" to "git notes edit"
- Add an expensive test for git-notes
- Speed up git notes lookup
- Add a script to edit/inspect notes
- Introduce commit notes
Dscho asked about the performance implications of this; I do not think I
saw any progress on that yet...
* ph/submodule-rebase (Fri Apr 24 09:06:38 2009 +1000) 1 commit
+ git-submodule: add support for --rebase.
There was a discussion on --rebase vs --merge and needs for unified
configuration variable handling for this patch...
* lt/read-directory (Fri May 15 12:01:29 2009 -0700) 3 commits
- Add initial support for pathname conversion to UTF-8
- read_directory(): infrastructure for pathname character set
conversion
- Add 'fill_directory()' helper function for directory traversal
Before adding the real "conversion", this needs a few real fixups, I
think. For example there is one hardcoded array that is used without
bounds check.
* ar/maint-1.6.2-merge-recursive-d-f (Mon May 11 21:25:36 2009 +0200) 2 commits
- Fix for a merge where a branch has an F->D transition
- Add a reminder test case for a merge with F/D transition
Although the reported breakage is covered with the patch, Alex feels the
solution unsatisfactory. Cleaning up D/F conflict handling in merge-recursive
may be long overdue but seems to be a hard problem.
* ps/blame (Thu Mar 12 21:30:03 2009 +1100) 1 commit
- blame.c: start libifying the blame infrastructure
A few minor point remains in this initial one. I hate to do these minor
fix-ups myself, but I may end up doing so...
* jc/log-tz (Tue Mar 3 00:45:37 2009 -0800) 1 commit
- Allow --date=local --date=other-format to work as expected
The one I posted had a few corner-case bugs that was caught with the test
suite; this one has them fixed. People did not like the UI so it is kept
out of 'next'
* jc/merge-convert (Mon Jan 26 16:45:01 2009 -0800) 1 commit
- git-merge-file: allow converting the results for the work tree
This is a feature waiting for a user.
We did not give scripted Porcelains a way to say "this temporary file I am
using for merging is for this path, so use the core.autocrlf and attributes
rules for that final path". Instead, merge-file simply wrote out the
data in the canonical repository representation.
rerere has the same issue, but it is a lot worse. It reads the three
files (preimage, postimage and thisimage) from the work tree in the work
tree representation, merges them without converting them to the canonical
representation first but inserts the conflict markers with the canonical
representation and writes the resulting mess out. It needs to be fixed to
read with convert_to_git(), merge them while they are still in the
canonical representation and possibly add conflict markers, and then write
the results out after convert_to_working_tree(). It also needs to write
in binary mode as well.
* db/foreign-scm (Tue Mar 24 23:04:12 2009 -0400) 3 commits
- Add option for using a foreign VCS
- Document details of transport function APIs
- Allow late reporting of fetched hashes
* hv/cvsps-tests (Sun Apr 5 01:40:50 2009 -0700) 8 commits
- t/t9600: remove exit after test_done
- cvsimport: extend testcase about patchset order to contain
branches
- cvsimport: add test illustrating a bug in cvsps
- Add a test of "git cvsimport"'s handling of tags and branches
- Add some tests of git-cvsimport's handling of vendor branches
- Test contents of entire cvsimported "master" tree contents
- Use CVS's -f option if available (ignore user's ~/.cvsrc file)
- Start a library for cvsimport-related tests
----------------------------------------------------------------
[Actively cooking]
* da/araxis-mergetool (Sun May 24 00:24:41 2009 +0000) 1 commit
+ mergetool--lib: add support for araxis merge
* jc/cache-tree (Fri May 22 23:14:25 2009 -0700) 5 commits
+ Avoid "diff-index --cached" optimization under --find-copies-
harder
+ Optimize "diff-index --cached" using cache-tree
+ t4007: modernize the style
+ cache-tree.c::cache_tree_find(): simplify internal API
+ write-tree --ignore-cache-tree
* cb/maint-1.6.0-xdl-merge-fix (Mon May 25 01:21:14 2009 +0100) 2 commits
- Change xdl_merge to generate output even for null merges
- t6023: merge-file fails to output anything for a degenerate merge
Soon in 'next';
* jc/diff-whitespace-only-status (Sat May 23 01:15:35 2009 -0700) 2 commits
- diff: Rename QUIET internal option to QUICK
- diff: change semantics of "ignore whitespace" options
* cc/bisect (Thu May 28 23:21:16 2009 +0200) 2 commits
- bisect: display first bad commit without forking a new process
- bisect: drop unparse_commit() and use clear_commit_marks()
Soon in 'next';
* rc/http-push (Sat May 30 01:59:50 2009 +0800) 21 commits
- http*: add helper methods for fetching objects (loose)
- http*: add helper methods for fetching packs
- http: use new http API in fetch_index()
- http*: add http_get_info_packs
- Use the new http API in fetch_symref()
- Use the new http API in update_remote_info_refs()
- Use the new http API in http_fetch_ref()
- Use the new http API in get_refs_via_curl()
- Two new functions for the http API
- http: create function end_url_with_slash
- http*: move common variables and macros to http.[ch]
- Some cleanup in get_refs_via_curl()
- Don't expect verify_pack() callers to set pack_size
- http-push: do not SEGV after fetching a bad pack idx file
- http*: copy string returned by sha1_to_hex
- http-walker: verify remote packs
- http-push, http-walker: style fixes
- http-push: fix missing "#ifdef USE_CURL_MULTI" around
"is_running_queue"
- http-push: send out fetch requests on queue
- t5540-http-push: test fetching of packed objects
- t5540-http-push: test fetching of loose objects
Updated (but not yet with the "slot->local = NULL" patch)
* cc/replace (Wed May 27 07:14:09 2009 +0200) 14 commits
- t6050: check pushing something based on a replaced commit
- Documentation: add documentation for "git replace"
- Add git-replace to .gitignore
- builtin-replace: use "usage_msg_opt" to give better error messages
- parse-options: add new function "usage_msg_opt"
- builtin-replace: teach "git replace" to actually replace
- Add new "git replace" command
- environment: add global variable to disable replacement
- mktag: call "check_sha1_signature" with the replacement sha1
- replace_object: add a test case
- object: call "check_sha1_signature" with the replacement sha1
- sha1_file: add a "read_sha1_file_repl" function
- replace_object: add mechanism to replace objects found in
"refs/replace/"
- refs: add a "for_each_replace_ref" function
Rebased to master.
----------------------------------------------------------------
[On Hold]
* jc/deny-delete-current-1.7.0 (Mon Feb 9 00:19:46 2009 -0800) 1 commit
- receive-pack: default receive.denyDeleteCurrent to refuse
* jc/refuse-push-to-current-1.7.0 (Wed Feb 11 02:28:03 2009 -0800) 1 commit
- Refuse updating the current branch in a non-bare repository via
push
These are for 1.7.0, but the messages when they trigger together may need
to be rethought.
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (Nov 2009, #06; Wed, 25)
@ 2009-11-26 1:03 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2009-11-26 1:03 UTC (permalink / raw)
To: git
I wanted to do a 1.6.6-rc1 but somehow ended up spending too much time in
mail compose buffer instead of in C-mode today. There are a few topics
that are in "stalled" state that may be worthy of being in 1.6.6.
We should start updating the Release Notes to make the 1.7.0 warning a bit
more visible.
-- >8 --
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
marked with '.' do not appear in any of the integration branches, but I am
still holding onto them.
In 1.7.0, we plan to correct handful of warts in the interfaces everybody
agrees that they were mistakes. The resulting system may not be strictly
backward compatible. Currently planned changes are:
* refuse push to update the checked out branch in a non-bare repo by
default
Make "git push" into a repository to update the branch that is checked
out fail by default. You can countermand this default by setting a
configuration variable in the receiving repository.
http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007
* refuse push to delete the current branch by default
Make "git push $there :$killed" to delete the branch that is pointed at
by its HEAD fail by default. You can countermand this default by
setting a configuration variable in the receiving repository.
http://thread.gmane.org/gmane.comp.version-control.git/108862/focus=108936
* "git send-email" won't make deep threads by default
Many people said that by default when sending more than 2 patches the
threading git-send-email makes by default is hard to read, and they
prefer the default be one cover letter and each patch as a direct
follow-up to the cover letter. You can countermand this by setting a
configuration variable.
http://article.gmane.org/gmane.comp.version-control.git/109790
* "git status" won't be "git-commit --dry-run" anymore
http://thread.gmane.org/gmane.comp.version-control.git/125989/focus=125993
* "git diff -w --exit-code" will exit success if only differences it
found are whitespace changes that are stripped away from the output.
http://thread.gmane.org/gmane.comp.version-control.git/119731/focus=119751
* "git diff -w/-b" won't even produce "diff --git" header when all changes
are about whitespaces.
http://thread.gmane.org/gmane.comp.version-control.git/133256
--------------------------------------------------
[Graduated to "master"]
* bg/fetch-multi (2009-11-10) 9 commits.
(merged to 'next' on 2009-11-21 at 282f464)
+ Re-implement 'git remote update' using 'git fetch'
+ builtin-fetch: add --dry-run option
+ builtin-fetch: add --prune option
+ teach warn_dangling_symref to take a FILE argument
+ remote: refactor some logic into get_stale_heads()
+ Add missing test for 'git remote update --prune'
+ Add the configuration option skipFetchAll
+ Teach the --multiple option to 'git fetch'
+ Teach the --all option to 'git fetch'
* bg/apply-doc (2009-11-22) 4 commits
(merged to 'next' on 2009-11-22 at b42fece)
+ apply: Use the term "working tree" consistently
+ apply: Format all options using back-quotes
+ apply: apply works outside a repository
+ Clarify and correct -z
* cc/replace (2009-11-19) 3 commits
(merged to 'next' on 2009-11-21 at 2aaf84b)
+ Documentation: talk a little bit about GIT_NO_REPLACE_OBJECTS
+ Documentation: fix typos and spelling in replace documentation
+ replace: use a GIT_NO_REPLACE_OBJECTS env variable
* mm/maint-hint-failed-merge (2009-11-22) 2 commits.
(merged to 'next' on 2009-11-22 at c0f64c2)
+ user-manual: Document that "git merge" doesn't like uncommited changes.
+ merge-recursive: point the user to commit when file would be overwritten.
* rj/maint-cygwin-count-objects (2009-11-19) 2 commits.
(merged to 'next' on 2009-11-22 at 4ba5880)
+ ST_BLOCKS_COUNTS_IN_BLKSIZE to say on-disk size is (st_blksize * st_blocks)
+ git-count-objects: Fix a disk-space under-estimate on Cygwin
* rs/color-escape-has-zero-width (2009-11-23) 1 commit
+ Teach %w() that color escape codes have zero width
* jc/log-stdin (2009-11-23) 5 commits
(merged to 'next' on 2009-11-23 at ea71363)
+ Add trivial tests for --stdin option to log family
(merged to 'next' on 2009-11-21 at c3e2e52)
+ Make --stdin option to "log" family read also pathspecs
+ setup_revisions(): do not call get_pathspec() too early
+ Teach --stdin option to "log" family
+ read_revision_from_stdin(): use strbuf
* mr/gitweb-snapshot (2009-11-07) 4 commits.
(merged to 'next' on 2009-11-21 at e825ad9)
+ gitweb: Smarter snapshot names
+ gitweb: Document current snapshot rules via new tests
+ t/gitweb-lib.sh: Split gitweb output into headers and body
(merged to 'next' on 2009-10-11 at 22ba047)
+ gitweb: check given hash before trying to create snapshot
* rs/work-around-grep-opt-insanity (2009-11-23) 2 commits.
(merged to 'next' on 2009-11-25 at bf972d8)
+ Protect scripted Porcelains from GREP_OPTIONS insanity
+ mergetool--lib: simplify guess_merge_tool()
--------------------------------------------------
[New Topics]
* jc/botched-maint-cygwin-count-objects (2009-11-24) 2 commits
(merged to 'next' on 2009-11-25 at 8aa62a0)
+ Revert "ST_BLOCKS_COUNTS_IN_BLKSIZE to say on-disk size is (st_blksize * st_blocks)"
(merged to 'next' on 2009-11-22 at 4ba5880)
+ ST_BLOCKS_COUNTS_IN_BLKSIZE to say on-disk size is (st_blksize * st_blocks)
This is a revert of the tip one I merged prematurely to 'next'. The real
fix from Ramsay is already in 'master'.
* jc/grep-full-tree (2009-11-24) 1 commit.
- grep: --full-tree
We probably would want test, doc and a configuration variable to make it
default (or non-default) before we can merge it to 'master'.
* uk/maint-shortlog-encoding (2009-11-25) 1 commit.
- shortlog: respect commit encoding
The fix is a maint material but the patch was against next, so I
back-rebased it myself. I tried to be careful but please double check the
result.
Perhaps merge it to 'master' before 1.6.6-rc1?
--------------------------------------------------
[Stalled]
* je/send-email-no-subject (2009-08-05) 1 commit.
(merged to 'next' on 2009-10-11 at 1b99c56)
+ send-email: confirm on empty mail subjects
The existing tests cover the positive case (i.e. as long as the user says
"yes" to the "do you really want to send this message that lacks subject",
the message is sent) of this feature, but the feature itself needs its own
test to verify the negative case (i.e. does it correctly stop if the user
says "no"?)
* fc/send-email-envelope (2009-11-22) 1 commit.
- t9001: test --envelope-sender option of send-email
The new feature itself looked promising; this is just an unrelated test
patch.
* jn/rfc-pull-rebase-error-message (2009-11-12) 1 commit
- git-pull.sh --rebase: overhaul error handling when no candidates are found
I heard this needs at least retitling among other changes?
* sr/vcs-helper (2009-11-18) 12 commits
- Add Python support library for remote helpers
- Basic build infrastructure for Python scripts
- Allow helpers to report in "list" command that the ref is unchanged
- Fix various memory leaks in transport-helper.c
- Allow helper to map private ref names into normal names
- Add support for "import" helper command
- Allow specifying the remote helper in the url
- Add a config option for remotes to specify a foreign vcs
- Allow fetch to modify refs
- Use a function to determine whether a remote is valid
- Allow programs to not depend on remotes having urls
- Fix memory leak in helper method for disconnect
Replaced again, and looking good. Perhaps Daniel has some comments?
* jh/notes (2009-11-20) 10 commits
- Add more testcases to test fast-import of notes
- Rename t9301 to t9350, to make room for more fast-import tests
- fast-import: Proper notes tree manipulation using the notes API
- Refactor notes concatenation into a flexible interface for combining notes
- Notes API: Allow multiple concurrent notes trees with new struct notes_tree
- Notes API: for_each_note(): Traverse the entire notes tree with a callback
- Notes API: get_note(): Return the note annotating the given object
- Notes API: add_note(): Add note objects to the internal notes tree structure
- Notes API: init_notes(): Initialize the notes tree from the given notes ref
- Notes API: get_commit_notes() -> format_note() + remove the commit restriction
Johan waits for an Ack from Shawn on "fast-import" one.
* tr/maint-merge-ours-clarification (2009-11-15) 1 commit
(merged to 'next' on 2009-11-21 at fadaf7b)
+ rebase: refuse to rebase with -s ours
I do not think we reached a concensus for solving conflicts between "give
them rope" and "protect users from clearly meaningless combinations". The
author obviously is for the latter (and I am inclined to agree); Dscho
seems to think otherwise.
* jc/fix-tree-walk (2009-10-22) 8 commits
(merged to 'next' on 2009-10-22 at 10c0c8f)
+ Revert failed attempt since 353c5ee
+ read-tree --debug-unpack
(merged to 'next' on 2009-10-11 at 0b058e2)
+ unpack-trees.c: look ahead in the index
+ unpack-trees.c: prepare for looking ahead in the index
+ Aggressive three-way merge: fix D/F case
+ traverse_trees(): handle D/F conflict case sanely
+ more D/F conflict tests
+ tests: move convenience regexp to match object names to test-lib.sh
This has some stupid bugs and reverted from 'next' until I can fix it, but
the "temporarily" turned out to be very loooong. Sigh...
* sr/gfi-options (2009-09-06) 6 commits.
- fast-import: test the new option command
- fast-import: add option command
- fast-import: test the new feature command
- fast-import: add feature command
- fast-import: put marks reading in it's own function
- fast-import: put option parsing code in separate functions
Sverre is working on a re-roll to address comments from Shawn.
--------------------------------------------------
[Cooking]
* jc/mailinfo-remove-brackets (2009-07-15) 1 commit.
(merged to 'next' on 2009-11-25 at 09d498f)
+ mailinfo: -b option keeps [bracketed] strings that is not a [PATCH] marker
Jim Meyering sent a patch to do a subset of what this does; to allow
keeping '[SECURITY]' when the subject says '[SECURITY][PATCH]', you need
to also teach "am" to pass the new -b option, but that is independent of
what Jim showed the need in real-world, so I think this can go in as-is.
Perhaps merge it to 'master' before 1.6.6-rc1?
* jc/checkout-merge-base (2009-11-20) 2 commits
- "rebase --onto A...B" replays history on the merge base between A and B
- "checkout A...B" switches to the merge base between A and B
I've been using the first one for a while myself but do not see many users
want this (yet); the new feature is not urgent anyway.
* tr/reset-checkout-patch (2009-11-19) 1 commit.
(merged to 'next' on 2009-11-22 at b224950)
+ {checkout,reset} -p: make patch direction configurable
I do not particularly like a configuration like this that changes the
behaviour of a command in a drastic way---it will make helping others much
harder.
Perhaps merge it to 'master' before 1.6.6-rc1?
* jn/gitweb-blame (2009-11-24) 8 commits.
(merged to 'next' on 2009-11-25 at 0a5b649)
+ gitweb.js: fix padLeftStr() and its usage
+ gitweb.js: Harden setting blamed commit info in incremental blame
+ gitweb.js: fix null object exception in initials calculation
+ gitweb: Minify gitweb.js if JSMIN is defined
+ gitweb: Create links leading to 'blame_incremental' using JavaScript
(merged to 'next' on 2009-10-11 at 73c4a83)
+ gitweb: Colorize 'blame_incremental' view during processing
+ gitweb: Incremental blame (using JavaScript)
+ gitweb: Add optional "time to generate page" info in footer
Ajax-y blame, with further fixes. As this does not seem to break existing
features, I am inclined to say that we push this out early, as a new
feature with known breakages, to give it wider audience.
* em/commit-claim (2009-11-04) 1 commit
(merged to 'next' on 2009-11-23 at b5df6fd)
+ commit -c/-C/--amend: reset timestamp and authorship to committer with --reset-author
I am not sure if the option name does a good job at explaining it to the
end users, but I think the code and feature is solid.
Perhaps merge it to 'master' before 1.6.6-rc1?
* cc/bisect-doc (2009-11-08) 1 commit
- Documentation: add "Fighting regressions with git bisect" article
Nobody seems to think this should go to Documentation/technical instead,
so unless I hear otherwise, we will have it as-is in 'next' shortly.
Perhaps merge it to 'master' before 1.6.6-rc1?
* nd/sparse (2009-11-25) 20 commits.
(merged to 'next' on 2009-11-25 at 71380f5)
+ tests: rename duplicate t1009
(merged to 'next' on 2009-11-23 at f712a41)
+ sparse checkout: inhibit empty worktree
+ Add tests for sparse checkout
+ read-tree: add --no-sparse-checkout to disable sparse checkout support
+ unpack-trees(): ignore worktree check outside checkout area
+ unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index
+ unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout
+ unpack-trees.c: generalize verify_* functions
+ unpack-trees(): add CE_WT_REMOVE to remove on worktree alone
+ Introduce "sparse checkout"
+ dir.c: export excluded_1() and add_excludes_from_file_1()
+ excluded_1(): support exclude files in index
+ unpack-trees(): carry skip-worktree bit over in merged_entry()
+ Read .gitignore from index if it is skip-worktree
+ Avoid writing to buffer in add_excludes_from_file_1()
+ Teach Git to respect skip-worktree bit (writing part)
+ Teach Git to respect skip-worktree bit (reading part)
+ Introduce "skip-worktree" bit in index, teach Git to get/set this bit
+ Add test-index-version
+ update-index: refactor mark_valid() in preparation for new options
* jc/pretty-lf (2009-10-04) 1 commit.
- Pretty-format: %[+-]x to tweak inter-item newlines
Perhaps drop the "%-x" part and merge it to 'next' and to 'master' before
1.6.6?
--------------------------------------------------
[For 1.7.0]
* jk/1.7.0-status (2009-09-05) 5 commits.
(merged to 'next' on 2009-11-21 at 884bb56)
+ docs: note that status configuration affects only long format
(merged to 'next' on 2009-10-11 at 65c8513)
+ commit: support alternate status formats
+ status: add --porcelain output format
+ status: refactor format option parsing
+ status: refactor short-mode printing to its own function
(this branch uses jc/1.7.0-status.)
Gives the --short output format to post 1.7.0 "git commit --dry-run" that
is similar to that of post 1.7.0 "git status".
* jc/1.7.0-status (2009-09-05) 4 commits.
(merged to 'next' on 2009-10-11 at 9558627)
+ status: typo fix in usage
+ git status: not "commit --dry-run" anymore
+ git stat -s: short status output
+ git stat: the beginning of "status that is not a dry-run of commit"
(this branch is used by jk/1.7.0-status.)
With this, "git status" is no longer "git commit --dry-run".
* jc/1.7.0-send-email-no-thread-default (2009-08-22) 1 commit.
(merged to 'next' on 2009-10-11 at 043acdf)
+ send-email: make --no-chain-reply-to the default
* jc/1.7.0-diff-whitespace-only-status (2009-08-30) 4 commits.
(merged to 'next' on 2009-10-11 at 546c74d)
+ diff.c: fix typoes in comments
+ Make test case number unique
+ diff: Rename QUIET internal option to QUICK
+ diff: change semantics of "ignore whitespace" options
This changes exit code from "git diff --ignore-whitespace" and friends
when there is no actual output. It is a backward incompatible change, but
we could argue that it is a bugfix.
* gb/1.7.0-diff-whitespace-only-outout (2009-11-19) 1 commit
(merged to 'next' on 2009-11-21 at 3375bf4)
+ No diff -b/-w output for all-whitespace changes
* jc/1.7.0-push-safety (2009-02-09) 2 commits.
(merged to 'next' on 2009-10-11 at 81b8128)
+ Refuse deleting the current branch via push
+ Refuse updating the current branch in a non-bare repository via push
--------------------------------------------------
[I have been too busy to purge these]
* jc/log-tz (2009-03-03) 1 commit.
- Allow --date=local --date=other-format to work as expected
Maybe some people care about this. I dunno.
* jc/1.7.0-no-commit-no-ff-2 (2009-10-22) 1 commit.
. git-merge: forbid fast-forward and up-to-date when --no-commit is given
This makes "git merge --no-commit" fail when it results in fast-forward or
up-to-date. It appears nobody wants to have this, so I dropped it.
* ne/rev-cache (2009-10-19) 7 commits.
. support for commit grafts, slight change to general mechanism
. support for path name caching in rev-cache
. full integration of rev-cache into git, completed test suite
. administrative functions for rev-cache, start of integration into git
. support for non-commit object caching in rev-cache
. basic revision cache system, no integration or features
. man page and technical discussion for rev-cache
The author indicated that there is another round coming. Does not seem to
pass the tests when merged to 'pu', so it has been ejected for now.
* pb/gitweb-no-project-list (2009-11-06) 3 commits.
. gitweb: Polish the content tags support
. gitweb: Support for no project list on gitweb front page
. gitweb: Refactor project list routines
I picked these up but didn't queue as Warthog9's comments made certain
amount of sense to me.
* ks/precompute-completion (2009-11-15) 4 commits.
(merged to 'next' on 2009-11-15 at 23cdb96)
+ Revert ks/precompute-completion series
(merged to 'next' on 2009-10-28 at cd5177f)
+ completion: ignore custom merge strategies when pre-generating
(merged to 'next' on 2009-10-22 at f46a28a)
+ bug: precomputed completion includes scripts sources
(merged to 'next' on 2009-10-14 at adf722a)
+ Speedup bash completion loading
Reverted out of 'next', to be replaced with jn/faster-completion-startup
topic.
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (Jan 2010, #04; Wed, 13)
@ 2010-01-13 23:11 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2010-01-13 23:11 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
marked with '.' do not appear in any of the integration branches, but I am
still holding onto them.
--------------------------------------------------
[Graduated to "master"]
* nd/sparse (2010-01-04) 25 commits
(merged to 'next' on 2010-01-10 at fa73d6e)
+ t7002: test for not using external grep on skip-worktree paths
+ t7002: set test prerequisite "external-grep" if supported
(merged to 'next' on 2010-01-02 at 5499bbe)
+ grep: do not do external grep on skip-worktree entries
+ commit: correctly respect skip-worktree bit
+ ie_match_stat(): do not ignore skip-worktree bit with CE_MATCH_IGNORE_VALID
+ tests: rename duplicate t1009
+ sparse checkout: inhibit empty worktree
+ Add tests for sparse checkout
+ read-tree: add --no-sparse-checkout to disable sparse checkout support
+ unpack-trees(): ignore worktree check outside checkout area
+ unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index
+ unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout
+ unpack-trees.c: generalize verify_* functions
+ unpack-trees(): add CE_WT_REMOVE to remove on worktree alone
+ Introduce "sparse checkout"
+ dir.c: export excluded_1() and add_excludes_from_file_1()
+ excluded_1(): support exclude files in index
+ unpack-trees(): carry skip-worktree bit over in merged_entry()
+ Read .gitignore from index if it is skip-worktree
+ Avoid writing to buffer in add_excludes_from_file_1()
+ Teach Git to respect skip-worktree bit (writing part)
+ Teach Git to respect skip-worktree bit (reading part)
+ Introduce "skip-worktree" bit in index, teach Git to get/set this bit
+ Add test-index-version
+ update-index: refactor mark_valid() in preparation for new options
With the removal of external grep near future, some codepaths will be
slightly simplified.
* cc/reset-more (2010-01-08) 8 commits
(merged to 'next' on 2010-01-10 at 84730de)
+ t7111: check that reset options work as described in the tables
(merged to 'next' on 2010-01-06 at 96639cb)
+ Documentation: reset: add some missing tables
(merged to 'next' on 2010-01-04 at 8802c2c)
+ Fix bit assignment for CE_CONFLICTED
(merged to 'next' on 2010-01-03 at f83d4c6)
+ "reset --merge": fix unmerged case
+ reset: use "unpack_trees()" directly instead of "git read-tree"
+ reset: add a few tests for "git reset --merge"
+ Documentation: reset: add some tables to describe the different options
+ reset: improve mixed reset error message when in a bare repo
* rs/maint-archive-match-pathspec (2009-12-12) 1 commit
(merged to 'next' on 2010-01-03 at 92d7d15)
+ archive: complain about path specs that don't match anything
* il/vcs-helper (2010-01-09) 9 commits
(merged to 'next' on 2010-01-10 at 11e448e)
+ Reset possible helper before reusing remote structure
(merged to 'next' on 2010-01-06 at 7c79f42)
+ Remove special casing of http, https and ftp
+ Support remote archive from all smart transports
+ Support remote helpers implementing smart transports
+ Support taking over transports
+ Refactor git transport options parsing
+ Pass unknown protocols to external protocol handlers
+ Support mandatory capabilities
+ Add remote helper debug mode
* jc/checkout-merge-base (2010-01-07) 4 commits
(merged to 'next' on 2010-01-07 at 5229608)
+ rebase -i: teach --onto A...B syntax
+ rebase: fix --onto A...B parsing and add tests
(merged to 'next' on 2010-01-02 at 6a8f6fc)
+ "rebase --onto A...B" replays history on the merge base between A and B
+ "checkout A...B" switches to the merge base between A and B
--------------------------------------------------
[New Topics]
* jc/maint-1.6.4-grep-lookahead (2010-01-10) 1 commit
(merged to 'next' on 2010-01-13 at 20f8f4b)
+ grep: optimize built-in grep by skipping lines that do not hit
(this branch is used by jc/grep-lookahead and jc/maint-grep-lookahead.)
Optimize the "line-by-line" internal grep by skiping en masse over lines
that cannot possibly match.
* jc/maint-grep-lookahead (2010-01-12) 0 commits
(this branch uses jc/maint-1.6.4-grep-lookahead; is used by jc/grep-lookahead.)
Early conflict resolution for the above for recent git.
* jc/grep-lookahead (2010-01-12) 2 commits
(merged to 'next' on 2010-01-13 at 20f8f4b)
+ grep: rip out pessimization to use fixmatch()
+ grep: rip out support for external grep
(this branch uses jc/maint-1.6.4-grep-lookahead and jc/maint-grep-lookahead.)
This is for eventual inclusion for the next release.
* jc/symbol-static (2010-01-11) 17 commits
- symlinks.c: remove unused functions
- object.c: remove unused functions
- blob.c: remove unused function
- strbuf.c: remove unused function
- sha1_file.c: remove unused function
- mailmap.c: remove unused function
- utf8.c: mark file-local function static
- submodule.c: mark file-local function static
- quote.c: mark file-local function static
- remote-curl.c: mark file-local function static
- read-cache.c: mark file-local functions static
- parse-options.c: mark file-local function static
- entry.c: mark file-local function static
- http.c: mark file-local functions static
- pretty.c: mark file-local function static
- builtin-rev-list.c: mark file-local function static
- bisect.c: mark file-local function static
Mark file-local symbols "static", and remove unused functions. Daniel
suggests to leave some comment for blob.c and I agree in principle, but
I don't think of a good description myself.
* nd/include-termios-for-osol (2010-01-11) 1 commit
- Add missing #include to support TIOCGWINSZ on Solaris
* pc/uninteresting-submodule-disappear-upon-switch-branches (2010-01-11) 1 commit
- Remove empty directories when checking out a commit with fewer submodules
Instead of using unlink(2) that will never succeed, use rmdir(2) to remove
an empty directory, knowing that this won't harm a populated directory.
* sd/cd-p-show-toplevel (2010-01-12) 2 commits
- Use $(git rev-parse --show-toplevel) in cd_to_toplevel().
- Add 'git rev-parse --show-toplevel' option.
Avoid having to use "cd -P" that may not be available on some platforms'
shells.
* jk/warn-author-committer-after-commit (2010-01-13) 4 commits
- commit: allow suppression of implicit identity advice
- commit: show interesting ident information in summary
- strbuf: add strbuf_addbuf_percentquote
- strbuf_expand: convert "%%" to "%"
* js/refer-upstream (2009-09-10) 1 commit
- Introduce <branch>@{upstream} notation
This does not teach the public interface about the new syntax; callers
that care about distinction between name vs SHA-1 might not work as well
as they should.
* mm/conflict-advice (2010-01-12) 1 commit
- Be more user-friendly when refusing to do something because of conflict.
* jc/maint-strbuf-add-fix-doubling (2010-01-12) 1 commit
- strbuf_addbuf(): allow passing the same buf to dst and src
* jl/submodule-diff (2010-01-13) 2 commits
- Teach diff that modified submodule directory is dirty
- Show submodules as modified when they contain a dirty work tree
--------------------------------------------------
[Stalled]
* ap/merge-backend-opts (2008-07-18) 6 commits
- Document that merge strategies can now take their own options
- Extend merge-subtree tests to test -Xsubtree=dir.
- Make "subtree" part more orthogonal to the rest of merge-recursive.
- Teach git-pull to pass -X<option> to git-merge
- git merge -X<option>
- git-merge-file --ours, --theirs
"git pull" patch needs sq-then-eval fix to protect it from $IFS
but otherwise seemed good.
* mh/rebase-fixup (2010-01-12) 5 commits
(merged to 'next' on 2010-01-12 at e84eab0)
+ rebase-i: Ignore comments and blank lines in peek_next_command
+ lib-rebase: Allow comments and blank lines to be added to the rebase script
+ lib-rebase: Provide clearer debugging info about what the editor did
(merged to 'next' on 2010-01-06 at c4779a7)
+ Add a command "fixup" to rebase --interactive
+ t3404: Use test_commit to set up test repository
(this branch is used by ns/rebase-auto-squash.)
Expecting further improvements to skip opening the editor if a pick is
followed only by "fixup" and no "squash".
* ns/rebase-auto-squash (2009-12-08) 1 commit
(merged to 'next' on 2010-01-06 at da4e2f5)
+ rebase -i --autosquash: auto-squash commits
(this branch uses mh/rebase-fixup.)
Blocked by the above.
* jh/notes (2009-12-07) 11 commits
- Refactor notes concatenation into a flexible interface for combining notes
- Notes API: Allow multiple concurrent notes trees with new struct notes_tree
- Notes API: for_each_note(): Traverse the entire notes tree with a callback
- Notes API: get_note(): Return the note annotating the given object
- Notes API: add_note(): Add note objects to the internal notes tree structure
- Notes API: init_notes(): Initialize the notes tree from the given notes ref
- Notes API: get_commit_notes() -> format_note() + remove the commit restriction
- Minor style fixes to notes.c
(merged to 'next' on 2010-01-02 at ae42130)
+ Add more testcases to test fast-import of notes
+ Rename t9301 to t9350, to make room for more fast-import tests
+ fast-import: Proper notes tree manipulation
http://thread.gmane.org/gmane.comp.version-control.git/134738
What's the status of the fourth and later patches on this topic? Overall
it looked reasonable, if I recall correctly what I thought when I reviewed
it last time, and I am tempted to merge it to 'next' soonish. Please
file complaints before I do so if people have objections.
Hold: JH on 2010-01-05, http://article.gmane.org/gmane.comp.version-control.git/136183
* jh/gitweb-cached (2010-01-13) 7 commits
- (sign-off?) gitweb: File based caching layer (from git.kernel.org)
- (sign-off?) gitweb: add a get function to compliment print_local_time
- (sign-off?) gitweb: Convert output to using indirect file handle
- gitweb: Optionally add "git" links in project list page
- gitweb: Makefile improvements
- gitweb: Add option to force version match
- gitweb: Load checking
Replaced with a re-roll. Update to t9500 is probably needed.
--------------------------------------------------
[Cooking]
* jh/commit-status (2010-01-13) 2 commits
(merged to 'next' on 2010-01-13 at 0905d59)
+ t7502: test commit.status, --status and --no-status
+ commit: support commit.status, --status, and --no-status
I have already given ample time for people to react, but ended up getting
tired of waiting for tests to materialize and doing it myself, as I want
to close merge window for 1.7.0-rc0 by the end of next week to have the
final release early next month.
* bk/fix-relative-gitdir-file (2010-01-08) 2 commits
- Handle relative paths in submodule .git files
- Test update-index for a gitlink to a .git file
* jc/ident (2010-01-08) 3 commits
- ident.c: treat $EMAIL as giving user.email identity explicitly
(merged to 'next' on 2010-01-10 at f1f9ded)
+ ident.c: check explicit identity for name and email separately
+ ident.c: remove unused variables
Opinions on the topmost one?
* jc/ls-files-ignored-pathspec (2010-01-08) 4 commits
- ls-files: fix overeager pathspec optimization
- read_directory(): further split treat_path()
- read_directory_recursive(): refactor handling of a single path into a separate function
- t3001: test ls-files -o ignored/dir
* js/exec-error-report (2010-01-12) 4 commits
- Improve error message when a transport helper was not found
- start_command: detect execvp failures early
- run-command: move wait_or_whine earlier
- start_command: report child process setup errors to the parent's stderr
* jc/maint-1.6.1-checkout-m-custom-merge (2010-01-06) 1 commit
(merged to 'next' on 2010-01-10 at df14116)
+ checkout -m path: fix recreating conflicts
* jn/makefile (2010-01-06) 4 commits
(merged to 'next' on 2010-01-10 at f5a5d42)
+ Makefile: consolidate .FORCE-* targets
+ Makefile: learn to generate listings for targets requiring special flags
+ Makefile: use target-specific variable to pass flags to cc
+ Makefile: regenerate assembler listings when asked
* da/difftool (2010-01-09) 6 commits
(merged to 'next' on 2010-01-10 at 749c870)
+ git-diff.txt: Link to git-difftool
+ difftool: Allow specifying unconfigured commands with --extcmd
+ difftool--helper: Remove use of the GIT_MERGE_TOOL variable
+ difftool--helper: Update copyright and remove distracting comments
(merged to 'next' on 2010-01-06 at e957395)
+ git-difftool: Add '--gui' for selecting a GUI tool
+ t7800-difftool: Set a bogus tool for use by tests
* tc/test-locate-httpd (2010-01-02) 1 commit
(merged to 'next' on 2010-01-06 at 9d913e5)
+ t/lib-http.sh: Restructure finding of default httpd location
* jc/fix-tree-walk (2009-09-14) 7 commits
(merged to 'next' on 2010-01-13 at 1c01b87)
+ read-tree --debug-unpack
+ unpack-trees.c: look ahead in the index
+ unpack-trees.c: prepare for looking ahead in the index
+ Aggressive three-way merge: fix D/F case
+ traverse_trees(): handle D/F conflict case sanely
+ more D/F conflict tests
+ tests: move convenience regexp to match object names to test-lib.sh
Resurrected from "Ejected" category. This is fix for a tricky codepath
and testing and improving before it hits 'master' is greatly appreciated.
(I have been using this in my private build for some time).
* jc/branch-d (2009-12-29) 1 commit
(merged to 'next' on 2010-01-10 at 61a14b7)
+ branch -d: base the "already-merged" safety on the branch it merges with
* jc/rerere (2009-12-04) 1 commit
(merged to 'next' on 2010-01-10 at e295b7f)
+ Teach --[no-]rerere-autoupdate option to merge, revert and friends
* jk/run-command-use-shell (2010-01-01) 8 commits
(merged to 'next' on 2010-01-10 at 7479e2a)
+ t4030, t4031: work around bogus MSYS bash path conversion
+ diff: run external diff helper with shell
+ textconv: use shell to run helper
+ editor: use run_command's shell feature
+ run-command: optimize out useless shell calls
+ run-command: convert simple callsites to use_shell
+ t0021: use $SHELL_PATH for the filter script
+ run-command: add "use shell" option
Shuffled the commits in the topic, following J6t's suggestion in
http://thread.gmane.org/gmane.comp.version-control.git/136128
* tc/clone-v-progress (2009-12-26) 4 commits
(merged to 'next' on 2010-01-10 at ec2bfd7)
+ clone: use --progress to force progress reporting
+ clone: set transport->verbose when -v/--verbose is used
+ git-clone.txt: reword description of progress behaviour
+ check stderr with isatty() instead of stdout when deciding to show progress
Perhaps needs an entry in the Release Notes, but otherwise looked Ok.
* tc/smart-http-restrict (2010-01-02) 4 commits
(merged to 'next' on 2010-01-06 at 82736cb)
+ Smart-http tests: Test http-backend without curl or a webserver
+ Smart-http tests: Break test t5560-http-backend into pieces
+ Smart-http tests: Improve coverage in test t5560
+ Smart-http: check if repository is OK to export before serving it
* jc/cache-unmerge (2009-12-25) 9 commits
(merged to 'next' on 2010-01-13 at 2290c44)
+ rerere forget path: forget recorded resolution
+ rerere: refactor rerere logic to make it independent from I/O
+ rerere: remove silly 1024-byte line limit
+ resolve-undo: teach "update-index --unresolve" to use resolve-undo info
+ resolve-undo: "checkout -m path" uses resolve-undo information
+ resolve-undo: allow plumbing to clear the information
+ resolve-undo: basic tests
+ resolve-undo: record resolved conflicts in a new index extension section
+ builtin-merge.c: use standard active_cache macros
* tr/http-push-ref-status (2010-01-08) 6 commits
- transport-helper.c::push_refs(): emit "no refs" error message
- transport-helper.c::push_refs(): ignore helper-reported status if ref is not to be pushed
- transport.c::transport_push(): make ref status affect return value
- refactor ref status logic for pushing
- t5541-http-push.sh: add test for unmatched, non-fast-forwarded refs
- t5541-http-push.sh: add tests for non-fast-forward pushes
Rerolled.
* sr/gfi-options (2009-12-04) 7 commits
(merged to 'next' on 2010-01-10 at 8b305fb)
+ fast-import: add (non-)relative-marks feature
+ fast-import: allow for multiple --import-marks= arguments
+ fast-import: test the new option command
+ fast-import: add option command
+ fast-import: add feature command
+ fast-import: put marks reading in its own function
+ fast-import: put option parsing code in separate functions
^ permalink raw reply [relevance 2%]
* Re: Git automatic stashing?
@ 2010-11-09 7:49 2% ` Matthieu Moy
0 siblings, 0 replies; 200+ results
From: Matthieu Moy @ 2010-11-09 7:49 UTC (permalink / raw)
To: Casey McGinty; +Cc: git
Casey McGinty <casey.mcginty@gmail.com> writes:
> Is there any feature in git to perform and auto stash apply/pop when
> trying to do a merge/rebase in a dirty working dir? This would save
> some keystrokes from time-to-time, and make it easier for new users
> unfamiliar with git.
I agree with the keystrokes part, but not with the fact that it would
make it easier in general. In the sequence
git stash
git merge
git stash pop
conflicts can occur in 2 distinct places. One can easily forsee this
senario occuring:
git stash
git merge
# fix conflicts
# git commit
# forget to do the action needed to get the "git stash pop"
and voila, you've just lost data.
Actually, what I'd like to see would be this feature, but limited to
the case where the merge is a fast-forward, because then, only the
last action of the sequence could possibly leave conflict, so Git
could finish with a message like "please fix conflicts and continue
working". Actually, this is not far from what "git checout -m" is
doing.
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
^ permalink raw reply [relevance 2%]
* [ANNOUNCE] GIT 1.6.1.3
@ 2009-02-07 21:54 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2009-02-07 21:54 UTC (permalink / raw)
To: git; +Cc: linux-kernel
The latest maintenance release GIT 1.6.1.3 is available at the
usual places:
http://www.kernel.org/pub/software/scm/git/
git-1.6.1.3.tar.{gz,bz2} (source tarball)
git-htmldocs-1.6.1.3.tar.{gz,bz2} (preformatted docs)
git-manpages-1.6.1.3.tar.{gz,bz2} (preformatted docs)
The RPM binary packages for a few architectures are also provided
as courtesy.
RPMS/$arch/git-*-1.6.1.3-1.fc9.$arch.rpm (RPM)
GIT v1.6.1.3 Release Notes
==========================
Fixes since v1.6.1.2
--------------------
* "git diff --binary | git apply" pipeline did not work well when
a binary blob is changed to a symbolic link.
* Some combinations of -b/-w/--ignore-space-at-eol to "git diff" did
not work as expected.
* "git grep" did not pass the -I (ignore binary) option when
calling out an external grep program.
* "git log" and friends include HEAD to the set of starting points
when --all is given. This makes a difference when you are not
on any branch.
* "git mv" to move an untracked file to overwrite a tracked
contents misbehaved.
* "git merge -s octopus" with many potential merge bases did not
work correctly.
* RPM binary package installed the html manpages in a wrong place.
Also includes minor documentation fixes and updates.
----------------------------------------------------------------
Changes since v1.6.1.2 are as follows:
Anders Melchiorsen (2):
Documentation: more git push examples
Documentation: rework src/dst description in git push
David J. Mellor (1):
Fixed broken git help -w when installing from RPM
Guanqun Lu (2):
fix typo in Documentation
add test-dump-cache-tree in Makefile
Johannes Schindelin (2):
revision walker: include a detached HEAD in --all
apply: fix access to an uninitialized mode variable, found by valgrind
Junio C Hamano (6):
bundle: allow the same ref to be given more than once
Documentation: simplify refspec format description
diff.c: output correct index lines for a split diff
builtin-apply.c: do not set bogus mode in check_preimage() for deleted path
grep: pass -I (ignore binary) down to external grep
GIT 1.6.1.3
Keith Cascio (2):
test more combinations of ignore-whitespace options to diff
Fix combined use of whitespace ignore options to diff
Linus Torvalds (1):
Wrap inflate and other zlib routines for better error reporting
Matthieu Moy (3):
Missing && in t/t7001.sh.
Add a testcase for "git mv -f" on untracked files.
builtin-mv.c: check for unversionned files before looking at the destination.
René Scharfe (1):
merge: fix out-of-bounds memory access
SZEDER Gábor (1):
Fix gitdir detection when in subdir of gitdir
Stefan Naewe (1):
urls.txt: document optional port specification in git URLS
William Pursell (1):
User-manual: "git stash <comment>" form is long gone
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (Jan 2010, #02 draft; Wed, 06)
2010-01-06 22:22 2% What's cooking in git.git (Jan 2010, #02 draft; Wed, 06) Junio C Hamano
@ 2010-01-06 22:25 2% ` Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2010-01-06 22:25 UTC (permalink / raw)
To: git
This is the current draft of "2010 Jan, issue #2" that the experimental
"incremental update" I sent earlier was made out of, for comparison
purposes.
--------------------------------------------------
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
marked with '.' do not appear in any of the integration branches, but I am
still holding onto them.
The tip of 'next' has been rebuilt on top of the current 'master'.
--------------------------------------------------
[New Topics]
* jc/maint-1.6.1-checkout-m-custom-merge (2010-01-06) 1 commit
- checkout -m path: fix recreating conflicts
* jn/makefile (2010-01-06) 4 commits
- Makefile: consolidate .FORCE-* targets
- Makefile: learn to generate listings for targets requiring special flags
- Makefile: use target-specific variable to pass flags to cc
- Makefile: regenerate assembler listings when asked
--------------------------------------------------
[Will graduate after a bit more cooking]
* mo/bin-wrappers (2009-12-02) 3 commits
(merged to 'next' on 2010-01-03 at 8c5fa27)
+ INSTALL: document a simpler way to run uninstalled builds
+ run test suite without dashed git-commands in PATH
+ build dashless "bin-wrappers" directory similar to installed bindir
* mv/commit-date (2009-12-03) 2 commits
(merged to 'next' on 2010-01-03 at 1c45fdf)
+ Document date formats accepted by parse_date()
+ builtin-commit: add --date option
* bg/maint-add-all-doc (2009-12-07) 4 commits
(merged to 'next' on 2010-01-03 at b19a323)
+ squash! rm documentation--also mention add-u where we mention commit-a
+ git-rm doc: Describe how to sync index & work tree
+ git-add/rm doc: Consistently back-quote
+ Documentation: 'git add -A' can remove files
* so/cvsserver-update (2009-12-07) 1 commit
(merged to 'next' on 2010-01-03 at 99959b6)
+ cvsserver: make the output of 'update' more compatible with cvs.
* mg/tag-d-show (2009-12-10) 1 commit
(merged to 'next' on 2010-01-03 at 87657d2)
+ tag -d: print sha1 of deleted tag
* sb/maint-octopus (2009-12-11) 3 commits
(merged to 'next' on 2010-01-03 at ffe77d6)
+ octopus: remove dead code
+ octopus: reenable fast-forward merges
+ octopus: make merge process simpler to follow
* js/filter-branch-prime (2009-12-15) 1 commit
(merged to 'next' on 2010-01-03 at 7c90319)
+ filter-branch: remove an unnecessary use of 'git read-tree'
* tr/http-updates (2009-12-28) 4 commits
(merged to 'next' on 2010-01-02 at cf25698)
+ Remove http.authAny
+ Allow curl to rewind the RPC read buffer
+ Add an option for using any HTTP authentication scheme, not only basic
+ http: maintain curl sessions
* nd/sparse (2009-12-30) 23 commits
(merged to 'next' on 2010-01-02 at 5499bbe)
+ grep: do not do external grep on skip-worktree entries
+ commit: correctly respect skip-worktree bit
+ ie_match_stat(): do not ignore skip-worktree bit with CE_MATCH_IGNORE_VALID
+ tests: rename duplicate t1009
+ sparse checkout: inhibit empty worktree
+ Add tests for sparse checkout
+ read-tree: add --no-sparse-checkout to disable sparse checkout support
+ unpack-trees(): ignore worktree check outside checkout area
+ unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index
+ unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout
+ unpack-trees.c: generalize verify_* functions
+ unpack-trees(): add CE_WT_REMOVE to remove on worktree alone
+ Introduce "sparse checkout"
+ dir.c: export excluded_1() and add_excludes_from_file_1()
+ excluded_1(): support exclude files in index
+ unpack-trees(): carry skip-worktree bit over in merged_entry()
+ Read .gitignore from index if it is skip-worktree
+ Avoid writing to buffer in add_excludes_from_file_1()
+ Teach Git to respect skip-worktree bit (writing part)
+ Teach Git to respect skip-worktree bit (reading part)
+ Introduce "skip-worktree" bit in index, teach Git to get/set this bit
+ Add test-index-version
+ update-index: refactor mark_valid() in preparation for new options
* jk/maint-1.6.5-reset-hard (2009-12-30) 1 commit
(merged to 'next' on 2010-01-02 at 190d63b)
+ reset: unbreak hard resets with GIT_WORK_TREE
* jk/push-to-delete (2009-12-30) 1 commit
(merged to 'next' on 2010-01-03 at 9ee293b)
+ builtin-push: add --delete as syntactic sugar for :foo
* mm/config-path (2009-12-30) 1 commit
(merged to 'next' on 2010-01-03 at 9c0e81a)
+ builtin-config: add --path option doing ~ and ~user expansion.
* pm/cvs-environ (2009-12-30) 1 commit
(merged to 'next' on 2010-01-03 at 4c22932)
+ CVS Server: Support reading base and roots from environment
* tr/maint-1.6.5-bash-prompt-show-submodule-changes (2009-12-31) 1 commit
(merged to 'next' on 2010-01-03 at b785974)
+ bash completion: factor submodules into dirty state
* bg/maint-remote-update-default (2009-12-31) 1 commit
(merged to 'next' on 2010-01-03 at 113009e)
+ Fix "git remote update" with remotes.defalt set
--------------------------------------------------
[Cooking]
* da/difftool (2009-12-22) 2 commits
(merged to 'next' on 2010-01-06 at e957395)
+ git-difftool: Add '--gui' for selecting a GUI tool
+ t7800-difftool: Set a bogus tool for use by tests
* jh/gitweb-cached (2010-01-03) 4 commits
- gitweb: Makefile improvements
- gitweb: Optionally add "git" links in project list page
- gitweb: Add option to force version match
- gitweb: Load checking
Will merge to 'next', unless I hear objections within a few days.
* tc/test-locate-httpd (2010-01-02) 1 commit
(merged to 'next' on 2010-01-06 at 9d913e5)
+ t/lib-http.sh: Restructure finding of default httpd location
* jc/fix-tree-walk (2009-09-14) 7 commits
- read-tree --debug-unpack
- unpack-trees.c: look ahead in the index
- unpack-trees.c: prepare for looking ahead in the index
- Aggressive three-way merge: fix D/F case
- traverse_trees(): handle D/F conflict case sanely
- more D/F conflict tests
- tests: move convenience regexp to match object names to test-lib.sh
Resurrected from "Ejected" category. This is fix for a tricky codepath
and testing and improving before it hits 'next' by brave souls is greatly
appreciated. I am not very happy about the solution myself.
* cc/reset-more (2010-01-05) 7 commits
(merged to 'next' on 2010-01-06 at 96639cb)
+ Documentation: reset: add some missing tables
(merged to 'next' on 2010-01-04 at 8802c2c)
+ Fix bit assignment for CE_CONFLICTED
(merged to 'next' on 2010-01-03 at f83d4c6)
+ "reset --merge": fix unmerged case
+ reset: use "unpack_trees()" directly instead of "git read-tree"
+ reset: add a few tests for "git reset --merge"
+ Documentation: reset: add some tables to describe the different options
+ reset: improve mixed reset error message when in a bare repo
* jc/branch-d (2009-12-29) 1 commit
- branch -d: base the "already-merged" safety on the branch it merges with
http://thread.gmane.org/gmane.comp.version-control.git/135837/focus=135863
I am tempted to merge this to 'next', but please stop me if people see issues
in it.
* jc/rerere (2009-12-04) 1 commit
- Teach --[no-]rerere-autoupdate option to merge, revert and friends
* jk/run-command-use-shell (2010-01-01) 8 commits
- t4030, t4031: work around bogus MSYS bash path conversion
- diff: run external diff helper with shell
- textconv: use shell to run helper
- editor: use run_command's shell feature
- run-command: optimize out useless shell calls
- run-command: convert simple callsites to use_shell
- t0021: use $SHELL_PATH for the filter script
- run-command: add "use shell" option
Shuffled the commits in the topic, following J6t's suggestion in
http://thread.gmane.org/gmane.comp.version-control.git/136128
* rs/maint-archive-match-pathspec (2009-12-12) 1 commit
(merged to 'next' on 2010-01-03 at 92d7d15)
+ archive: complain about path specs that don't match anything
* tc/clone-v-progress (2009-12-26) 4 commits
- clone: use --progress to force progress reporting
- clone: set transport->verbose when -v/--verbose is used
- git-clone.txt: reword description of progress behaviour
- check stderr with isatty() instead of stdout when deciding to show progress
Perhaps needs an entry in the Release Notes, but otherwise looked Ok.
* tc/smart-http-restrict (2010-01-02) 4 commits
(merged to 'next' on 2010-01-06 at 82736cb)
+ Smart-http tests: Test http-backend without curl or a webserver
+ Smart-http tests: Break test t5560-http-backend into pieces
+ Smart-http tests: Improve coverage in test t5560
+ Smart-http: check if repository is OK to export before serving it
* jc/cache-unmerge (2009-12-25) 9 commits
- rerere forget path: forget recorded resolution
- rerere: refactor rerere logic to make it independent from I/O
- rerere: remove silly 1024-byte line limit
- resolve-undo: teach "update-index --unresolve" to use resolve-undo info
- resolve-undo: "checkout -m path" uses resolve-undo information
- resolve-undo: allow plumbing to clear the information
- resolve-undo: basic tests
- resolve-undo: record resolved conflicts in a new index extension section
- builtin-merge.c: use standard active_cache macros
Will wait a bit more before moving it to 'next'.
* jh/commit-status (2009-12-07) 1 commit
- [test?] Add commit.status, --status, and --no-status
Needs tests.
* jc/checkout-merge-base (2009-11-20) 2 commits
(merged to 'next' on 2010-01-02 at 6a8f6fc)
+ "rebase --onto A...B" replays history on the merge base between A and B
+ "checkout A...B" switches to the merge base between A and B
Users of "rebase -i" might want to teach this to the command. Volunteers?
* tr/http-push-ref-status (2009-12-24) 6 commits
- transport-helper.c::push_refs(): emit "no refs" error message
- transport-helper.c::push_refs(): ignore helper-reported status if ref is not to be pushed
- transport.c::transport_push(): make ref status affect return value
- refactor ref status logic for pushing
- t5541-http-push.sh: add test for unmatched, non-fast-forwarded refs
- t5541-http-push.sh: add tests for non-fast-forward pushes
Peff: $gmane/136169, 136167, 136168
RC: $gmane/136172
* il/vcs-helper (2009-12-09) 8 commits
(merged to 'next' on 2010-01-06 at 7c79f42)
+ Remove special casing of http, https and ftp
+ Support remote archive from all smart transports
+ Support remote helpers implementing smart transports
+ Support taking over transports
+ Refactor git transport options parsing
+ Pass unknown protocols to external protocol handlers
+ Support mandatory capabilities
+ Add remote helper debug mode
* mm/diag-path-in-treeish (2009-12-07) 1 commit
(merged to 'next' on 2010-01-06 at 6b4201e)
+ Detailed diagnosis when parsing an object name fails.
* mh/rebase-fixup (2009-12-07) 2 commits
(merged to 'next' on 2010-01-06 at c4779a7)
+ Add a command "fixup" to rebase --interactive
+ t3404: Use test_commit to set up test repository
(this branch is used by ns/rebase-auto-squash.)
Initial round of "fixup" action that is similar to "squash" action in
"rebase -i" that excludes the commit log message from follow-up commits
when composing the log message for the updated one. Expected is a further
improvement to skip opening the editor if a pick is followed only by
"fixup" and no "squash".
* ns/rebase-auto-squash (2009-12-08) 2 commits
(merged to 'next' on 2010-01-06 at 91913ca)
+ fixup! rebase -i --autosquash
+ rebase -i --autosquash: auto-squash commits
(this branch uses mh/rebase-fixup.)
* jh/notes (2009-12-07) 11 commits
- Refactor notes concatenation into a flexible interface for combining notes
- Notes API: Allow multiple concurrent notes trees with new struct notes_tree
- Notes API: for_each_note(): Traverse the entire notes tree with a callback
- Notes API: get_note(): Return the note annotating the given object
- Notes API: add_note(): Add note objects to the internal notes tree structure
- Notes API: init_notes(): Initialize the notes tree from the given notes ref
- Notes API: get_commit_notes() -> format_note() + remove the commit restriction
- Minor style fixes to notes.c
(merged to 'next' on 2010-01-02 at ae42130)
+ Add more testcases to test fast-import of notes
+ Rename t9301 to t9350, to make room for more fast-import tests
+ fast-import: Proper notes tree manipulation
http://thread.gmane.org/gmane.comp.version-control.git/134738
What's the status of the fourth and later patches on this topic? Overall
it looked reasonable, if I recall correctly what I thought when I reviewed
it last time, and I am tempted to merge it to 'next' soonish. Please
file complaints before I do so if people have objections.
http://mid.gmane.org/201001051231.43048.johan@herland.net Hold!
* fc/opt-quiet-gc-reset (2009-12-02) 1 commit
(merged to 'next' on 2010-01-06 at 03e00cd)
+ General --quiet improvements
* sr/gfi-options (2009-12-04) 7 commits
- fast-import: add (non-)relative-marks feature
- fast-import: allow for multiple --import-marks= arguments
- fast-import: test the new option command
- fast-import: add option command
- fast-import: add feature command
- fast-import: put marks reading in its own function
- fast-import: put option parsing code in separate functions
http://thread.gmane.org/gmane.comp.version-control.git/134540
I haven't seen comments on this round, and I am tempted to merge it to
'next' soonish. Please file complaints before I do so if people have
objections.
* ap/merge-backend-opts (2008-07-18) 6 commits
- Document that merge strategies can now take their own options
- Extend merge-subtree tests to test -Xsubtree=dir.
- Make "subtree" part more orthogonal to the rest of merge-recursive.
- Teach git-pull to pass -X<option> to git-merge
- git merge -X<option>
- git-merge-file --ours, --theirs
"git pull" patch needs sq-then-eval fix to protect it from $IFS
but otherwise seemed good.
^ permalink raw reply [relevance 2%]
* Re: [PATCH] rebase --merge: fix for rebasing more than 7 commits.
2006-06-22 8:44 1% [PATCH] rebase --merge: fix for rebasing more than 7 commits Junio C Hamano
@ 2006-06-22 8:54 2% ` Junio C Hamano
2006-06-22 11:09 2% ` Eric Wong
0 siblings, 1 reply; 200+ results
From: Junio C Hamano @ 2006-06-22 8:54 UTC (permalink / raw)
To: Eric Wong; +Cc: git
Junio C Hamano <junkio@cox.net> writes:
> * I wanted to raise my confidence level in the new rebase --merge
> code, so I did a little exercise which resulted in finding this
> buglet.
>...
> So the exercise went like this:
>...
> With this fix, the above works beautifully. I am reasonably
> happy with this shiny new toy. Good job, Eric! and thanks.
By the way, I do not quite understand the reasoning behind not
moving the head being rebased until the finalization phase.
Also I think --skip would be straightforward. What you look at
in call_merge() is the current HEAD, the commit being rebased
and its direct parent (actually what you are interested in are
trees of these commits and not ancestry chains among them -- if
we can tell git-merge-recursive not to try its own "recursive"
merge base finding but just use what we give it as the base, I
could sleep better. I think the current code could misbehave in
funnier ancestry graph if we allow it to pick merge base on its
own), so skipping is just a matter of, eh, skipping the commit.
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (Dec 2009, #04; Wed, 09)
@ 2009-12-10 7:11 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2009-12-10 7:11 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
marked with '.' do not appear in any of the integration branches, but I am
still holding onto them.
As we are supposed to be in pre-release feature freeze, there is nothing
to see here ;-)
--------------------------------------------------
[Graduated to "master"]
* jk/maint-add-p-delete-fix (2009-12-08) 1 commit.
(merged to 'next' on 2009-12-08 at 3c2c08a)
+ add-interactive: fix deletion of non-empty files
Fixes a regression in 1.6.5.3.
* jn/maint-pull-rebase-error-message (2009-11-27) 1 commit.
(merged to 'next' on 2009-12-03 at 2ced03c)
+ pull: clarify advice for the unconfigured error case
Replaces old 'jn/rfc-pull-rebase-error-message' topic.
--------------------------------------------------
[New Topics]
* cc/reset-more (2009-12-08) 6 commits
- Documentation: reset: add some tables to describe the different options
- Documentation: reset: describe new "--keep-local-changes" option
- reset: add test cases for "--keep-local-changes" option
- reset: add option "--keep-local-changes" to "git reset"
- reset: use "unpack_trees()" directly instead of "git read-tree"
- reset: add a few tests for "git reset --merge"
The documentation is much clearer than the previous round in describing
what it does, but I find it a bit unclear in describing what it is _good_
for (iow, scenarios and use cases).
Breaks 'pu' and does not pass test on its own yet.
* tr/http-push-ref-status (2009-12-08) 3 commits
- transport-helper.c::push_refs(): emit "no refs" error message
- transport.c::transport_push(): make ref status affect return value
- refactor ref status logic for pushing
--------------------------------------------------
[Stalled]
* je/send-email-no-subject (2009-08-05) 1 commit.
(merged to 'next' on 2009-10-11 at 1b99c56)
+ send-email: confirm on empty mail subjects
The existing tests cover the positive case (i.e. as long as the user says
"yes" to the "do you really want to send this message that lacks subject",
the message is sent) of this feature, but the feature itself needs its own
test to verify the negative case (i.e. does it correctly stop if the user
says "no"?)
* jc/checkout-merge-base (2009-11-20) 2 commits
- "rebase --onto A...B" replays history on the merge base between A and B
- "checkout A...B" switches to the merge base between A and B
I've been using the first one for a while myself but do not see many users
want this (yet); the new feature is not urgent anyway.
* tr/maint-merge-ours-clarification (2009-11-15) 1 commit
(merged to 'next' on 2009-11-21 at fadaf7b)
+ rebase: refuse to rebase with -s ours
I do not think we reached a concensus for solving conflicts between "give
them rope" and "protect users from clearly meaningless combinations". The
author obviously is for the latter (and I am inclined to agree); Dscho
seems to think otherwise.
* jc/fix-tree-walk (2009-10-22) 8 commits
(merged to 'next' on 2009-10-22 at 10c0c8f)
+ Revert failed attempt since 353c5ee
+ read-tree --debug-unpack
(merged to 'next' on 2009-10-11 at 0b058e2)
+ unpack-trees.c: look ahead in the index
+ unpack-trees.c: prepare for looking ahead in the index
+ Aggressive three-way merge: fix D/F case
+ traverse_trees(): handle D/F conflict case sanely
+ more D/F conflict tests
+ tests: move convenience regexp to match object names to test-lib.sh
This has some stupid bugs and reverted from 'next' until I can fix it, but
the "temporarily" turned out to be very loooong. Sigh. We won't have a
proper fix in 1.6.6.
--------------------------------------------------
[Cooking]
* bg/maint-add-all-doc (2009-12-07) 4 commits.
- squash! rm documentation--also mention add-u where we mention commit-a
- git-rm doc: Describe how to sync index & work tree
- git-add/rm doc: Consistently back-quote
- Documentation: 'git add -A' can remove files
I didn't like the existing documentation for "add -u" myself (especially
because I wrote the initial version) and this neatly fix it as well.
* il/vcs-helper (2009-12-09) 8 commits
- Remove special casing of http, https and ftp
- Support remote archive from all smart transports
- Support remote helpers implementing smart transports
- Support taking over transports
- Refactor git transport options parsing
- Pass unknown protocols to external protocol handlers
- Support mandatory capabilities
- Add remote helper debug mode
(this branch uses early parts of sr/vcs-helper.)
Yet another round.
* jh/commit-status (2009-12-07) 1 commit
- [test?] Add commit.status, --status, and --no-status
* mm/diag-path-in-treeish (2009-12-07) 1 commit
- Detailed diagnosis when parsing an object name fails.
* ns/rebase-auto-squash (2009-12-08) 2 commits
- fixup! rebase -i --autosquash
- rebase -i --autosquash: auto-squash commits
(this branch uses mh/rebase-fixup.)
* jh/notes (2009-12-07) 11 commits
- Refactor notes concatenation into a flexible interface for combining notes
- Notes API: Allow multiple concurrent notes trees with new struct notes_tree
- Notes API: for_each_note(): Traverse the entire notes tree with a callback
- Notes API: get_note(): Return the note annotating the given object
- Notes API: add_note(): Add note objects to the internal notes tree structure
- Notes API: init_notes(): Initialize the notes tree from the given notes ref
- Notes API: get_commit_notes() -> format_note() + remove the commit restriction
- Minor style fixes to notes.c
- Add more testcases to test fast-import of notes
- Rename t9301 to t9350, to make room for more fast-import tests
- fast-import: Proper notes tree manipulation
Rerolled and under discussion.
* fc/opt-quiet-gc-reset (2009-12-02) 1 commit
- General --quiet improvements
* mv/commit-date (2009-12-03) 2 commits
- Document date formats accepted by parse_date()
- builtin-commit: add --date option
* mh/rebase-fixup (2009-12-07) 2 commits
- Add a command "fixup" to rebase --interactive
- t3404: Use test_commit to set up test repository
(this branch is used by ns/rebase-auto-squash.)
Initial round of "fixup" action that is similar to "squash" action in
"rebase -i" that excludes the commit log message from follow-up commits
when composing the log message for the updated one. Expected is a further
improvement to skip opening the editor if a pick is followed only by
"fixup" and no "squash".
* sr/gfi-options (2009-12-04) 7 commits
- fast-import: add (non-)relative-marks feature
- fast-import: allow for multiple --import-marks= arguments
- fast-import: test the new option command
- fast-import: add option command
- fast-import: add feature command
- fast-import: put marks reading in its own function
- fast-import: put option parsing code in separate functions
Rerolled.
* ap/merge-backend-opts (2008-07-18) 6 commits
- Document that merge strategies can now take their own options
- Extend merge-subtree tests to test -Xsubtree=dir.
- Make "subtree" part more orthogonal to the rest of merge-recursive.
- Teach git-pull to pass -X<option> to git-merge
- git merge -X<option>
- git-merge-file --ours, --theirs
"git pull" patch needs sq-then-eval fix to protect it from $IFS
but otherwise seemed good.
* mo/bin-wrappers (2009-12-02) 3 commits
- INSTALL: document a simpler way to run uninstalled builds
- run test suite without dashed git-commands in PATH
- build dashless "bin-wrappers" directory similar to installed bindir
Rerolled.
* tr/http-updates (2009-12-01) 3 commits
(merged to 'next' on 2009-12-07 at f08d447)
+ Allow curl to rewind the RPC read buffer
+ Add an option for using any HTTP authentication scheme, not only basic
+ http: maintain curl sessions
* jc/diff-whitespace-prepare (2009-11-28) 2 commits
- diff: flip the default diff.bwoutputonly to true
- diff: optionally allow traditional "-b/-w affects only output" semantics
(this branch uses gb/1.7.0-diff-whitespace-only-output and jc/1.7.0-diff-whitespace-only-status; is used by jc/1.7.0-diff-whitespace-prepare.)
This was to redo the two -b/-w semantic changes to prepare the migration of
existing users before 1.7.0 happens, but I think we should drop it.
Comments?
* sr/vcs-helper (2009-12-07) 14 commits
(merged to 'next' on 2009-12-07 at 8f041bc)
+ tests: handle NO_PYTHON setting
(merged to 'next' on 2009-12-03 at e45b562)
+ builtin-push: don't access freed transport->url
(merged to 'next' on 2009-11-27 at 83268ab)
+ Add Python support library for remote helpers
+ Basic build infrastructure for Python scripts
+ Allow helpers to report in "list" command that the ref is unchanged
+ Fix various memory leaks in transport-helper.c
+ Allow helper to map private ref names into normal names
+ Add support for "import" helper command
+ Allow specifying the remote helper in the url
+ Add a config option for remotes to specify a foreign vcs
+ Allow fetch to modify refs
+ Use a function to determine whether a remote is valid
+ Allow programs to not depend on remotes having urls
+ Fix memory leak in helper method for disconnect
(this branch shares commits with il/vcs-helper.)
Should be among the first to graduate after 1.6.6 final.
* tr/reset-checkout-patch (2009-11-19) 1 commit.
(merged to 'next' on 2009-11-22 at b224950)
+ {checkout,reset} -p: make patch direction configurable
I do not particularly like a configuration like this that changes the
behaviour of a command in a drastic way---it will make helping others
much harder.
Comments?
* nd/sparse (2009-11-25) 20 commits.
(merged to 'next' on 2009-11-25 at 71380f5)
+ tests: rename duplicate t1009
(merged to 'next' on 2009-11-23 at f712a41)
+ sparse checkout: inhibit empty worktree
+ Add tests for sparse checkout
+ read-tree: add --no-sparse-checkout to disable sparse checkout support
+ unpack-trees(): ignore worktree check outside checkout area
+ unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index
+ unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout
+ unpack-trees.c: generalize verify_* functions
+ unpack-trees(): add CE_WT_REMOVE to remove on worktree alone
+ Introduce "sparse checkout"
+ dir.c: export excluded_1() and add_excludes_from_file_1()
+ excluded_1(): support exclude files in index
+ unpack-trees(): carry skip-worktree bit over in merged_entry()
+ Read .gitignore from index if it is skip-worktree
+ Avoid writing to buffer in add_excludes_from_file_1()
+ Teach Git to respect skip-worktree bit (writing part)
+ Teach Git to respect skip-worktree bit (reading part)
+ Introduce "skip-worktree" bit in index, teach Git to get/set this bit
+ Add test-index-version
+ update-index: refactor mark_valid() in preparation for new options
There were some test glitches reported and at least one test seems to
be broken in the sense that it is not testing what it is trying to.
Fix-up expected.
--------------------------------------------------
[For 1.7.0]
* jk/1.7.0-status (2009-12-08) 13 commits.
(merged to 'next' on 2009-12-08 at 9b57d84)
+ t7508-status: test all modes with color
+ t7508-status: status --porcelain ignores relative paths setting
(merged to 'next' on 2009-12-07 at 7723acf)
+ status: reduce duplicated setup code
+ status: disable color for porcelain format
(merged to 'next' on 2009-12-05 at 44dcefd)
+ status -s: obey color.status
+ builtin-commit: refactor short-status code into wt-status.c
(merged to 'next' on 2009-11-27 at 91691ec)
+ t7508-status.sh: Add tests for status -s
+ status -s: respect the status.relativePaths option
(merged to 'next' on 2009-11-21 at 884bb56)
+ docs: note that status configuration affects only long format
(merged to 'next' on 2009-10-11 at 65c8513)
+ commit: support alternate status formats
+ status: add --porcelain output format
+ status: refactor format option parsing
+ status: refactor short-mode printing to its own function
(this branch uses jc/1.7.0-status.)
Gives the --short output format to post 1.7.0 "git commit --dry-run" that
is similar to that of post 1.7.0 "git status".
Immediately after 1.6.6 while rebuilding 'next', we may want to reorder a
few commits at the tip, as "docs: affects only long format" describes a
limitation that has disappeared.
* jc/1.7.0-status (2009-09-05) 4 commits.
(merged to 'next' on 2009-10-11 at 9558627)
+ status: typo fix in usage
+ git status: not "commit --dry-run" anymore
+ git stat -s: short status output
+ git stat: the beginning of "status that is not a dry-run of commit"
(this branch is used by jk/1.7.0-status.)
With this, "git status" is no longer "git commit --dry-run".
* jc/1.7.0-send-email-no-thread-default (2009-08-22) 1 commit.
(merged to 'next' on 2009-10-11 at 043acdf)
+ send-email: make --no-chain-reply-to the default
As the title says.
* jc/1.7.0-push-safety (2009-02-09) 2 commits.
(merged to 'next' on 2009-10-11 at 81b8128)
+ Refuse deleting the current branch via push
+ Refuse updating the current branch in a non-bare repository via push
* jc/1.7.0-diff-whitespace-only-status (2009-08-30) 4 commits.
(merged to 'next' on 2009-10-11 at 546c74d)
+ diff.c: fix typoes in comments
+ Make test case number unique
+ diff: Rename QUIET internal option to QUICK
+ diff: change semantics of "ignore whitespace" options
(this branch is used by jc/1.7.0-diff-whitespace-prepare and jc/diff-whitespace-prepare.)
This changes exit code from "git diff --ignore-whitespace" and friends
when there is no actual output. It is a backward incompatible change,
and jc/diff-whitespace-prepare topic is meant to ease the transition.
* gb/1.7.0-diff-whitespace-only-output (2009-11-19) 1 commit
(merged to 'next' on 2009-11-21 at 3375bf4)
+ No diff -b/-w output for all-whitespace changes
(this branch is used by jc/1.7.0-diff-whitespace-prepare and jc/diff-whitespace-prepare.)
Likewise but for the output of "diff --git" headers.
* jc/1.7.0-diff-whitespace-prepare (2009-11-28) 2 commits
- diff: disable diff.bwoutputonly warning
- diff: flip the diff.bwoutputonly default to false
(this branch uses gb/1.7.0-diff-whitespace-only-output, jc/1.7.0-diff-whitespace-only-status and jc/diff-whitespace-prepare.)
And this is to actually flip the default and eventually remove the warning.
As I am contemplating of dropping jc/diff-whitespace-prepare, this should
also be dropped as well.
* ns/1.7.0-send-email-no-chain-reply-to (2009-08-22) 1 commit
- send-email: make --no-chain-reply-to the default
And this is to actually flip the default in 1.7.0.
--------------------------------------------------
[Reverted from 'next']
* jc/botched-maint-cygwin-count-objects (2009-11-24) 2 commits.
(merged to 'next' on 2009-11-25 at 8aa62a0)
+ Revert "ST_BLOCKS_COUNTS_IN_BLKSIZE to say on-disk size is (st_blksize * st_blocks)"
(merged to 'next' on 2009-11-22 at 4ba5880)
+ ST_BLOCKS_COUNTS_IN_BLKSIZE to say on-disk size is (st_blksize * st_blocks)
This is a revert of the tip one I merged prematurely to 'next'. The real
fix from Ramsay is already in 'master'.
* ks/precompute-completion (2009-11-15) 4 commits.
(merged to 'next' on 2009-11-15 at 23cdb96)
+ Revert ks/precompute-completion series
(merged to 'next' on 2009-10-28 at cd5177f)
+ completion: ignore custom merge strategies when pre-generating
(merged to 'next' on 2009-10-22 at f46a28a)
+ bug: precomputed completion includes scripts sources
(merged to 'next' on 2009-10-14 at adf722a)
+ Speedup bash completion loading
Reverted out of 'next', to be replaced with jn/faster-completion-startup
topic.
--------------------------------------------------
[Haven't been purged from 'pu' yet]
* jc/grep-full-tree (2009-11-24) 1 commit.
- grep: --full-tree
The interaction with this option and pathspecs need to be worked out
better. I _think_ "grep --full-tree -e pattern -- '*.h'" should find from
all the header files in the tree, for example.
^ permalink raw reply [relevance 2%]
* Re: What's cooking in git.git (Mar 2017, #06; Tue, 14)
@ 2017-03-14 23:39 2% ` Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2017-03-14 23:39 UTC (permalink / raw)
To: git
Junio C Hamano <gitster@pobox.com> writes:
> Among the topics merged to 'master' since v2.12 was tagged, 40+ of
> them could be also merged to 'maint' (some of these are new features
> and by default should not be, though). Among them two are fixes for
> regressions found in v2.12:
>
> * The patch subcommand of "git add -i" was meant to have paths
> selection prompt just like other subcommand, unlike "git add -p"
> directly jumps to hunk selection. Recently, this was broken and
> "add -i" lost the paths selection dialog, but it now has been
> fixed.
> (merge c852bd54bd jk/add-i-patch-do-prompt later to maint).
>
> * Git v2.12 was shipped with an embarrassing breakage where various
> operations that verify paths given from the user stopped dying when
> seeing an issue, and instead later triggering segfault.
> (merge ce83eadd9a js/realpath-pathdup-fix later to maint).
>
> These two have been merged to 'master' only a few days ago;
> additional tests on 'master' to make sure they fix the issues, and
> more importantly they do not introduce new regressions, are greatly
> appreciated. I am hoping we can merge them (and probably others)
> to 'maint' to cut v2.12.1 by early next week.
Those who are curious what "probably others" are, a good place to
start is this list (refer to RelNotes on the 'master' for what they
are about):
jk/delta-chain-limit # 2 (2 weeks ago)
jk/grep-no-index-fix # 7 (2 weeks ago)
jn/remote-helpers-with-git-dir # 2 (2 weeks ago)
jk/show-branch-lift-name-len-limit # 3 (2 weeks ago)
jk/tempfile-ferror-fclose-confusion # 1 (2 weeks ago)
rl/remote-allow-missing-branch-name-merge # 1 (2 weeks ago)
dt/gc-ignore-old-gc-logs # 1 (2 weeks ago)
jc/config-case-cmdline-take-2 # 2 (4 days ago)
jk/ident-empty # 4 (4 days ago)
jt/upload-pack-error-report # 1 (4 days ago)
rs/sha1-file-plug-fallback-base-leak # 1 (4 days ago)
jt/http-base-url-update-upon-redirect # 1 (4 days ago)
jk/add-i-patch-do-prompt # 1 (2 days ago)
js/realpath-pathdup-fix # 2 (2 days ago)
ss/remote-bzr-hg-placeholder-wo-python # 1 (2 days ago)
ax/line-log-range-merge-fix # 1 (2 days ago)
vn/line-log-memcpy-size-fix # 1 (2 days ago)
jc/diff-populate-filespec-size-only-fix # 1 (2 days ago)
ab/cond-skip-tests # 3 (75 minutes ago)
jk/interpret-branch-name # 9 (75 minutes ago)
mm/fetch-show-error-message-on-unadvertised-object # 3 (75 minutes ago)
dp/filter-branch-prune-empty # 4 (75 minutes ago)
ew/http-alternates-as-redirects-warning # 2 (75 minutes ago)
jk/push-deadlock-regression-fix # 6 (75 minutes ago)
mm/two-more-xstrfmt # 2 (2 weeks ago)
ps/docs-diffcore # 2 (4 days ago)
ew/markdown-url-in-readme # 1 (4 days ago)
rj/remove-unused-mktemp # 2 (4 days ago)
jk/ewah-use-right-type-in-sizeof # 1 (2 days ago)
^ permalink raw reply [relevance 2%]
* Re: Sharing merge conflict resolution between multiple developers
@ 2014-08-11 23:29 2% ` Chris Packham
2014-08-12 1:57 2% ` Junio C Hamano
0 siblings, 1 reply; 200+ results
From: Chris Packham @ 2014-08-11 23:29 UTC (permalink / raw)
To: Junio C Hamano; +Cc: GIT
On Tue, Aug 12, 2014 at 6:44 AM, Junio C Hamano <gitster@pobox.com> wrote:
> Chris Packham <judge.packham@gmail.com> writes:
>
>> Is there any way where we could share the conflict resolution around
>> but still end up with a single merge commit.
>
> One idea that immediately comes to me is to use something like
> "rerere" (not its implementation and storage, but the underlying
> idea) enhanced with the trick I use to fix-up merges in my daily
> integration cycle (look for "merge-fix" in howto/maintain-git.txt
> in Documentation/).
>
>> developer A:
>> git merge $upstream
>> <conflicts>
>
> And then commit this immediately, together with conflict markers
> (i.e. "commit -a"), and discard it with "reset --hard HEAD^" *after*
> storing it somewhere safe. And then redo the same merge, resolve
> the conflicts and commit the usual way.
>
> The difference between the final conflict resolution and the
> original conflicted state can be used as a reference for others to
> redo the same conflict resolution later elsewhere. That can most
> easily be done by creating a commit that records the final state
> whose parent is the one you recorded the initial conflicted state.
>
> So, the "recording" phase may go something like this:
>
> git checkout $this
> git merge $that
> git commit -a -m 'merge-fix/$this-$that preimage'
> git branch merge-fix/$this-$that
> git reset --hard HEAD^
> git merge $that
> edit
> git commit -a -m 'merge $that to $this'
> git checkout merge-fix/$this-$that
> git read-tree -m -u HEAD $this
> git commit -a -m 'merge-fix/$this-$that postimage'
>
> The rough idea is "git show merge-fix/$this-$that" will show the
> "patch" you can apply on top of the conflicted state other people
> would get by running "git merge $that" while on "$this" branch.
So how would someone else pickup that postimage and use it?
git checkout $this
git merge $that
git fetch $remote ':/merge-fix/$this-$that postimage'
git show ':/merge-fix/$this-$that postimage' | git apply (or patch -p1)
edit
>
> "rerere" essentially does the above recording (and replaying)
> per-path and it comes with a clever indexing scheme to identify
> which previous conflict resolution would apply to the conflicts you
> see in your working tree.
I feel a toy patch coming on.
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (Jun 2014, #05; Fri, 20)
@ 2014-06-20 22:26 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2014-06-20 22:26 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
Many topics that have been cooking in 'next' during the previous
cycle and also some new topics since this cycle opened, totalling
slightly more than 300 individual patches are in 'master' now. We
have also accumulated some fixes we need to merge down to 'maint'
and cut a v2.0.1 sometime next week.
You can find the changes described here in the integration branches
of the repositories listed at
http://git-blame.blogspot.com/p/git-public-repositories.html
--------------------------------------------------
[Graduated to "master"]
* jc/test-lazy-prereq (2014-06-13) 6 commits
(merged to 'next' on 2014-06-10 at 4f774f7)
+ t3419: drop unnecessary NOT_EXPENSIVE pseudo-prerequisite
+ t3302: drop unnecessary NOT_EXPENSIVE pseudo-prerequisite
+ t3302: do not chdir around in the primary test process
+ t3302: coding style updates
+ test: turn USR_BIN_TIME into a lazy prerequisite
+ test: turn EXPENSIVE into a lazy prerequisite
Test-script clean-up.
* jc/revision-dash-count-parsing (2014-06-09) 1 commit
(merged to 'next' on 2014-06-10 at 1aeca19)
+ revision: parse "git log -<count>" more carefully
"git log -2master" is a common typo that shows two commits starting
from whichever random branch that is not 'master' that happens to
be checked out currently.
* jm/api-strbuf-doc (2014-06-09) 1 commit
(merged to 'next' on 2014-06-10 at 831aa30)
+ api-strbuf.txt minor typos
* mt/send-email-cover-to-cc (2014-06-10) 3 commits
(merged to 'next' on 2014-06-10 at 6bb1465)
+ t9001: avoid non-portable '\n' with sed
+ test/send-email: to-cover, cc-cover tests
+ git-send-email: two new options: to-cover, cc-cover
Originally merged to 'next' on 2014-06-10
"git send-email" learns two new options.
* rs/more-starts-with (2014-06-09) 1 commit
(merged to 'next' on 2014-06-10 at efcd02e)
+ Use starts_with() for C strings instead of memcmp()
* tb/t5551-clone-notice-to-stderr (2014-06-09) 1 commit
(merged to 'next' on 2014-06-10 at 374082c)
+ t5551: fix the 50,000 tag test
* jc/fetch-pull-refmap (2014-06-12) 10 commits
(merged to 'next' on 2014-06-12 at 5428530)
+ docs: Explain the purpose of fetch's and pull's <refspec> parameter.
(merged to 'next' on 2014-06-10 at 13c13ae)
+ fetch: allow explicit --refmap to override configuration
+ fetch doc: add a section on configured remote-tracking branches
+ fetch doc: remove "short-cut" section
+ fetch doc: update refspec format description
+ fetch doc: on pulling multiple refspecs
+ fetch doc: remove notes on outdated "mixed layout"
+ fetch doc: update note on '+' in front of the refspec
+ fetch doc: move FETCH_HEAD material lower and add an example
+ fetch doc: update introductory part for clarity
--------------------------------------------------
[New Topics]
* dt/refs-check-refname-component-sse (2014-06-18) 1 commit
(merged to 'next' on 2014-06-20 at d286027)
+ refs.c: SSE2 optimizations for check_refname_component
Further micro-optimization of a leaf-function.
* tb/unicode-7.0-display-width (2014-06-18) 1 commit
(merged to 'next' on 2014-06-20 at 111b246)
+ Update of unicode_width.h to Unicode Version 7.0
Will merge to 'master'.
* ye/http-extract-charset (2014-06-17) 1 commit
(merged to 'next' on 2014-06-20 at 9492bae)
+ http: fix charset detection of extract_content_type()
Will merge to 'master'.
* jk/skip-prefix (2014-06-20) 18 commits
- http-push: refactor parsing of remote object names
- imap-send: use skip_prefix instead of using magic numbers
- use skip_prefix to avoid repeated calculations
- git: avoid magic number with skip_prefix
- fetch-pack: refactor parsing in get_ack
- fast-import: refactor parsing of spaces
- stat_opt: check extra strlen call
- daemon: use skip_prefix to avoid magic numbers
- fast-import: use skip_prefix for parsing input
- use skip_prefix to avoid repeating strings
- use skip_prefix to avoid magic numbers
- transport-helper: avoid reading past end-of-string
- fast-import: fix read of uninitialized argv memory
- apply: use skip_prefix instead of raw addition
- refactor skip_prefix to return a boolean
- avoid using skip_prefix as a boolean
- daemon: mark some strings as const
- parse_diff_color_slot: drop ofs parameter
Will merge to 'next'.
* jk/xstrfmt (2014-06-19) 10 commits
- unique_path: fix unlikely heap overflow
- walker_fetch: fix minor memory leak
- merge: use argv_array when spawning merge strategy
- sequencer: use argv_array_pushf
- setup_git_env: use git_pathdup instead of xmalloc + sprintf
- use xstrfmt to replace xmalloc + strcpy/strcat
- use xstrfmt to replace xmalloc + sprintf
- use xstrdup instead of xmalloc + strcpy
- use xstrfmt in favor of manual size calculations
- strbuf: add xstrfmt helper
Will merge to 'next'.
* jm/dedup-name-compare (2014-06-20) 2 commits
- cleanup duplicate name_compare() functions
- name-hash.c: replace cache_name_compare() with memcmp(3)
Will merge to 'next'.
* kb/perf-trace (2014-06-17) 11 commits
. git: add performance tracing for git's main() function to debug scripts
. trace: add trace_performance facility to debug performance issues
. trace: add high resolution timer function to debug performance issues
. trace: add 'file:line' to all trace output
. trace: move code around, in preparation to file:line output
. trace: add current timestamp to all trace output
. trace: add infrastructure to augment trace output with additional info
. trace: factor out printing to the trace file
. trace: remove redundant printf format attribute
. trace: consistently name the format parameter
. trace: move trace declarations from cache.h to new trace.h
--------------------------------------------------
[Stalled]
* mg/verify-commit (2014-06-10) 3 commits
- verify-commit: scriptable commit signature verification
- gpg-interface: provide access to the payload
- pretty: free the gpg status buf
What is queued here is v1; v2 exists but I skipped it.
Expecting a reroll.
* cc/replace-graft (2014-06-09) 5 commits
- DONTMERGE: wise to wait for peff's commit->buffer length series
- contrib: add convert-grafts-to-replace-refs.sh
- Documentation: replace: add --graft option
- replace: add test for --graft
- replace: add --graft option
"git replace" learned a "--graft" option to rewrite parents of a
commit.
Expecting a reroll on top of jk/commit-buffer-length.
* ab/add-interactive-show-diff-func-name (2014-05-12) 2 commits
- SQUASH??? git-add--interactive: Preserve diff heading when splitting hunks
- git-add--interactive: Preserve diff heading when splitting hunks
Waiting for a reroll.
* jn/gitweb-utf8-in-links (2014-05-27) 1 commit
- gitweb: Harden UTF-8 handling in generated links
$gmane/250758?
* rh/prompt-tests (2014-06-05) 11 commits
- t9904: new __git_ps1 tests for Zsh
- test-lib: make it possible to override how test code is eval'd
- lib-prompt-tests.sh: add variable for string that encodes percent in PS1
- lib-prompt-tests.sh: put all tests inside a function
- t9903: move prompt tests to a new lib-prompt-tests.sh file
- t9903: move PS1 color code variable definitions to lib-bash.sh
- t9903: include "Bash" in test names via new $shellname var
- t9903: run pc mode tests again with PS1 expansion disabled
- t9903: move test name prefix to a separate variable
- t9903: put the Bash pc mode prompt test cases in a function
- t9903: remove Zsh test from the suite of Bash prompt tests
Expecting a reroll to limit the damage to test_eval_; also reported
to be broken with older zsh that are still in the field ($gmane/251231).
* ss/userdiff-update-csharp-java (2014-06-02) 2 commits
- userdiff: support Java try keyword
- userdiff: support C# async methods and correct C# keywords
Reviews sent; waiting for a response.
* cc/interpret-trailers (2014-05-28) 11 commits
- Documentation: add documentation for 'git interpret-trailers'
- trailer: add tests for commands in config file
- trailer: execute command from 'trailer.<name>.command'
- trailer: add tests for "git interpret-trailers"
- trailer: add interpret-trailers command
- trailer: put all the processing together and print
- trailer: parse trailers from file or stdin
- trailer: process command line trailer arguments
- trailer: read and process config information
- trailer: process trailers from input message and arguments
- trailer: add data structures and basic functions
A new filter to programatically edit the tail end of the commit log
messages.
What is the status of this one? I think I saw reviews by Michael
but after that I do not recall seeing any updates.
* mh/lockfile (2014-04-15) 25 commits
- trim_last_path_elm(): replace last_path_elm()
- resolve_symlink(): take a strbuf parameter
- resolve_symlink(): use a strbuf for internal scratch space
- change lock_file::filename into a strbuf
- commit_lock_file(): use a strbuf to manage temporary space
- try_merge_strategy(): use a statically-allocated lock_file object
- try_merge_strategy(): remove redundant lock_file allocation
- struct lock_file: declare some fields volatile
- lockfile: avoid transitory invalid states
- commit_lock_file(): die() if called for unlocked lockfile object
- commit_lock_file(): inline temporary variable
- remove_lock_file(): call rollback_lock_file()
- lock_file(): exit early if lockfile cannot be opened
- write_packed_entry_fn(): convert cb_data into a (const int *)
- prepare_index(): declare return value to be (const char *)
- delete_ref_loose(): don't muck around in the lock_file's filename
- cache.h: define constants LOCK_SUFFIX and LOCK_SUFFIX_LEN
- lockfile.c: document the various states of lock_file objects
- lock_file(): always add lock_file object to lock_file_list
- hold_lock_file_for_append(): release lock on errors
- lockfile: unlock file if lockfile permissions cannot be adjusted
- rollback_lock_file(): set fd to -1
- rollback_lock_file(): do not clear filename redundantly
- api-lockfile: expand the documentation
- unable_to_lock_die(): rename function from unable_to_lock_index_die()
Refactor and fix corner-case bugs in the lockfile API, all looked
sensible.
Expecting a reroll.
* bg/rebase-off-of-previous-branch (2014-04-16) 1 commit
- git-rebase: print name of rev when using shorthand
Teach "git rebase -" to report the concrete name of the branch
(i.e. the previous one).
But it stops short and does not do the same for "git rebase @{-1}".
Expecting a reroll.
* tr/merge-recursive-index-only (2014-02-05) 3 commits
- merge-recursive: -Xindex-only to leave worktree unchanged
- merge-recursive: internal flag to avoid touching the worktree
- merge-recursive: remove dead conditional in update_stages()
(this branch is used by tr/remerge-diff.)
* tr/remerge-diff (2014-02-26) 5 commits
. log --remerge-diff: show what the conflict resolution changed
. name-hash: allow dir hashing even when !ignore_case
. merge-recursive: allow storing conflict hunks in index
. revision: fold all merge diff variants into an enum merge_diff_mode
. combine-diff: do not pass revs->dense_combined_merges redundantly
(this branch uses tr/merge-recursive-index-only.)
"log -p" output learns a new way to let users inspect a merge
commit by showing the differences between the automerged result
with conflicts the person who recorded the merge would have seen
and the final conflict resolution that was recorded in the merge.
Needs to be rebased, now kb/fast-hashmap topic is in.
* jk/makefile (2014-02-05) 16 commits
. FIXUP
. move LESS/LV pager environment to Makefile
. Makefile: teach scripts to include make variables
. FIXUP
. Makefile: auto-build C strings from make variables
. Makefile: drop *_SQ variables
. FIXUP
. Makefile: add c-quote helper function
. Makefile: introduce sq function for shell-quoting
. Makefile: always create files via make-var
. Makefile: store GIT-* sentinel files in MAKE/
. Makefile: prefer printf to echo for GIT-*
. Makefile: use tempfile/mv strategy for GIT-*
. Makefile: introduce make-var helper function
. Makefile: fix git-instaweb dependency on gitweb
. Makefile: drop USE_GETTEXT_SCHEME from GIT-CFLAGS
Simplify the Makefile rules and macros that exist primarily for
quoting purposes, and make it easier to robustly express the
dependency rules.
Expecting a reroll.
* po/everyday-doc (2014-01-27) 1 commit
- Make 'git help everyday' work
This may make the said command to emit something, but the source is
not meant to be formatted into a manual pages to begin with, and
also its contents are a bit stale. It may be a good first step in
the right direction, but needs more work to at least get the
mark-up right before public consumption.
Will hold.
* jk/branch-at-publish-rebased (2014-01-17) 5 commits
. t1507 (rev-parse-upstream): fix typo in test title
. implement @{publish} shorthand
. branch_get: provide per-branch pushremote pointers
. branch_get: return early on error
. sha1_name: refactor upstream_mark
Give an easier access to the tracking branches from "other" side in
a triangular workflow by introducing B@{publish} that works in a
similar way to how B@{upstream} does.
Meant to be used as a basis for whatever Ram wants to build on.
Ejected from 'pu' to unclutter.
* fc/publish-vs-upstream (2014-04-21) 8 commits
. sha1_name: add support for @{publish} marks
. sha1_name: simplify track finding
. sha1_name: cleanup interpret_branch_name()
. branch: display publish branch
. push: add --set-publish option
. branch: add --set-publish-to option
. Add concept of 'publish' branch
. t5516 (fetch-push): fix test restoration
Add branch@{publish}; it seems that this is somewhat different from
Ram and Peff started working on. At least the tip needs to be
rerolled not to squat on @{p} which @{push} and possibly @{pull}
may want to share.
* rb/merge-prepare-commit-msg-hook (2014-01-10) 4 commits
- merge: drop unused arg from abort_commit method signature
- merge: make prepare_to_commit responsible for write_merge_state
- t7505: ensure cleanup after hook blocks merge
- t7505: add missing &&
Expose more merge states (e.g. $GIT_DIR/MERGE_MODE) to hooks that
run during "git merge". The log message stresses too much on one
hook, prepare-commit-msg, but it would equally apply to other hooks
like post-merge, I think.
Waiting for a reroll.
* jc/graph-post-root-gap (2013-12-30) 3 commits
- WIP: document what we want at the end
- graph: remove unused code a bit
- graph: stuff the current commit into graph->columns[]
This was primarily a RFH ($gmane/239580).
* np/pack-v4 (2013-09-18) 90 commits
. packv4-parse.c: add tree offset caching
. t1050: replace one instance of show-index with verify-pack
. index-pack, pack-objects: allow creating .idx v2 with .pack v4
. unpack-objects: decode v4 trees
. unpack-objects: allow to save processed bytes to a buffer
- ...
Nico and Duy advancing the eternal vaporware pack-v4. This is here
primarily for wider distribution of the preview edition.
Needs to be rebased, now the pack-bitmap series is in.
* tg/perf-lib-test-perf-cleanup (2013-09-19) 2 commits
- perf-lib: add test_perf_cleanup target
- perf-lib: split starting the test from the execution
Add test_perf_cleanup shell function to the perf suite, that allows
the script writers to define a test with a clean-up action.
Will hold.
* jc/show-branch (2014-03-24) 5 commits
- show-branch: use commit slab to represent bitflags of arbitrary width
- show-branch.c: remove "all_mask"
- show-branch.c: abstract out "flags" operation
- show-branch.c: lift all_mask/all_revs to a global static
- show-branch.c: update comment style
Waiting for the final step to lift the hard-limit before sending it out.
* jh/submodule-tests (2014-04-17) 1 commit
- t7410: 210 tests for various 'git submodule update' scenarios
More or less abandoned. Will drop.
* nd/multiple-work-trees (2014-03-25) 28 commits
. count-objects: report unused files in $GIT_DIR/repos/...
. gc: support prune --repos
. gc: style change -- no SP before closing bracket
. prune: strategies for linked checkouts
. checkout: detach if the branch is already checked out elsewhere
. checkout: clean up half-prepared directories in --to mode
. checkout: support checking out into a new working directory
. use new wrapper write_file() for simple file writing
. wrapper.c: wrapper to open a file, fprintf then close
. setup.c: support multi-checkout repo setup
. setup.c: detect $GIT_COMMON_DIR check_repository_format_gently()
. setup.c: convert check_repository_format_gently to use strbuf
. setup.c: detect $GIT_COMMON_DIR in is_git_directory()
. setup.c: convert is_git_directory() to use strbuf
. git-stash: avoid hardcoding $GIT_DIR/logs/....
. *.sh: avoid hardcoding $GIT_DIR/hooks/...
. git-sh-setup.sh: use rev-parse --git-path to get $GIT_DIR/objects
. $GIT_COMMON_DIR: a new environment variable
. commit: use SEQ_DIR instead of hardcoding "sequencer"
. fast-import: use git_path() for accessing .git dir instead of get_git_dir()
. reflog: avoid constructing .lock path with git_path
. *.sh: respect $GIT_INDEX_FILE
. git_path(): be aware of file relocation in $GIT_DIR
. path.c: group git_path(), git_pathdup() and strbuf_git_path() together
. path.c: rename vsnpath() to do_git_path()
. git_snpath(): retire and replace with strbuf_git_path()
. path.c: make get_pathname() call sites return const char *
. path.c: make get_pathname() return strbuf instead of static buffer
A replacement for contrib/workdir/git-new-workdir that does not
rely on symbolic links and make sharing of objects and refs safer
by making the borrowee and borrowers aware of each other.
--------------------------------------------------
[Cooking]
* fr/sequencer-fail-with-not-one-upon-no-ff (2014-06-09) 1 commit
(merged to 'next' on 2014-06-16 at 29734cc)
+ sequencer: signal failed ff as an aborted, not a conflicted merge
Will merge to 'master'.
* hv/submodule-config (2014-06-13) 6 commits
- SQUASH compilation fix
- do not die on error of parsing fetchrecursesubmodules option
- use new config API for worktree configurations of submodules
- extract functions for submodule config set and lookup
- implement submodule config cache for lookup of submodule names
- hashmap: add enum for hashmap free_entries option
* mc/git-p4-prepare-p4-only (2014-06-13) 1 commit
(merged to 'next' on 2014-06-16 at 3c05e19)
+ git-p4: fix submit in non --prepare-p4-only mode
Will merge to 'master'.
* sk/mingw-unicode-spawn-args (2014-06-16) 6 commits
- Win32: Unicode arguments (incoming)
- Win32: Unicode arguments (outgoing)
- MinGW: disable CRT command line globbing
- Win32: fix potential multi-threading issue
- Win32: simplify internal mingw_spawn* APIs
- Win32: let mingw_execve() return an int
(this branch uses sk/mingw-main and sk/mingw-uni-console.)
* sp/complete-ext-alias (2014-06-13) 1 commit
(merged to 'next' on 2014-06-16 at 399679e)
+ completion: handle '!f() { ... }; f' and "!sh -c '...' -" aliases
Will merge to 'master'.
* bc/fix-rebase-merge-skip (2014-06-16) 1 commit
(merged to 'next' on 2014-06-20 at 01f81f5)
+ rebase--merge: fix --skip with two conflicts in a row
"git rebase --skip" did not work well when it stopped due to a
conflict twice in a row.
Will merge to 'master'.
* jl/submodule-tests (2014-06-20) 15 commits
- revert: add t3513 for submodule updates
- stash: add t3906 for submodule updates
- am: add t4255 for submodule updates
- cherry-pick: add t3512 for submodule updates
- pull: add t5572 for submodule updates
- rebase: add t3426 for submodule updates
- merge: add t7613 for submodule updates
- bisect: add t6041 for submodule updates
- reset: add t7112 for submodule updates
- read-tree: add t1013 for submodule updates
- apply: add t4137 for submodule updates
- checkout: call the new submodule update test framework
- SQUASH???
- submodules: Add the lib-submodule-update.sh test library
- test-lib: add test_dir_is_empty()
* mc/doc-submodule-sync-recurse (2014-06-13) 1 commit
(merged to 'next' on 2014-06-20 at 04815e3)
+ submodule: document "sync --recursive"
Will merge to 'master'.
* pb/trim-trailing-spaces (2014-06-13) 1 commit
(merged to 'next' on 2014-06-20 at 6985153)
+ t0008: do not depend on 'echo' handling backslashes specially
Will merge to 'master'.
* po/error-message-style (2014-06-16) 1 commit
- doc: state coding guideline for error message punctuation
Expecting a reroll.
* rs/blame-refactor (2014-06-13) 2 commits
(merged to 'next' on 2014-06-20 at ddaa722)
+ blame: simplify prepare_lines()
+ blame: factor out get_next_line()
Will merge to 'master'.
* rs/ref-transaction (2014-06-20) 48 commits
- refs.c: make write_ref_sha1 static
- fetch.c: change s_update_ref to use a ref transaction
- refs.c: propagate any errno==ENOTDIR from _commit back to the callers
- refs.c: pass a skip list to name_conflict_fn
- refs.c: call lock_ref_sha1_basic directly from commit
- refs.c: move the check for valid refname to lock_ref_sha1_basic
- refs.c: pass NULL as *flags to read_ref_full
- refs.c: pass the ref log message to _create/delete/update instead of _commit
- refs.c: add an err argument to delete_ref_loose
- refs.c: make delete_ref use a transaction
- refs.c: make prune_ref use a transaction to delete the ref
- refs.c: remove lock_ref_sha1
- refs.c: remove the update_ref_write function
- refs.c: remove the update_ref_lock function
- refs.c: make lock_ref_sha1 static
- walker.c: use ref transaction for ref updates
- fast-import.c: use a ref transaction when dumping tags
- receive-pack.c: use a reference transaction for updating the refs
- refs.c: change update_ref to use a transaction
- branch.c: use ref transaction for all ref updates
- fast-import.c: change update_branch to use ref transactions
- sequencer.c: use ref transactions for all ref updates
- commit.c: use ref transactions for updates
- replace.c: use the ref transaction functions for updates
- tag.c: use ref transactions when doing updates
- refs.c: add transaction.status and track OPEN/CLOSED/ERROR
- refs.c: make ref_transaction_begin take an err argument
- refs.c: update ref_transaction_delete to check for error and return status
- refs.c: change ref_transaction_create to do error checking and return status
- refs.c: change ref_transaction_update() to do error checking and return status
- refs.c: remove the onerr argument to ref_transaction_commit
- update-ref: use err argument to get error from ref_transaction_commit
- refs.c: make update_ref_write update a strbuf on failure
- refs.c: make ref_update_reject_duplicates take a strbuf argument for errors
- refs.c: log_ref_write should try to return meaningful errno
- refs.c: make resolve_ref_unsafe set errno to something meaningful on error
- refs.c: commit_packed_refs to return a meaningful errno on failure
- refs.c: make remove_empty_directories always set errno to something sane
- refs.c: verify_lock should set errno to something meaningful
- refs.c: make sure log_ref_setup returns a meaningful errno
- refs.c: add an err argument to repack_without_refs
- lockfile.c: make lock_file return a meaningful errno on failurei
- lockfile.c: add a new public function unable_to_lock_message
- refs.c: add a strbuf argument to ref_transaction_commit for error logging
- refs.c: allow passing NULL to ref_transaction_free
- refs.c: constify the sha arguments for ref_transaction_create|delete|update
- refs.c: ref_transaction_commit should not free the transaction
- refs.c: remove ref_transaction_rollback
Updated in response to review comments from Michael.
Seems to be getting ready for 'next'.
* ye/doc-http-proto (2014-06-16) 1 commit
(merged to 'next' on 2014-06-20 at 24f347d)
+ http-protocol.txt: Basic Auth is defined in RFC 2617, not RFC 2616
Will merge to 'master'.
* jk/pretty-G-format-fixes (2014-06-17) 5 commits
(merged to 'next' on 2014-06-20 at f504bbc)
+ pretty: avoid reading past end-of-string with "%G"
+ t7510: check %G* pretty-format output
+ t7510: test a commit signed by an unknown key
+ t7510: use consistent &&-chains in loop
+ t7510: stop referring to master in later tests
Will merge to 'master'.
* nd/split-index (2014-06-13) 32 commits
- t1700: new tests for split-index mode
- t2104: make sure split index mode is off for the version test
- read-cache: force split index mode with GIT_TEST_SPLIT_INDEX
- read-tree: note about dropping split-index mode or index version
- read-tree: force split-index mode off on --index-output
- rev-parse: add --shared-index-path to get shared index path
- update-index --split-index: do not split if $GIT_DIR is read only
- update-index: new options to enable/disable split index mode
- split-index: strip pathname of on-disk replaced entries
- split-index: do not invalidate cache-tree at read time
- split-index: the reading part
- split-index: the writing part
- read-cache: mark updated entries for split index
- read-cache: save deleted entries in split index
- read-cache: mark new entries for split index
- read-cache: split-index mode
- read-cache: save index SHA-1 after reading
- entry.c: update cache_changed if refresh_cache is set in checkout_entry()
- cache-tree: mark istate->cache_changed on prime_cache_tree()
- cache-tree: mark istate->cache_changed on cache tree update
- cache-tree: mark istate->cache_changed on cache tree invalidation
- unpack-trees: be specific what part of the index has changed
- resolve-undo: be specific what part of the index has changed
- update-index: be specific what part of the index has changed
- read-cache: be specific what part of the index has changed
- read-cache: be strict about "changed" in remove_marked_cache_entries()
- read-cache: store in-memory flags in the first 12 bits of ce_flags
- read-cache: relocate and unexport commit_locked_index()
- read-cache: new API write_locked_index instead of write_index/write_cache
- sequencer: do not update/refresh index if the lock cannot be held
- ewah: delete unused ewah_read_mmap_native declaration
- ewah: fix constness of ewah_read_mmap
* ep/avoid-test-a-o (2014-06-19) 20 commits
(merged to 'next' on 2014-06-20 at c47322b)
+ git-submodule.sh: avoid "echo" path-like values
+ git-submodule.sh: avoid "test <cond> -a/-o <cond>"
+ t/test-lib-functions.sh: avoid "test <cond> -a/-o <cond>"
+ t/t9814-git-p4-rename.sh: avoid "test <cond> -a/-o <cond>"
+ t/t5538-push-shallow.sh: avoid "test <cond> -a/-o <cond>"
+ t/t5403-post-checkout-hook.sh: avoid "test <cond> -a/-o <cond>"
+ t/t5000-tar-tree.sh: avoid "test <cond> -a/-o <cond>"
+ t/t4102-apply-rename.sh: avoid "test <cond> -a/-o <cond>"
+ t/t0026-eol-config.sh: avoid "test <cond> -a/-o <cond>"
+ t/t0025-crlf-auto.sh: avoid "test <cond> -a/-o <cond>"
+ t/lib-httpd.sh: avoid "test <cond> -a/-o <cond>"
+ git-rebase--interactive.sh: avoid "test <cond> -a/-o <cond>"
+ git-mergetool.sh: avoid "test <cond> -a/-o <cond>"
+ git-bisect.sh: avoid "test <cond> -a/-o <cond>"
+ contrib/examples/git-resolve.sh: avoid "test <cond> -a/-o <cond>"
+ contrib/examples/git-repack.sh: avoid "test <cond> -a/-o <cond>"
+ contrib/examples/git-merge.sh: avoid "test <cond> -a/-o <cond>"
+ contrib/examples/git-commit.sh: avoid "test <cond> -a/-o <cond>"
+ contrib/examples/git-clone.sh: avoid "test <cond> -a/-o <cond>"
+ check_bindir: avoid "test <cond> -a/-o <cond>"
Update tests and scripts to avoid "test ... -a ...", which is often
more error-prone than "test ... && test ...".
Squashed misconversion fix-up into git-submodule.sh updates.
Will merge to 'master'.
* jc/test-lazy-prereq (2014-06-13) 1 commit
- tests: drop GIT_*_TIMING_TESTS environment variable support
* jk/commit-buffer-length (2014-06-13) 18 commits
(merged to 'next' on 2014-06-16 at b2d2d7b)
+ reuse cached commit buffer when parsing signatures
+ commit: record buffer length in cache
+ commit: convert commit->buffer to a slab
+ commit-slab: provide a static initializer
+ use get_commit_buffer everywhere
+ convert logmsg_reencode to get_commit_buffer
+ use get_commit_buffer to avoid duplicate code
+ use get_cached_commit_buffer where appropriate
+ provide helpers to access the commit buffer
+ provide a helper to set the commit buffer
+ provide a helper to free commit buffer
+ sequencer: use logmsg_reencode in get_message
+ logmsg_reencode: return const buffer
+ do not create "struct commit" with xcalloc
+ commit: push commit_index update into alloc_commit_node
+ alloc: include any-object allocations in alloc_report
+ replace dangerous uses of strbuf_attach
+ commit_tree: take a pointer/len pair rather than a const strbuf
Move "commit->buffer" out of the in-core commit object and keep
track of their lengths. Use this to optimize the code paths to
validate GPG signatures in commit objects.
Will merge to 'master'.
* sk/mingw-dirent (2014-06-09) 5 commits
- Win32 dirent: improve dirent implementation
- Win32 dirent: clarify #include directives
- Win32 dirent: change FILENAME_MAX to MAX_PATH
- Win32 dirent: remove unused dirent.d_reclen member
- Win32 dirent: remove unused dirent.d_ino member
* sk/mingw-main (2014-06-10) 2 commits
- mingw: avoid const warning
- Win32: move main macro to a function
(this branch is used by sk/mingw-uni-console and sk/mingw-unicode-spawn-args.)
* sk/mingw-uni-console (2014-06-16) 7 commits
- Win32: reliably detect console pipe handles
- Win32: fix broken pipe detection
- Win32: Thread-safe windows console output
- Win32: add Unicode conversion functions
- Win32: warn if the console font doesn't support Unicode
- Win32: detect console streams more reliably
- Win32: support Unicode console output
(this branch is used by sk/mingw-unicode-spawn-args; uses sk/mingw-main.)
Now, are Windows folks happy with all four mingw topics?
* jk/repack-pack-keep-objects (2014-06-10) 3 commits
(merged to 'next' on 2014-06-16 at 89716c9)
+ repack: s/write_bitmap/&s/ in code
+ repack: respect pack.writebitmaps
+ repack: do not accidentally pack kept objects by default
(this branch is used by jk/repack-pack-writebitmaps-config.)
Recent updates to "git repack" started to duplicate objects that
are in packfiles marked with .keep flag into the new packfile by
mistake.
Will merge to 'master'.
* jk/repack-pack-writebitmaps-config (2014-06-12) 4 commits
(merged to 'next' on 2014-06-16 at 777005d)
+ t7700: drop explicit --no-pack-kept-objects from .keep test
+ repack: introduce repack.writeBitmaps config option
+ repack: simplify handling of --write-bitmap-index
+ pack-objects: stop respecting pack.writebitmaps
(this branch uses jk/repack-pack-keep-objects.)
Will merge to 'master'.
* nd/init-restore-env (2014-06-10) 1 commit
(merged to 'next' on 2014-06-16 at ecbbfca)
+ git potty: restore environments after alias expansion
Will merge to 'master'.
* jl/git-gui-show-added-submodule-changes (2014-04-15) 1 commit
- git-gui: show staged submodules regardless of ignore config
Tentatively queued what I expect to receive via Pat Thoyts.
* jl/gitk-show-added-submodule-changes (2014-04-15) 3 commits
- gitk: show staged submodules regardless of ignore config
- gitk: Merge branch 'new' of https://github.com/vnwildman/gitk
- l10n: Init Vietnamese translation
Will drop, as I heard from Paul that these are queued in his tree.
* mt/patch-id-stable (2014-06-10) 1 commit
- patch-id: change default to stable
Teaches "git patch-id" to compute the patch ID that does not change
when the files in a single patch is reordered. As this new algorithm
is backward incompatible, the last bit to flip it to be the default
is left out of 'master' for now.
* mt/patch-id-stable (2014-06-10) 1 commit
- patch-id: change default to stable
^ permalink raw reply [relevance 2%]
* Re: [PATCH v2 3/6] merge: fix save_state() to work when there are racy-dirty files
2022-06-19 6:50 2% ` [PATCH v2 3/6] merge: fix save_state() to work when there are racy-dirty files Elijah Newren via GitGitGadget
@ 2022-07-17 16:28 2% ` ZheNing Hu
0 siblings, 0 replies; 200+ results
From: ZheNing Hu @ 2022-07-17 16:28 UTC (permalink / raw)
To: Elijah Newren via GitGitGadget; +Cc: Git List, Elijah Newren
Elijah Newren via GitGitGadget <gitgitgadget@gmail.com> 于2022年6月19日周日 14:50写道：
>
> From: Elijah Newren <newren@gmail.com>
>
> When there are racy-dirty files, but no files are modified,
> `git stash create` exits with unsuccessful status. This causes merge
> to fail. Refresh the index first to avoid this problem.
>
> Signed-off-by: Elijah Newren <newren@gmail.com>
> ---
> builtin/merge.c | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
> diff --git a/builtin/merge.c b/builtin/merge.c
> index 00de224a2da..8ce4336dd3f 100644
> --- a/builtin/merge.c
> +++ b/builtin/merge.c
> @@ -313,8 +313,16 @@ static int save_state(struct object_id *stash)
> int len;
> struct child_process cp = CHILD_PROCESS_INIT;
> struct strbuf buffer = STRBUF_INIT;
> + struct lock_file lock_file = LOCK_INIT;
> + int fd;
> int rc = -1;
>
> + fd = repo_hold_locked_index(the_repository, &lock_file, 0);
> + refresh_cache(REFRESH_QUIET);
> + if (0 <= fd)
> + repo_update_index_if_able(the_repository, &lock_file);
> + rollback_lock_file(&lock_file);
> +
> strvec_pushl(&cp.args, "stash", "create", NULL);
> cp.out = -1;
> cp.git_cmd = 1;
> --
> gitgitgadget
>
I just want to show what sence will meet this errors:
1. touch file
2. git add file
3. git stash push (user may do it before git merge)
4. touch file (update file but not update its content)
5. git merge (call git stash create and return 1)
So I have knew about what's the meaning of this patch:
If user do the git stash manually and update file timestamp
before git merge, it may make next git stash failed. And
refresh index can make index entry sync with the work tree
file status.
Thanks.
ZheNing Hu
^ permalink raw reply [relevance 2%]
* Re: [PATCH] rebase --merge: fix for rebasing more than 7 commits.
2006-06-22 8:54 2% ` Junio C Hamano
@ 2006-06-22 11:09 2% ` Eric Wong
2006-06-24 7:09 2% ` Junio C Hamano
0 siblings, 1 reply; 200+ results
From: Eric Wong @ 2006-06-22 11:09 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
Junio C Hamano <junkio@cox.net> wrote:
> Junio C Hamano <junkio@cox.net> writes:
>
> > * I wanted to raise my confidence level in the new rebase --merge
> > code, so I did a little exercise which resulted in finding this
> > buglet.
> >...
> > So the exercise went like this:
> >...
> > With this fix, the above works beautifully. I am reasonably
> > happy with this shiny new toy. Good job, Eric! and thanks.
:) Thanks for the extra QA and fix.
> By the way, I do not quite understand the reasoning behind not
> moving the head being rebased until the finalization phase.
That's because my original patch that only used git-merge, which didn't
let me manually commit with all the information from a previous commit.
> Also I think --skip would be straightforward. What you look at
> in call_merge() is the current HEAD, the commit being rebased
> and its direct parent (actually what you are interested in are
> trees of these commits and not ancestry chains among them -- if
> we can tell git-merge-recursive not to try its own "recursive"
> merge base finding but just use what we give it as the base, I
> could sleep better. I think the current code could misbehave in
> funnier ancestry graph if we allow it to pick merge base on its
> own), so skipping is just a matter of, eh, skipping the commit.
Another consequence of relying on plain git-merge in my original
patch. --skip should be very doable now that we can specify
the correct base. I'll look into it more when I'm more awake.
--
Eric Wong
^ permalink raw reply [relevance 2%]
* Re: [PATCH] rebase --merge: fix for rebasing more than 7 commits.
2006-06-22 11:09 2% ` Eric Wong
@ 2006-06-24 7:09 2% ` Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2006-06-24 7:09 UTC (permalink / raw)
To: Eric Wong; +Cc: git
Eric Wong <normalperson@yhbt.net> writes:
> Junio C Hamano <junkio@cox.net> wrote:
>> Junio C Hamano <junkio@cox.net> writes:
>>
>> > * I wanted to raise my confidence level in the new rebase --merge
>> > code, so I did a little exercise which resulted in finding this
>> > buglet.
>> >...
>> > So the exercise went like this:
>> >...
>> > With this fix, the above works beautifully. I am reasonably
>> > happy with this shiny new toy. Good job, Eric! and thanks.
>
> :) Thanks for the extra QA and fix.
Another thing I noticed is while rebasing onto the mainline that
has accepted a few of the patches from the topic. The original
rebase with "git am -3" logic notices that the patch has already
been applied and drops that commit, which is rather nice, but
the new "rebase --merge" logic barfs when git-commit notices
there is nothing to commit. I think you could before calling
git-commit check if the git-merge-$strategy gave you the tree
identical to the HEAD tree, and simply skip it (maybe after
giving the user "patch already applied"message).
^ permalink raw reply [relevance 2%]
* [PATCH 2/6] git-merge: fix faulty SQUASH_MSG
@ 2007-09-23 22:51 2% ` Lars Hjemli
0 siblings, 0 replies; 200+ results
From: Lars Hjemli @ 2007-09-23 22:51 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
Only the first 'remote' head is currently specified as an argument to 'git
log' when generating a SQUSH_MSG, which makes the generated message fail
to mention every commit involved in the merge. This fixes the problem.
Noticed-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
---
git-merge.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/git-merge.sh b/git-merge.sh
index 3a01db0..3857634 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -59,7 +59,7 @@ finish_up_to_date () {
squash_message () {
echo Squashed commit of the following:
echo
- git log --no-merges ^"$head" $remote
+ git log --no-merges ^"$head" $remoteheads
}
finish () {
--
1.5.3.2.82.g75c8d
^ permalink raw reply related [relevance 2%]
* [PATCH] builtin-merge: fix a typo in an error message
@ 2009-04-13 18:10 2% Allan Caffee
2009-04-13 23:12 2% ` Miklos Vajna
2009-04-13 21:41 2% ` Allan Caffee
0 siblings, 2 replies; 200+ results
From: Allan Caffee @ 2009-04-13 18:10 UTC (permalink / raw)
To: git
Signed-off-by: Allan Caffee <allan.caffee@gmail.com>
---
builtin-merge.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/builtin-merge.c b/builtin-merge.c
index 6a51823..0b58e5e 100644
--- a/builtin-merge.c
+++ b/builtin-merge.c
@@ -764,7 +764,7 @@ static int suggest_conflicts(void)
fp = fopen(git_path("MERGE_MSG"), "a");
if (!fp)
- die("Could open %s for writing", git_path("MERGE_MSG"));
+ die("Could not open %s for writing", git_path("MERGE_MSG"));
fprintf(fp, "\nConflicts:\n");
for (pos = 0; pos < active_nr; pos++) {
struct cache_entry *ce = active_cache[pos];
--
1.5.6.3
^ permalink raw reply related [relevance 2%]
* Re: [PATCH] builtin-merge: fix a typo in an error message
2009-04-13 18:10 2% [PATCH] builtin-merge: fix a typo in an error message Allan Caffee
2009-04-13 23:12 2% ` Miklos Vajna
@ 2009-04-13 21:41 2% ` Allan Caffee
1 sibling, 0 replies; 200+ results
From: Allan Caffee @ 2009-04-13 21:41 UTC (permalink / raw)
To: git
On Mon, Apr 13, 2009 at 2:10 PM, Allan Caffee <allan.caffee@gmail.com> wrote:
>
> Signed-off-by: Allan Caffee <allan.caffee@gmail.com>
> ---
> builtin-merge.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/builtin-merge.c b/builtin-merge.c
> index 6a51823..0b58e5e 100644
> --- a/builtin-merge.c
> +++ b/builtin-merge.c
> @@ -764,7 +764,7 @@ static int suggest_conflicts(void)
>
> fp = fopen(git_path("MERGE_MSG"), "a");
> if (!fp)
> - die("Could open %s for writing", git_path("MERGE_MSG"));
> + die("Could not open %s for writing", git_path("MERGE_MSG"));
On second thought this commit message should probably read something more like:
builtin-merge.c: correct error message for failed open
Since the original message is actually wrong.
^ permalink raw reply [relevance 2%]
* Re: [PATCH] builtin-merge: fix a typo in an error message
2009-04-13 18:10 2% [PATCH] builtin-merge: fix a typo in an error message Allan Caffee
@ 2009-04-13 23:12 2% ` Miklos Vajna
2009-04-27 15:41 2% ` Allan Caffee
2009-04-13 21:41 2% ` Allan Caffee
1 sibling, 1 reply; 200+ results
From: Miklos Vajna @ 2009-04-13 23:12 UTC (permalink / raw)
To: Allan Caffee; +Cc: git
[-- Attachment #1: Type: text/plain, Size: 426 bytes --]
On Mon, Apr 13, 2009 at 02:10:08PM -0400, Allan Caffee <allan.caffee@gmail.com> wrote:
> - die("Could open %s for writing", git_path("MERGE_MSG"));
> + die("Could not open %s for writing", git_path("MERGE_MSG"));
Acked-by: Miklos Vajna <vmiklos@frugalware.org>
Thanks.
PS: Please use 'unset followup_to' when sending messages to the git
list, see
http://thread.gmane.org/gmane.comp.version-control.git/83140/focus=83234.
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [relevance 2%]
* Re: [PATCH] builtin-merge: fix a typo in an error message
2009-04-13 23:12 2% ` Miklos Vajna
@ 2009-04-27 15:41 2% ` Allan Caffee
2009-04-27 16:37 2% ` Junio C Hamano
0 siblings, 1 reply; 200+ results
From: Allan Caffee @ 2009-04-27 15:41 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git, Miklos Vajna
Hello Junio,
On Tue, 14 Apr 2009, Miklos Vajna wrote:
> On Mon, Apr 13, 2009 at 02:10:08PM -0400, Allan Caffee <allan.caffee@gmail.com> wrote:
> > - die("Could open %s for writing", git_path("MERGE_MSG"));
> > + die("Could not open %s for writing", git_path("MERGE_MSG"));
>
> Acked-by: Miklos Vajna <vmiklos@frugalware.org>
Is this one ready for maint? (The issue dates back to 1c7b76be.)
^ permalink raw reply [relevance 2%]
* Re: [PATCH] builtin-merge: fix a typo in an error message
2009-04-27 15:41 2% ` Allan Caffee
@ 2009-04-27 16:37 2% ` Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2009-04-27 16:37 UTC (permalink / raw)
To: Allan Caffee; +Cc: Miklos Vajna, git
Allan Caffee <allan.caffee@gmail.com> writes:
> Hello Junio,
>
> On Tue, 14 Apr 2009, Miklos Vajna wrote:
>
>> On Mon, Apr 13, 2009 at 02:10:08PM -0400, Allan Caffee <allan.caffee@gmail.com> wrote:
>> > - die("Could open %s for writing", git_path("MERGE_MSG"));
>> > + die("Could not open %s for writing", git_path("MERGE_MSG"));
>>
>> Acked-by: Miklos Vajna <vmiklos@frugalware.org>
>
> Is this one ready for maint? (The issue dates back to 1c7b76be.)
Indeed it is; I do not know how this one slipped.
Thanks.
^ permalink raw reply [relevance 2%]
* [PATCH 3/6] merge: fix GIT_EDITOR override for commit hook
@ 2014-03-06 14:50 2% ` Benoit Pierre
0 siblings, 0 replies; 200+ results
From: Benoit Pierre @ 2014-03-06 14:50 UTC (permalink / raw)
To: git
Don't set GIT_EDITOR to ":" when calling prepare-commit-msg hook if the
editor is going to be called (e.g. with "merge -e").
Signed-off-by: Benoit Pierre <benoit.pierre@gmail.com>
---
builtin/merge.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/merge.c b/builtin/merge.c
index d2a1bfe..da7cafe 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -821,7 +821,7 @@ static void prepare_to_commit(struct commit_list *remoteheads)
if (0 < option_edit)
strbuf_commented_addf(&msg, _(merge_editor_comment), comment_line_char);
write_merge_msg(&msg);
- if (run_commit_hook(1, get_index_file(), "prepare-commit-msg",
+ if (run_commit_hook(0 < option_edit, get_index_file(), "prepare-commit-msg",
git_path("MERGE_MSG"), "merge", NULL))
abort_commit(remoteheads, NULL);
if (0 < option_edit) {
--
1.9.0
^ permalink raw reply related [relevance 2%]
* [PATCH 5/7] merge: fix GIT_EDITOR override for commit hook
@ 2014-03-10 18:49 2% ` Benoit Pierre
0 siblings, 0 replies; 200+ results
From: Benoit Pierre @ 2014-03-10 18:49 UTC (permalink / raw)
To: git
Don't set GIT_EDITOR to ":" when calling prepare-commit-msg hook if the
editor is going to be called (e.g. with "merge -e").
Signed-off-by: Benoit Pierre <benoit.pierre@gmail.com>
---
builtin/merge.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/merge.c b/builtin/merge.c
index 67f312d..b11a528 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -821,7 +821,7 @@ static void prepare_to_commit(struct commit_list *remoteheads)
if (0 < option_edit)
strbuf_commented_addf(&msg, _(merge_editor_comment), comment_line_char);
write_merge_msg(&msg);
- if (run_commit_hook(1, get_index_file(), "prepare-commit-msg",
+ if (run_commit_hook(0 < option_edit, get_index_file(), "prepare-commit-msg",
git_path("MERGE_MSG"), "merge", NULL))
abort_commit(remoteheads, NULL);
if (0 < option_edit) {
--
1.9.0
^ permalink raw reply related [relevance 2%]
* [PATCH 5/7] merge: fix GIT_EDITOR override for commit hook
@ 2014-03-15 21:42 2% ` Benoit Pierre
0 siblings, 0 replies; 200+ results
From: Benoit Pierre @ 2014-03-15 21:42 UTC (permalink / raw)
To: git
Don't set GIT_EDITOR to ":" when calling prepare-commit-msg hook if the
editor is going to be called (e.g. with "merge -e").
Signed-off-by: Benoit Pierre <benoit.pierre@gmail.com>
---
builtin/merge.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/merge.c b/builtin/merge.c
index bdf6655..e15d0e1 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -824,7 +824,7 @@ static void prepare_to_commit(struct commit_list *remoteheads)
if (0 < option_edit)
strbuf_commented_addf(&msg, _(merge_editor_comment), comment_line_char);
write_merge_msg(&msg);
- if (run_commit_hook(1, get_index_file(), "prepare-commit-msg",
+ if (run_commit_hook(0 < option_edit, get_index_file(), "prepare-commit-msg",
git_path("MERGE_MSG"), "merge", NULL))
abort_commit(remoteheads, NULL);
if (0 < option_edit) {
--
1.9.0
^ permalink raw reply related [relevance 2%]
* [PATCH 5/7] merge: fix GIT_EDITOR override for commit hook
@ 2014-03-18 10:00 2% ` Benoit Pierre
0 siblings, 0 replies; 200+ results
From: Benoit Pierre @ 2014-03-18 10:00 UTC (permalink / raw)
To: git
Don't set GIT_EDITOR to ":" when calling prepare-commit-msg hook if the
editor is going to be called (e.g. with "merge -e").
Signed-off-by: Benoit Pierre <benoit.pierre@gmail.com>
---
builtin/merge.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/merge.c b/builtin/merge.c
index bdf6655..e15d0e1 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -824,7 +824,7 @@ static void prepare_to_commit(struct commit_list *remoteheads)
if (0 < option_edit)
strbuf_commented_addf(&msg, _(merge_editor_comment), comment_line_char);
write_merge_msg(&msg);
- if (run_commit_hook(1, get_index_file(), "prepare-commit-msg",
+ if (run_commit_hook(0 < option_edit, get_index_file(), "prepare-commit-msg",
git_path("MERGE_MSG"), "merge", NULL))
abort_commit(remoteheads, NULL);
if (0 < option_edit) {
--
1.9.0
^ permalink raw reply related [relevance 2%]
* Re: [PATCH] rebase--merge: fix --skip with two conflicts in a row
2014-06-16 0:01 2% ` [PATCH] rebase--merge: fix --skip with two conflicts in a row brian m. carlson
@ 2014-06-16 20:31 2% ` Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2014-06-16 20:31 UTC (permalink / raw)
To: brian m. carlson; +Cc: git, Phillip Susi, Jeff King
"brian m. carlson" <sandals@crustytoothpaste.net> writes:
> If git rebase --merge encountered a conflict, --skip would not work if the
> next commit also conflicted. The msgnum file would never be updated with
> the new patch number, so no patch would actually be skipped, resulting in an
> inescapable loop.
>
> Update the msgnum file's value as the first thing in call_merge. This also
> avoids an "Already applied" message when skipping a commit. There is no
> visible change for the other contexts in which call_merge is invoked, as the
> msgnum file's value remains unchanged in those situations.
>
> Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
> ---
Sounds good to me. Thanks.
> git-rebase--merge.sh | 5 +++--
> t/t3402-rebase-merge.sh | 15 +++++++++++++++
> 2 files changed, 18 insertions(+), 2 deletions(-)
>
> diff --git a/git-rebase--merge.sh b/git-rebase--merge.sh
> index 6d77b3c..d3fb67d 100644
> --- a/git-rebase--merge.sh
> +++ b/git-rebase--merge.sh
> @@ -53,11 +53,12 @@ continue_merge () {
> }
>
> call_merge () {
> - cmt="$(cat "$state_dir/cmt.$1")"
> + msgnum="$1"
> + echo "$msgnum" >"$state_dir/msgnum"
> + cmt="$(cat "$state_dir/cmt.$msgnum")"
> echo "$cmt" > "$state_dir/current"
> hd=$(git rev-parse --verify HEAD)
> cmt_name=$(git symbolic-ref HEAD 2> /dev/null || echo HEAD)
> - msgnum=$(cat "$state_dir/msgnum")
> eval GITHEAD_$cmt='"${cmt_name##refs/heads/}~$(($end - $msgnum))"'
> eval GITHEAD_$hd='$onto_name'
> export GITHEAD_$cmt GITHEAD_$hd
> diff --git a/t/t3402-rebase-merge.sh b/t/t3402-rebase-merge.sh
> index be8c1d5..5a27ec9 100755
> --- a/t/t3402-rebase-merge.sh
> +++ b/t/t3402-rebase-merge.sh
> @@ -33,6 +33,7 @@ test_expect_success setup '
> tr "[a-z]" "[A-Z]" <original >newfile &&
> git add newfile &&
> git commit -a -m"side edits further." &&
> + git branch second-side &&
>
> tr "[a-m]" "[A-M]" <original >newfile &&
> rm -f original &&
> @@ -41,6 +42,7 @@ test_expect_success setup '
> git branch test-rebase side &&
> git branch test-rebase-pick side &&
> git branch test-reference-pick side &&
> + git branch test-conflicts side &&
> git checkout -b test-merge side
> '
>
> @@ -138,4 +140,17 @@ test_expect_success 'rebase -s funny -Xopt' '
> test -f funny.was.run
> '
>
> +test_expect_success 'rebase --skip works with two conflicts in a row' '
> + git checkout second-side &&
> + tr "[A-Z]" "[a-z]" <newfile >tmp &&
> + mv tmp newfile &&
> + git commit -a -m"edit conflicting with side" &&
> + tr "[d-f]" "[D-F]" <newfile >tmp &&
> + mv tmp newfile &&
> + git commit -a -m"another edit conflicting with side" &&
> + test_must_fail git rebase --merge test-conflicts &&
> + test_must_fail git rebase --skip &&
> + git rebase --skip
> +'
> +
> test_done
^ permalink raw reply [relevance 2%]
* Re: [PATCH 0/1] merge: fix cache_entry use-after-free
2015-10-09 22:16 2% ` David Turner
@ 2015-10-09 22:51 2% ` Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2015-10-09 22:51 UTC (permalink / raw)
To: David Turner; +Cc: git mailing list, Duy Nguyen
David Turner <dturner@twopensource.com> writes:
>> > + assert(removed == dir);
>> > + drop_ce_ref(dir->ce);
>>
>> This is curious. In remove_name_hash() you do not have the
>> corresponding assert. Why is it necessary here (or is it
>> unnecessary over there)?
>
> It is unnecessary in any case: it's an assert rather than a check for an
> expected (or even unexpected) case. That just happens to be where Keith
> first managed to track down the use-after free, so that's where he
> happened to put the assert while trying to debug it. I'm in general in
> favor of more asserts rather than fewer, so I would prefer to keep it
> in. But I can remove it if you like.
OK, it was just the inconsistency between the two made them look
curious, as if one of them is more likely to get broken, or the
patch author was not so sure about the assumption, or something.
>> > + add_ce_ref(ce);
>> > add_name_hash(istate, ce);
>> > }
>>
>> What happens to the existing entry that used to be istate->cache[nr],
>> which may or may not be 'ce' that is replacing it?
>>
>> It turns out that all three calling sites are safe, but it is not
>> immediately obvious why. Perhaps some comment in front of the
>> function is in order, to warn those who may have to add a new caller
>> or restructure the existing calling chain, that istate->cache[nr] is
>> expected not to hold a live reference when the function is called,
>> or something?
>
> Happy to add it if you want, but to me it was clear without because if
> there were a value in istate->cache[nr], that old value would be leaked.
OK, that's sort-of-cheating, but is a sound short-cut ;-).
>> > + if (old != istate->split_index->base->cache[new->index - 1]) {
>> > + struct cache_entry *ce = istate->split_index->base->cache[new->index - 1];
>> > + drop_ce_ref(ce);
>> > + }
>> > istate->split_index->base->cache[new->index - 1] = new;
>>
>> Does 'new' already have the right refcount at this point?
>
> I spoke to Keith, and he thinks we do need an add_ce_ref there. I'll fix
> that on the reroll. Duy, do you agree?
^ permalink raw reply [relevance 2%]
Results 201-400 of ~2000 next [<= 0%] | prev [>= 2%] | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2009-10-12 3:18 2% What's cooking in git.git (Oct 2009, #02; Sun, 11) Junio C Hamano
2017-03-13 22:43 2% What's cooking in git.git (Mar 2017, #05; Mon, 13) Junio C Hamano
2017-03-10 23:03 2% What's cooking in git.git (Mar 2017, #04; Fri, 10) Junio C Hamano
[not found] <20131024122255.GI9378@mwanda>
[not found] ` <20131024122512.GB9534@mwanda>
[not found] ` <20131026181709.GB10488@kroah.com>
2013-10-27 1:34 ` [PATCH] commit: Add -f, --fixes <commit> option to add Fixes: line Josh Triplett
2013-10-28 0:49 2% ` Jim Hill
2009-10-22 6:52 2% What's cooking in git.git (Oct 2009, #04; Wed, 21) Junio C Hamano
2009-12-06 8:17 2% What's cooking in git.git (Dec 2009, #02; Sat, 05) Junio C Hamano
2010-01-13 23:11 2% What's cooking in git.git (Jan 2010, #04; Wed, 13) Junio C Hamano
2009-02-07 21:54 2% [ANNOUNCE] GIT 1.6.1.3 Junio C Hamano
2015-10-20 22:10 2% What's cooking in git.git (Oct 2015, #04; Tue, 20) Junio C Hamano
2010-01-21 0:52 2% What's cooking in git.git (Jan 2010, #06; Wed, 20) Junio C Hamano
2009-10-19 8:05 2% What's cooking in git.git (Oct 2009, #03; Mon, 19) Junio C Hamano
[not found] <AANLkTim3MacQK6EtTPNJsYbqb=5bOM3W3BXC6p=hT+PU@mail.gmail.com>
2010-11-09 5:37 ` Git automatic stashing? Casey McGinty
2010-11-09 7:49 2% ` Matthieu Moy
2017-03-03 23:26 2% What's cooking in git.git (Mar 2017, #02; Fri, 3) Junio C Hamano
2014-06-18 17:25 2% What's cooking in git.git (Jun 2014, #04; Tue, 17) Junio C Hamano
2009-11-18 7:53 2% What's cooking in git.git (Nov 2009, " Junio C Hamano
2010-01-01 0:10 2% What's cooking in git.git (Dec 2009, #06; Thu, 31) Junio C Hamano
2009-10-31 4:04 2% What's cooking in git.git (Oct 2009, #06; Fri, 30) Junio C Hamano
2009-11-15 10:23 2% What's cooking in git.git (Nov 2009, #03; Sun, 15) Junio C Hamano
2010-08-17 6:51 2% [PATCH/RFC] updating examples/git-merge (plus a builtin/merge fix) Jonathan Nieder
2010-08-17 7:04 2% ` [PATCH 15/24] merge script: improve log message subject Jonathan Nieder
2009-10-12 2:53 2% [PATCH] Aggressive three-way merge: fix D/F case Junio C Hamano
2016-04-14 22:12 2% [PATCH] ll-merge: fix typo in comment Junio C Hamano
2009-08-13 2:14 2% What's cooking in git.git (Aug 2009, #02; Wed, 12) Junio C Hamano
2015-10-30 22:07 2% What's cooking in git.git (Oct 2015, #07; Fri, 30) Junio C Hamano
2014-07-16 22:02 2% [ANNOUNCE] Git v2.0.2 Junio C Hamano
2010-01-20 10:24 2% What's cooking in git.git (Jan 2010, #06 draft) Junio C Hamano
2009-11-09 5:18 2% What's cooking in git.git (Nov 2009, #02; Sun, 08) Junio C Hamano
2010-01-10 19:55 2% "What's cooking" incremental edition Junio C Hamano
2017-04-20 20:52 2% [BUG] test suite broken with GIT_TEST_SPLIT_INDEX Thomas Gummerer
2014-06-26 22:02 2% What's cooking in git.git (Jun 2014, #06; Thu, 26) Junio C Hamano
2007-09-23 22:51 2% [PATCH 0/6] per branch options for git-merge Lars Hjemli
2007-09-23 22:51 ` [PATCH 1/6] Add test-script for git-merge porcelain Lars Hjemli
2007-09-23 22:51 2% ` [PATCH 2/6] git-merge: fix faulty SQUASH_MSG Lars Hjemli
2017-03-08 23:47 2% What's cooking in git.git (Mar 2017, #03; Wed, 8) Junio C Hamano
2009-04-13 18:10 2% [PATCH] builtin-merge: fix a typo in an error message Allan Caffee
2009-04-13 23:12 2% ` Miklos Vajna
2009-04-27 15:41 2% ` Allan Caffee
2009-04-27 16:37 2% ` Junio C Hamano
2009-04-13 21:41 2% ` Allan Caffee
2016-04-29 22:04 2% [ANNOUNCE] Git v2.8.2 Junio C Hamano
2009-06-01 1:24 2% What's cooking in git.git (May 2009, #04; Sun, 31) Junio C Hamano
2009-02-02 8:05 2% What's in git.git (Feb 2009, #01; Sun, 01) Junio C Hamano
2014-10-15 12:39 2% [PATCH] git-svn: merge: fix rooturl/branchurl match check Tommaso Colombo
2014-10-20 6:24 2% ` Eric Wong
2014-06-20 22:26 2% What's cooking in git.git (Jun 2014, #05; Fri, 20) Junio C Hamano
2009-12-28 9:57 2% What's cooking in git.git (Dec 2009, #05; Mon, 28) Junio C Hamano
2009-11-23 6:16 2% What's cooking in git.git (Nov 2009, #05; Sun, 22) Junio C Hamano
2009-12-10 7:11 2% What's cooking in git.git (Dec 2009, #04; Wed, 09) Junio C Hamano
2010-01-04 8:39 2% What's cooking in git.git (Jan 2010, #01; Mon, 04) Junio C Hamano
2024-04-02 17:45 2% [BUG] "git range-diff" does not know X^! is a valid range Junio C Hamano
2024-04-02 20:24 0% ` René Scharfe
2009-11-26 1:03 2% What's cooking in git.git (Nov 2009, #06; Wed, 25) Junio C Hamano
2009-10-28 21:11 2% What's cooking in git.git (Oct 2009, #05; Wed, 28) Junio C Hamano
2009-12-01 22:10 2% What's cooking in git.git (Dec 2009, #01; Tue, 01) Junio C Hamano
2009-11-05 5:41 2% What's cooking in git.git (Nov 2009, #01; Wed, 04) Junio C Hamano
2011-02-15 1:07 2% [PATCH] merge: honor prepare-commit-msg hook Jay Soffian
2010-01-06 22:22 2% What's cooking in git.git (Jan 2010, #02 draft; Wed, 06) Junio C Hamano
2010-01-06 22:25 2% ` Junio C Hamano
2017-09-05 21:01 2% [PATCH] builtin/merge: honor commit-msg hook for merges Stefan Beller
2009-11-29 10:05 2% What's cooking in git.git (Nov 2009, #07; Sun, 29) Junio C Hamano
2010-01-17 2:46 2% What's cooking in git.git (Jan 2010, #05; Sat, 16) Junio C Hamano
2015-11-05 23:13 2% What's cooking in git.git (Nov 2015, #01; Thu, 5) Junio C Hamano
2010-01-25 4:39 2% What's cooking in git.git (Jan 2010, #08; Sun, 24) Junio C Hamano
2006-06-10 21:16 2% [ANNOUNCE] GIT 1.4.0 Junio C Hamano
2015-10-12 22:03 1% [PATCH v2] merge: fix cache_entry use-after-free David Turner
2018-11-13 18:05 1% Git Test Coverage Report (Tuesday, Nov 13) Derrick Stolee
2015-10-14 22:07 1% [PATCH v3] merge: fix cache_entry use-after-free David Turner
2015-10-15 3:35 ` René Scharfe
2015-10-15 19:02 ` David Turner
2015-10-15 20:51 2% ` Junio C Hamano
2015-10-16 7:05 2% ` David Turner
2015-10-16 16:04 2% ` Junio C Hamano
2015-10-19 22:27 2% ` David Turner
2015-10-20 2:13 1% ` Junio C Hamano
2006-06-22 8:44 1% [PATCH] rebase --merge: fix for rebasing more than 7 commits Junio C Hamano
2006-06-22 8:54 2% ` Junio C Hamano
2006-06-22 11:09 2% ` Eric Wong
2006-06-24 7:09 2% ` Junio C Hamano
2012-12-20 17:37 1% [PATCH] oneway_merge(): only lstat() when told to update worktree Martin von Zweigbergk
2021-06-10 13:06 1% [PATCH] add_pending_object_with_path(): work around "gcc -O3" complaint Jeff King
2009-12-11 18:55 FEATURE REQUEST: Announce branch name with merge comamnd Jari Aalto
2009-12-12 0:38 2% ` [PATCH 1/3] octopus: make merge process simpler to follow Stephen Boyd
2017-05-23 8:08 What's cooking in git.git (May 2017, #07; Tue, 23) Junio C Hamano
2017-05-23 19:08 ` Stefan Beller
2017-05-23 19:38 ` Stefan Beller
2017-05-23 19:50 ` Ævar Arnfjörð Bjarmason
2017-05-25 3:42 2% ` Junio C Hamano
2018-09-04 20:27 [PATCH 0/2] commit-graph: add progress output Ævar Arnfjörð Bjarmason
2018-09-07 18:29 ` [PATCH v2 1/2] commit-graph write: " Ævar Arnfjörð Bjarmason
2018-09-21 20:01 ` Derrick Stolee
2018-09-21 21:43 ` Junio C Hamano
2018-09-21 21:57 2% ` Junio C Hamano
2020-03-27 11:44 git rebase fast-forward fails with abbreviateCommands Jan Alexander Steffens (heftig)
2020-03-30 12:42 2% ` [PATCH v1 0/2] rebase --merge: fix fast forwarding when `rebase.abbreviateCommands' is set Alban Gruin
2014-03-15 16:11 [PATCH 3/7] test patch hunk editing with "commit -p -m" Benoit Pierre
2014-03-15 21:42 ` [PATCH 1/7] merge hook tests: fix missing '&&' in test Benoit Pierre
2014-03-15 21:42 2% ` [PATCH 5/7] merge: fix GIT_EDITOR override for commit hook Benoit Pierre
2006-10-29 19:32 Merging five months of Linux kernel history Jan-Benedict Glaw
2006-10-29 20:34 2% ` Junio C Hamano
2024-05-08 11:03 [PATCH 00/13] reftable: prepare for re-seekable iterators Patrick Steinhardt
2024-05-08 23:42 ` Junio C Hamano
2024-05-09 0:16 2% ` Junio C Hamano
2021-08-27 23:59 [PATCH] t7900: add '--scheduler=launchctl' parameter to fix test Ramsay Jones
2021-08-30 16:02 ` Junio C Hamano
2021-08-31 0:44 ` Ramsay Jones
2021-08-31 15:59 2% ` Junio C Hamano
2006-05-14 17:43 Allow one-way tree merge to remove old files Linus Torvalds
2006-05-14 18:20 ` Simplify "git reset --hard" Linus Torvalds
2006-05-15 6:55 ` Junio C Hamano
2006-05-15 7:08 ` Junio C Hamano
2006-05-15 7:46 2% ` Junio C Hamano
2008-08-23 9:01 [PATCH] builtin-merge: fail properly when we are in the middle of a conflicted merge Junio C Hamano
2008-08-23 10:57 ` Miklos Vajna
2008-08-23 19:55 2% ` Junio C Hamano
2008-08-23 19:56 2% ` [PATCH 1/2] merge: fix numerus bugs around "trivial merge" area Junio C Hamano
2009-08-09 10:00 [PATCH] merge: indicate remote tracking branches in merge message Jeff King
2009-08-09 10:02 2% ` [PATCH 2/3] merge: fix incorrect merge message for ambiguous tag/branch Jeff King
2018-06-29 1:21 [PATCH v3 00/32] object-store: lookup_commit Stefan Beller
2018-06-29 17:57 ` Junio C Hamano
2018-06-29 18:03 2% ` Junio C Hamano
2011-04-15 17:21 git rebase -p doesn't understand -X Marius Storm-Olsen
2011-04-19 9:06 ` Martin von Zweigbergk
2011-04-20 23:40 2% ` Jonathan Nieder
2017-11-14 9:31 [PATCH] t/lib-gpg: fix gpgconf stderr redirect to /dev/null Johan Herland
2017-11-14 16:17 2% ` [PATCH] notes: send "Automatic notes merge failed" messages to stderr Todd Zullinger
2018-07-11 5:18 [PATCH 0/2] Address recovery failures with directory/file conflicts Elijah Newren
2018-07-11 5:18 2% ` [PATCH 2/2] read-cache: fix directory/file conflict handling in read_index_unmerged() Elijah Newren
2018-07-13 16:33 ` [PATCH v2 0/2] Address recovery failures with directory/file conflicts Elijah Newren
2018-07-13 16:33 2% ` [PATCH v2 2/2] read-cache: fix directory/file conflict handling in read_index_unmerged() Elijah Newren
2018-07-31 17:12 ` [PATCH v3 0/2] Address recovery failures with directory/file conflicts Elijah Newren
2018-07-31 17:12 2% ` [PATCH v3 2/2] read-cache: fix directory/file conflict handling in read_index_unmerged() Elijah Newren
2021-03-20 21:39 What's cooking in git.git (Mar 2021, #06; Sat, 20) Junio C Hamano
2021-03-22 13:52 ` Matheus Tavares Bernardino
2021-03-22 18:41 2% ` Junio C Hamano
2017-07-25 15:09 [RFC] Git rerere and non-conflicting changes during conflict resolution Raman Gupta
2017-07-25 17:52 ` Jeff King
2017-07-25 20:26 ` Junio C Hamano
2017-07-25 20:40 2% ` Junio C Hamano
2017-07-25 20:58 2% ` Jeff King
2012-07-28 15:01 [PATCH 0/3] null sha1 in trees Jeff King
2012-07-28 15:05 ` [PATCH 2/3] do not write null sha1s to on-disk index Jeff King
2012-12-29 10:03 ` Jonathan Nieder
2012-12-29 10:27 ` Jeff King
2012-12-29 10:34 ` Jonathan Nieder
2012-12-29 11:05 ` Jeff King
2012-12-29 20:51 1% ` [BUG] two-way read-tree can write null sha1s into index Jeff King
2013-04-10 20:35 Premerging topics (was: [RFD] annnotating a pair of commit objects?) Antoine Pelisse
2013-04-23 6:34 ` Johan Herland
2013-04-23 14:51 ` Antoine Pelisse
2013-04-23 23:06 ` Johan Herland
2013-04-24 5:48 ` Premerging topics Junio C Hamano
2013-04-24 6:22 ` Johan Herland
2013-04-24 7:14 ` Junio C Hamano
2013-04-29 19:06 ` Antoine Pelisse
2013-04-29 22:19 2% ` Junio C Hamano
2021-04-09 4:02 [RFC PATCH v1 00/13][GSoC] doc: (monospace) apply CodingGuidelines on a large-scale Firmin Martin
2021-04-09 4:02 2% ` [RFC PATCH v1 02/13] doc: typeset branches and remotes in monospace Firmin Martin
2023-09-27 19:49 [PATCH 00/30] Initial support for multiple hash functions Eric W. Biederman
2023-09-27 19:55 ` [PATCH 21/30] repository: Implement extensions.compatObjectFormat Eric W. Biederman
2023-09-27 21:39 ` Junio C Hamano
2023-09-28 20:18 ` Junio C Hamano
2023-09-29 16:59 ` Eric W. Biederman
2023-09-29 18:48 2% ` Junio C Hamano
2023-10-02 0:48 0% ` Eric W. Biederman
2022-10-20 1:31 What's cooking in git.git (Oct 2022, #06; Wed, 19) Junio C Hamano
2022-10-20 9:56 0% ` pw/rebase-reflog-fixes (was Re: What's cooking in git.git (Oct 2022, #06; Wed, 19)) Phillip Wood
2019-01-29 10:56 [PATCH 0/1] Provide a fix for the semantic merge conflict between 'js/vsts-ci' and 'sg/travis-specific-cc' Johannes Schindelin via GitGitGadget
2019-01-29 10:56 ` [PATCH 1/1] fixup! Merge branch 'js/vsts-ci' into pu Johannes Schindelin via GitGitGadget
2019-01-29 17:50 2% ` Junio C Hamano
2021-06-13 22:58 [PATCH 0/4] merge: cleanups and fix Felipe Contreras
2021-06-13 22:58 2% ` [PATCH 2/4] merge: fix Yoda conditions Felipe Contreras
2014-03-06 14:50 [PATCH 0/6] fix hunk editing with 'commit -p -m' Benoit Pierre
2014-03-06 14:50 2% ` [PATCH 3/6] merge: fix GIT_EDITOR override for commit hook Benoit Pierre
2020-08-02 6:33 [PATCH 0/4] Attr fixes Elijah Newren via GitGitGadget
2020-08-02 6:33 2% ` [PATCH 1/4] t6038: make tests fail for the right reason Elijah Newren via GitGitGadget
2020-08-03 18:41 ` [PATCH v2 0/4] Attr fixes Elijah Newren via GitGitGadget
2020-08-03 18:41 2% ` [PATCH v2 1/4] t6038: make tests fail for the right reason Elijah Newren via GitGitGadget
2023-10-08 6:45 [PATCH 00/25] Documentation fixes Elijah Newren via GitGitGadget
2023-10-08 6:45 1% ` [PATCH 01/25] documentation: wording improvements Elijah Newren via GitGitGadget
2012-12-20 20:02 [PATCH] oneway_merge(): only lstat() when told to update worktree Junio C Hamano
2012-12-20 21:03 2% ` [PATCH v2] " Martin von Zweigbergk
2015-11-25 1:07 What's cooking in git.git (Nov 2015, #04; Tue, 24) Jeff King
2015-11-28 15:40 ` brian m. carlson
2015-11-28 16:35 ` Jeff King
2015-11-28 17:09 ` brian m. carlson
2015-12-01 23:10 2% ` Jeff King
2019-08-26 2:43 [PATCH 00/11] hashmap: bugfixes, safety fixes, and WIP improvements Eric Wong
2019-08-26 2:43 ` [PATCH 04/11] hashmap_entry: detect improper initialization Eric Wong
2019-08-27 9:10 ` Johannes Schindelin
2019-08-27 9:49 ` Eric Wong
2019-08-27 22:16 1% ` Junio C Hamano
2021-04-22 0:55 [PATCH v3] git-merge: rewrite already up to date message Josh Soref via GitGitGadget
2021-05-02 5:14 ` [PATCH v4 0/2] normalize & fix merge "up to date" messages Eric Sunshine
2021-05-02 5:14 2% ` [PATCH v4 2/2] merge: fix swapped "up to date" message components Eric Sunshine
2007-09-06 8:52 What's cooking in git.git (topics) Junio C Hamano
[not found] ` <7v1wd1d0le.fsf@gitster.siamese.dyndns.org>
2007-09-26 20:05 ` Junio C Hamano
2007-10-02 5:53 2% ` Junio C Hamano
2024-03-12 9:10 [PATCH v2 0/16] allow multi-byte core.commentChar Jeff King
2024-03-12 9:17 ` [PATCH v2 16/16] config: " Jeff King
2024-03-13 18:23 ` Kristoffer Haugsbakk
2024-03-15 5:59 ` Jeff King
2024-03-15 7:16 ` Kristoffer Haugsbakk
2024-03-15 8:10 ` Jeff King
2024-03-26 22:10 ` Junio C Hamano
2024-03-27 7:46 ` Jeff King
2024-03-27 8:19 ` [PATCH 17/16] config: add core.commentString Jeff King
2024-03-27 16:13 2% ` Junio C Hamano
2014-08-12 18:13 [PATCH] unpack-tree.c: remove dead code Junio C Hamano
2014-08-12 21:15 ` Stefan Beller
2014-08-12 23:57 ` [PATCH 0/3] " Jonathan Nieder
2014-08-13 0:03 1% ` [PATCH 3/3] checkout -m: attempt merge when deletion of path was staged Jonathan Nieder
2009-01-29 6:24 Something weird is happening H. Peter Anvin
2009-01-29 6:56 ` Junio C Hamano
[not found] ` <20090129113846.GA10645@elte.hu>
2009-01-29 12:05 ` Ingo Molnar
2009-01-31 14:39 2% ` [PATCH] merge: fix out-of-bounds memory access René Scharfe
2023-05-20 8:01 I think there is error in merge documents - current branch Minnie Shi
2023-05-20 8:44 2% ` [PATCH] doc: merge: fix mention of `ORIG_HEAD` Kristoffer Haugsbakk
2023-05-20 22:27 ` I think there is error in merge documents - current branch Junio C Hamano
2023-05-21 12:23 ` Sergey Organov
2023-05-21 13:28 2% ` Minnie Shi
2023-05-21 13:49 0% ` Minnie Shi
2017-03-14 23:35 What's cooking in git.git (Mar 2017, #06; Tue, 14) Junio C Hamano
2017-03-14 23:39 2% ` Junio C Hamano
2012-12-29 7:22 [PATCH v2] wt-status: Show ignored files in untracked dirs Jeff King
2012-12-30 14:39 ` [PATCH 1/2] dir.c: Make git-status --ignored more consistent Antoine Pelisse
2012-12-30 14:54 ` Antoine Pelisse
2012-12-30 21:36 2% ` Junio C Hamano
2022-02-21 11:10 [PATCH 0/7] rebase: make reflog messages independent of the backend Phillip Wood via GitGitGadget
2022-02-21 11:10 2% ` [PATCH 3/7] rebase --merge: fix reflog message after skipping Phillip Wood via GitGitGadget
2022-02-21 11:10 1% ` [PATCH 2/7] rebase --merge: fix reflog when continuing Phillip Wood via GitGitGadget
2022-04-20 9:56 ` [PATCH v2 0/8] rebase: make reflog messages independent of the backend Phillip Wood via GitGitGadget
2022-10-12 9:35 2% ` [PATCH v3 " Phillip Wood via GitGitGadget
2022-10-21 9:21 2% ` [PATCH v4 " Phillip Wood via GitGitGadget
2022-10-21 9:21 2% ` [PATCH v4 3/8] rebase --merge: fix reflog when continuing Phillip Wood via GitGitGadget
2022-10-21 17:37 ` Junio C Hamano
2022-10-25 10:08 2% ` Phillip Wood
2022-10-21 9:21 2% ` [PATCH v4 4/8] rebase --merge: fix reflog message after skipping Phillip Wood via GitGitGadget
2022-10-12 9:35 2% ` [PATCH v3 " Phillip Wood via GitGitGadget
2022-10-12 9:35 2% ` [PATCH v3 3/8] rebase --merge: fix reflog when continuing Phillip Wood via GitGitGadget
2022-04-20 9:56 2% ` [PATCH v2 4/8] rebase --merge: fix reflog message after skipping Phillip Wood via GitGitGadget
2022-04-20 9:56 2% ` [PATCH v2 3/8] rebase --merge: fix reflog when continuing Phillip Wood via GitGitGadget
2018-11-07 9:41 What's cooking in git.git (Nov 2018, #03; Wed, 7) Junio C Hamano
2018-11-07 13:09 ` SZEDER Gábor
2018-11-07 15:09 ` Duy Nguyen
2018-11-07 22:09 2% ` Junio C Hamano
2018-11-08 6:09 1% ` Junio C Hamano
2018-04-17 16:34 [PATCH v1 0/5] Allocate cache entries from memory pool Jameson Miller
2018-04-18 4:49 ` Junio C Hamano
2018-04-23 16:19 1% ` Jameson Miller
2018-04-20 17:49 ` Stefan Beller
2018-04-23 16:44 2% ` Jameson Miller
2007-12-06 4:49 When a merge turns into a conflict Anand Kumria
2007-12-06 5:51 2% ` Junio C Hamano
2018-02-16 13:08 [RFC] Rebasing merges: a jorney to the ultimate solution (Road Clear) Sergey Organov
2018-02-19 23:44 ` Igor Djordjevic
2018-02-27 0:07 ` Johannes Schindelin
2018-02-27 5:30 ` Jacob Keller
2018-02-27 16:21 ` Johannes Schindelin
2018-02-27 18:55 ` Igor Djordjevic
2018-02-27 19:59 ` Igor Djordjevic
2018-02-27 23:40 ` Igor Djordjevic
2018-02-28 5:19 ` Sergey Organov
2018-02-28 20:25 ` Igor Djordjevic
2018-03-01 5:39 ` Sergey Organov
2018-03-02 11:31 ` Phillip Wood
2018-03-03 0:29 ` Igor Djordjevic
2018-03-05 5:00 ` Sergey Organov
2018-03-06 10:52 ` Phillip Wood
2018-03-06 16:56 2% ` Junio C Hamano
2018-03-08 7:05 ` Johannes Schindelin
2018-03-08 8:18 2% ` Junio C Hamano
2019-03-21 13:16 [PATCH v5 00/26] Add new command 'switch' Nguyễn Thái Ngọc Duy
2019-03-29 10:38 ` [PATCH v6 00/27] " Nguyễn Thái Ngọc Duy
2019-03-29 10:38 ` [PATCH v6 07/27] checkout: inform the user when removing branch state Nguyễn Thái Ngọc Duy
2019-07-02 8:06 ` SZEDER Gábor
2019-07-02 9:03 ` Duy Nguyen
2019-07-02 17:51 2% ` Junio C Hamano
2022-01-20 7:47 [PATCH 0/2] Fix some old memory leaks in merge-ort and builtin/merge Elijah Newren via GitGitGadget
2022-01-20 7:47 2% ` [PATCH 2/2] merge: fix memory leaks in cmd_merge() Elijah Newren via GitGitGadget
2022-01-22 0:05 2% ` Junio C Hamano
2023-09-20 14:00 [PATCH] attr: attr.allowInvalidSource config to allow invalid revision John Cai via GitGitGadget
2023-10-04 18:18 ` [PATCH v2 0/2] attr: add attr.tree and attr.allowInvalidSource configs John Cai via GitGitGadget
2023-10-04 18:18 ` [PATCH v2 1/2] attr: add attr.tree for setting the treeish to read attributes from John Cai via GitGitGadget
2023-10-04 23:45 1% ` Junio C Hamano
2023-10-06 17:20 0% ` Jonathan Tan
2020-07-23 17:56 [PATCH v2 00/18] Maintenance builtin, allowing 'gc --auto' customization Derrick Stolee via GitGitGadget
2020-07-30 22:24 ` [PATCH v3 00/20] " Derrick Stolee via GitGitGadget
2020-07-30 23:31 ` Junio C Hamano
2020-07-31 2:58 2% ` Junio C Hamano
2017-07-14 14:44 [PATCH v6 00/10] The final building block for a faster rebase -i Johannes Schindelin
2017-07-20 21:38 2% ` Junio C Hamano
2020-06-12 14:08 Collaborative conflict resolution feature request Curtin, Eric
2020-06-13 12:08 ` Christian Couder
2020-06-13 12:38 ` Curtin, Eric
2020-06-13 13:14 ` Philip Oakley
2020-06-13 16:44 2% ` Junio C Hamano
2020-06-15 9:51 ` Sergey Organov
2020-06-15 11:04 ` Philip Oakley
2020-06-16 17:17 ` Stefan Moch
2020-06-17 18:32 2% ` Curtin, Eric
2023-12-03 6:41 [PATCH 00/12] Additional header cleanups (removing unnecessary includes) Elijah Newren via GitGitGadget
2023-12-03 6:41 ` [PATCH 02/12] treewide: remove unnecessary includes in source files Elijah Newren via GitGitGadget
2023-12-03 13:15 2% ` Junio C Hamano
2014-03-10 18:49 [PATCH V2 0/7] fix hunk editing with 'commit -p -m' Benoit Pierre
2014-03-10 18:49 2% ` [PATCH 5/7] merge: fix GIT_EDITOR override for commit hook Benoit Pierre
2022-05-19 16:26 [PATCH 0/2] Fix merge restore state Elijah Newren via GitGitGadget
2022-06-19 6:50 ` [PATCH v2 0/6] " Elijah Newren via GitGitGadget
2022-06-19 6:50 2% ` [PATCH v2 3/6] merge: fix save_state() to work when there are racy-dirty files Elijah Newren via GitGitGadget
2022-07-17 16:28 2% ` ZheNing Hu
2022-07-21 8:16 ` [PATCH v3 0/7] Fix merge restore state Elijah Newren via GitGitGadget
2022-07-21 8:16 2% ` [PATCH v3 2/7] merge-resolve: abort if index does not match HEAD Elijah Newren via GitGitGadget
2022-07-21 8:16 2% ` [PATCH v3 3/7] merge: do not abort early if one strategy fails to handle the merge Elijah Newren via GitGitGadget
2022-07-21 8:16 2% ` [PATCH v3 4/7] merge: fix save_state() to work when there are stat-dirty files Elijah Newren via GitGitGadget
2022-07-22 5:15 ` [PATCH v4 0/7] Fix merge restore state Elijah Newren via GitGitGadget
2022-07-22 5:15 2% ` [PATCH v4 2/7] merge-resolve: abort if index does not match HEAD Elijah Newren via GitGitGadget
2022-07-22 5:15 2% ` [PATCH v4 4/7] merge: fix save_state() to work when there are stat-dirty files Elijah Newren via GitGitGadget
2022-07-22 5:15 2% ` [PATCH v4 3/7] merge: do not abort early if one strategy fails to handle the merge Elijah Newren via GitGitGadget
2022-07-23 1:53 ` [PATCH v5 0/8] Fix merge restore state Elijah Newren via GitGitGadget
2022-07-23 1:53 2% ` [PATCH v5 2/8] merge-resolve: abort if index does not match HEAD Elijah Newren via GitGitGadget
2022-07-23 1:53 2% ` [PATCH v5 4/8] merge: do not abort early if one strategy fails to handle the merge Elijah Newren via GitGitGadget
2022-07-23 1:53 2% ` [PATCH v5 5/8] merge: fix save_state() to work when there are stat-dirty files Elijah Newren via GitGitGadget
2006-03-25 22:26 Why would merge fail on a one-line addition? Marc Singer
2006-03-26 1:32 2% ` Junio C Hamano
2014-03-15 8:41 [PATCH 0/6] Fix misuses of "nor" Justin Lebar
2014-03-15 8:56 2% ` Duy Nguyen
2017-09-05 21:38 [PATCH] builtin/merge: honor commit-msg hook for merges Junio C Hamano
2017-09-07 22:04 2% ` [PATCHv3] " Stefan Beller
2017-09-05 23:29 2% ` [PATCHv2] " Stefan Beller
2020-01-08 0:31 [PATCH] submodule add: show 'add --dry-run' stderr when aborting Kyle Meyer
2020-01-16 16:17 ` Johannes Schindelin
2020-01-16 20:23 2% ` Junio C Hamano
2011-05-09 5:33 What's cooking in git.git (May 2011, #04; Sun, 8) Junio C Hamano
2011-05-09 8:55 2% ` Ciaran
2013-10-31 17:21 [BUG?] "error: cache entry has null sha1" Jeff King
2013-11-01 22:44 ` Re* " Junio C Hamano
2013-11-01 22:44 1% ` [PATCH 1/3] unpack-trees: fix "read-tree -u --reset A B" with conflicted index Junio C Hamano
2015-10-08 18:47 [PATCH 0/1] merge: fix cache_entry use-after-free David Turner
2015-10-08 18:47 1% ` David Turner
2015-10-08 20:00 2% ` Junio C Hamano
2015-10-09 22:16 2% ` David Turner
2015-10-09 22:51 2% ` Junio C Hamano
2014-06-15 22:39 git rebase --skip stuck in a loop brian m. carlson
2014-06-16 0:01 2% ` [PATCH] rebase--merge: fix --skip with two conflicts in a row brian m. carlson
2014-06-16 20:31 2% ` Junio C Hamano
2018-06-03 6:58 [RFC PATCH 0/7] merge requirement: index matches head Elijah Newren
2018-06-03 6:58 1% ` [RFC PATCH 7/7] merge: fix misleading pre-merge check documentation Elijah Newren
2018-07-01 1:24 ` [PATCH v2 0/9] Fix merge issues with index not matching HEAD Elijah Newren
2018-07-01 1:25 1% ` [PATCH v2 9/9] merge: fix misleading pre-merge check documentation Elijah Newren
2016-03-20 1:23 [PATCH] Fixing segmentation fault when merging FETCH_HEAD Eric Sunshine
2016-03-21 0:11 ` Jose Ivan B. Vilarouca Filho
2016-03-21 19:01 2% ` merge: fix NULL pointer dereference when merging nothing into void Junio C Hamano
2014-03-17 18:53 [PATCH 3/7] test patch hunk editing with "commit -p -m" Junio C Hamano
2014-03-18 10:00 ` [PATCH 1/7] merge hook tests: fix missing '&&' in test Benoit Pierre
2014-03-18 10:00 2% ` [PATCH 5/7] merge: fix GIT_EDITOR override for commit hook Benoit Pierre
2014-05-07 15:40 Beginner question on "Pull is mostly evil" Jim Garrison
2014-05-07 20:15 2% ` Junio C Hamano
2014-05-09 6:08 ` [PATCH] How to keep a project's canonical history correct Stephen P. Smith
2014-05-09 21:05 1% ` Junio C Hamano
2024-04-01 19:09 What's cooking in git.git (Apr 2024, #01; Mon, 1) Junio C Hamano
2024-04-01 21:17 ` Taylor Blau
2024-04-01 22:09 ` Junio C Hamano
2024-04-01 23:08 2% ` Junio C Hamano
2024-04-01 23:27 0% ` Taylor Blau
2008-01-12 22:46 performance problem: "git commit filename" Linus Torvalds
2008-01-13 1:46 ` Linus Torvalds
2008-01-13 4:04 ` Linus Torvalds
2008-01-13 8:12 ` Junio C Hamano
2008-01-13 10:33 ` Junio C Hamano
2008-01-13 11:09 2% ` Junio C Hamano
2020-07-28 20:21 [PATCH 0/11] renaming argv_array Jeff King
2020-07-28 20:27 ` [PATCH 10/11] strvec: drop argv_array compatibility layer Jeff King
2020-07-28 22:23 ` Junio C Hamano
2020-07-29 0:04 ` Jeff King
2020-07-29 0:37 ` Jeff King
2020-07-29 0:44 2% ` Junio C Hamano
2008-09-25 0:58 having to pull twice Michael P. Soulier
2008-09-25 1:01 ` Shawn O. Pearce
2008-09-25 7:05 ` Thomas Rast
2008-09-25 23:25 2% ` Miklos Vajna
2020-09-09 0:49 [PATCH v4 0/9] propose config-based hooks Emily Shaffer
2020-09-09 21:04 2% ` Junio C Hamano
2009-12-12 20:46 [PATCH 1/3] octopus: make merge process simpler to follow Junio C Hamano
2009-12-15 6:49 2% ` [PATCH] " Stephen Boyd
2011-10-10 5:46 [PATCH 0/2] Provide API to invalidate refs cache Michael Haggerty
2011-10-10 8:24 ` [PATCH v2 0/7] " Michael Haggerty
2011-10-11 0:02 ` Junio C Hamano
2011-10-11 5:50 ` Michael Haggerty
2011-10-11 17:26 2% ` Junio C Hamano
2022-11-03 17:05 [PATCH 00/17] leak fixes: use existing constructors & other trivia Ævar Arnfjörð Bjarmason
2022-11-03 17:06 2% ` [PATCH 14/17] sequencer.c: fix sequencer_continue() leak Ævar Arnfjörð Bjarmason
2015-12-02 0:24 What's cooking in git.git (Dec 2015, #01; Tue, 1) Jeff King
2015-12-02 22:11 2% ` Junio C Hamano
2013-07-30 15:46 ANNOUNCE: git-integration -- Easily manage integration branches John Keeping
2013-07-30 16:45 ` Junio C Hamano
2013-07-30 17:57 2% ` John Keeping
2014-08-11 4:59 Sharing merge conflict resolution between multiple developers Chris Packham
2014-08-11 18:44 ` Junio C Hamano
2014-08-11 23:29 2% ` Chris Packham
2014-08-12 1:57 2% ` Junio C Hamano
2008-03-09 10:46 What's cooking in git.git (topics) Junio C Hamano
2008-04-04 18:24 ` Junio C Hamano
2008-04-09 9:43 ` Junio C Hamano
2008-04-14 7:00 ` Junio C Hamano
2008-04-19 8:19 ` Junio C Hamano
2008-04-22 10:03 ` Junio C Hamano
2008-04-27 6:04 ` Junio C Hamano
2008-05-06 6:38 ` Junio C Hamano
2008-05-14 22:30 ` Junio C Hamano
2008-05-22 1:18 ` Junio C Hamano
2008-05-26 1:22 ` Junio C Hamano
2008-05-30 20:44 ` Junio C Hamano
2008-06-02 7:58 ` Junio C Hamano
2008-06-13 10:16 ` Junio C Hamano
2008-06-18 7:31 ` Junio C Hamano
2008-06-21 9:44 ` Junio C Hamano
2008-06-23 7:15 ` Junio C Hamano
2008-06-25 9:31 ` Junio C Hamano
2008-06-29 8:55 ` Junio C Hamano
2008-06-30 9:08 ` Junio C Hamano
2008-07-02 4:41 ` Junio C Hamano
2008-07-06 10:04 2% ` Junio C Hamano
2008-07-08 2:46 2% ` Junio C Hamano
2008-07-10 2:32 2% ` Junio C Hamano
2008-07-14 5:11 ` Junio C Hamano
2008-07-16 3:33 2% ` Junio C Hamano
2012-11-13 17:52 What's cooking in git.git (Nov 2012, #03; Tue, 13) Jeff King
2012-11-13 20:01 2% ` Junio C Hamano
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).