Mehul Jain writes:
> On Thu, Mar 3, 2016 at 10:44 PM, Junio C Hamano wrote:
>> Should this entry this verbose?
>>
>> - Is there a non-temporary stash?
>>
>> - I think "This means that ..." is totally unnecessary.
>>
>> - It probably makes sense to have "This option is only valid..." as
>>
Mehul Jain writes:
> On Thu, Mar 3, 2016 at 10:54 PM, Matthieu Moy
> wrote:
>> Mehul Jain writes:
>>> + else {
>>> + /* If --[no-]autostash option is called without --rebase */
>>> + if (opt_autostash == 0)
>>> + die(_("--no-autostash option is on
Eric Sunshine writes:
> It would be reasonable to combine the two cases into one:
>
> if (opt_autostash != -1)
> die(_("--[no]-autostash option is only valid with --rebase."));
Nit (in case Mehul copy/paste this): that would be --[no-], not --[no]-.
--
Matthieu Moy
http://www-verim
I'm on 2.7.0.
Here's a quick sanity check:
├── baz
│ ├── quux
│ │ ├── corge
│ │ │ └── wibble.txt
│ │ └── grault.txt
│ └── waldo.txt
└── foo
├── bar.txt
└── garply.txt
$ git --version
git version 2.7.0
$ git status -sb -uall
## Initial commit on master
?? baz/quux/corge
On Thu, Mar 03, 2016 at 09:11:56PM -0500, Charles Strahan wrote:
> Hello,
>
> I've found a change in the way .gitignore works, and I'm not sure if
> it's a bug
> or intended.
>
> Previously, one could use the following .gitignore:
>
> *
> !/foo
> !/foo/bar.txt
> !/baz
> !/baz
On Thu, Mar 3, 2016 at 11:01 PM, Matthieu Moy
wrote:
> There's no need to split code/test/doc into separate patches, except if
> your patches are getting really huge. As a reviewer, I like having tests
> and doc in the same patch because they describe the intention of the
> programmer.
>
> We try
On Thu, Mar 3, 2016 at 10:54 PM, Matthieu Moy
wrote:
> Mehul Jain writes:
>
>> If rebase.autoStash configuration variable is
>> set, there is no way to override it for
>> "git pull --rebase" from the command line.
>>
>> Teach "git pull --rebase" the --[no]autostash
>> command line flag which over
On Thu, Mar 3, 2016 at 10:44 PM, Junio C Hamano wrote:
> Should this entry this verbose?
>
> - Is there a non-temporary stash?
>
> - I think "This means that ..." is totally unnecessary.
>
> - It probably makes sense to have "This option is only valid..." as
>a separate second paragraph as
On Fri, Mar 4, 2016 at 9:11 AM, Charles Strahan wrote:
> Hello,
>
> I've found a change in the way .gitignore works, and I'm not sure if
> it's a bug
> or intended.
Can't look into this just yet. Quick question, what's the git version
you're currently running?
--
Duy
--
To unsubscribe from this
Hello,
I've found a change in the way .gitignore works, and I'm not sure if
it's a bug
or intended.
Previously, one could use the following .gitignore:
*
!/foo
!/foo/bar.txt
!/baz
!/baz/quux
!/baz/quux/**/*
And these files would be seen by git:
foo/bar.txt
baz/q
On Thu, Mar 3, 2016 at 12:24 PM, Matthieu Moy
wrote:
> Mehul Jain writes:
>> + else {
>> + /* If --[no-]autostash option is called without --rebase */
>> + if (opt_autostash == 0)
>> + die(_("--no-autostash option is only valid with
>> --rebase."))
On Thu, Mar 03, 2016 at 08:35:54PM -0300, Gabriel Souza Franco wrote:
> > The code looks good to me. Do we need documentation or test updates?
> >
> > Here's a test that can be squashed in. For documentation, it looks like
> > we don't cover the " " form at all. That's maybe OK, as it's
> > mostly
On Tue, Mar 1, 2016 at 1:54 AM, Jeff King wrote:
> On Mon, Feb 29, 2016 at 11:12:56PM -0300, Gabriel Souza Franco wrote:
>
>> Commit 58f2ed0 (remote-curl: pass ref SHA-1 to fetch-pack as well,
>> 2013-12-05) added support for specifying a SHA-1 as well as a ref name.
>> Add support for specifying
Junio C Hamano writes:
> Note that this name choice does not matter very much in the larger
> picture. As an initial clone that bootstraps from a clone-bundle is
> expected to do a rough equivalent of:
>
> # create a new repository
> git init new-repository &&
> git remote add origin
Le 03/03/2016 23:55, Junio C Hamano a écrit :
Grégoire PARIS writes:
Not sure how cherry-picking is managed, and whether commit is able to
see that we are doing a cherry-pick, and end it up properly. Anyway,
with Kevin's patch, we should be able to happily use cherry-pick
[Please do not top p
Teach a new option "--clone-bundle" to "git index-pack" to create a
split bundle file that uses an existing packfile as its data part.
The expected "typical" preparation for helping initial clone would
start by preparing a packfile that contains most of the history and
add another packfile that co
Grégoire PARIS writes:
> Not sure how cherry-picking is managed, and whether commit is able to
> see that we are doing a cherry-pick, and end it up properly. Anyway,
> with Kevin's patch, we should be able to happily use cherry-pick
[Please do not top post]
It is somewhat sad to see such a resp
On Thu, Mar 03, 2016 at 01:37:18PM -0800, Junio C Hamano wrote:
> These are automatically named by replacing .pack suffix in the
> name of the packfile. Add a small helper to do so, as I'll be
> adding another one soonish.
>
> Signed-off-by: Junio C Hamano
> ---
> builtin/index-pack.c | 35 +++
On Thu, Mar 03, 2016 at 05:05:03PM -0500, Santiago Torres wrote:
> I've been trying to shape these changes into sensible patch, but it is
> not as trivial as I originally thought. I think the issue lies in the
> tag desambiguation aspect of the git-tag command.
>
> It seems that verify-tag can ta
Not sure how cherry-picking is managed, and whether commit is able to
see that we are doing a cherry-pick, and end it up properly. Anyway,
with Kevin's patch, we should be able to happily use cherry-pick
greg0ire
Le 03/03/2016 22:30, Junio C Hamano a écrit :
greg0ire writes:
Steps to repro
Oh great, glad to see that, good job!
greg0ire
Le 03/03/2016 22:17, Kevin Daudt a écrit :
On Tue, Mar 01, 2016 at 12:01:53PM +0100, greg0ire wrote:
Hello,
using git 2.1.4 here, and it seems there is no option to bypass pre-commit
hooks while cherry-picking, while git commit provides a --no-ve
I do not want to issue "What's cooking" report daily, so here is
just a highlight of what will be merged to 'master' by -rc1:
Will merge to 'master' by 2.8-rc1
+ mg/httpd-tests-update-for-apache-2.4 02-25/03-01
#1
+ jk/pack-idx-corruption-safety
Hi Peff.
I've been trying to shape these changes into sensible patch, but it is
not as trivial as I originally thought. I think the issue lies in the
tag desambiguation aspect of the git-tag command.
It seems that verify-tag can take either the refname or the hash of the
object. However, git tag
On Thu, Mar 3, 2016 at 2:14 PM, Junio C Hamano wrote:
> When 592ce208 (index-pack: use strip_suffix to avoid magic numbers,
> 2014-06-30) refactored the code to derive names of .idx and .keep
> files from the name of .pack file, a copy-and-paste typo crept in,
> mistakingly attempting to create an
These are automatically named by replacing .pack suffix in the
name of the packfile. Add a small helper to do so, as I'll be
adding another one soonish.
Signed-off-by: Junio C Hamano
---
builtin/index-pack.c | 35 +--
1 file changed, 17 insertions(+), 18 deletion
greg0ire writes:
> Steps to reproduce :
>
> 1. create a pre-commit hook
> 2. create a commit that fails the hook, and bypass the hook
> 3. checkout another branch
> 4. might be optional : create a conflicting change with the previously
> created commit
> 5. cherry-pick the commit
> 6. might be op
On Tue, Mar 01, 2016 at 12:01:53PM +0100, greg0ire wrote:
> Hello,
>
> using git 2.1.4 here, and it seems there is no option to bypass pre-commit
> hooks while cherry-picking, while git commit provides a --no-verify option.
> I ended up doing this to disable hooks while cherry picking :
>
> t
Acked-by: Matthias Rüster
Am 03.03.2016 um 20:20 schrieb Ralf Thielow:
> Translate 48 new messages came from git.pot update in
> 9eb3984 (l10n: git.pot: v2.8.0 round 1 (48 new, 16 removed)).
>
> Signed-off-by: Ralf Thielow
> ---
> po/de.po | 144
> +++--
Signed-off-by: Ralf Thielow
---
po/TEAMS | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/po/TEAMS b/po/TEAMS
index df12b58..56274ad 100644
--- a/po/TEAMS
+++ b/po/TEAMS
@@ -11,7 +11,7 @@ Leader: Alex Henrie
Language: de (German)
Repository:https://g
Acked-by: Phillip Sz
> Signed-off-by: Ralf Thielow
> ---
> po/de.po | 80
>
> 1 file changed, 40 insertions(+), 40 deletions(-)
>
> diff --git a/po/de.po b/po/de.po
> index 5422ee3..8d1ccbb 100644
> --- a/po/de.po
> +++ b/po/de
On Thu, Mar 03, 2016 at 11:14:46AM -0800, Junio C Hamano wrote:
> When 592ce208 (index-pack: use strip_suffix to avoid magic numbers,
> 2014-06-30) refactored the code to derive names of .idx and .keep
> files from the name of .pack file, a copy-and-paste typo crept in,
> mistakingly attempting to
Translate 48 new messages came from git.pot update in
9eb3984 (l10n: git.pot: v2.8.0 round 1 (48 new, 16 removed)).
Signed-off-by: Ralf Thielow
---
po/de.po | 144 +++
1 file changed, 72 insertions(+), 72 deletions(-)
diff --git a/po/d
When 592ce208 (index-pack: use strip_suffix to avoid magic numbers,
2014-06-30) refactored the code to derive names of .idx and .keep
files from the name of .pack file, a copy-and-paste typo crept in,
mistakingly attempting to create and store the keep message file in
the .idx file we just created,
Signed-off-by: Thomas Ackermann
---
Documentation/git-ls-files.txt | 2 +-
Documentation/user-manual.txt | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt
index 0e08f56..75c3f41 100644
--- a/Documentation/git-l
Am 03.03.2016 um 08:38 schrieb Lars Schneider:
(1) If I have a Git core branch with a some changes that builds and
tests clean on Linux and OSX. How do I apply all the necessary Git for
Windows specific changes to this branch?
How do you do it when you make a patch on Linux and want to test it
On Thu, Mar 03, 2016 at 08:19:22PM +0700, Duy Nguyen wrote:
> On Tue, Mar 1, 2016 at 9:42 PM, Jeff King wrote:
> > - for (i = 0; i < unknown_extensions.nr; i++)
> > - warning("unknown repository extension: %s",
> > - unknown_extens
On Thu, Mar 03, 2016 at 08:08:40PM +0700, Duy Nguyen wrote:
> On Tue, Mar 1, 2016 at 9:40 PM, Jeff King wrote:
> > There's a chicken-and-egg problem with using the regular
> > git_config during the repository setup process. We get
> > around it here by using a special interface that lets us
> > s
On Thu, Mar 03, 2016 at 08:00:03PM +0700, Duy Nguyen wrote:
> On Tue, Mar 1, 2016 at 9:39 PM, Jeff King wrote:
> > + if (need_shared_repository_from_config) {
> > + const char *var = "core.sharedrepository";
> > + const char *value;
> > + if (!git_c
Am 03.03.2016 um 13:09 schrieb Duy Nguyen:
+the-other-Johannes who added valgrind support.
On Thu, Mar 3, 2016 at 1:55 PM, Johannes Sixt wrote:
8<
Subject: [PATCH] t0001: fix GIT_* environment variable check under --valgrind
When a test case is run without --valgrind, the wrap-for-b
Signed-off-by: Ralf Thielow
---
po/de.po | 80
1 file changed, 40 insertions(+), 40 deletions(-)
diff --git a/po/de.po b/po/de.po
index 5422ee3..8d1ccbb 100644
--- a/po/de.po
+++ b/po/de.po
@@ -396,7 +396,7 @@ msgstr "Ungültiger Mo
On Thu, Mar 03, 2016 at 07:09:12PM +0700, Duy Nguyen wrote:
> +the-other-Johannes who added valgrind support.
>
> On Thu, Mar 3, 2016 at 1:55 PM, Johannes Sixt wrote:
> > 8<
> > Subject: [PATCH] t0001: fix GIT_* environment variable check under
> > --valgrind
> >
> > When a test case
Junio C Hamano writes:
> Matthieu Moy writes:
>
>> I may get some students to work on this in May, or do it myself one day.
>
> I envy teachers who can say "hey, code this for me if you want
> course credits".
Well, in practice it's often still more work to supervise students than
to do the wor
Mehul Jain writes:
> Signed-off-by: Mehul Jain
> ---
> t/t5520-pull.sh | 19 +++
> t/t5521-pull-options.sh | 16
There's no need to split code/test/doc into separate patches, except if
your patches are getting really huge. As a reviewer, I like having te
Mehul Jain writes:
> If rebase.autoStash configuration variable is
> set, there is no way to override it for
> "git pull --rebase" from the command line.
>
> Teach "git pull --rebase" the --[no]autostash
> command line flag which overrides the current
> value of rebase.autostash, if set. As "gi
Matthieu Moy writes:
> We don't have "procedure" for feature requests. It happens often that
> someone dreams aloud like I did above, and it's OK as long as "it
> shouldn't be hard to implement" is understood as "one day I should do
> it" and not "hey, you lazy devs, why don't you code that for m
Mehul Jain writes:
> Signed-off-by: Mehul Jain
> ---
> Documentation/git-pull.txt | 15 +++
> 1 file changed, 15 insertions(+)
>
> diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
> index a62a2a6..a593972 100644
> --- a/Documentation/git-pull.txt
> +++ b/Document
Martine Lenders writes:
>> [ Please, don't top-post on this list ]
... and as much as possible keep the "XYZ wrote:" line so that we know
who wrote what ;-).
I wrote:
>> I wish I could write commit messages like
>>
>> fixup! deadbeef: fix typo (foo -> bar)
>>
>> So that the commit message conta
Christian Couder writes:
> Junio do you plan to merge this patch or would you prefer something like:
>
> +
> +Bugs & Caveats
> +--
> +
> +Some git commands, like `git log`, are run by default using a
> +pager. In this case, stdout and stderr are redirected to the pager and
> +are clos
> [ Please, don't top-post on this list ]
Sorry (*^.^*)
> It won't match if you put it in the subject line, but John's proposal is
to put it at the bottom (i.e. in the body). This won't disturb "git
rebase --autosquash".
For some reason I did not even consider the bottom. Tried and it
works! Tha
Signed-off-by: Mehul Jain
---
Documentation/git-pull.txt | 15 +++
1 file changed, 15 insertions(+)
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index a62a2a6..a593972 100644
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -128,6 +128,21 @
Signed-off-by: Mehul Jain
---
t/t5520-pull.sh | 19 +++
t/t5521-pull-options.sh | 16
2 files changed, 35 insertions(+)
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
index c952d5e..f5d1d31 100755
--- a/t/t5520-pull.sh
+++ b/t/t5520-pull.sh
@@ -245,6 +245
If rebase.autoStash configuration variable is
set, there is no way to override it for
"git pull --rebase" from the command line.
Teach "git pull --rebase" the --[no]autostash
command line flag which overrides the current
value of rebase.autostash, if set. As "git rebase"
understands the --[no]au
Martine Lenders writes:
> Hi John,
> yes, it can be anywhere in the commit message and I already thought
> about using a hook for generating the commit message too, but the
> problem is then, that `git rebase` won't pair up the commit for
> squashing/fixing up with the original commit.
It won't
Duy Nguyen writes:
> On Thu, Mar 3, 2016 at 7:09 PM, Duy Nguyen wrote:
>> But it's probably better that we inject valgrind command
>> from inside bin-wrappers script, the same way we inject gdb, I think.
>
> For the best of both worlds, we should recreate bin-wrappers in
> test-lib.sh (i.e. the
[ Please, don't top-post on this list ]
Martine Lenders writes:
> Hi Matthieu,
> We already do this :-). But sadly, this won't help: [ci skip]
> encourages Travis-CI to do nothing at all, while your proposed
> solution will at least require Travis to boot up a VM (or in case of a
> build matrix
[please don't top post on this list]
On Thu, Mar 03, 2016 at 03:33:34PM +0100, Martine Lenders wrote:
> yes, it can be anywhere in the commit message and I already thought
> about using a hook for generating the commit message too, but the
> problem is then, that `git rebase` won't pair up the com
Hi Matthieu,
We already do this :-). But sadly, this won't help: [ci skip]
encourages Travis-CI to do nothing at all, while your proposed
solution will at least require Travis to boot up a VM (or in case of a
build matrix several VMs). In our case, including queueing this can
take up to 1h.
Just i
Hi John,
yes, it can be anywhere in the commit message and I already thought
about using a hook for generating the commit message too, but the
problem is then, that `git rebase` won't pair up the commit for
squashing/fixing up with the original commit.
Maybe another approach could be to allow for
John Keeping writes:
> On Thu, Mar 03, 2016 at 01:47:00PM +0100, Martine Lenders wrote:
>> I'm not sure if this was already requested somewhere (a quick - but
>> admittedly not thorough - search did not reveal anything in that
>> direction), but I really miss an option to configure the prefixes g
On Thu, Mar 03, 2016 at 01:47:00PM +0100, Martine Lenders wrote:
> I'm not sure if this was already requested somewhere (a quick - but
> admittedly not thorough - search did not reveal anything in that
> direction), but I really miss an option to configure the prefixes generated
> by `git commit (-
On Tue, Mar 1, 2016 at 9:42 PM, Jeff King wrote:
> - for (i = 0; i < unknown_extensions.nr; i++)
> - warning("unknown repository extension: %s",
> - unknown_extensions.items[i].string);
> - *nongit_ok = -1;
> -
On Tue, Mar 1, 2016 at 9:40 PM, Jeff King wrote:
> There's a chicken-and-egg problem with using the regular
> git_config during the repository setup process. We get
> around it here by using a special interface that lets us
> specify the per-repo config, and avoid calling
> git_pathdup().
>
> But
On Tue, Mar 1, 2016 at 9:39 PM, Jeff King wrote:
> + if (need_shared_repository_from_config) {
> + const char *var = "core.sharedrepository";
> + const char *value;
> + if (!git_config_get_value(var, &value))
> + the_shared_repo
Hi,
I'm not sure if this was already requested somewhere (a quick - but
admittedly not thorough - search did not reveal anything in that
direction), but I really miss an option to configure the prefixes generated
by `git commit (--fixup | --squash) ` and picked up by `git rebase
-i --autosquash`.
On Thu, Mar 3, 2016 at 7:09 PM, Duy Nguyen wrote:
> But it's probably better that we inject valgrind command
> from inside bin-wrappers script, the same way we inject gdb, I think.
For the best of both worlds, we should recreate bin-wrappers in
test-lib.sh (i.e. the valgrind way), not in Makefile
+the-other-Johannes who added valgrind support.
On Thu, Mar 3, 2016 at 1:55 PM, Johannes Sixt wrote:
> 8<
> Subject: [PATCH] t0001: fix GIT_* environment variable check under --valgrind
>
> When a test case is run without --valgrind, the wrap-for-bin.sh
> helper script inserts the envir
On 2016-02-26 14:49-0500, Eric Sunshine wrote:
On Fri, Feb 26, 2016 at 3:28 AM, Mathias Nyman wrote:
On 2016-02-25 17:23-0500, Eric Sunshine wrote:
On Tue, Feb 23, 2016 at 5:25 AM, Mathias Nyman
wrote:
- cat <<-EOF
- $commit_message
-
- git-subtree-dir: $dir
On Mon, Feb 29, 2016 at 10:31 PM, Jeff King wrote:
> On Mon, Feb 29, 2016 at 03:21:20PM +0100, Christian Couder wrote:
>
>> Signed-off-by: Christian Couder
>> ---
>> Documentation/technical/api-trace.txt | 43
>> +++
>> 1 file changed, 43 insertions(+)
>
> I thin
68 matches
Mail list logo
