Make git-rev-tree obsolete

2005-08-08 Thread Johannes Schindelin
Hi, Junio remarked that Jeff's git-changes-script still uses git-rev-tree, and therefore it should not be removed. This patch changes git-changes-script over to git-rev-list: --- git-changes-script.orig Tue Aug 9 02:21:36 2005 +++ git-changes-script Tue Aug 9 02:20:53 2005 @@ -85,14

Re: Make git-rev-tree obsolete

2005-08-09 Thread Johannes Schindelin
Hi, On Mon, 8 Aug 2005, Junio C Hamano wrote: Johannes Schindelin [EMAIL PROTECTED] writes: Junio remarked that Jeff's git-changes-script still uses git-rev-tree, and therefore it should not be removed. This patch changes git-changes-script over to git-rev-list: Just to make things

Re: Sanity check of git-commit patch, was Re: [PATCH] Making CFLAGS compilant with GNU Coding Standards

2005-08-09 Thread Johannes Schindelin
Hi, On Tue, 9 Aug 2005, Junio C Hamano wrote: Johannes Schindelin [EMAIL PROTECTED] writes: - I don't like the GNU way to abbreviate long options too much... True. My bad old habit. An elegant method to do that: case --some-long-option in $1*) ..; esac Ciao, Dscho - To unsubscribe

Re: gitweb - feature request

2005-08-09 Thread Johannes Schindelin
Hi, On Tue, 9 Aug 2005, Sam Ravnborg wrote: On Tue, Aug 09, 2005 at 09:58:18PM +0200, Kay Sievers wrote: I was hoping people that want stuff like this would use a RSS reader. :) Some day I will try to use such a beast... You have Firefox, don't you? Next time you surf to gitweb, right

Re: Sanity check of git-commit patch, was Re: [PATCH] Making CFLAGS compilant with GNU Coding Standards

2005-08-10 Thread Johannes Schindelin
Hi, On Tue, 9 Aug 2005, Horst von Brand wrote: Isn't it easier to just use getopt(1)? Only if GNU getopt is available. On Mac OS X, only the BSD version is installed by default, which does not handle long options at all. Please stop! I'm dizzy already! :-) Ciao, Dscho - To unsubscribe

git reveals a bug in (some versions) BSD diff

2005-08-12 Thread Johannes Schindelin
Hi, big was my surprise when my daily routine of git pull make test failed. git bisect revealed that commit 8e832e: String comparison of test is done with '=', not '=='. was the culprit. But it isn't. The version of diff present on my iBook (OS 10.2.8) does not work properly in this case:

[PATCH] Add --sign option to git-format-patch-script

2005-08-12 Thread Johannes Schindelin
This adds the option --sign to git-format-patch-script which adds a Signed-off-by: line automatically. Signed-off-by: Johannes Schindelin [EMAIL PROTECTED] --- git-format-patch-script | 12 +++- 1 files changed, 11 insertions(+), 1 deletions

Re: [PATCH] Use -script postfix for scripts

2005-08-12 Thread Johannes Schindelin
hI, On Fri, 12 Aug 2005, Junio C Hamano wrote: Johannes Schindelin [EMAIL PROTECTED] writes: For consistency reasons, the names of all scripts should end in -script. This may be a bit controversial (people might find it unnecessary). Subject to discussion. I have never liked

Re: [PATCH] Add --sign option to git-format-patch-script

2005-08-12 Thread Johannes Schindelin
Hi, On Fri, 12 Aug 2005, Junio C Hamano wrote: Good intentions, but I'd rather see these S-O-B lines in the actual commit objects. Giving format-patch this option would discourage people to do so. Maybe a patch to git commit would be more appropriate, methinks. Maybe in addition to this

Re: Some tutorial text (was git/cogito workshop/bof at linuxconf au?)

2005-08-15 Thread Johannes Schindelin
Hi, On Mon, 15 Aug 2005, [EMAIL PROTECTED] wrote: Linus Torvalds wrote: I'll happily help anybody who wants to try to write some nice documentation (answer questions etc), but I'm just not very good at doing it myself. Here's something that I've been putting together on how I'm using

Re: Making note, in the repository, of push/pull relationships

2005-08-15 Thread Johannes Schindelin
Hi, On Mon, 15 Aug 2005, Carl Baldwin wrote: Somewhere in the thread something was mentioned about maintaining local branch:remote branch pairs in the git repository when pushes and pulls are performed. I think the argument was actually against keeping this information and ultimately

Re: Switching heads and head vs branch after CVS import

2005-08-15 Thread Johannes Schindelin
Hi, On Mon, 15 Aug 2005, Linus Torvalds wrote: I was seriously considering just breaking the remote cvs support entirely (you can always just use cvsup or something to download it to make it local), and just taking the RCS parsing code from GNU rcs/cvs and making a C language CVS importer.

Re: git reveals a bug in (some versions) BSD diff

2005-08-15 Thread Johannes Schindelin
Hi, On Sat, 13 Aug 2005, Brad Roberts wrote: I'm seeing this on a standard os/x 10.3.9 install which seems to have an old, but still GNU based, diff. $ which diff /usr/bin/diff $ diff --version diff - GNU diffutils version 2.7 That is exactly the same as with 10.2.8. [...] * FAIL

