On Thu, Aug 25, 2016 at 12:03 AM, Jeff King wrote:
> On Wed, Aug 24, 2016 at 08:26:26PM +0200, Øystein Walle wrote:
>
>> In the mean time, however, I have discovered that this conflicts with
>> kn/ref-filter-branch-list in pu. In that topic this specific feature is
>> implemented
2016-08-20 10:01 GMT-06:00 Jean-Noël AVILA :
> 2. in sequencer.c, there is a mistake in the original string to translate
> "Cannot revert during a another revert"
There's also "In both case" in git-rebase--interactive.sh.
-Alex
--
To unsubscribe from this list: send the line
On Wed, Aug 24, 2016 at 3:52 PM, Stefan Beller wrote:
> On Tue, Aug 23, 2016 at 11:29 PM, Jacob Keller wrote:
>> On Tue, Aug 23, 2016 at 4:03 PM, Stefan Beller wrote:
> +
> + if (option_recursive) {
> +
From: "Dakota Hawkins"
On Wed, Aug 24, 2016 at 11:41 AM, Johannes Schindelin
wrote:
Hi Dakota,
On Tue, 23 Aug 2016, Dakota Hawkins wrote:
I use GFW almost exclusively, but I pretty much always consult the
upstream documentation anyway
On Wed, Aug 24, 2016 at 03:37:29PM -0700, Stefan Beller wrote:
> > That sounds massively ... broken. So before even thinking about
> > flipping it to default, this needs to be fixed first.
>
> I agree. That sounds bad.
>
> However having the --auto-check feels like papering over the
> actual
On Tue, Aug 23, 2016 at 11:29 PM, Jacob Keller wrote:
> On Tue, Aug 23, 2016 at 4:03 PM, Stefan Beller wrote:
+
+ if (option_recursive) {
+ if (option_required_reference.nr &&
+
Pranit Bauva writes:
> +struct bisect_terms {
> + struct strbuf term_good;
> + struct strbuf term_bad;
> +};
I think "struct strbuf" is overrated. For things like this, where
these fields will never change once it is set (and setting it is
done atomically, not
Pranit Bauva writes:
> +static int mark_good(const char *refname, const struct object_id *oid,
> + int flag, void *cb_data)
> +{
> + int *m_good = (int *)cb_data;
> + *m_good = 0;
> + return 1;
> +}
> +
> +static char *bisect_voc(char
On Wed, Aug 24, 2016 at 12:37 PM, Junio C Hamano wrote:
> Jeff King writes:
>
> This seems to be dropped from the list, probably due to no "To:"
> header in the original, which led to "no", "To-header" "on" and
> "input <" on YOUR recipient list, so I am quoting
Pranit Bauva writes:
> +static int is_expected_rev(const char *expected_hex)
> +{
> + struct strbuf actual_hex = STRBUF_INIT;
> + int res = 0;
> + if (strbuf_read_file(_hex, git_path_bisect_expected_rev(), 0) >=
> 0) {
> + strbuf_trim(_hex);
> +
Jeff King writes:
> On Wed, Aug 24, 2016 at 02:16:02PM -0700, Junio C Hamano wrote:
>
>> * jk/pack-objects-optim-mru (2016-08-11) 4 commits
>> (merged to 'next' on 2016-08-11 at c0a7dae)
>> + pack-objects: use mru list when iterating over packs
>> + pack-objects: break delta
On Wed, Aug 24, 2016 at 01:48:30PM -0700, Jacob Keller wrote:
> On Wed, Aug 24, 2016 at 9:22 AM, Junio C Hamano wrote:
> > The merge-base is to compute the point you forked your topic from
> > the mainline. So if you want to compare your current state in the
> > index with
On Wed, Aug 24, 2016 at 04:52:33PM -0400, Alex Nauda wrote:
> Elastic File System (EFS) is Amazon's scalable filesystem product that
> is exposed to the OS as an NFS mount. We're using EFS to host the
> filesystem used by a Jenkins CI server. Sometimes when Jenkins tries
> to git fetch, we get
On Wed, Aug 24, 2016 at 02:16:02PM -0700, Junio C Hamano wrote:
> * jk/pack-objects-optim-mru (2016-08-11) 4 commits
> (merged to 'next' on 2016-08-11 at c0a7dae)
> + pack-objects: use mru list when iterating over packs
> + pack-objects: break delta cycles before delta-search phase
> +
Junio C Hamano writes:
> Jeff King writes:
>
>> For instance, try this from a checkout of linux.git:
>>
>> for i in no check; do
>> rm -rf dst.git
>> git init --bare dst.git
>> echo "==> Pushing with submodules=$i"
>> time git push
I didn't apply the patch and test it out but from just a code review, the logic
behind and the design of this patch makes sense and it's a relatively small
patch for the gain. It's also a great example of the minimal amount of work
required to add a new extension into the index. Thank you for
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.
v2.10.0-rc1 was tagged last week,
Pranit Bauva writes:
> +static int bisect_reset(const char *commit)
> +{
> + struct strbuf branch = STRBUF_INIT;
> +
> + if (!commit) {
> + if (strbuf_read_file(, git_path_bisect_start(), 0) < 1) {
Hmm, tricky but correct to do the "< 1" comparison.
Elastic File System (EFS) is Amazon's scalable filesystem product that
is exposed to the OS as an NFS mount. We're using EFS to host the
filesystem used by a Jenkins CI server. Sometimes when Jenkins tries
to git fetch, we get this error:
$ git -c core.askpass=true fetch --tags --progress
Pranit Bauva writes:
> Reimplement `bisect_clean_state` shell function in C and add a
> `bisect-clean-state` subcommand to `git bisect--helper` to call it from
> git-bisect.sh .
>
> Using `--bisect-clean-state` subcommand is a measure to port shell
> function to C so as
On Wed, Aug 24, 2016 at 9:22 AM, Junio C Hamano wrote:
> The merge-base is to compute the point you forked your topic from
> the mainline. So if you want to compare your current state in the
> index with the fork point, you'd do
>
> git diff --cached $(git merge-base
On Wed, Aug 24, 2016 at 07:05:17PM +0200, Jakub Narębski wrote:
> W dniu 24.08.2016 o 16:20, Josh Triplett pisze:
> > On Wed, Aug 24, 2016 at 03:16:56PM +0200, Jakub Narębski wrote:
> [...]
> >> Not really.
> >>
> >> The above means only that the support for new syntax would be not
> >> as easy as
Jeff King wrote:
> On Wed, Aug 24, 2016 at 06:49:38PM +, Eric Wong wrote:
> > > > Given that public-inbox provides an NNTP interface, couldn't the ARTICLE
> > > > NNTP command be used to easily retrieve the messages in a
> > > > given patch series (at least compared to POP or
Jeff King writes:
This seems to be dropped from the list, probably due to no "To:"
header in the original, which led to "no", "To-header" "on" and
"input <" on YOUR recipient list, so I am quoting it in full without
trimming.
> On Wed, Aug 24, 2016 at 10:30:17AM -0700, Stefan
Christian Couder writes:
> Diff with previous v2 version
> ~
>
> diff --git a/Documentation/config.txt b/Documentation/config.txt
> index f5b6061..8a115b3 100644
> --- a/Documentation/config.txt
> +++ b/Documentation/config.txt
> @@
Johannes Schindelin wrote:
> On Mon, 22 Aug 2016, Philip Oakley wrote:
> > I do note that dscho's patches now have the extra footer (below the three
> > dashes) e.g.
> >
> > Published-As: https://github.com/dscho/git/releases/tag/cat-file-filters-v1
> > Fetch-It-Via:
On Wed, Aug 24, 2016 at 06:49:38PM +, Eric Wong wrote:
> > > Given that public-inbox provides an NNTP interface, couldn't the ARTICLE
> > > NNTP command be used to easily retrieve the messages in a
> > > given patch series (at least compared to POP or IMAP). Perhaps
> > > git-send-email
On Wed, Aug 24, 2016 at 08:41:57PM +0200, Christian Couder wrote:
> +test_pack_input_limit () {
> + case "$1" in
> + index) unpack_limit=1 ;;
> + unpack) unpack_limit=1 ;;
> + esac
Nice, this is pretty self-explanatory.
> + test_expect_success 'prepare destination
On Wed, Aug 24, 2016 at 08:26:26PM +0200, Øystein Walle wrote:
> In the mean time, however, I have discovered that this conflicts with
> kn/ref-filter-branch-list in pu. In that topic this specific feature is
> implemented as well. They incorporate it into %(upstream:track) instead
> of having a
Johannes Schindelin wrote:
> Hi Arif,
>
> On Tue, 23 Aug 2016, Arif Khokar wrote:
>
> > On 08/20/2016 03:57 PM, Jakub Narębski wrote:
> >
> > > But perhaps the problem is current lack of tooling in the opposite
> > > direction, namely getting patches from mailing
Stefan Beller writes:
> When working with submodules, it is easy to forget to push the submodules.
> The setting 'check', which checks if any existing submodule is present on
> at least one remote of the submodule remotes, is designed to prevent this
> mistake.
>
> Flipping
When receiving a pack-file, it can be useful to abort the
`git unpack-objects`, if the pack-file is too big.
Signed-off-by: Christian Couder
---
Documentation/git-unpack-objects.txt | 3 +++
builtin/unpack-objects.c | 7 +++
2 files changed, 10
From: Jeff King
Receive-pack feeds its input to either index-pack or
unpack-objects, which will happily accept as many bytes as
a sender is willing to provide. Let's allow an arbitrary
cutoff point where we will stop writing bytes to disk.
Cleaning up what has already been
From: Jeff King
When receiving a pack-file, it can be useful to abort the
`git index-pack`, if the pack-file is too big.
Signed-off-by: Jeff King
Signed-off-by: Christian Couder
---
Documentation/git-index-pack.txt | 2 ++
Goal
In https://public-inbox.org/git/20150612182045.GA23698%40peff.net/,
Peff sent a patch that is used by GitHub to abort `git receive-pack`
when the size of the pack we receive is bigger than a configured
limit.
GitLab is interested in using the same approach and in standardizing
the
Hi, Peff
On 24 August 2016 at 20:07, Jeff King wrote
>
> Whoops, your v2 spurred me to review, but I accidentally read and
> responded to v1.
>
Thanks for the review! I was worried this patch had been buried :-)
In the mean time, however, I have discovered that this conflicts
Junio C Hamano writes:
> Mentioned elsewhere, but I think the above should be
>
> if (!path)
> path = obj_context.path;
>
> if (obj_context.mode == S_IFINVALID)
> obj_context.mode = 0100644;
>
> IOW, even when there is an explicit path
Stefan Beller writes:
> I guess we can postpone it until 3.0, though I currently think it is not a big
> issue as it helps avoiding "bugs in your workflow".
>
> On the other hand if you really want to push out the superproject without
> the submodules, you need to adapt your
On Mon, Aug 22, 2016 at 07:35:28PM +0200, Øystein Walle wrote:
> git branch -vv will show "gone" next to a remote tracking branch if it
> does not exist. for-each-ref is suitable for parsing but had no way of
> showing this information.
>
> This introduces "%(upstream:gone)" to display "gone" in
On Fri, Aug 19, 2016 at 11:50:23PM +0200, Øystein Walle wrote:
> git branch -vv will show "gone" next to a remote tracking branch if it
> does not exist. for-each-ref is suitable for parsing but had no way of
> showing this information.
>
> This introduces "%(upstream:gone)" to display "gone" in
Jeff King writes:
> That is not too bad, I guess. I can switch it if you prefer that way.
> Since there are only these two callers with two different sets of needs
> (and the function is static), I just let them continue inspecting the
> elements directly.
I do not think it is
When working with submodules, it is easy to forget to push the submodules.
The setting 'check', which checks if any existing submodule is present on
at least one remote of the submodule remotes, is designed to prevent this
mistake.
Flipping the default to check for submodules is safer than the
Jeff King writes:
> I don't suppose anybody cares that much either way, but it feels weird
> to behave differently depending on how we looked up the blob (whereas
> for the HEAD:t case, a tree is always a tree).
I do not care strongly either way, but HEAD:RelNotes case we _know_
Junio C Hamano writes:
>> +test_expect_success 'setup ' '
>> +echo "*.txt eol=crlf diff=txt" >.gitattributes &&
>> +echo "hello" | append_cr >world.txt &&
>> +git add .gitattributes world.txt &&
>
> git update-index --cacheinfo :world.txt,$EMPTY_BLOB,symlink
On Sat, Aug 20, 2016 at 08:07:00PM +0100, Richard wrote:
> Because git is not namespace aware for anything but git-upload-pack
> and git-receive-pack, I've had to implement namespace parsing in cgit
> for listing branches, showing logs, displaying notes and commit
> decorations. It might be more
Johannes Schindelin writes:
> +static int filter_object(const char *path, unsigned mode,
> + const unsigned char *sha1,
> + char **buf, unsigned long *size)
> +{
> + enum object_type type;
> +
> + *buf =
Johannes Schindelin writes:
> @@ -65,6 +68,11 @@ static int cat_one_file(int opt, const char *exp_type,
> const char *obj_name,
> if (get_sha1_with_context(obj_name, 0, sha1, _context))
> die("Not a valid object name %s", obj_name);
>
> + if
On Tue, Aug 23, 2016 at 02:49:15PM -0700, Junio C Hamano wrote:
> > diff --git a/sha1_file.c b/sha1_file.c
> > index 1d0810c..8264b39 100644
> > --- a/sha1_file.c
> > +++ b/sha1_file.c
> > @@ -2152,10 +2152,7 @@ static inline void release_delta_base_cache(struct
> > delta_base_cache_entry *ent)
On Wed, Aug 24, 2016 at 10:02:39AM -0700, Junio C Hamano wrote:
> Jeff King writes:
>
> > On Wed, Aug 24, 2016 at 09:09:06AM -0700, Junio C Hamano wrote:
> >
> >> > + if (!path)
> >> > + path = obj_context.path;
> >> > + else if (obj_context.mode ==
W dniu 24.08.2016 o 16:20, Josh Triplett pisze:
> On Wed, Aug 24, 2016 at 03:16:56PM +0200, Jakub Narębski wrote:
[...]
>> Not really.
>>
>> The above means only that the support for new syntax would be not
>> as easy as adding it to 'git rev-parse' (and it's built-in equivalent),
>> except for
Jeff King writes:
> On Wed, Aug 24, 2016 at 09:09:06AM -0700, Junio C Hamano wrote:
>
>> > + if (!path)
>> > + path = obj_context.path;
>> > + else if (obj_context.mode == S_IFINVALID)
>> > + obj_context.mode = 0100644;
>> > +
>> >buf = NULL;
>> >
On Tue, Aug 23, 2016 at 03:45:33PM +, David McGough wrote:
> When I try to push to the server I get this message:
> remote: error: insufficient permission for adding an object to repository
> database ./objects
> remote: fatal: failed to write object
> [...]
> So I am pretty confused about
Chris Packham writes:
> Allow completion of refs with a ^ prefix. This allows completion of
> commands like 'git log HEAD ^origin/master'.
> ...
> + [[ "$cur" == ^* ]] && pfx="^"
> for i in HEAD FETCH_HEAD ORIG_HEAD MERGE_HEAD;
On Thu, Aug 18, 2016 at 7:09 AM, Heiko Voigt wrote:
> On Wed, Aug 17, 2016 at 02:14:11PM -0700, Stefan Beller wrote:
>> On Wed, Aug 17, 2016 at 2:05 PM, Junio C Hamano wrote:
>> > Stefan Beller writes:
> [...]
>> >> Flipping the default
Johannes Schindelin writes:
>> In any case, in the ideal future, I would imagine that we would want
>> to have "cat-file blob" to enable "--filters" by default; that would
>> make cat-file and hash-objects a pair of symmetric operations.
>
> I would advocate against
Nguyễn Thái Ngọc Duy writes:
> It's not wonderful, but it's in line with how git-checkout stops caring
> about ambiguity after the first argument can be resolved as a ref
> (there's even a test for it, t2010.6).
But that is justifiable because checkout can only ever take one
On Wed, Aug 24, 2016 at 3:28 AM, Leandro Lucarella
wrote:
> On Tue, 23 Aug 2016 14:40:08 -0700
> Stefan Beller wrote:
>> The surrounding advice is printed to stderr, but the list of
>> submodules is not. Make the report consistent by
On Wed, Aug 24, 2016 at 7:20 AM, Josh Triplett wrote:
> Depends on which cases you want to handle. In the most general case,
> you'd need to find and process the applicable .gitmodules file, which
> would only work if you started from the top-level tree, not a random
>
On Wed, Aug 24, 2016 at 09:09:06AM -0700, Junio C Hamano wrote:
> > + if (!path)
> > + path = obj_context.path;
> > + else if (obj_context.mode == S_IFINVALID)
> > + obj_context.mode = 0100644;
> > +
> > buf = NULL;
> > switch (opt) {
> > case 't':
>
> The
Michael J Gruber writes:
> As it stands, the documentation gives the impression that
>
> git diff-tree | git patch-id
>
> would be a working invocation of git patch-id, leaving the novice user
> in the dark.
>
> Make it explicit that 'git diff-tree -p' would be the
Robert Dailey writes:
> $ git diff master...topic
... which is defined roughly as
git diff $(git merge-base master topic) topic
The merge-base is to compute the point you forked your topic from
the mainline. So if you want to compare your current state in
Johannes Schindelin writes:
> diff --git a/builtin/cat-file.c b/builtin/cat-file.c
> index 5f91cf4..f8a3a08 100644
> --- a/builtin/cat-file.c
> +++ b/builtin/cat-file.c
> @@ -61,6 +61,7 @@ static int cat_one_file(int opt, const char *exp_type,
> const char
On Wed, Aug 24, 2016 at 11:41 AM, Johannes Schindelin
wrote:
> Hi Dakota,
>
> On Tue, 23 Aug 2016, Dakota Hawkins wrote:
>
>> I use GFW almost exclusively, but I pretty much always consult the
>> upstream documentation anyway (because I find it easier).
>
> Oh... I
Hi Eric,
On Wed, 24 Aug 2016, Eric Sunshine wrote:
> On Tue, Aug 23, 2016 at 12:07 PM, Johannes Schindelin
> wrote:
> > To be truly useful, the sequencer should never die() but always return
> > an error.
> >
> > Signed-off-by: Johannes Schindelin
On Wed, Aug 24, 2016 at 11:00 AM, Michael J Gruber
wrote:
> The 3-dot notation means:
>
> Show the difference between the merge-base of master and topic, and topic.
>
> I'm not completely sure, but I guess what you want is:
>
> Show the difference between the merge-base
Hi Eric,
On Wed, 24 Aug 2016, Eric Sunshine wrote:
> On Tue, Aug 23, 2016 at 12:07 PM, Johannes Schindelin
> wrote:
> > To be truly useful, the sequencer should never die() but always return
> > an error.
> >
> > Signed-off-by: Johannes Schindelin
Robert Dailey venit, vidit, dixit 24.08.2016 16:28:
> I want to view the complete diff of my branch (topic) relative to its
> parent branch (master). This should include cached/staged files and
> unstaged working tree changes.
>
> If I do this:
>
> $ git diff master
>
> This will include
Hi Eric,
On Wed, 24 Aug 2016, Eric Sunshine wrote:
> On Tue, Aug 23, 2016 at 12:07 PM, Johannes Schindelin
> wrote:
> > To be truly useful, the sequencer should never die() but always return
> > an error.
> >
> > Signed-off-by: Johannes Schindelin
Hi Eric,
On Wed, 24 Aug 2016, Eric Sunshine wrote:
> On Tue, Aug 23, 2016 at 12:07 PM, Johannes Schindelin
> wrote:
> > To be truly useful, the sequencer should never die() but always return
> > an error.
> >
> > Signed-off-by: Johannes Schindelin
Hi Eric,
On Wed, 24 Aug 2016, Eric Sunshine wrote:
> On Tue, Aug 23, 2016 at 12:07 PM, Johannes Schindelin
> wrote:
> > To be truly useful, the sequencer should never die() but always return
> > an error.
> >
> > Signed-off-by: Johannes Schindelin
Hi Eric,
On Wed, 24 Aug 2016, Eric Sunshine wrote:
> On Tue, Aug 23, 2016 at 12:06 PM, Johannes Schindelin
> wrote:
> > To be truly useful, the sequencer should never die() but always return
> > an error.
> >
> > Signed-off-by: Johannes Schindelin
Hi Eric,
On Wed, 24 Aug 2016, Eric Sunshine wrote:
> On Tue, Aug 23, 2016 at 12:06 PM, Johannes Schindelin
> wrote:
> > To be truly useful, the sequencer should never die() but always return
> > an error.
> >
> > Signed-off-by: Johannes Schindelin
I'll squash this in to avoid compilation breakage. We do not allow
decl-after-stmt.
Thanks.
config.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/config.c b/config.c
index e33c703..0dfed68 100644
--- a/config.c
+++ b/config.c
@@ -652,10 +652,11 @@ int
Hi Junio,
On Tue, 23 Aug 2016, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > The feature in question is also highly unlikely to be used as much by
> > non-Windows users as by Windows users due to the unfortunate choice of the
> > default setting for
Here comes suggested replacement for 1/3 and 2/3.
Let's not correct "C" in "Cannot" at this stage and leave them to
the next cycle; there are too many of them.
-- >8 --
From: Jean-Noel Avila
Date: Sun, 21 Aug 2016 16:50:37 +0200
Subject: [PATCH 1/3] i18n: fix typos for
And here is the second one, using wording suggested by Jiang.
-- >8 --
From: Jean-Noel Avila
Date: Sun, 21 Aug 2016 16:50:38 +0200
Subject: [PATCH] i18n: fix git rebase interactive commit messages
For proper i18n, the logic cannot embed english specific processing.
Hi Arif,
On Tue, 23 Aug 2016, Arif Khokar wrote:
> On 08/20/2016 03:57 PM, Jakub Narębski wrote:
>
> > But perhaps the problem is current lack of tooling in the opposite
> > direction, namely getting patches from mailing list and applying them
> > to GitHub repo, or Bitbucket, or GitLab.
Hi Dakota,
On Tue, 23 Aug 2016, Dakota Hawkins wrote:
> I use GFW almost exclusively, but I pretty much always consult the
> upstream documentation anyway (because I find it easier).
Oh... I thought that typing "git help git-commit" opening a nice HTML page
in your favorite browser was good
Hi Junio,
On Tue, 23 Aug 2016, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > In case it is not crystal-clear, let me clarify one very important point.
> > It seems that some people mistake the work I do for something I do on a
> > whim. This is not so.
>
Signed-off-by: Ramsay Jones
---
Hi Michael,
If you need to re-roll your 'mh/diff-indent-heuristic' branch, could
you please squash this into the relevant patch (commit 8f5cc189,
"diff: improve positioning of add/delete blocks in diffs", 22-08-2016).
Thanks!
ATB,
On Wed, Aug 24, 2016 at 03:16:56PM +0200, Jakub Narębski wrote:
> W dniu 24.08.2016 o 07:36, Junio C Hamano pisze:
> > Jakub Narębski writes:
> >
> >> The point is that submodule has it's own object database. It might
> >> be the same as superproject's, but you need to handle
W dniu 15.08.2016 o 14:28, Jeff King pisze:
> On Sun, Aug 14, 2016 at 07:58:14AM -0700, n...@dad.org wrote:
>
>> I am learning how to use git. I would like to know how:
>>
>> Given a branch's designation, such as "master~4", how can I see the message I
>> furnished when I created the branch using
I want to view the complete diff of my branch (topic) relative to its
parent branch (master). This should include cached/staged files and
unstaged working tree changes.
If I do this:
$ git diff master
This will include changes on master *since* my last merge, which I do
not want (I don't want
On Wed, Aug 24, 2016 at 02:44:29PM +0200, Jakub Narębski wrote:
> W dniu 24.08.2016 o 11:37, Duy Nguyen pisze:
>
> > It works for me either way. So I'm going to assume we want
> > "[include-if "gitdir-is:..."]", unless people think it needs more
> > discussion (then just write something,
W dniu 24.08.2016 o 07:36, Junio C Hamano pisze:
> Jakub Narębski writes:
>
>> The point is that submodule has it's own object database. It might
>> be the same as superproject's, but you need to handle submodule objects
>> being in separate submodule repository anyway.
Hi Philip,
On Mon, 22 Aug 2016, Philip Oakley wrote:
> From: "Duy Nguyen"
> > On Mon, Aug 22, 2016 at 8:06 PM, Johannes Schindelin
> > wrote:
> > > My point stands. We are way more uninviting to contributors than
> > > necessary. And a huge part
As it stands, the documentation gives the impression that
git diff-tree | git patch-id
would be a working invocation of git patch-id, leaving the novice user
in the dark.
Make it explicit that 'git diff-tree -p' would be the command to use.
Signed-off-by: Michael J Gruber
W dniu 24.08.2016 o 11:37, Duy Nguyen pisze:
> It works for me either way. So I'm going to assume we want
> "[include-if "gitdir-is:..."]", unless people think it needs more
> discussion (then just write something, anything, so I can put it back
> in my backlog)
A final note: [include
The --filters option applies the convert_to_working_tree() filter for
the path when showing the contents of a regular file blob object.
This feature comes in handy when a 3rd-party tool wants to work with
the contents of files from past revisions as if they had been checked
out, but without
There are circumstances when it is relatively easy to figure out the
object name for a given path, but not the name of the containing tree.
For example, when looking at a diff generated by Git, the object names
are recorded, but not the revision. As a matter of fact, the revisions
from which the
When third-party tools need to access to contents of blobs in the
database, they might be more interested in the worktree version than in
the "clean" version of said contents.
This branch introduces the --filters option to make that happen, the
--use-path option to provide the path separately if
"... has be ..." -> "... has to be ..."
Signed-off-by: Johannes Schindelin
---
Documentation/git-cat-file.txt | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-cat-file.txt b/Documentation/git-cat-file.txt
index
With this patch, --batch can be combined with --textconv or --filters.
For this to work, the input needs to have the form
so that the filters can be chosen appropriately.
Signed-off-by: Johannes Schindelin
---
Documentation/git-cat-file.txt | 18
Shougang Group of company
45 Huagong Road Xinji City,
Hebei Province China.
webpage: www.shougang.com.cn
This is an official request for Professional/consultants who will stand as
our regional representative to run logistics on behalf of Shougang Group.
We are only looking for individual or
On Tue, 23 Aug 2016 14:40:08 -0700
Stefan Beller wrote:
> The surrounding advice is printed to stderr, but the list of
> submodules is not. Make the report consistent by reporting everything
> to stderr.
>
> Signed-off-by: Stefan Beller
> ---
>
> This
W dniu 11.08.2016 o 00:07, Josh Triplett pisze:
> On August 9, 2016 11:37:31 PM HST, Richard Ipsum
> wrote:
>> On Thu, Aug 04, 2016 at 12:40:58PM -1000, Josh Triplett wrote:
[...]
>>> If you use a format-patch diff that includes the headers and
>>> commit message,
On Tue, Aug 23, 2016 at 8:42 PM, Johannes Schindelin
wrote:
> Hi Duy,
>
> On Mon, 22 Aug 2016, Duy Nguyen wrote:
>
>> On Mon, Aug 22, 2016 at 8:22 PM, Matthieu Moy
>> wrote:
>> >>> I think the syntax should be design to allow arbitrary
> On 16 Aug 2016, at 22:48, Junio C Hamano wrote:
>
> Lars Schneider writes:
>
>>> On 30 Jul 2016, at 17:11, Brian Henderson wrote:
>>>
>>> ---
>>> contrib/diff-highlight/Makefile | 5 ++
>>>
On Tue, Aug 23, 2016 at 10:21 PM, Michael J Gruber
wrote:
> I've cc'ed the master of worktrees.
Thanks for the analysis. I'll provide some patch as soon as possible.
This git-init may also be a good place to repair broken worktrees too
(e.g. because you moved a
Allow completion of refs with a ^ prefix. This allows completion of
commands like 'git log HEAD ^origin/master'.
Signed-off-by: Chris Packham
---
I often find myself using variations of 'git log HEAD ^origin/master' to
see commits that I have locally that have not been
1 - 100 of 112 matches
Mail list logo