[TCP]: Unconditionally clear TCP_NAGLE_PUSH in skb_entail().

tree d017e5c04afcd33d99a2bf8554332c5754df8c36 parent 0fbbeb1ba43bd04f0f1d4f161b7f72437a1c8a03 author David S. Miller [EMAIL PROTECTED] Wed, 24 Aug 2005 00:13:06 -0700 committer David S. Miller [EMAIL PROTECTED] Wed, 24 Aug 2005 00:13:06 -0700 [TCP]: Unconditionally clear TCP_NAGLE_PUSH in

[NET]: Fix socket bitop damage

tree 117e7f530fa2aa37751cfd22908cd81253fd08f8 parent 66a79a19a7c582efd99bb143c3a59fbda006eb39 author Ralf Baechle [EMAIL PROTECTED] Wed, 24 Aug 2005 00:11:30 -0700 committer David S. Miller [EMAIL PROTECTED] Wed, 24 Aug 2005 00:11:30 -0700 [NET]: Fix socket bitop damage The socket flag cleanups

[NETFILTER]: Fix HW checksum handling in ip_queue/ip6_queue

tree 615163e271e256063ede49f73ae01e8abb39ed72 parent 1344a41637114485fac7afa1505bce2ff862807a author Patrick McHardy [EMAIL PROTECTED] Wed, 24 Aug 2005 00:10:35 -0700 committer David S. Miller [EMAIL PROTECTED] Wed, 24 Aug 2005 00:10:35 -0700 [NETFILTER]: Fix HW checksum handling in

[RPC]: Kill bogus kmap in krb5

tree 61c7cde232f4d241489fba3bd5386ceaefd223ac parent 14869c388673e8db3348ab3706fa6485d0f0cf95 author Herbert Xu [EMAIL PROTECTED] Wed, 24 Aug 2005 00:09:53 -0700 committer David S. Miller [EMAIL PROTECTED] Wed, 24 Aug 2005 00:09:53 -0700 [RPC]: Kill bogus kmap in krb5 While I was going through

[TCP]: Do TSO deferral even if tail SKB can go out now.

tree fa5de8895166ae31371264544027941d469044f9 parent f6fdd7d9c273bb2a20ab467cb57067494f932fa3 author Dmitry Yusupov [EMAIL PROTECTED] Wed, 24 Aug 2005 00:09:27 -0700 committer David S. Miller [EMAIL PROTECTED] Wed, 24 Aug 2005 00:09:27 -0700 [TCP]: Do TSO deferral even if tail SKB can go out now.

[IA64] remove unused function __ia64_get_io_port_base

tree d5a2b5ef9687fd67b9897825e8011f458cb29515 parent 4aec0fb12267718c750475f3404337ad13caa8f5 author Tony Luck [EMAIL PROTECTED] Fri, 19 Aug 2005 04:40:00 -0700 committer Tony Luck [EMAIL PROTECTED] Fri, 19 Aug 2005 04:40:00 -0700 [IA64] remove unused function __ia64_get_io_port_base Not only

[IPV4]: Fix negative timer loop with lots of ipv4 peers.

tree cf8f84bee2b6e23a17e97beef53791a698256f77 parent c3a20692ca5c8eb8cf5d0f489d4fc839ce7593d1 author Dave Johnson [EMAIL PROTECTED] Wed, 24 Aug 2005 00:10:15 -0700 committer David S. Miller [EMAIL PROTECTED] Wed, 24 Aug 2005 00:10:15 -0700 [IPV4]: Fix negative timer loop with lots of ipv4 peers.

[AX25]: UID fixes

tree ee4f22a33557bae4883eb2f4fb1359e97ac74186 parent 53b924b31fa53ac3007df3fef6870d5074a9adf8 author Ralf Baechle [EMAIL PROTECTED] Wed, 24 Aug 2005 00:11:45 -0700 committer David S. Miller [EMAIL PROTECTED] Wed, 24 Aug 2005 00:11:45 -0700 [AX25]: UID fixes o Brown paperbag bug -

[PKT_SCHED]: Fix missing qdisc_destroy() in qdisc_create_dflt()