Re: [PATCH] Add SubmittingPatches

2005-08-15 Thread Johannes Schindelin
Hi, On Sat, 13 Aug 2005, Junio C Hamano wrote: +Note that your maintainer does not subscribe to the git mailing +list (he reads it via mail-to-news gateway). Wow. I didn't even read a newsgroup in decades... BTW, I don't know how many people still use pine, but for those poor souls it may

Re: How is working on arbitrary remote heads supposed to work in Cogito (+ PATCH)?

2005-08-15 Thread Johannes Schindelin
Hi, On Sat, 13 Aug 2005, Junio C Hamano wrote: Johannes posted a script on the list a couple of days ago, which should work well, except that it was written before the git-fetch-pack command was updated to natively download from multiple refs, so it does not know how to fetch multiple refs

[PATCH] Make git-format-patch's signoff option more consistent

2005-08-15 Thread Johannes Schindelin
Since git-commit-script has a --signoff option, use that in git-format-patch-script, too (and since partial option names are supported,--sign is still valid). Also, if the message already contains the S-O-B line, silently ignore the --signoff request. Signed-off-by: Johannes Schindelin

Re: [PATCH] Add SubmittingPatches

2005-08-15 Thread Johannes Schindelin
Hi, On Mon, 15 Aug 2005, Linus Torvalds wrote: On Tue, 16 Aug 2005, Johannes Schindelin wrote: BTW, I don't know how many people still use pine, but for those poor souls it may be good to mention that the quell-flowed-text is needed for recent versions. And 4.58 needs at least

Re: [PATCH] Add SubmittingPatches

2005-08-15 Thread Johannes Schindelin
Hi, On Mon, 15 Aug 2005, Junio C Hamano wrote: Johannes Schindelin [EMAIL PROTECTED] writes: Maybe we should enhance git-applymbox to detect whitespace corruption in particular, and output the User-Agent header (or if that does not exist, the Message-ID header; thanks, pine) on error

Re: Git 1.0 Synopis (Draft v4)

2005-08-16 Thread Johannes Schindelin
Hi, On Tue, 16 Aug 2005, Junio C Hamano wrote: - Glossary documentation Johannes Schindelin is working on. Yeah, yeah. Call _me_ lazy :-) I'll try to come up with a discussable item today. - git prune and git fsck-cache; think about their interactions with an object database

Re: Git 1.0 Synopis (Draft v4)

2005-08-16 Thread Johannes Schindelin
Hi, On Tue, 16 Aug 2005, Junio C Hamano wrote: - Are all the files in Documentation/ reachable from git(7) or otherwise made into a standalone document using asciidoc by the Makefile? I haven't looked into documentation generation myself (I use only the text files as they

Re: [RFC] Patches exchange is bad?

2005-08-16 Thread Johannes Schindelin
Hi, On Tue, 16 Aug 2005, Marco Costalba wrote: Suppose a possible scenario involves using a couple of git archives, one for releases and stable code, say MAIN, and one for experimental stuff or new development, say HEAD. Suppose there is stuff in HEAD you don't want merged in MAIN,

Re: Git 1.0 Synopis (Draft v4)

2005-08-16 Thread Johannes Schindelin
Hi, On Tue, 16 Aug 2005, Horst von Brand wrote: And teach make(1) about checking out files from git... or just create a co(1) command for git. How about git-checkout-script, optionally with the -f flag to ignore changes since the last checkout/checkin? Ciao, Dscho - To unsubscribe from

Re: Making note, in the repository, of push/pull relationships

2005-08-16 Thread Johannes Schindelin
Hi, On Tue, 16 Aug 2005, Carl Baldwin wrote: So, just a question. What, exactly, is meant by 'cross-pulling'? When I say cross-pulling I mean that a branch is pulled from a remote repository, where the named head is called a, but that reference is pulled into the local branch whose head is

[PATCH] Also handle CVS branches with a '/' in their name

2005-08-17 Thread Johannes Schindelin
-by: Johannes Schindelin [EMAIL PROTECTED] --- git-cvsimport-script |1 + 1 files changed, 1 insertions(+), 0 deletions(-) 787879e1e16d6cece75dc4744358ba0073e908cc diff --git a/git-cvsimport-script b/git-cvsimport-script --- a/git-cvsimport-script +++ b/git-cvsimport-script @@ -621,6 +621,7 @@ while

Re: [PATCH] Also handle CVS branches with a '/' in their name

2005-08-17 Thread Johannes Schindelin
Hi, On Wed, 17 Aug 2005, Junio C Hamano wrote: Johannes Schindelin [EMAIL PROTECTED] writes: I track a CVS project which has a branch with a '/' in the branch name. Since git wants the branch name to be a file name at the same time, translate that character to a '-'. This should work

First stab at glossary

2005-08-17 Thread Johannes Schindelin
Hi, long, long time. Here´s my first stab at the glossary, attached the alphabetically sorted, asciidoc marked up txt file (Comments? Suggestions? Pizzas?): object:: The unit of storage in GIT. It is uniquely identified by the SHA1 of its contents. Consequently, an object can

