From: Junio C Hamano <junkio@cox.net>
Date: Mon, 8 May 2006 23:40:23 +0000 (-0700)
Subject: Merge branch 'fix'
X-Git-Tag: v1.4.0-rc1~161
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=45f75a0167b4a4693f2c6005bf7db231ca91ecc8;p=git.git

Merge branch 'fix'

* fix:
  Separate object name errors from usage errors
  Documentation: {caret} fixes (git-rev-list.txt)
  Fix "git diff --stat" with long filenames
  Fix repo-config set-multivar error return path.
---

45f75a0167b4a4693f2c6005bf7db231ca91ecc8
diff --cc revision.c
index f8ee38e5,d41e59b9..2294b16e
--- a/revision.c
+++ b/revision.c
@@@ -812,18 -687,16 +812,18 @@@ int setup_revisions(int argc, const cha
  			revs->prune_data = get_pathspec(revs->prefix, argv + i);
  			break;
  		}
 -		commit = get_commit_reference(revs, arg, sha1, flags ^ local_flags);
 -		add_one_commit(commit, revs);
 +		if (!seen_dashdash)
 +			verify_non_filename(revs->prefix, arg);
 +		object = get_reference(revs, arg, sha1, flags ^ local_flags);
 +		add_pending_object(revs, object, arg);
  	}
 -	if (def && !revs->commits) {
 +	if (def && !revs->pending_objects) {
  		unsigned char sha1[20];
 -		struct commit *commit;
 +		struct object *object;
- 		if (get_sha1(def, sha1) < 0)
+ 		if (get_sha1(def, sha1))
  			die("bad default revision '%s'", def);
 -		commit = get_commit_reference(revs, def, sha1, 0);
 -		add_one_commit(commit, revs);
 +		object = get_reference(revs, def, sha1, 0);
 +		add_pending_object(revs, object, def);
  	}
  
  	if (revs->topo_order || revs->unpacked)