tree 80aff375f2b1de10a69743d73977df39f356dda5 parent d2287f844187158e5eddd0d5de8e95bd607abcb7 author Thomas Graf [EMAIL PROTECTED] Wed, 24 Aug 2005 00:12:44 -0700 committer David S. Miller [EMAIL PROTECTED] Wed, 24 Aug 2005 00:12:44 -0700 [PKT_SCHED]: Fix missing qdisc_destroy() in

[IA64] Fix simulator boot (for real this time).

tree 868c53b157ceacf5be84004f9ecc464b794256c2 parent 62d75f3753647656323b0365faa43fc1a8f7be97 author Peter Chubb [EMAIL PROTECTED] Tue, 23 Aug 2005 07:50:00 -0700 committer Tony Luck [EMAIL PROTECTED] Tue, 23 Aug 2005 21:41:56 -0700 [IA64] Fix simulator boot (for real this time). Thanks to

[ROSE]: Fix missing unlocks in rose_route_frame()

tree 0f1dcf6e5f9f57989d0aca1a565fa56701ed7556 parent d5d283751ef3c05b6766501a46800cbee84959d6 author David S. Miller [EMAIL PROTECTED] Wed, 24 Aug 2005 00:50:09 -0700 committer David S. Miller [EMAIL PROTECTED] Wed, 24 Aug 2005 00:50:09 -0700 [ROSE]: Fix missing unlocks in rose_route_frame()

[PATCH] Kconfig fix (alpha NUMA)

tree 2309d142ab9b80c64172d3cad43bb2420086d9d2 parent 81065e2f415af6c028eac13f481fb9e60a0b487b author Al Viro [EMAIL PROTECTED] Tue, 23 Aug 2005 22:44:50 +0100 committer Linus Torvalds [EMAIL PROTECTED] Wed, 24 Aug 2005 08:43:39 -0700 [PATCH] Kconfig fix (alpha NUMA) NUMA is broken on alpha;