Re: git-format-patch + git-applymbox small issue

2005-08-17 Thread Johannes Schindelin
Hi, On Wed, 17 Aug 2005, Junio C Hamano wrote: Marco Costalba [EMAIL PROTECTED] writes: So 'revision' is the struct and 'commit object' the pointer ;-) It would be more like revision is a concept represented (not referenced) by a commit object. Actually, I think it is referenced,

Re: First stab at glossary

2005-08-17 Thread Johannes Schindelin
Hi, On Wed, 17 Aug 2005, Daniel Barkalow wrote: On Wed, 17 Aug 2005, Johannes Schindelin wrote: SHA1:: A 20-byte sequence (or 41-byte file containing the hex representation and a newline). It is calculated from the contents of an object by the Secure Hash Algorithm 1

Re: [RFC] Patches exchange is bad?

2005-08-17 Thread Johannes Schindelin
Hi Catalin, maybe it is time for a quick run through the typical jobs you do with StGIT, much like what Jeff sent the other day? Ciao, Dscho - To unsubscribe from this list: send the line unsubscribe git in the body of a message to [EMAIL PROTECTED] More majordomo info at

Re: First stab at glossary

2005-08-17 Thread Johannes Schindelin
Hi, On Wed, 17 Aug 2005, Daniel Barkalow wrote: On Wed, 17 Aug 2005, Johannes Schindelin wrote: On Wed, 17 Aug 2005, Daniel Barkalow wrote: [...] Okay for hash. I think we only need at most two names for this, so this is more a matter of fixing old usage than documenting it. It's

Re: [PATCH/RFC] Allow file removal when git commit --all is used.

2005-08-18 Thread Johannes Schindelin
Hi, On Thu, 18 Aug 2005, Junio C Hamano wrote: After you deleted files from your working tree, automatic git-update-cache used when the --all flag is given to git commit barfs because it lacks the --remove flag. It can be argued that this is a feature; people should be careful and

[PATCH] Add Makefile target glossary.html

2005-08-18 Thread Johannes Schindelin
This also includes a script which does the sorting, and introduces hyperlinks for every described term. Signed-off-by: Johannes Schindelin [EMAIL PROTECTED] --- Documentation/Makefile |7 +++- Documentation/sort_glossary.pl | 70 2 files

Subject: [PATCH] Updates to glossary

2005-08-18 Thread Johannes Schindelin
Changes to the descriptions of tree and tag objects, a link for ent, and descriptions for rewind, rebase and core git were added. Signed-off-by: Johannes Schindelin [EMAIL PROTECTED] --- Documentation/glossary.txt | 28 ++-- 1 files changed, 22 insertions(+), 6

Re: Subject: [PATCH] Updates to glossary

2005-08-18 Thread Johannes Schindelin
Hi, On Thu, 18 Aug 2005, Matthias Urlichs wrote: Hi, Johannes Schindelin wrote: Subject: Subject: [PATCH] Updates to glossary Something is stuttering here -- one Subject: is quite sufficient. Subject! Subject! Subject! ;-) My bad. Dscho - To unsubscribe from this list: send the line

Re: Subject: [PATCH] Updates to glossary

2005-08-18 Thread Johannes Schindelin
Hi, On Thu, 18 Aug 2005, Daniel Barkalow wrote: On Thu, 18 Aug 2005, Johannes Schindelin wrote: tree object:: - An object containing a list of blob and/or tree objects. - (A tree usually corresponds to a directory without - subdirectories). + An object containing a list

Re: [PATCH] Teach parse_commit_buffer about grafting.

2005-08-18 Thread Johannes Schindelin
Hi, On Fri, 19 Aug 2005, Paul Mackerras wrote: Linus Torvalds writes: Paul, I hate to tell you about yet another flag [...] But why? You're doing such a fine job telling people about flags :-) Umm. git-rev-list really does everything. Rule of thumb: if you _ever_ need to look at any

Re: [PATCH/RFC] Allow file removal when git commit --all is used.

2005-08-19 Thread Johannes Schindelin
Hi, On Thu, 18 Aug 2005, Junio C Hamano wrote: Johannes Schindelin [EMAIL PROTECTED] writes: The patch is for people who thinks the user who uses the --all flag deserves the danger that comes with the convenience. Comments? This is a sane default behaviour. Maybe introduce yet

Re: Multi-head fetches, pulls, and a King Ghidorah

2005-08-19 Thread Johannes Schindelin
Hi, If I understand correctly, the multi-head fetch would not write any ref if used like this: git fetch remote:repository/ head tail but it would try a fast-forward when used like this: git fetch remote:repository/ head:head tail:tail Correct? If yes: This is fantastic! It

FYI: My experiences with cygwin git

2005-08-19 Thread Johannes Schindelin
Hi, I tried to compile run git on cygwin. Two showstoppers: - cygwin does not support IPv6 (yet). Therefore, it does not have getaddrinfo() and friends. (minor showstopper) - fork() and mmap() together have problems. This manifests itself in git-diff-tree -p

Re: gitweb tag display

