Radu Manea skrev 2012-07-06 13.46:
Hi,
Thank you for the detailed presentation posted on git.or.cz site.
One question: is there any equivalent config spec file for GIT as is in
ClearCase today?
Repo (http://source.android.com/source/version-control.html) is perhaps
the tool that is most simi
Chris Packham skrev 2012-06-26 10.18:
Hi,
This is a bit of a secondhand bug report/query so sorry if the details
are a bit sketchy.
Since git 1.7.8:
``When populating a new submodule directory with "git submodule init",
the $GIT_DIR metainformation directory for submodules is created inside
$G
A note on how JGit would work here. Java has none of the fields
that constitute statcrc. I guess we would write zero here when
creating new entries. Git could recognize that when checking status and
simply assume "clean" unless mtime or st_size says otherwise.
For existing entries JGit could e
Junio C Hamano skrev 2012-07-22 23.08:
Thomas Rast writes:
Hum, I'm a bit lost now.
What is the status quo? I take it JGit does not have any of ctime, dev,
ino etc., and either leaves the existing value or puts a 0
an argument in favor of splitting stat_crc into its fields again?
A dif
Torsten Bögershausen skrev 2012-06-24 17.47:
Do we have a motivation for pushing a solution that ignores
the unicode composition ?
I say we do. I tried your patch and it worked fine.
I'll send a V5 version with hopefully a better motivation
-- robin
--
To unsubscribe from this list: send
Just a couple of nitpicks.
Torsten Bögershausen skrev 2012-07-08 15.50:
diff --git a/compat/precompose_utf8.c b/compat/precompose_utf8.c
[...]
+static size_t has_utf8(const char *s, size_t maxlen, size_t *strlen_c)
+{
+ const uint8_t *utf8p = (const uint8_t*) s;
+ size_t strlen_cha
Nguyễn Thái Ngọc Duy skrev 2012-08-06 16.36:
+++ b/read-cache-v5.c
@@ -0,0 +1,1170 @@
+#include "cache.h"
+#include "read-cache.h"
+#include "resolve-undo.h"
+#include "cache-tree.h"
+
+struct cache_header_v5 {
+ unsigned int hdr_ndir;
+ unsigned int hdr_nfile;
+ unsigned int h
Remove extraneous parentheses and braces
Remove redundant NUL-termination
Check result of unlink when probing for decomposed file names
Signed-off-by: Robin Rosenberg
---
compat/precompose_utf8.c | 11 ---
1 fil ändrad, 4 tillägg(+), 7 borttagningar(-)
diff --git a/compat
Jose Nobile skrev 2012-08-20 07.12:
I have a big repository, around 80GB
git --version
#git version 1.7.12
git init .
#Initialized empty Git repository in /reponame/.git/
git add -A .
git commmit -m "Backup 2012-08-19 03:43:44"
#fatal: Out of memory, malloc failed (tried to allocate 32220431361
Torsten Bögershausen skrev 2012-09-01 08.11:> Allow path names to be encoded in
UTF-8 in the repository
> and checkout out as e.g. ISO-8859-1 in the working tree.
Ack for attempting this.
Did it myself if 2007, but times weren't ripe then, I guess.
> +i18n.pathEncoding::
> + This option is on
Jeff King skrev 2011-12-08 00.06:
On Wed, Dec 07, 2011 at 11:58:27PM +0100, Carlos Martín Nieto wrote:
If you want to use OSX to develop this project, you'll have to either
rename one of those files or set your filesystem to be case-sensitive
(and unset core.ignorecase afterwards). From what I'
- Ursprungligt meddelande -
> Robin Rosenberg venit, vidit, dixit 06.12.2012 02:23:
> >
> >
> > - Ursprungligt meddelande -
> >> Robin Rosenberg writes:
> >>
> >>> If core.symlinks is set to copy then symbolic links in a git
&
- Ursprungligt meddelande -
> This may be more of an Eclipse question than a git question but
> hopefully someone on this list knows both. I now have a working git
> central repository (on Linux) and a local repository clone (on
> Windows).
> I can see and edit my files in Eclipse, commit
- Ursprungligt meddelande -
> Hi Andreas,
>
> Thanks for the reply and no, I could not. However, you put me on the
> right track. Since I was only pushing/pulling from Windows to/from my
> Linux repository, I did not realize that an SSH session from the
> Linux
> back to Windows would ev
they are set to zero in the index.
This change introduces a core.ignorezerostat config option where the
user can list the fields to ignore using the names above.
Signed-off-by: Robin Rosenberg
---
Documentation/config.txt | 9 +
cache.h | 8
config.c
- Ursprungligt meddelande -
> Robin Rosenberg writes:
>
> > diff --git a/read-cache.c b/read-cache.c
> > index fda78bc..f7fe15d 100644
> > --- a/read-cache.c
> > +++ b/read-cache.c
> > @@ -197,8 +197,9 @@ static int ce_match_stat_basic(struct
they are set to zero in the index.
This change introduces a core.ignorezerostat config option where the
user can list the fields to ignore using the names above.
Signed-off-by: Robin Rosenberg
---
Documentation/config.txt | 9 +
cache.h | 8
config.c
> Is this "the user edits in eclipse and then runs 'git status' from
> the
> terminal" problem?
Yes. Of course not just status, but any command that validates
the index. On Unix this is usually bearable, though slow, but on
Windows I often see git status take minutes (yes large files...).
-- rob
- Ursprungligt meddelande -
> Robin Rosenberg writes:
>
> > Semantically they're somewhat different. My flags are for ignoring
> > a value when it's not used as indicated by the value zero, while
> > trustctime is for ignoring untrustworthy, non-zero,
- Ursprungligt meddelande -
> That configurability is a slipperly slope to drag us into giving
> users
> more complexity that does not help them very much, I suspect.
>
> Earlier somebody mentioned "size and mtime is often enough", so I
> think a single option core.looseStatInfo (substi
- Ursprungligt meddelande -
> Most git commands that can be used with our without a filepattern are
> tree-wide by default, the filepattern being used to restrict their
> scope.
> A few exceptions are: 'git grep', 'git clean', 'git add -u' and 'git
> add -A'.
>
> The inconsistancy of 'gi
- Ursprungligt meddelande -
> > git diff
> > #looks good
> > git add -u
>
> That's indeed the kind of mistake I'd like to avoid. In your example,
> "git diff" is tree-wide, and "git add -u" is limited to ., so in
> general
> "git add -u" won't stage the same thing as "git diff" just sho
all fields (default), or just size
and the whole second part of mtime (minimal).
Signed-off-by: Robin Rosenberg
---
Documentation/config.txt | 6 ++
cache.h | 1 +
config.c | 8
environment.c| 1 +
read-cache.c | 28
- Ursprungligt meddelande -
> Also, even though we settled on "default/minimal", we may regret in
> the future if old implementations died on an unrecognized value, as
> that will forbid users from using an old Git and a new Git on the
> same repository at the same time, so I'd suggest r
Hi,
What good reason is it that 'git stash apply' gives hairy conflict markers,
while 'git merge stash' does not. No renames involved.
-- robin
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://v
Thanks. Feeling a bit studid now.
I was actually thinking about using merge to implement stash apply
in JGit. What we have is broken so I tried using merge to implement
it and them compared to git merge --no-commit.. FAIL.
The main difference is of course that I set the merge base to
stash^1, whi
- Ursprungligt meddelande -
> Robin Rosenberg writes:
>
> > Thanks. Feeling a bit studid now.
> >
> > I was actually thinking about using merge to implement stash apply
> > in JGit. What we have is broken so I tried using merge to implement
> > it
A few nitpicks
- Ursprungligt meddelande -
> Always assume format_commit_item() takes an utf-8 string for
> simplicity. If commit message is in non-utf8, or output encoding is
> not, then the commit is first converted to utf-8, processed, then
> output converted to output encoding.
>
> T
igned-off-by: Robin Rosenberg
---
read-cache.c | 21 +
1 file changed, 13 insertions(+), 8 deletions(-)
diff --git a/read-cache.c b/read-cache.c
index fda78bc..6f13a22 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -197,21 +197,26 @@ static int ce_match_stat_basic(s
nk old '%s'
(%s)", path, strerror(errno));
+ }
+ }
+ }
} else if (state->not_new)
return 0;
create_directories(path, len, state);
diff --git a/environment.c b/environment.c
index 71e438c..
- Ursprungligt meddelande -
> On Tue, Nov 27, 2012 at 11:58 PM, Eric S. Raymond
> wrote:
> > Junio C Hamano :
> >> Roundtrip conversions may benefit from sub-second timestamps, but
> >> personally I think negative timestamps are more interesting and of
> >> practical use.
> >
> > You mea
- Ursprungligt meddelande -
> Hi,
>
> I've written a tool to stitch the first-parent histories of several
> git repositories. To illustrate, consider that we have a toplevel
> git
> repository inside which the other repositories reside.
>
[...]
>
> I'd like to know whether the tool wo
- Ursprungligt meddelande -
> Robin Rosenberg writes:
>
> > At least JGit does sets uid, gid, ctime, ino and dev fields to zero
> > on update. To Git this looks like the stat data does not match and
> > a full file compare will be forced even it size and mtime m
- Ursprungligt meddelande -
> Robin Rosenberg writes:
>
> > If core.symlinks is set to copy then symbolic links in a git
> > repository
> > will be checked out as copies of the file it points to.
>
> That all sounds nice on surface when the primary thin
- Ursprungligt meddelande -
> Am 12/6/2012 2:09, schrieb Robin Rosenberg:
> >> Robin Rosenberg writes:
> >>> At least JGit does sets uid, gid, ctime, ino and dev fields to
> >>> zero
> >>> on update. To Git this looks like the stat data do
- Ursprungligt meddelande -
> Am 12/5/2012 23:46, schrieb Robin Rosenberg:
> > - git status - when do we report a diff.
> > - After checkout we should probably not
>
> Are you saying that it should be ignored that the index records a
> symbolic
> link,
Signed-off-by: Robin Rosenberg
---
contrib/completion/git-prompt.sh | 2 ++
1 file changed, 2 insertions(+)
diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh
index 341422a..756a951 100644
--- a/contrib/completion/git-prompt.sh
+++ b/contrib/completion/git
- Ursprungligt meddelande -
> Från: "Alan Franzoni"
> Till: git@vger.kernel.org
> Kopia: "Alan Franzoni"
> Skickat: torsdag, 26 jun 2014 15:53:32
> Ämne: [PATCH] Fix: wrong offset for CET timezone
>
> From: Alan Franzoni
>
> Signed-off-by: Alan Franzoni
> ---
> Documentation/date-f
- Ursprungligt meddelande -
> Från: "Alan Franzoni"
> Till: "Robin Rosenberg"
> Kopia: git@vger.kernel.org, "Alan Franzoni" ,
> sch...@linux-m68k.org
> Skickat: fredag, 27 jun 2014 10:24:23
> Ämne: Re: [PATCH] Fix: wrong offset for CE
- Ursprungligt meddelande -
> Från: "Elliot Wolk"
> Till: git@vger.kernel.org
> Skickat: måndag, 30 jun 2014 8:38:18
> Ämne: move detection doesnt take filename into account
>
> if you move two identical {e.g.: empty} files to two new locations in a
> single commit, the move detection p
- Ursprungligt meddelande -
> Från: "Jeremy Morton"
> Till: git@vger.kernel.org
> Skickat: söndag, 27 apr 2014 1:56:47
> Ämne: Recording the current branch on each commit?
>
> Currently, git records a checksum, author, commit date/time, and commit
> message with every commit (as get be
- Ursprungligt meddelande -
> Från: "Felipe Contreras"
> Till: "James Denholm" , "Felipe Contreras"
>
> Kopia: "David Kastrup" , "Jeremy Morton"
> , "Johan Herland" ,
> "Git mailing list"
> Skickat: tisdag, 29 apr 2014 5:32:29
> Ämne: Re: Recording the current branch on each commit?
- Ursprungligt meddelande -
> Från: "Alex Dickson"
> Till: git@vger.kernel.org
> Skickat: måndag, 18 aug 2014 13:07:46
> Ämne: Cannot run cmd command lines from GIT bash
>
> HI,
> I have just installed GIT from Git-1.9.4-preview20140815.exe having
> previously been using Git-1.9.2-previ
h does not cause confusion.
Signed-off-by: Robin Rosenberg
---
Documentation/git-mergetool.txt | 7 +++
git-mergetool.sh| 10 ++
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt
ind
h does not cause confusion.
Signed-off-by: Robin Rosenberg
---
Documentation/git-mergetool.txt | 7 +++
git-mergetool.sh| 10 ++
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt
ind
h does not cause confusion.
Signed-off-by: Robin Rosenberg
---
Documentation/config.txt| 5 +
Documentation/git-mergetool.txt | 7 +++
git-mergetool.sh| 10 ++
3 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/Documentation/config.txt b/Doc
- Ursprungligt meddelande -
> Från: "Junio C Hamano"
> Till: "Johannes Sixt"
> Kopia: "Robin Rosenberg" , git@vger.kernel.org
> Skickat: onsdag, 20 aug 2014 0:14:21
> Ämne: Re: [PATCH v3] Allow the user to change the temporary file nam
h does not cause confusion.
Signed-off-by: Robin Rosenberg
---
Documentation/config.txt| 5 +
Documentation/git-mergetool.txt | 7 +++
git-mergetool.sh| 10 ++
3 files changed, 18 insertions(+), 4 deletions(-)
Fixed a spelling error.
-- robin
di
- Ursprungligt meddelande -
> Från: "David Aguilar"
> Till: "Junio C Hamano"
> Kopia: "Robin Rosenberg" , git@vger.kernel.org,
> "Charles Bailey"
> Skickat: onsdag, 15 okt 2014 8:38:49
> Ämne: Re: [PATCH] mergetool: add an
- Ursprungligt meddelande -
> Från: "Ram Kunchur"
> Till: git@vger.kernel.org
> Kopia: "Daren Scott" , "Rajen Shah"
> , "Sagar Keluskar"
>
> Skickat: fredag, 20 sep 2013 16:17:38
> Ämne: GIT Plug-in for PowerBuilder
>
> Hello Team,
> We wish to use GITSCC plug-in with PowerBu
- Ursprungligt meddelande -
> Från: "David Loyall"
> Till: git@vger.kernel.org
> Skickat: onsdag, 18 sep 2013 21:00:46
> Ämne: suspected bug(s) in git-cvsexportcommit.perl
>
> Hello.
>
> I don't believe that git-cvsexportcommit.perl is working properly.
>
> First off, invocations of "
Signed-off-by: Robin Rosenberg
---
Documentation/git-config.txt | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt
index 9ae2508..3198d52 100644
--- a/Documentation/git-config.txt
+++ b/Documentation/git
I guess this isn't true either. Anyone has a better way of
specifiying where the system wide config file is read from,
or a user-parseable definition of $(prefix) ?
-- robin
- Ursprungligt meddelande -
> Signed-off-by: Robin Rosenberg
> ---
> Documentation/git-
- Ursprungligt meddelande -
> On Mon, Jul 08, 2013 at 12:00:02AM +0200, Robin Rosenberg wrote:
> > Signed-off-by: Robin Rosenberg
> > ---
> > Documentation/git-config.txt | 6 --
> > 1 file changed, 4 insertions(+), 2 deletions(-)
> >
> > di
This looks ok with me, though I can manage without backward compatibility.
-- robin
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
55 matches
Mail list logo