[PATCH] Kconfig fix (ISA_DMA_API and sound/*)

tree 5fb22ae8b2ef903d27850f7894ed669fabce96ad parent e9bcb173dd1747075214a1ccdb65dc6320cae49d author Al Viro [EMAIL PROTECTED] Tue, 23 Aug 2005 22:45:06 +0100 committer Linus Torvalds [EMAIL PROTECTED] Wed, 24 Aug 2005 08:43:40 -0700 [PATCH] Kconfig fix (ISA_DMA_API and sound/*) fixed kconfig

[PATCH] Kconfig fix (epca on 64bit)

tree f6ca23abfd0777f7e3c571efbd58b67af3eaf1e8 parent ac6babd26ce514e0017ec5809051ea6cdc44c8f6 author Al Viro [EMAIL PROTECTED] Tue, 23 Aug 2005 22:45:01 +0100 committer Linus Torvalds [EMAIL PROTECTED] Wed, 24 Aug 2005 08:43:39 -0700 [PATCH] Kconfig fix (epca on 64bit) epca is broken on 64bit;

libata: release prep (bump versions, etc.)

tree c1960e7a0fa37330b6e8ad9ba228ea31a97d22c7 parent f6fdd7d9c273bb2a20ab467cb57067494f932fa3 author Jeff Garzik [EMAIL PROTECTED] Tue, 23 Aug 2005 10:53:51 -0400 committer Jeff Garzik [EMAIL PROTECTED] Tue, 23 Aug 2005 10:53:51 -0400 libata: release prep (bump versions, etc.) - bump versions

[PATCH] Kconfig fix (arv)

tree f5fdcf5dd425fc6df501971ac2575360d7c37c05 parent a2b2f45be7e9138bde7fcba3b8e9257fea04d087 author Al Viro [EMAIL PROTECTED] Tue, 23 Aug 2005 22:45:46 +0100 committer Linus Torvalds [EMAIL PROTECTED] Wed, 24 Aug 2005 08:43:41 -0700 [PATCH] Kconfig fix (arv) arv uses constants provided only by

[PATCH] Kconfig fix (airo_cs on m32r)

tree 2fd70a093445ca3a0806141ca6d8fa4f926b1861 parent a4d544fdd30111a1183ab92ea25febb8b6460214 author Al Viro [EMAIL PROTECTED] Tue, 23 Aug 2005 22:45:56 +0100 committer Linus Torvalds [EMAIL PROTECTED] Wed, 24 Aug 2005 08:43:41 -0700 [PATCH] Kconfig fix (airo_cs on m32r) airo_cs is broken on

[PATCH] Kconfig fix (M32R_PLDSIO dependecies)

tree a0b910b7e369ec580065a74c45ddcdc0fc8c5904 parent 14d891d20374c139acfaa379e61a7091b00df8fa author Al Viro [EMAIL PROTECTED] Tue, 23 Aug 2005 22:46:06 +0100 committer Linus Torvalds [EMAIL PROTECTED] Wed, 24 Aug 2005 08:43:42 -0700 [PATCH] Kconfig fix (M32R_PLDSIO dependecies) M32R_PLDSIO

[PATCH] Kconfig fix (ppc32 SMP dependencies)

tree b7d5afe6cf1ada72f18c0207e830d8387274d6f3 parent 51583cf108b27baf81c6db3ec718f932314986ea author Al Viro [EMAIL PROTECTED] Tue, 23 Aug 2005 22:46:26 +0100 committer Linus Torvalds [EMAIL PROTECTED] Wed, 24 Aug 2005 08:43:42 -0700 [PATCH] Kconfig fix (ppc32 SMP dependencies) ppc SMP is

[PATCH] Kconfig fix (ppc 4xx and early serial)

tree 909650e573cccf7d497953cbdf97a76b9423bcf1 parent c4457fb9010765620faebccf4daf83b288295154 author Al Viro [EMAIL PROTECTED] Tue, 23 Aug 2005 22:46:36 +0100 committer Linus Torvalds [EMAIL PROTECTED] Wed, 24 Aug 2005 08:43:43 -0700 [PATCH] Kconfig fix (ppc 4xx and early serial) a bunch of ppc

[PATCH] Kconfig fix (CONFIG_PM on 44x)

tree 8940b518f5bc72bd05722873829884e1ab8f9dc8 parent f08243a491f3e21feabbb04476a03fb0cbc975ff author Al Viro [EMAIL PROTECTED] Tue, 23 Aug 2005 22:46:41 +0100 committer Linus Torvalds [EMAIL PROTECTED] Wed, 24 Aug 2005 08:43:43 -0700 [PATCH] Kconfig fix (CONFIG_PM on 44x) CONFIG_PM is broken on

[PATCH] Kconfig fix (emac dependencient)

tree 55f4012ba6a1216c5eed29f59b25c321731a46f9 parent 6299afc40c8612a87358ecea80882395fe67111f author Al Viro [EMAIL PROTECTED] Tue, 23 Aug 2005 22:46:46 +0100 committer Linus Torvalds [EMAIL PROTECTED] Wed, 24 Aug 2005 08:43:43 -0700 [PATCH] Kconfig fix (emac dependencient) emac doesn't build

[PATCH] Kconfig fix (sparc32 drivers/char dependencies)

tree 893f6c381087588c69bd0694c69fe66d33898538 parent 997183dc2a8992374d93e66f5ea0d58fa1022a47 author Al Viro [EMAIL PROTECTED] Tue, 23 Aug 2005 22:46:51 +0100 committer Linus Torvalds [EMAIL PROTECTED] Wed, 24 Aug 2005 08:43:43 -0700 [PATCH] Kconfig fix (sparc32 drivers/char dependencies) since

[PATCH] alpha gcc4 warnings

tree f1dfed1a990b8dec1269b88350b6c837973ccadc parent a238b563502a7f458624b9c6404742e441b2f9e8 author Al Viro [EMAIL PROTECTED] Tue, 23 Aug 2005 22:46:56 +0100 committer Linus Torvalds [EMAIL PROTECTED] Wed, 24 Aug 2005 08:43:43 -0700 [PATCH] alpha gcc4 warnings on UP smp_call_function() is

[PATCH] missing include in pcmcia_resource.c

tree 1bd14fc69b8c7b9afd04d7c2acb92809dd2abeb5 parent 18415e923e90b986db316abd078f6d863cee7b18 author Al Viro [EMAIL PROTECTED] Tue, 23 Aug 2005 22:47:01 +0100 committer Linus Torvalds [EMAIL PROTECTED] Wed, 24 Aug 2005 08:43:43 -0700 [PATCH] missing include in pcmcia_resource.c missing include

[PATCH] alpha xchg fix

tree bcc10e8f4f576d525b4f2a617010f49077d03e6f parent 531e5ca62bd9aabef6bd8340d8ae93bac1b5caa2 author Al Viro [EMAIL PROTECTED] Tue, 23 Aug 2005 22:47:07 +0100 committer Linus Torvalds [EMAIL PROTECTED] Wed, 24 Aug 2005 08:43:44 -0700 [PATCH] alpha xchg fix alpha xchg has to be a macro - alpha

[PATCH] alpha spinlock code and bogus constraints

tree 1089c4acaa09ace254aecd72b118891f8f23aa07 parent 79fb7bdce363685b336e3f0fb8207312fd1f02fc author Al Viro [EMAIL PROTECTED] Tue, 23 Aug 2005 22:47:12 +0100 committer Linus Torvalds [EMAIL PROTECTED] Wed, 24 Aug 2005 08:43:44 -0700 [PATCH] alpha spinlock code and bogus constraints =m

[PATCH] m32r_sio gcc4 fixes

tree d2a88ac07bb1d834c33943242f8b57ffdf1cd429 parent c51d9943b11441fd1ea42c7e70cfb5eed33fe97b author Al Viro [EMAIL PROTECTED] Tue, 23 Aug 2005 22:47:27 +0100 committer Linus Torvalds [EMAIL PROTECTED] Wed, 24 Aug 2005 08:43:44 -0700 [PATCH] m32r_sio gcc4 fixes extern declaration followed by

[PATCH] broken inline asm on s390 (misuse of labels)

tree 4b7ccdab07948b5a80f28d73cc9ecb04f67c754c parent a828b8e4e699b5e3ce0dcbb708ecb099b86f3126 author Al Viro [EMAIL PROTECTED] Tue, 23 Aug 2005 22:47:32 +0100 committer Linus Torvalds [EMAIL PROTECTED] Wed, 24 Aug 2005 08:43:44 -0700 [PATCH] broken inline asm on s390 (misuse of labels) use of

[PATCH] m32r icu_data gcc4 fixes

tree 18f2694b421cba1e0160db3781346d577a1e9b5a parent e231a9c4fdf402bcfd5a7c27be49050882631a95 author Al Viro [EMAIL PROTECTED] Tue, 23 Aug 2005 22:47:22 +0100 committer Linus Torvalds [EMAIL PROTECTED] Wed, 24 Aug 2005 08:43:44 -0700 [PATCH] m32r icu_data gcc4 fixes either icu_data declaration

[PATCH] Kconfig fix (missing dependencies on PCI in sound/*)

tree c238d57648a893504b0dc20fca42f986d71ed50e parent eaaece266a78b8f56ade48fe23147b8b933364de author Al Viro [EMAIL PROTECTED] Tue, 23 Aug 2005 22:48:02 +0100 committer Linus Torvalds [EMAIL PROTECTED] Wed, 24 Aug 2005 08:43:46 -0700 [PATCH] Kconfig fix (missing dependencies on PCI in sound/*) a

[PATCH] cpu_exclusive sched domains on partial nodes temp fix

tree c81c261274011d301dfbcfd1a3e13480b93c167e parent ae75784bc576a1af70509c2f3ba2b70bb65a0c58 author Paul Jackson [EMAIL PROTECTED] Tue, 23 Aug 2005 15:04:27 -0700 committer Linus Torvalds [EMAIL PROTECTED] Wed, 24 Aug 2005 10:02:52 -0700 [PATCH] cpu_exclusive sched domains on partial nodes temp

[PATCH] Kconfig fix (infiniband and PCI)

tree 6b1e668b1c7ccba11f88478413509906f5bbfd9b parent 697ae16ac0482283741f42378108b67b492870e8 author Al Viro [EMAIL PROTECTED] Tue, 23 Aug 2005 22:45:41 +0100 committer Linus Torvalds [EMAIL PROTECTED] Wed, 24 Aug 2005 08:43:41 -0700 [PATCH] Kconfig fix (infiniband and PCI) infiniband uses PCI

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

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

git-rev-parse question.

I have been looking at what git-rev-parse does and could not figure out a way to convince it to give me only arguments with a '-' prefix. Specifically, I wanted to remove the hardcoded -p and -M flags from git-diff-script. Running $ sh -x git-diff-script -C HEAD^ HEAD reveals that none of

[RFC] cg-log -r order:matters

It's sometimes unclear which head is ahead of the other. If I get the order wrong, cg-log shows no log output. Is this expected? I was expecting a warning, or a reverse-ordered log. Or both. ;) martin - To unsubscribe from this list: send the line unsubscribe git in the body of a message to

Re: arch2git import script

On 8/24/05, Martin Langhoff [EMAIL PROTECTED] wrote: First draft of an Arch import. And now, with sample script attached, too. cheers, martin git-archimport-script Description: Binary data

Re: cg-update/cg-merge refuse to update if state is dirty?

Hello, Here's a thought. It might be nice, in this situation, to have something like a git-undo-script that can undo the changes in the index storing them in a tree object but not wrapping them into a commit. A ref to the tree can be stored in an 'undo' file somewhere under .git. When the merge

[RFC] Removing deleted files after checkout

Hello, I recently started using git to revision control the source for my web-page. I wrote a post-update hook to checkout the files when I push to the 'live' repository. In this particular context I decided that it was important to me to remove deleted files after checking out the new HEAD. I

[PATCH] Improve can_hardlink diagnostics, remove suggest_hardlink

Hello! suggest_hardlink is write-only in cg-pull - remove it. can_hardlink should not be shown to the user as is (it's either l or empty) - we should output something meaningful instead. Signed-off-by: Pavel Roskin [EMAIL PROTECTED] diff --git a/cg-pull b/cg-pull --- a/cg-pull +++ b/cg-pull @@

Re: [RFC] Stgit - patch history / add extra parents

Daniel Barkalow [EMAIL PROTECTED] wrote: One factor not mentioned there is that, as things move upstream, we often want to discard a lot of history; if someone commits constantly to deal with editor malfunction or something, we don't really want to take all of this junk into the project

Re: git-rev-parse question.

On Tue, 23 Aug 2005, Junio C Hamano wrote: I have been looking at what git-rev-parse does and could not figure out a way to convince it to give me only arguments with a '-' prefix. Gaah. Understandable. It got broken during some cleanup. Try this trivial patch, it should work better.

Current status toward 0.99.5 and beyond

Some people may have noticed that the progress of the master branch head has somewhat slowed down lately, and I have kept some changes in the proposed updates branch for quite some time. There are two reasons for this. One is that I've been quite busy during my day job hours, and haven't had

Re: Current status toward 0.99.5 and beyond

On Tue, 23 Aug 2005, Junio C Hamano wrote: So far, the following commands should be usable with relative directory paths: update-cache ls-files diff-files diff-cache diff-tree Also, git-rev-parse. Finally, this trivial patch makes git-rev-list also able to handle

Re: git-rev-parse question.

On Tue, 23 Aug 2005, Linus Torvalds wrote: Try this trivial patch, it should work better. Actually, don't do the show_default() part of this. We should _not_ show the default string if we haev --no-revs and the string doesn't match a rev. Also, this fixes -- handlign with --flags.

Re: [RFC] Stgit - patch history / add extra parents

On Tue, 23 Aug 2005, Catalin Marinas wrote: So the point is that there are things which are, in fact, parents, but we don't want to list them, because it's not desired information. What's the definition of a parent in GIT terms? What are the restriction for a commit object to be a parent?

Re: [RFC] Removing deleted files after checkout

On Tue, 23 Aug 2005, Carl Baldwin wrote: Hello, I recently started using git to revision control the source for my web-page. I wrote a post-update hook to checkout the files when I push to the 'live' repository. In this particular context I decided that it was important to me to remove

Re: Improve handling of . and .. in git-diff-*

On 8/17/05, Linus Torvalds [EMAIL PROTECTED] wrote: NOTE! This does _not_ handle .. or . in the _middle_ of a pathspec. If you have people who do BTW, could this (below) be useful for something? #include string.h #include stdio.h #include stdlib.h // an analog of cd path from a directory cwd.

Re: Improve handling of . and .. in git-diff-*

On 8/23/05, Alex Riesen [EMAIL PROTECTED] wrote: On 8/17/05, Linus Torvalds [EMAIL PROTECTED] wrote: NOTE! This does _not_ handle .. or . in the _middle_ of a pathspec. If you have people who do BTW, could this (below) be useful for something? Well, a bit of explanation is certainly

Re: [PATCH] Introduce reset type flag to git reset

I am not sure what mixed reset (the current behaviour) is good for. If nobody comes up with a good use case it may not be a bad idea to remove it. Using the principle of minimum suprise the --mixed should be removed. --soft - undo the commit leaving all changes. --hard - undo the commit and

Re: [RFC] Stgit - patch history / add extra parents

Daniel Barkalow wrote: On Tue, 23 Aug 2005, Catalin Marinas wrote: Something is legitimate as a parent if someone took that commit and did something to it to get the new commit. The operation which caused the change is not specified. But you only want to include it if anyone cares about

Re: [PATCH] Spell __attribute__ correctly in cache.h.

And Junio C Hamano writes: - BTW, how would people feel about replacing the - setenv() and unsetenv() calls with the older putenv()? - No comment on this one at this moment until I do my own digging - a bit. If you're interested, I have a few patches in

Re: [RFC] Removing deleted files after checkout

On Tue, 23 Aug 2005, Carl Baldwin wrote: On Tue, Aug 23, 2005 at 03:43:56PM -0400, Daniel Barkalow wrote: On Tue, 23 Aug 2005, Carl Baldwin wrote: Hello, I recently started using git to revision control the source for my web-page. I wrote a post-update hook to checkout the files

[PATCH] cg-pull to stop treating master specially, fix fetch_local for .git/HEAD

Hello! This patch changes cg-pull so that if the branch is not specified, it takes origin's .git/HEAD without first trying .git/refs/heads/master. This removes preferential treatment of the master branch, allowing the upstream to use another name for the default branch. To get the master branch,

Re: [RFC] Removing deleted files after checkout

On Tue, 23 Aug 2005, Carl Baldwin wrote: The point is to push and use a post-update hook to do the checkout. So, this won't be possible. You could have the remote repository be something like ~/git/website.git, and have a hook which does: cd ~/www; git pull ~/git/website.git/. That is, have

Re: [PATCH] Introduce reset type flag to git reset

Sam Ravnborg [EMAIL PROTECTED] writes: But --soft, --hard looks rather confusing to me. Something like --force or --prune may be a bit more intuitive, and let default behaviour be the one you name --soft for now. I do not have objections to removing --mixed, but I do not find --force/--prune

Re: Automatic merge failed, fix up by hand

Len Brown [EMAIL PROTECTED] writes: The merge issue below is reproduced in a git clone -l copy with no plain files present. Meaning you did not have any file in the working tree? It seems to me that what is happenning is the resolve is trying to merge the head of your tree and from-linus, but

Re: [RFC] Removing deleted files after checkout

Daniel Barkalow [EMAIL PROTECTED] writes: If you don't use -f, git-checkout-script removes deleted files. Using -f tells it to ignore the old index, which means that it can't tell the difference between removed files and files that weren't tracked at all. Yes and no. git checkout assumes

Re: [RFC] Stgit - patch history / add extra parents

On Tue, 23 Aug 2005, Jan Veldeman wrote: Daniel Barkalow wrote: On Tue, 23 Aug 2005, Catalin Marinas wrote: Something is legitimate as a parent if someone took that commit and did something to it to get the new commit. The operation which caused the change is not specified. But you

Re: [RFC] Removing deleted files after checkout

Ok, the following is what I came up with based on your response. This is .git/hooks/update. It mostly works in my situation. See below for my discussion on what didn't work. #!/bin/sh export PATH=/usr/local/bin:/usr/bin:/bin # cd to the root of the project directory (assume one dir up from

Re: [RFC] Removing deleted files after checkout

On Tue, 23 Aug 2005, Carl Baldwin wrote: The thing that this doesn't do is remove empty directories when the last file is deleted. I once expressed the opinion in a previous thread that directories should be added and removed explicitly in git. (Thus allowing an empty directory to be

baffled again

So I have another anomaly in my GIT tree. A patch to back out a bogus change to arch/ia64/hp/sim/boot/bootloader.c in my release branch at commit 62d75f3753647656323b0365faa43fc1a8f7be97 appears to have been lost when I merged the release branch to the test branch at commit

Re: [PATCH] Introduce reset type flag to git reset

At Tue, 23 Aug 2005 15:08:44 -0700, Junio C Hamano wrote: Sam Ravnborg [EMAIL PROTECTED] writes: But --soft, --hard looks rather confusing to me. Something like --force or --prune may be a bit more intuitive, and let default behaviour be the one you name --soft for now. I do not

Fix silly pathspec bug in git-ls-files

The verify_pathspec() function doesn't test for ending NUL character in the pathspec, causing some really funky and unexpected behaviour. It just happened to work in the cases I had tested. Signed-off-by: Linus Torvalds [EMAIL PROTECTED] --- diff --git a/ls-files.c b/ls-files.c ---

Re: [PATCH] Introduce reset type flag to git reset

Yasushi SHOJI [EMAIL PROTECTED] writes: for --hard option, what you want to do is to completely revert the current state of your index file and work tree to known point. for that, how about git-revert-script? git revert is to create a commit that reverts a previous commit, which I think is

Re: [RFC] Stgit - patch history / add extra parents

Catalin Marinas [EMAIL PROTECTED] writes: What's the definition of a parent in GIT terms? What are the restriction for a commit object to be a parent? Can a parent be an arbitrarily chosen commit? Yes it can. GIT does not care if the commit ancestry does not make sense in contents terms

Re: Automatic merge failed, fix up by hand

On Tue, 2005-08-23 at 19:58 -0400, Junio C Hamano wrote: Len Brown [EMAIL PROTECTED] writes: I could get to 81065e2f415af6... commit (Linus tip at this moment), so if you can tell me where to snarf the other commit (702c7e76) that would help me diagnose the problem a lot.

Re: Automatic merge failed, fix up by hand

Junio C Hamano [EMAIL PROTECTED] writes: I think merge-base, even though we attempted to fix it recently, is still confused and that is one of the reasons why you are getting this. prompt$ git-rev-parse origin test-lenb-merge 81065e2f415af6c028eac13f481fb9e60a0b487b

Re: Automatic merge failed, fix up by hand

On Tue, 23 Aug 2005, Len Brown wrote: I'm having trouble using git for merging kernel trees. git seems to manufacture conflicts in files that I never touched, and on some files it completely throws up its arms, see Not handling case below. Cool. You've found a case where git-merge-base

Re: Automatic merge failed, fix up by hand

Junio C Hamano [EMAIL PROTECTED] writes: Probably the ideal way would be to give merge-base an option to spit out all the candidates, and have the script try to see which ones yield the least number of non-trivial merges. I first checked out your 702c7e.. commit, and slurped Linus tip (back

Re: Automatic merge failed, fix up by hand

On Tue, 2005-08-23 at 21:07 -0400, Junio C Hamano wrote: Junio C Hamano [EMAIL PROTECTED] writes: Probably the ideal way would be to give merge-base an option to spit out all the candidates, and have the script try to see which ones yield the least number of non-trivial merges. I first

Fix git-rev-parse breakage

The --flags cleanup caused problems: we used to depend on the fact that revs_only magically suppressed flags, adn that assumption was broken by the recent fixes. It wasn't a good assumption in the first place, so instead of re-introducing it, let's just get rid of it. This makes --revs-only

Re: Automatic merge failed, fix up by hand

On Tue, 23 Aug 2005, Junio C Hamano wrote: Only lightly tested, in the sense that I did only this one case and nothing else. For a large repository and with complex merges, merge-base -a _might_ end up reporting many candidates, in which case the pre-merge step to figure out the best merge

Re: Fix git-rev-parse breakage

Linus Torvalds [EMAIL PROTECTED] writes: This makes --revs-only imply --no-flags. [ Side note: we might want to get rid of these confusing two-way flags, where some flags say only print xxx, and others say don't print yyy. We'd be better off with just three flags that say print zzz,

Re: baffled again

I'm at home, and too lazy to log in to work to look at my tree. But I have a theory as to what went wrong for me. At the start I had a file, same contents in test and release branch. I applied a patch to release, and pulled to test. So the contents are still the same, both with the patch

Re: baffled again

On Tue, 23 Aug 2005, Tony Luck wrote: So GIT decides that the test branch has had a patch, and the release branch hasn't ... and so it merges by keeping the version in test. Plausible? Very. Sounds like what happened. Linus - To unsubscribe from this list: send the line