All of lore.kernel.org
 help / color / mirror / Atom feed
From: colin@horizon.com
To: junkio@cox.net
Cc: git@vger.kernel.org
Subject: Re: fatal: git-write-tree: not able to write tree
Date: 29 Apr 2006 09:23:24 -0400	[thread overview]
Message-ID: <20060429132324.31638.qmail@science.horizon.com> (raw)

diff --git a/git-am.sh b/git-am.sh
index eab4aa8..872145b 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -376,6 +376,13 @@ do
 			echo "No changes - did you forget update-index?"
 			stop_here $this
 		fi
+		unmerged=$(git-ls-files -u)
+		if test -n "$unmerged"
+		then
+			echo "You still have unmerged paths in your index"
+			echo "did you forget update-index?"
+			stop_here $this
+		fi
 		apply_status=0
 		;;
 	esac

Er... it's very non-obvious to me why you'd want to stick a workaround
here when you could instead fix git-write-tree to do it.  That seems
like The Right Thing.
(It would also be helpful to mention at least one unmerged file by name.)

             reply	other threads:[~2006-04-29 13:23 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-04-29 13:23 colin [this message]
2006-04-29 18:34 ` fatal: git-write-tree: not able to write tree Junio C Hamano
  -- strict thread matches above, loose matches on Subject: below --
2006-04-28  8:43 Brown, Len
2006-04-28  9:01 ` Junio C Hamano
2006-04-28  8:30 Len Brown
2006-04-28  8:32 ` Junio C Hamano

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=20060429132324.31638.qmail@science.horizon.com \
    --to=colin@horizon.com \
    --cc=git@vger.kernel.org \
    --cc=junkio@cox.net \
    /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.