2005-08-19 Thread Johannes Schindelin
Hi, On Sat, 20 Aug 2005, Paul Mackerras wrote: Hmmm... now I suppose we want a way to use gitk to drive the git bisection process... :) Ssshh! Let sleeping dogs lie! ;-) Ciao, Dscho - To unsubscribe from this list: send the line unsubscribe git in the body of a message to [EMAIL PROTECTED]

Re: git-ls-new-files make patch, pull, etc.

2005-08-23 Thread Johannes Schindelin
Hi, On Mon, 22 Aug 2005, Jeff Carr wrote: patch: git-diff-files -p git diff push: git-send-pack `cat .git/branches/origin` git push origin (or maybe git push HEAD:origin) pull: git-pull-script `cat .git/branches/origin` git-read-tree -m HEAD

Subject: [PATCH] More missing terms in glossary.txt

2005-08-25 Thread Johannes Schindelin
Describe a DAG and octopus, and change wording of tree object. Signed-off-by: Johannes Schindelin [EMAIL PROTECTED] --- Documentation/glossary.txt | 14 -- 1 files changed, 12 insertions(+), 2 deletions(-) e077919262930f6ce494c963d23317eb2aaf0dd3 diff --git a/Documentation

Re: [PATCH] Fix pulling into the same branch.

2005-08-26 Thread Johannes Schindelin
Hi, On Thu, 25 Aug 2005, Junio C Hamano wrote: This patch is to show my current thinking. Please let me know what you think. I like it. As Linus stated, the index originally had a different role from what it has now, so it really should be an internal git thing, i.e. the git user should

Re: [PATCH 0/3] tests: --valgrind=tool

2013-04-01 Thread Johannes Schindelin
Hi Thomas, On Sun, 31 Mar 2013, Thomas Rast wrote: From: Thomas Rast tr...@inf.ethz.ch I had a quick-and-dirty edit to t/valgrind/valgrind.sh in my trees while we did the index-pack investigation. This small series is the proper way of achieving the same. Thomas Rast (3): t/README:

Re: [PATCH v2] submodule: print graph output next to submodule log

2013-04-05 Thread Johannes Schindelin
Hi John, On Fri, 5 Apr 2013, John Keeping wrote: When running git log -p --submodule=log, the submodule log is not indented by the graph output, although all other lines are. Fix this by prepending the current line prefix to each line of the submodule log. Nice! I agree that submodules are

Re: [PATCH 4/4] fast-import: only store commit objects

2013-05-06 Thread Johannes Schindelin
Hi Thomas, On Mon, 6 May 2013, Thomas Rast wrote: The proposed patch wants to stop writing marks (in --export-marks) for anything but commits. Then it should not go in. Ciao, Dscho -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to

Re: [PATCH 4/4] fast-import: only store commit objects

2013-05-06 Thread Johannes Schindelin
Hi, On Tue, 7 May 2013, Michael Haggerty wrote: On 05/06/2013 11:04 PM, Felipe Contreras wrote: On Mon, May 6, 2013 at 5:45 AM, Michael Haggerty mhag...@alum.mit.edu wrote: On 05/06/2013 12:32 PM, Thomas Rast wrote: So the proposed change would break a documented use of cvs2git.

Re: [PATCH] patch-ids.c: cache patch IDs in a notes tree

2013-05-11 Thread Johannes Schindelin
Hi John Linus, On Sat, 11 May 2013, Linus Torvalds wrote: [...] I really think caching patch ID's should be something people should be aware of is fundamentally wrong, even if it might work. Given the incredible performance win, I would say it is still worth looking into. If you store also

Re: [msysGit] Re: [PATCH] git-compat-util.h: reduce optimization level to 1 on MinGW env.

2013-09-25 Thread Johannes Schindelin
Hi, On Wed, 25 Sep 2013, Jonathan Nieder wrote: Wataru Noguchi wrote: - actually file name is decoded.]

Re: [msysGit] [PATCH] mingw-multibyte: fix memory acces violation and path length limits.

