On Tue, Jan 19, 2016 at 05:09:57PM +0100, Jean Delvare wrote:
> Earlier today my desktop environment warned me that my /home was almost
> full. I thought that running "git gc" on my git trees would maybe save
> some disk space.
>
> Unfortunately the opposite happened. "git gc" failed on me with:
[resend; sorry, I forgot to cc Michael on the first one]
On Thu, Jan 07, 2016 at 02:24:41PM -0500, Karl Moskowski wrote:
> The problem is, deleting a branch whose name contains slashes doesn’t
> delete the directories in .git/refs/heads/.
Yes. Git's model is to leave the directories in place, an
Using git 2.7.0 or master (563e3849) apply/pop prints
"Already up-to-date!" if the stash contains only untracked files. As
an example:
git init
git commit --allow-empty -m init
touch test.txt
git stash -u
Now that the stash contains only untracked files, applying it with
either pop or apply prod
On Thu, Jan 07, 2016 at 02:24:41PM -0500, Karl Moskowski wrote:
> The problem is, deleting a branch whose name contains slashes doesn’t
> delete the directories in .git/refs/heads/.
Yes. Git's model is to leave the directories in place, and remove them
only when they get in the way of creating an
On Sun, 2015-12-13 at 7:51, Michael Brade wrote:
> Now node_modules will be deleted even though it was ignored at the time
> of the "git stash save -u". Apparently .gitignore is reverted first,
> then the cleanup is done taking the new state of .gitignore into account
> where node_modules is now un
Hi,
On Wed, 3 Feb 2016, Klinger, Xia wrote:
> When the memory allocation preference is set to be Top-down on Windows
> and there are more than 4GB memory available, git will crash. The
> symptom is "Segmentation Fault".
This might be related to https://github.com/git-for-windows/git/issues/627
On Thu, Jan 14, 2016 at 11:26:10AM -0500, David Turner wrote:
> +static int dereference_symrefs(struct ref_transaction *transaction,
> +struct strbuf *err)
> +{
> + int i;
> + int nr = transaction->nr;
> +
> + for (i = 0; i < nr; i++) {
> + struc
On Tue, Feb 02, 2016 at 11:25:44AM -0800, Junio C Hamano wrote:
> Having said that, I do not necessarily think "git checkout" should
> revalidate the object name. The repository that you use for your
> daily work would have the same error/corruption rate as your working
> tree files, and I do not
On Thu, Feb 04, 2016 at 07:36:46AM +0200, Dan Aloni wrote:
> > In a sense, that encourages a nice workflow for your intended feature.
> > You have to do:
> >
> > git clone -c user.name=... -c user.email=... clone ...
> >
> > to set up your ident in the newly-cloned repository, or else clone wi
On Wed, Feb 03, 2016 at 11:01:11PM -0500, Jeff King wrote:
>[..]
> > > * Do these new tests really deserve a new test script, or would they
> > > fit into an existing script? (Genuine question.)
> >
> > I am not sure. IMHO it makes sense to have a new test script for a new
> > feature.
>
> I hope
On Wed, Feb 03, 2016 at 11:19:09PM -0500, Jeff King wrote:
> On Wed, Feb 03, 2016 at 11:01:11PM -0500, Jeff King wrote:
>
> > > + if (ident_explicit) {
> > > + if (name == git_default_name.buf &&
> > > + !(committer_ident_explicitly_given & IDENT_NAME_GIVEN) &&
> > > +
On Wed, Feb 03, 2016 at 11:01:11PM -0500, Jeff King wrote:
> > + if (ident_explicit) {
> > + if (name == git_default_name.buf &&
> > + !(committer_ident_explicitly_given & IDENT_NAME_GIVEN) &&
> > + !(author_ident_explicitly_given & IDENT_NAME_GIVEN))
> > +
On Wed, Feb 03, 2016 at 09:22:27PM +0200, Dan Aloni wrote:
> > * The new config variable "user.explicit" has a more nebulous name
> > than Peff's suggestion of "user.guessIdent", which may make its intent
> > harder to determine without consulting documentation.
>
> I wasn't sure about that, was
On Wed, Feb 03, 2016 at 03:09:06PM -0800, Junio C Hamano wrote:
> > + } else if (!strcmp(item.buf, "update")) {
> > + if (!value)
> > + ret = config_error_nonbool(var);
> > + else if (!me->overwrite && submodule->update != NULL)
> > + warn_
Make Help > About & Key bindings dialogs readable if theme
has changed font color to something incompatible with white.
Signed-off-by: Guillermo S. Romero
---
Hi:
Found more places where themable colors makes things unreadable
because not everything adapted to the changed style.
GSR
PS: Not
On Thu, Feb 04, 2016 at 01:54:44AM +, Ramsay Jones wrote:
> > They were working for me as-of the time I sent them. I guess something
> > must have broken since. I'll rebase, test, and send a new series.
>
> I didn't spend too long looking at it, but I think this interacts with
> Jeff's patc
On 04/02/16 01:12, David Turner wrote:
> On Wed, 2016-02-03 at 16:09 -0800, Junio C Hamano wrote:
>> Junio C Hamano writes:
>>
>>> David Turner writes:
>>>
Are there any more reviews on this? I do have some changes from
this
set, but they're pretty minor so I don't want to post
Eric Sunshine writes:
>> @@ -138,10 +140,9 @@ int parse_ref_filter_atom(const char *atom, const char
>> *ep)
>> * shouldn't be used for checking against the valid_atom
>> * table.
>> */
>> - const char *formatp = strchr(sp, ':');
>
On Wed, 2016-02-03 at 16:09 -0800, Junio C Hamano wrote:
> Junio C Hamano writes:
>
> > David Turner writes:
> >
> > > Are there any more reviews on this? I do have some changes from
> > > this
> > > set, but they're pretty minor so I don't want to post a new one
> > > (unless
> > > folks woul
Stefan Beller writes:
> On Wed, Feb 3, 2016 at 3:24 PM, Junio C Hamano wrote:
>> Stefan Beller writes:
>>
>>> + if (ce_stage(ce)) {
>>> + if (pp->recursive_prefix)
>>> + strbuf_addf(err, "Skipping unmerged submodule
>>> %s/%s\n",
>>>
Stefan Beller writes:
>> The same comment as in the footnote for the review on [3/8] applies
>> here.
>
> Ok, so we want to have
>
> [section ""]
>
> and
>
> [section]
>
> be different, such that we could have a submodule with an "" name,
> but still be able to differentiate to the common
Junio C Hamano writes:
> David Turner writes:
>
>> Are there any more reviews on this? I do have some changes from this
>> set, but they're pretty minor so I don't want to post a new one (unless
>> folks would rather see those changes before reviewing). Let me know.
>
> Thanks for pinging. As
On Tue, Feb 2, 2016 at 8:25 PM, Jeff King wrote:
> On Tue, Feb 02, 2016 at 06:13:14PM +0100, Marc Strapetz wrote:
>
>> git -c credential.helper=helper submodule update --init submodule
>>
>> does not invoke "helper", but falls back to the default strategies.
>> When configuring in ~/.gitconfig:
>>
On Wed, Feb 3, 2016 at 3:24 PM, Junio C Hamano wrote:
> Stefan Beller writes:
>
>> + if (ce_stage(ce)) {
>> + if (pp->recursive_prefix)
>> + strbuf_addf(err, "Skipping unmerged submodule
>> %s/%s\n",
>> +
On Wed, Feb 3, 2016 at 3:09 PM, Junio C Hamano wrote:
> Stefan Beller writes:
>
>> This rewrites parse_config to distinguish between configs specific to
>> one submodule and configs which apply generically to all submodules.
>> We do not have generic submodule configs yet, but the next patch will
Stefan Beller writes:
> + if (ce_stage(ce)) {
> + if (pp->recursive_prefix)
> + strbuf_addf(err, "Skipping unmerged submodule
> %s/%s\n",
> + pp->recursive_prefix, ce->name);
> + e
Stefan Beller writes:
> This allows to configure fetching and updating in parallel
> without having the command line option.
>
> This moved the responsibility to determine how many parallel processes
> to start from builtin/fetch to submodule.c as we need a way to communicate
> "The user did not
Stefan Beller writes:
> This rewrites parse_config to distinguish between configs specific to
> one submodule and configs which apply generically to all submodules.
> We do not have generic submodule configs yet, but the next patch will
> introduce "submodule.fetchJobs".
OK.
> +static int parse
Stefan Beller writes:
> `name_and_item_from_var` does not provide the proper abstraction
> we need here in a later patch.
... so the idea is to first open-code the calling site in this
patch, and bring a different abstraction that is better suited to
this machinery in a later step? Makes sense,
Stefan Beller writes:
> We need the submodule update strategies in a later patch.
>
> Signed-off-by: Stefan Beller
> Signed-off-by: Junio C Hamano
> ---
> submodule-config.c | 11 +++
> submodule-config.h | 1 +
> 2 files changed, 12 insertions(+)
>
> diff --git a/submodule-config.c b
Stefan Beller writes:
> Adhere to the common coding style of Git and not check explicitly
> for NULL throughout the file. There are still other occurrences in the
> code base but that is usually inside of conditions with side effects.
>
> Signed-off-by: Stefan Beller
> Signed-off-by: Junio C Ham
Let me copy-paste the original bug report from the Debain mail list by Paul
Wise http://comments.gmane.org/gmane.linux.debian.devel.bugs.general/1321117.
The bug is still reproducible with the latest version of git-prompt.sh.
I recently did a git svn clone of the Planet Debian SVN and I notice
On Sun, Jan 31, 2016 at 12:42 PM, Karthik Nayak wrote:
> Parsing atoms is done in populate_value(), this is repetitive and
> hence expensive. Introduce a parsing function which would let us parse
> atoms beforehand and store the required details into the 'used_atom'
> structure for further usage.
On Wed, Feb 03, 2016 at 12:47:56PM -0500, Eric Sunshine wrote:
>[..]
> * The final paragraph of the commit message appears to be outdated
> since it still seems to be describing the approach taken by v1.
Revised.
> * Elsewhere, in the project, the spelling "email" is preferred over
> "E-Mail"; th
When the memory allocation preference is set to be Top-down on Windows and
there are more than 4GB memory available, git will crash. The symptom is
"Segmentation Fault".
How to reproduce
1. Install latest Git package on Windows 7 x64
2. Enable top-down memory allocation preference
3. Open Git ba
Dennis Kaarsemaker writes:
> It is not, the code should look for @{, not @.
Not exactly.
$ git show -s --format='%h %s' 'HEAD^{/@{3}}' --
55d5d5b combine-diff.c: fix performance problem when folding ...
The commit has a line with a string "@@@" on it and the regular
expression asked fo
On Wed, Feb 3, 2016 at 3:21 AM, Dan Aloni wrote:
> On Tue, Feb 02, 2016 at 10:56:48PM -0500, Jeff King wrote:
>> On Tue, Feb 02, 2016 at 09:54:21PM +0200, Dan Aloni wrote:
>> > + if (strict && email && !strcmp(email, "(per-repo)")) {
>> > + die("email is '(per-repo)', suggesting to set
- Original Message -
> From: "Jeff King"
> To: "Andrew Martin"
> Cc: "Matthieu Moy" , git@vger.kernel.org
> Sent: Tuesday, February 2, 2016 10:34:12 PM
> Subject: Re: git object-count differs between clones
>
> On Tue, Feb 02, 2016 at 11:22:08AM -0600, Andrew Martin wrote:
>
> > Thanks
On February 3, 2016 4:20 AM, Per Jørgen Johnsen wrote:
> Subject: SV: Using Git for Cobol source
> I wonder if it is ok to use Git for source control for Cobol programs and
take
> advantage of parallel development ?
>
> Today we are using VSS and needs to be replaced. Our Cobol development is
> do
On di, 2016-02-02 at 16:21 -0800, Junio C Hamano wrote:
> Dennis Kaarsemaker writes:
>
> > + if (revs->reflog_info) {
> > + /*
> > + * The reflog iterator gets confused when fed
> > things that don't
> > + * have reflogs. Help it along a bit
> > + */
>
Hi Hannes,
On Tue, 2 Feb 2016, Johannes Sixt wrote:
> I'm not 100% satisfied with your version because it stomps on
> short-and-sweet shell variables $i and $y.
Please note that $y was already stomped on before my patch.
> But then the utility only occurs upstream of a pipeline in a separate
>
Signed-off-by: Nguyễn Thái Ngọc Duy
---
builtin/worktree.c | 87 ++--
t/t2028-worktree-move.sh | 36
2 files changed, 112 insertions(+), 11 deletions(-)
diff --git a/builtin/worktree.c b/builtin/worktree.c
index 80a8b80..3f69
Signed-off-by: Nguyễn Thái Ngọc Duy
---
builtin/worktree.c | 45 +
1 file changed, 45 insertions(+)
diff --git a/builtin/worktree.c b/builtin/worktree.c
index 3ebb9e9..80a8b80 100644
--- a/builtin/worktree.c
+++ b/builtin/worktree.c
@@ -477,9 +477,52 @
Signed-off-by: Nguyễn Thái Ngọc Duy
---
builtin/worktree.c | 130 +
1 file changed, 81 insertions(+), 49 deletions(-)
diff --git a/builtin/worktree.c b/builtin/worktree.c
index 8d59199..3ebb9e9 100644
--- a/builtin/worktree.c
+++ b/builtin/work
Signed-off-by: Nguyễn Thái Ngọc Duy
---
builtin/worktree.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/worktree.c b/builtin/worktree.c
index 7b217fb..f490ca3 100644
--- a/builtin/worktree.c
+++ b/builtin/worktree.c
@@ -263,7 +263,7 @@ static int add_worktree(const
Signed-off-by: Nguyễn Thái Ngọc Duy
---
builtin/worktree.c| 51 +++
t/t2028-worktree-move.sh (new +x) | 41 +++
2 files changed, 92 insertions(+)
create mode 100755 t/t2028-worktree-move.sh
diff --git a/builtin/work
Signed-off-by: Nguyễn Thái Ngọc Duy
---
worktree.c | 58 ++
worktree.h | 6 ++
2 files changed, 64 insertions(+)
diff --git a/worktree.c b/worktree.c
index d4513b1..047319b 100644
--- a/worktree.c
+++ b/worktree.c
@@ -257,6 +257,64 @@
Signed-off-by: Nguyễn Thái Ngọc Duy
---
builtin/worktree.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/builtin/worktree.c b/builtin/worktree.c
index f490ca3..36d942e 100644
--- a/builtin/worktree.c
+++ b/builtin/worktree.c
@@ -332,7 +332,7 @@ static int add(int ac, cons
Signed-off-by: Nguyễn Thái Ngọc Duy
---
worktree.c | 23 +++
worktree.h | 6 ++
2 files changed, 29 insertions(+)
diff --git a/worktree.c b/worktree.c
index 80c525b..a11c053 100644
--- a/worktree.c
+++ b/worktree.c
@@ -221,6 +221,29 @@ int is_main_worktree(const struct w
Signed-off-by: Nguyễn Thái Ngọc Duy
---
worktree.c | 15 ++-
worktree.h | 7 +++
2 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/worktree.c b/worktree.c
index a11c053..d4513b1 100644
--- a/worktree.c
+++ b/worktree.c
@@ -237,13 +237,26 @@ int update_worktree_locati
Signed-off-by: Nguyễn Thái Ngọc Duy
---
cache.h | 3 +++
path.c | 29 +
2 files changed, 32 insertions(+)
diff --git a/cache.h b/cache.h
index dfc459c..ec71181 100644
--- a/cache.h
+++ b/cache.h
@@ -747,11 +747,14 @@ extern int check_repository_format(void);
*/
e
Signed-off-by: Nguyễn Thái Ngọc Duy
---
builtin/worktree.c | 2 +-
worktree.c | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/builtin/worktree.c b/builtin/worktree.c
index 475b958..7b217fb 100644
--- a/builtin/worktree.c
+++ b/builtin/worktree.c
@@ -94,7 +94,7 @@ s
Signed-off-by: Nguyễn Thái Ngọc Duy
---
worktree.c | 16
worktree.h | 6 ++
2 files changed, 22 insertions(+)
diff --git a/worktree.c b/worktree.c
index b4e4b57..e444ad1 100644
--- a/worktree.c
+++ b/worktree.c
@@ -198,6 +198,22 @@ const char *get_worktree_git_dir(const str
Signed-off-by: Nguyễn Thái Ngọc Duy
---
worktree.c | 5 +
worktree.h | 5 +
2 files changed, 10 insertions(+)
diff --git a/worktree.c b/worktree.c
index e444ad1..e878f49 100644
--- a/worktree.c
+++ b/worktree.c
@@ -214,6 +214,11 @@ struct worktree *find_worktree_by_path(struct worktree
We can reconstruct git_dir from id quite easily. It's a bit hackier to
do the reverse.
Signed-off-by: Nguyễn Thái Ngọc Duy
---
worktree.c | 29 -
worktree.h | 7 ++-
2 files changed, 22 insertions(+), 14 deletions(-)
diff --git a/worktree.c b/worktree.c
index dd
Signed-off-by: Nguyễn Thái Ngọc Duy
---
worktree.c | 14 +++---
worktree.h | 5 +
2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/worktree.c b/worktree.c
index 4c38414..b4e4b57 100644
--- a/worktree.c
+++ b/worktree.c
@@ -4,14 +4,22 @@
#include "worktree.h"
#include
Because HEAD is part of repository signature, even if it's per-worktree
file, we can't simply delete it. So main worktree is considered gone if
.git/HEAD contains all-zero SHA-1.
Signed-off-by: Nguyễn Thái Ngọc Duy
---
worktree.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/worktree.c b
Signed-off-by: Nguyễn Thái Ngọc Duy
---
cache.h | 2 ++
path.c | 27 ++-
2 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/cache.h b/cache.h
index ec71181..c75d13f 100644
--- a/cache.h
+++ b/cache.h
@@ -748,6 +748,8 @@ extern int check_repository_format(voi
This is busybox's copy_file() [1] modified to fit in Git. Because this
is busybox, the code is likely POSIX-y (or even Linux-y). Windows
support may not be there yet.
[1] in libbb/copy_file.c from the GPL2+ commit
f2c043acfcf9dad9fd3d65821b81f89986bbe54e (busybox: fix
uninitialized memory
Signed-off-by: Nguyễn Thái Ngọc Duy
---
git-compat-util.h | 1 +
usage.c | 10 ++
2 files changed, 11 insertions(+)
diff --git a/git-compat-util.h b/git-compat-util.h
index e8f2867..f2bd775 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -398,6 +398,7 @@ extern NORET
Signed-off-by: Nguyễn Thái Ngọc Duy
---
usage.c | 25 +++--
1 file changed, 15 insertions(+), 10 deletions(-)
diff --git a/usage.c b/usage.c
index 82ff131..0dba0c5 100644
--- a/usage.c
+++ b/usage.c
@@ -109,19 +109,12 @@ void NORETURN die(const char *err, ...)
va_end(
This is the rough first cut of "git worktree move" for early
feedback. The series adds "git worktree move" which can
- move a linked worktree to another place
- move .git repository away
The first use case is obvious. The second less so.
Main worktree has always been an odd ball because it doe
Hi
I wonder if it is ok to use Git for source control for Cobol programs and take
advantage of parallel development ?
Today we are using VSS and needs to be replaced. Our Cobol development is done
by an Eclipse tool (Micro Focus Enterprise Developer)
Regards
___
Wrong mailing list?
> On 3 Feb 2016, at 06:58, Wert Alexander
> wrote:
>
> Dear GitHub Developers,
>
> I'm using the GitHub API for retrieving statistics like stargazers_count or
> watchers_count.
> Unfortunately, an API call to https://api.github.com/users//repos
> returns (as JSON) the sam
Junio C Hamano writes:
> The change to t0023 is merely an example that shows that existing
> tests assume the convert_to_git() way of defining the dirtyness of
> the working tree. It used to be OK to have core.autocrlf set to true,
> have LF terminated file on the working tree and add it to the
(resend - my mailer was misconfigured)
On Tue, Feb 02, 2016 at 10:56:48PM -0500, Jeff King wrote:
> On Tue, Feb 02, 2016 at 09:54:21PM +0200, Dan Aloni wrote:
>[..]
> > + if (strict && email && !strcmp(email, "(per-repo)")) {
> > + die("email is '(per-repo)', suggesting to set specific
On 03.02.2016 08:35, Jacob Keller wrote:
On Tue, Feb 2, 2016 at 8:25 PM, Jeff King wrote:
I think the problem is that when git "switches" to working in the
submodule repository, it clears the environment, which includes any "-c"
command switches. This makes sense for some situations, but not fo
Jeff King writes:
> Just when I dare to think "somebody cannot possibly be relying on this
> arcane behavior", I am proven wrong. :)
My thoughts, exactly. This is the kind of thing that makes this
project uncomfortably "interesting"; we cannot make improvements
without risking breaking existing
68 matches
Mail list logo
