Having such 3-parts conflicts helps tremendously when you have to do the merge by hand, so I'm 100% in favor of such a change. BUT Please, please, pretty please, don't follow Perforce who blindly disregards previous standards. Instead use the format used by diff3 which has been there for ages: <<<<<<< foo original text ||||||| bar ancestor ======= new text I can live with that. As long as the conflict is clearly marked with all 3 parts, I can us...

Ack, except I think it should allow you to actually *set* what the diff is relative to. An example of that could be something like git diff --relative=drivers/scsi/ a..b -- drivers/scsi/ where you aren't actually *in* that subdirectory, but for one reason or another you're limiting the diff to just stuff in that subdirectory, and want a diff that is relative to that one. Hmm? Linus -

No it isn't. The above doesn't even work for bare repositories, or when you want to look at a branch that has a different directory structure than the currently-checked-out one. Linus -

Hmm. Have you tested what happens if you use XDL_MERGE_EAGER instead of XDL_MERGE_ZEALOUS in the "level" argument to xdl_merge() in merge-recursive.c? (No, I didn't test it myself, but it may get you the behaviour you want, and we could make it a config option for people who want a less aggressive merge) Linus -

You are quoting an older draft. The rules applied to 'master' is actually a bit more lenient: - Unless otherwise specified, indent with SP that could be replaced with HT are not "bad". But SP before HT in the indent is "bad", and trailing whitespaces are "bad". - For C source files, initial indent by SP that can be replaced with HT is also "bad". - Test scripts in t/ and test vectors in its subdirectories can contain anything, so we make it unrestricted for now. So your p...

This adds a new form of overview diffstat output, doing something that I have occasionally ended up doing manually (and badly, because it's actually pretty nasty to do), and that I think is very useful for an project like the kernel that has a fairly deep and well-separated directory structure with semantic meaning. What I mean by that is that it's often interesting to see exactly which sub-directories are impacted by a patch, and to what degree - even if you don't perhaps care so much abou...

Hi, During a git bisect session I ended up with the following in the .git/BISECT_LOG: # bad: [38a382ae5dd4f4d04e3046816b0a41836094e538] Kobject: convert arch/alpha arch/arm arch/avr32 arch/blackfin arch/cris arch/frv arch/h8300 arch/ia64 arch/m32r arch/m68k arch/m68knommu arch/mips arch/parisc arch/powerpc arch/ppc arch/s390 arch/sh arch/sh64 arch/sparc arch/sparc64 arch/um arch/v850 arch/x86 arch/x86_64 arch/xtensa from kobject_unregister() to kobject_put() git-bisect bad 38a382ae5dd4f4d0...

Hi, does this help? (It is a really trivial patch...) -- snipsnap -- [PATCH] bisect: use verbatim commit subject in the bisect log Due to a typo, the commit subject was shell expanded in the bisect log. That is, if you had some shell pattern in the commit subject, bisect would happily put all matching file names into the log. Noticed by Frans Pop. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> --- git-bisect.sh | 2 +- 1 files changed, 1 insertions(+), 1 dele...

Hello I was playing with 'git quiltimport' feature, trying to import a large quilt patchset (coming from vendor) into a local git repository containing linux kernel tree. Some of quilt patches in the patchset have been created by picking single git commits, likely with 'git show XXXXXX > file.patch. And I found that such patches fail to apply with 'git apply' (which is internally used by 'git quiltimport'). Git complains: fatal: patch with only garbage at line 3 However, if I edit patc...

Hi All, I compiled a fresh git 1.5.4 and tried to clone Ingo's kgdb-lite tree. I got rather strange out of memory. malloc failed7 error. I am using a 32 bit kernel on a pentium D processor with 1 GB of ram. Is this a git issue or something else? Can someone help me in telling me which is the correct place to report this? Better if this is a known issue ? isn't 1 GB of RAM enough for git??? luser@helvella:/opt/repo/archive$ sudo git-clone git://git.kernel.org/pub/scm/linux/kernel/git/mingo...

because I(as luser :) ) did not have write permissions in the me too.Thought it may be some git issue so reported. Seems like it is once in a blue moon situation. Nevermind, thanks for reply. Cu, --Pradeep -- Pradeep Singh Rautela http://eagain.wordpress.com http://emptydomain.googlepages.com -

Hello, yes, this is OpenSSL issue. I had to recompile OpenSSL myself to make it work (with no-asm option) I'm using only HP cc for building git (with all the toolchain). (No gcc here) # uname -mrs HP-UX B.11.23 ia64 # cc --version cc: HP C/aC++ B3910B A.06.14 [Feb 22 2007] Michal -

All, I upgraded from git 1.5.3.4.452.g09149 to git 1.5.4.1 and upon a subsequent git svn fetch I started receiving the following: Index mismatch: d1437ce54ff0e90f4023ee653761c28626a8295a != f567f1f12e7d7ddf1d18e3889061aa9a783dfbba rereading 1c3d0737f3eb78241eb508e7da6b80e3f3b7fa85 M src/foo.c M src/bar.c Last fetched revision of refs/remotes/release was r2990, but we are about to fetch: r2985! git svn fetch w/ 1.5.3 worked correctly and subsequent fetches "do n...

Don't need the `exec-path': git knows the right one already. So this is entirely equivalent to my suggestion, except that the user has to jump through this stupid hoop. Besides, I don't want to run `git' from inetd -- it makes distinguishing things in /etc/hosts.deny harder. Unless I write wrapper scripts or make symlinks for everything, I suppose, but doesn't it seem mad to invent wrapper scripts to distinguish between things which are already distinct Yes, of course. Silly me. It's much b...

There are some values where git can reasonably guess at an optimal value. For such occasions, this is a nifty addendum to the config api, letting the caller specify a magic string and a magic setting to return if the value of the variable matches the magic string. An example would be for threads, where 0 = auto is overly voodoo-ish for some consumers, and typing "auto" is much nicer and more immediately obvious. Signed-off-by: Andreas Ericsson <ae@op5.se> --- cache.h | 1 + confi...

if (delta_search_threads != 1) warning("no threads support, ignoring %s", k); I changed this to '!= 1' since that is the only time the user gets what they asked for when THREADED_DELTA_SEARCH is not enabled. If the user requested nthreads == ncpus by setting delta_search_threads = 0, I think we should let the user know that thread support is not enabled, and we are ignoring This is in the wrong place. It should be _after_ command line arguments are Same comment as above about warning whe...

Hi, I can't find the right pointer, but for linux it would be more usable to use sched_getaffinity(). Than you can do thinks like this: $ taskset 0x3 git gc ... and you will get 2 cpus, even 4 are online. Bert -

And now what? If you don't provide a pthread_* implementation for Windows, you can just drop the #ifdef _WIN32 part as long as the THREADED_DELTA_SEARCH guards remain. -- Hannes -

Config parser fixes are in 'maint', along with many other minor fixes. As promised, a handful topics that have been cooking in 'next' have graduated to 'master'. ---------------------------------------------------------------- * The 'maint' branch has these fixes since v1.5.4.1 David Steven Tweed (1): Make git prune remove temporary packs that look like write failures Frank Lichtenheld (1): config: Fix --unset for continuation lines Gerrit Pape (1): builtin-commit: remove .git/S...

Which means there remains only one initialization. I agree it's not a workaround anymore, but the word remained from the 3 previous attempts, which were workarounds. Mike -

Here are the topics that have been kept out of 'master'. Commits prefixed with '-' are only in 'pu' while commits prefixed with '+' are in 'next'. Now I am pushing 1.5.4.1 out, mature topics will start moving to 'master'. The topics list the commits in reverse chronological order. My wish is to have small but short release cycle for 1.5.5 and leave bigger ones cooking for 1.6.0. Many topics graduated to "master". As announced, I'll rewind and rebuild "next" with the surviving topics on top o...

Check repository configuration gitweb.description for project description, if $GIT_DIR/description does not exist Signed-off-by: Bruno Ribas <ribas@c3sl.ufpr.br> --- contrib/hooks/post-receive-email | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/contrib/hooks/post-receive-email b/contrib/hooks/post-receive-email index 77c88eb..bdd21fa 100644 --- a/contrib/hooks/post-receive-email +++ b/contrib/hooks/post-receive-email @@ -614,7 +614,11 @@ if [ -z "$GIT_DIR"...

Additionally, update some tests for which the multi-threaded result differs from the single-threaded result and the single-threaded result is expected. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> --- Two of the tests in t5300-pack-object.sh failed when multiple threads were used. My fix was to set --threads=1 for all pack-objects calls. I didn't look into it any further than that. All other tests passed. -brandon builtin-pack-objects.c | 2 +- t/t5300-pack-object.sh...

Hi, I'm pretty sure this worked before, but with git-1.5.4, when trying to clone a repository via ssh from a machine that does not have git installed in a standard system path, I get the following: $ git clone -u /home/enewren/software/install/linux/git/bin/git-upload-pack ssh://enewren@remote/var/scratch/enewren/votd Initialized empty Git repository in /home/newren/devel/votd/.git/ remote: fatal: exec pack-objects failed. remote: aborting due to possible repository corruption on the remote side...

The OP *did* use this option (rather, its short form, -u), see above. The problem is that git-upload-pack (which is not a built-in) does not call setup_path() and so does not extend PATH to contain the special installation location. Now, when git-upload-pack tries to exec git-pack-objects, it fails since this is not in PATH. A quick work-around for Elijah is to add GIT_EXEC_PATH=/home/enewren/software/install/linux/git/bin to .profile on the remote host. -- Hannes -