2013-09-28 Thread Johannes Schindelin
Hi, On Sun, 29 Sep 2013, Wataru Noguchi wrote: --- a/convert.c +++ b/convert.c @@ -724,6 +724,11 @@ static void convert_attrs(struct conv_attrs *ca, const char *path) { int i; static struct git_attr_check ccheck[NUM_CONV_ATTRS]; + + if (NUM_CONV_ATTRS != 0) { +

Re: [PATCH] builtin/remote: remove postfixcmp() and use suffixcmp() instead

2013-11-04 Thread Johannes Schindelin
Hi Junio, On Mon, 4 Nov 2013, Junio C Hamano wrote: Junio C Hamano gits...@pobox.com writes: I do not think anybody sane uses prefixcmp() or suffixcmp() for anything but checking with zero; in other words, I suspect that all uses of Xcmp() can be replaced with !!Xcmp(), so as a separate

Re: [msysGit] Re: [PATCH] Add a Windows-specific fallback to getenv(HOME);

2014-06-04 Thread Johannes Schindelin
Hi Duy, On Wed, 4 Jun 2014, Duy Nguyen wrote: On Wed, Jun 4, 2014 at 6:47 PM, Stepan Kasal ka...@ucw.cz wrote: @@ -133,7 +133,7 @@ char *git_path(const char *fmt, ...) void home_config_paths(char **global, char **xdg, char *file) { char *xdg_home = getenv(XDG_CONFIG_HOME); -

Re: [msysGit] Re: [PATCH] Add a Windows-specific fallback to getenv(HOME);

2014-06-04 Thread Johannes Schindelin
Hi Erik, On Wed, 4 Jun 2014, Erik Faye-Lund wrote: On Wed, Jun 4, 2014 at 3:47 PM, Duy Nguyen pclo...@gmail.com wrote: On Wed, Jun 4, 2014 at 6:47 PM, Stepan Kasal ka...@ucw.cz wrote: @@ -133,7 +133,7 @@ char *git_path(const char *fmt, ...) void home_config_paths(char **global, char

Re: [msysGit] Re: [PATCH] Add a Windows-specific fallback to getenv(HOME);

2014-06-04 Thread Johannes Schindelin
Hi kusma, On Wed, 4 Jun 2014, Erik Faye-Lund wrote: On Wed, Jun 4, 2014 at 5:14 PM, Johannes Schindelin johannes.schinde...@gmx.de wrote: On Wed, 4 Jun 2014, Erik Faye-Lund wrote: On Wed, Jun 4, 2014 at 3:47 PM, Duy Nguyen pclo...@gmail.com wrote: On Wed, Jun 4, 2014 at 6:47 PM

Re: [msysGit] Re: [PATCH] Add a Windows-specific fallback to getenv(HOME);

2014-06-04 Thread Johannes Schindelin
Hi kusma, On Wed, 4 Jun 2014, Johannes Schindelin wrote: The problem arises whenever git.exe calls subprocesses. You can pollute the environment by setting HOME, I do not recall the details, but I remember that we had to be very careful *not* to do that, hence the patch. Sorry, has been

Re: [msysGit] Re: [PATCH] Add a Windows-specific fallback to getenv(HOME);

2014-06-04 Thread Johannes Schindelin
Hi Stepan, On Wed, 4 Jun 2014, Stepan Kasal wrote: On Wed, Jun 4, 2014 at 5:14 PM, Johannes Schindelin johannes.schinde...@gmx.de wrote: No. Git is not always called through Bash or the git-wrapper, unfortunately. but you have to admit, that in most cases it is called through

Re: [msysGit] Re: [PATCH] Add a Windows-specific fallback to getenv(HOME);

2014-06-04 Thread Johannes Schindelin
Hi Stepan, On Wed, 4 Jun 2014, Stepan Kasal wrote: PS (about mingwGitDevEnv): plan is to switch to mingwGitDevEnv for said release. No more msysGit. Like, bu-bye. Thanks for all the fish. Interesting. With msysgit, there is the net installer - first time I installed msys/mingw

Re: [msysGit] Re: [PATCH] Add a Windows-specific fallback to getenv(HOME);

2014-06-05 Thread Johannes Schindelin
fixes 'git config' for the portable version only, and it only does so partially. Care to elaborate? Am 04.06.2014 17:46, schrieb Johannes Schindelin: I would be strongly in favor of fixing the problem by the root: avoiding to have Git rely on the HOME environment variable to be set

Re: [PATCH v2] Add a Windows-specific fallback to getenv(HOME);

2014-06-05 Thread Johannes Schindelin
Hi Karsten, On Thu, 5 Jun 2014, Karsten Blees wrote: Am 05.06.2014 10:03, schrieb Stepan Kasal: * even if $HOME was empty, git should setenv(HOME) so that child processes can benefit from it (similar to TMPDIR and TERM in current msysgit's mingw_startup()). Not setting $HOME because it

Re: [RFC PATCH 1/7] rebase -i: Make option handling in pick_one more flexible

2014-06-23 Thread Johannes Schindelin
Hi, On Sun, 22 Jun 2014, Fabian Ruch wrote: On 06/20/2014 03:40 PM, Michael Haggerty wrote: On 06/19/2014 05:28 AM, Fabian Ruch wrote: `pick_one` and `pick_one_preserving_merges` are wrappers around `cherry-pick` in `rebase --interactive`. They take the hash of a commit and build a

Re: [PATCH v2 2/2] git-merge-file: do not add LF at EOF while applying unrelated change

2014-06-30 Thread Johannes Schindelin
Hi Max, On Sun, 29 Jun 2014, Max Kirillov wrote: diff --git a/xdiff/xmerge.c b/xdiff/xmerge.c index 9e13b25..625198e 100644 --- a/xdiff/xmerge.c +++ b/xdiff/xmerge.c @@ -245,11 +245,11 @@ static int xdl_fill_merge_buffer(xdfenv_t *xe1, const char *name1,

Re: [PATCH v2 2/2] git-merge-file: do not add LF at EOF while applying unrelated change

2014-07-02 Thread Johannes Schindelin
Hi Max, On Wed, 2 Jul 2014, Max Kirillov wrote: On Mon, Jun 30, 2014 at 04:55:10PM +0200, Johannes Schindelin wrote: I just wish the tests were a little easier to understand... What could be improved with them? Oh, I would name the files more appropriately, for example. That is, instead

Git for Windows no longer on Google Code

2014-07-03 Thread Johannes Schindelin
Dear friends of Git, the Git for Windows team, myself included, tried quite a couple of times to mark the old home of Git for Windows on Google Code as obsolete. Unfortunately, it is not possible to disable issue trackers nor downloads (and Google Search helpfully insists on listing them as top

Re: Git for Windows no longer on Google Code

2014-07-04 Thread Johannes Schindelin
Hi Jakub, On Fri, 4 Jul 2014, Jakub Narębski wrote: Shouldn't this message be marked [ANNOUNCE] in subject? Well, I did not exactly announce something. Johannes Schindelin wrote: the Git for Windows team, myself included, tried quite a couple of times to mark the old home of Git

Re: [msysGit] [PATCH 1/2] symlinks: remove PATH_MAX limitation

2014-07-04 Thread Johannes Schindelin
Hi, On Sat, 5 Jul 2014, Karsten Blees wrote: 'git checkout' fails if a directory is longer than PATH_MAX, because the lstat_cache in symlinks.c checks if the leading directory exists using PATH_MAX-bounded string operations. Remove the limitation by using strbuf instead. Signed-off-by:

Re: [msysGit] Re: Topic sk/mingw-unicode-spawn-args breaks tests

2014-07-14 Thread Johannes Schindelin
Hi Stepan, On Sat, 12 Jul 2014, Stepan Kasal wrote: Am 10.07.2014 22:05, schrieb Johannes Sixt: It looks like I totally missed the topic sk/mingw-unicode-spawn-args. ... Am I doing something wrong? Does the topic depend on a particular version of MSYS (or DLL)? unfortunately, I

Re: [PATCH 1/6] MinGW: Skip test redirecting to fd 4

2014-07-17 Thread Johannes Schindelin
Hi Junio, On Thu, 17 Jul 2014, Junio C Hamano wrote: Is what is broken on MinGW redirecting arbitrary file descrptors? IIRC that was exactly the problem. diff --git a/t/t0081-line-buffer.sh b/t/t0081-line-buffer.sh index bd83ed3..881789a 100755 --- a/t/t0081-line-buffer.sh +++

Re: [msysGit] Re: [PATCH 4/6] t4210: skip command-line encoding tests on mingw

2014-07-21 Thread Johannes Schindelin
Hi Junio, On Mon, 21 Jul 2014, Junio C Hamano wrote: Oh by the way, can somebody remind me why we spell these as NOT_MINGW, instead of !MINGW? I guess that is my mistake; when I introduced the use of NOT_MINGW I was simply unaware of the !MINGW syntax. Let's use the latter consistently?

Re: [PATCH 2/2] Let deny.currentBranch=updateInstead ignore submodules

2014-11-13 Thread Johannes Schindelin
Hi Junio, On Thu, 13 Nov 2014, Junio C Hamano wrote: Johannes Schindelin johannes.schinde...@gmx.de writes: On Thu, 13 Nov 2014, Johannes Schindelin wrote: Due to that experience, the documentation also states pretty clearly that `updateInstead` succeeds only in updating the current

Re: [PATCH v3 0/1] Support updating working trees when pushing into non-bare repos

2014-11-13 Thread Johannes Schindelin
Hi Junio, On Thu, 13 Nov 2014, Junio C Hamano wrote: Johannes Schindelin johannes.schinde...@gmx.de writes: This patch series adds support for a new receive.denyCurrentBranch setting to update the working directory (which must be clean, i.e. there must not be any uncommitted changes

Re: [PATCH v3 1/1] Add another option for receive.denyCurrentBranch

2014-11-13 Thread Johannes Schindelin
Hi Junio, On Thu, 13 Nov 2014, Junio C Hamano wrote: Johannes Schindelin johannes.schinde...@gmx.de writes: diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh index f4da20a..ba002a9 100755 --- a/t/t5516-fetch-push.sh +++ b/t/t5516-fetch-push.sh @@ -1330,4 +1330,21

Re: [RFC 0/4] Fix the Visual Studio 2008 .sln generator

2014-11-21 Thread Johannes Schindelin
Hi Philip, On Thu, 20 Nov 2014, Philip Oakley wrote: Are the patches going in the right direction? Yes. A couple of general comments: - please do not comment out code. Just remove it. - the first three commit messages look funny, being indented by 4 spaces... unintentional? Is the

Re: [RFC 1/4] Fix i18n -o option in msvc engine.pl

2014-11-21 Thread Johannes Schindelin
Hi Philip, On Thu, 20 Nov 2014, Philip Oakley wrote: The i18n 5e9637c6 introduced an extra '-o' option into the make file, I take it you are referring to https://github.com/git/git/commit/5e9637c6#diff-b67911656ef5d18c4ae36cb6741b7965R2195 diff --git

Re: [RFC 2/4] Properly accept quoted space in filenames

2014-11-21 Thread Johannes Schindelin
Hi Philip, apart from adding dead code: On Thu, 20 Nov 2014, Philip Oakley wrote: diff --git a/contrib/buildsystems/engine.pl b/contrib/buildsystems/engine.pl index 9144ea7..8e41808 100755 --- a/contrib/buildsystems/engine.pl +++ b/contrib/buildsystems/engine.pl @@ -243,7 +244,8 @@ sub

Re: [RFC 3/4] engine.pl: split the .o and .obj processing

2014-11-21 Thread Johannes Schindelin
Hi Philip, On Thu, 20 Nov 2014, Philip Oakley wrote: Commit 4b623d80f7352 added an .obj file (invalidcontinue.obj) which was not processed correctly. The generate engine then mistakenly did a s/.o/.c/ to create a request to compile invalidcontinue.cbj. This is good. However, this:

Re: [RFC 4/4] Improve layout and reference msvc-build script

2014-11-21 Thread Johannes Schindelin
Hi Philip, On Thu, 20 Nov 2014, Philip Oakley wrote: [...] +Or, use the msvc-build script; also in /msysgit/bin/msvc-build As I mentioned before, from a Git Bash on Windows, the path is /bin/msvc-build (no /msysgit/). That is quite likely to stay the same with the upcoming Git for Windows

Re: [RFC 3/4] engine.pl: split the .o and .obj processing

2014-11-23 Thread Johannes Schindelin
Hi, On Fri, 21 Nov 2014, Philip Oakley wrote: From: Johannes Schindelin johannes.schinde...@gmx.de On Thu, 20 Nov 2014, Philip Oakley wrote: @@ -343,8 +346,10 @@ sub handleLinkLine } elsif ($part =~ /\.(a|lib)$/) { $part =~ s/\.a$/.lib/; push

[PATCH v4] Add another option for receive.denyCurrentBranch

2014-11-26 Thread Johannes Schindelin
. Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de --- Documentation/config.txt | 7 builtin/receive-pack.c | 94 ++-- t/t5516-fetch-push.sh| 21 +++ 3 files changed, 120 insertions(+), 2 deletions(-) diff --git

[PATCH v4] Support updating working trees when pushing into non-bare repos

2014-11-26 Thread Johannes Schindelin
. Hopefully you don't mind. Interdiff vs v3 below the diffstat Johannes Schindelin (1): Add another option for receive.denyCurrentBranch Documentation/config.txt | 7 builtin/receive-pack.c | 94 ++-- t/t5516-fetch-push.sh| 21 +++ 3

[PATCH v5] Add another option for receive.denyCurrentBranch

2014-11-26 Thread Johannes Schindelin
. Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de --- Documentation/config.txt | 7 builtin/receive-pack.c | 93 ++-- t/t5516-fetch-push.sh| 26 ++ 3 files changed, 124 insertions(+), 2 deletions(-) diff --git

[PATCH v5] Support updating working trees when pushing into non-bare repos

2014-11-26 Thread Johannes Schindelin
when updating a live web site via push (in which case a clean working directory is an absolute must). Interdiff vs v4 below diffstat. Johannes Schindelin (1): Add another option for receive.denyCurrentBranch Documentation/config.txt | 7 builtin/receive-pack.c | 93

Re: [PATCH v5] Add another option for receive.denyCurrentBranch

2014-11-30 Thread Johannes Schindelin
Hi Junio, On Sun, 30 Nov 2014, Junio C Hamano wrote: Thanks, will queue. Thanks! I think we would need a bit more tests to protect the feature from future changes, if you care about the cleanliness requirement of this feature which is a lot stricter than that of git checkout. Perhaps

Re: [PATCH v5] Add another option for receive.denyCurrentBranch

2014-12-02 Thread Johannes Schindelin
Hi Junio, On Mon, 1 Dec 2014, Junio C Hamano wrote: Junio C Hamano gits...@pobox.com writes: Johannes Schindelin johannes.schinde...@gmx.de writes: +static const char *update_worktree(unsigned char *sha1) +{ +... + const char *work_tree = git_work_tree_cfg ? git_work_tree_cfg

Re: [PATCH 2/2] receive-pack: support push-to-checkout hook

2014-12-02 Thread Johannes Schindelin
Hi Junio, On Mon, 1 Dec 2014, Junio C Hamano wrote: When receive.denyCurrentBranch is set to updateInstead, this hook can be used to override the built-in push-to-deploy logic, which insists that the working tree and the index must be unchanged relative to HEAD. The hook receives the commit

Re: [PATCH 2/2] receive-pack: support push-to-checkout hook

2014-12-02 Thread Johannes Schindelin
Hi Michael, On Tue, 2 Dec 2014, Michael J Gruber wrote: Johannes Schindelin schrieb am 02.12.2014 um 09:47: The only sad part is that the already huge test suite is enlarged by yet another extensive set of test cases (and those tests might not really need to be that extensive because

Re: [PATCH 2/2] receive-pack: support push-to-checkout hook

2014-12-02 Thread Johannes Schindelin
Hi Junio, On Tue, 2 Dec 2014, Junio C Hamano wrote: Johannes Schindelin johannes.schinde...@gmx.de writes: In this particular case, I think that we really, really *just* need to verify that the presence of the hook switches off the default behavior of updateInstead. *Nothing* else

Re: [PATCH v5] Add another option for receive.denyCurrentBranch

2014-12-02 Thread Johannes Schindelin
Hi Junio, On Tue, 2 Dec 2014, Junio C Hamano wrote: This feature [...] needs to be documented with an entry in the BUGS section, saying that it will not work in a repository that is tied to its working tree via the gitdir: mechanism. Fair enough. But which BUGS section? Should I add one to

Re: [PATCH 2/2] receive-pack: support push-to-checkout hook

2014-12-02 Thread Johannes Schindelin
Hi Junio, On Tue, 2 Dec 2014, Junio C Hamano wrote: Johannes Schindelin johannes.schinde...@gmx.de writes: Not really. You need to remember that we write tests not to show off the new shiny, but to protect essential invariants from being broken by careless others attempting to rewrite

Re: [PATCH] fsck: properly bound invalid tag name error message

2014-12-08 Thread Johannes Schindelin
stopping at the end of the line. Our tests did not notice because they look only for the matching line, but the bug is that we print much more than we wanted to. So we also adjust the test to be more exact. Good catch, thank you! Acked-by: Johannes Schindelin johannes.schinde...@gmx.de Ciao

Re: [PATCH] fsck: properly bound invalid tag name error message

2014-12-08 Thread Johannes Schindelin
Hi, On Mon, 8 Dec 2014, Jeff King wrote: On Mon, Dec 08, 2014 at 12:48:12AM -0500, Jeff King wrote: Note that when fscking tags with index-pack --strict, this is even worse. index-pack does not add a trailing NUL-terminator after the object, so we may actually read past the buffer and

Re: [PATCH] fsck: properly bound invalid tag name error message

2014-12-08 Thread Johannes Schindelin
Hi Duy, On Mon, 8 Dec 2014, Duy Nguyen wrote: On Mon, Dec 08, 2014 at 12:57:06AM -0500, Jeff King wrote: I do admit that I am tempted to teach index-pack to always NUL-terminate objects in memory that we feed to fsck, just to be on the safe side. It doesn't cost much, and could prevent a

Re: [PATCH] fsck: properly bound invalid tag name error message

2014-12-08 Thread Johannes Schindelin
Hi Peff, On Mon, 8 Dec 2014, Jeff King wrote: On Mon, Dec 08, 2014 at 12:35:27PM +0100, Johannes Schindelin wrote: On Mon, 8 Dec 2014, Duy Nguyen wrote: On Mon, Dec 08, 2014 at 12:57:06AM -0500, Jeff King wrote: I do admit that I am tempted to teach index-pack to always NUL

[PATCH v2] index-pack: terminate object buffers with NUL

2014-12-08 Thread Johannes Schindelin
King p...@peff.net Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de --- On Mon, 8 Dec 2014, Duy Nguyen wrote: Subject: [PATCH] index-pack: terminate object buffers with NUL Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com Here is a patch

[PATCH 00/18] Introduce an internal API to interact with the fsck machinery

2014-12-08 Thread Johannes Schindelin
by forcing them to update. This branch introduces an internal fsck API to be able to turn some of the errors into warnings, and to make it easier to call the fsck machinery from elsewhere in general. I am proud to report that this work has been sponsored by GitHub. Johannes Schindelin (18): Introduce

[PATCH 02/18] Introduce identifiers for fsck messages

2014-12-08 Thread Johannes Schindelin
the requirements on the calling code: instead of having to handle full-blown varargs in every callback, we now send a string buffer ready to be used by the callback. Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de --- builtin/fsck.c | 24 +++- fsck.c | 185

[PATCH 05/18] Allow demoting errors to warnings via receive.fsck.key = warn

2014-12-08 Thread Johannes Schindelin
to the --strict option. Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de --- builtin/index-pack.c | 4 builtin/receive-pack.c | 27 +++ builtin/unpack-objects.c | 5 + 3 files changed, 32 insertions(+), 4 deletions(-) diff --git a/builtin/index

[PATCH 03/18] Provide a function to parse fsck message IDs

2014-12-08 Thread Johannes Schindelin
the parsing robust, we generate strings from the enum keys, and we will match both lower-case, dash-separated values as well as camelCased ones (e.g. both missing-email and missingEmail will match the MISSING_EMAIL key). Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de --- fsck.c | 32

[PATCH 01/18] Introduce fsck options

2014-12-08 Thread Johannes Schindelin
Just like the diff machinery, we are about to introduce more settings, therefore it makes sense to carry them around as a (pointer to a) struct containing all of them. Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de --- builtin/fsck.c | 20 +-- builtin/index-pack.c

[PATCH 07/18] Make fsck_ident() warn-friendly

2014-12-08 Thread Johannes Schindelin
When fsck_ident() identifies a problem with the ident, it should still advance the pointer to the next line so that fsck can continue in the case of a mere warning. Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de --- fsck.c | 49 +++-- 1

[PATCH 09/18] fsck: handle multiple authors in commits specially

2014-12-08 Thread Johannes Schindelin
hide missing tree objects in the same commit because we cannot continue verifying any commit object after encountering a missing committer line, while we can continue in the case of multiple author lines. Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de --- fsck.c | 8 1 file

<    1   2   3   4   5   6   7   8   9   10   >