All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jeff Garzik <jgarzik@pobox.com>
To: Linus Torvalds <torvalds@osdl.org>
Cc: Andrew Morton <akpm@osdl.org>, Netdev <netdev@oss.sgi.com>,
	Linux Kernel <linux-kernel@vger.kernel.org>
Subject: Re: [git patches try2] 2.6.x net driver updates
Date: Wed, 25 May 2005 18:59:00 -0400	[thread overview]
Message-ID: <42950334.9090402@pobox.com> (raw)
In-Reply-To: <Pine.LNX.4.58.0505251200040.2307@ppc970.osdl.org>

[-- Attachment #1: Type: text/plain, Size: 922 bytes --]

Linus Torvalds wrote:
> 
> On Wed, 25 May 2005, Jeff Garzik wrote:
> 
>>Does this work better?
> 
> 
> Looks good.

Groovy.


> If this was automated, are your changes to git-pull-script generic enough 
> to be useful for others, or did you do a totally specialized one for just 
> the "lots of heads in the same directory" case?

Not specialized at all.  I do one pull at a time, so git-pull-script 
suffices with a simple addition to call git-resolve-script with the 
branch as $4, and a simple addition to git-resolve-script to add 'branch 
$foo' to merge_msg.  See attached (note the patch includes my earlier 
'optimization' patch).

On this last run, I actually just ignored git-pull-script and simply ran 
git-resolve-script -- since all my objects are in-tree already, I don't 
need the fetch step:

git-resolve-script $(cat .git/HEAD ) $(cat .git/refs/heads/amd8111) \
    /spare/repo/netdev-2.6 amd8111

	Jeff



[-- Attachment #2: patch --]
[-- Type: text/plain, Size: 1666 bytes --]

--- git-resolve-script	2005-05-25 15:21:32.772604549 -0400
+++ /usr/local/bin/git-resolve-script	2005-05-25 13:30:59.568504275 -0400
@@ -7,6 +7,7 @@
 head="$1"
 merge="$2"
 merge_repo="$3"
+merge_name=${4:-HEAD}
 
 : ${GIT_DIR=.git}
 : ${GIT_OBJECT_DIRECTORY="${SHA1_FILE_DIRECTORY-"$GIT_DIR/objects"}"}
@@ -20,7 +21,7 @@
 # but we do want it.
 #
 if [ "$merge_repo" == "" ]; then
-	echo "git-resolve-script <head> <remote> <merge-repo-name>"
+	echo "git-resolve-script <head> <remote> <merge-repo-name> <branch-name>"
 	exit 1
 fi
 
@@ -39,23 +40,23 @@
 	echo "Destroying all noncommitted data!"
 	echo "Kill me within 3 seconds.."
 	sleep 3
-	git-read-tree -m $merge && git-checkout-cache -f -u -a
+	git-read-tree -m $merge && git-checkout-cache -f -a && git-update-cache --refresh
 	echo $merge > "$GIT_DIR"/HEAD
 	git-diff-tree -p ORIG_HEAD HEAD | diffstat -p1
 	exit 0
 fi
 echo "Trying to merge $merge into $head"
 git-read-tree -m $common $head $merge
-merge_msg="Merge of $merge_repo"
+merge_msg="Merge of $merge_repo branch $merge_name"
 result_tree=$(git-write-tree  2> /dev/null)
 if [ $? -ne 0 ]; then
 	echo "Simple merge failed, trying Automatic merge"
 	git-merge-cache git-merge-one-file-script -a
-	merge_msg="Automatic merge of $merge_repo"
+	merge_msg="Automatic merge of $merge_repo branch $merge_name"
 	result_tree=$(git-write-tree) || exit 1
 fi
 result_commit=$(echo "$merge_msg" | git-commit-tree $result_tree -p $head -p $merge)
 echo "Committed merge $result_commit"
 echo $result_commit > "$GIT_DIR"/HEAD
-git-checkout-cache -f -u -a
+git-checkout-cache -f -a && git-update-cache --refresh
 git-diff-tree -p ORIG_HEAD HEAD | diffstat -p1

  reply	other threads:[~2005-05-25 22:59 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <4294BD9C.2050105@pobox.com>
2005-05-25 20:48 ` [git patches try2] 2.6.x net driver updates Linus Torvalds
2005-05-25 22:59   ` Jeff Garzik [this message]
2005-05-25 23:03     ` Jeff Garzik

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=42950334.9090402@pobox.com \
    --to=jgarzik@pobox.com \
    --cc=akpm@osdl.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netdev@oss.sgi.com \
    --cc=torvalds@osdl.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.