mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fix'

Browse Source 
* 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.
This commit is contained in:
Junio C Hamano
2006-05-08 16:40:23 -07:00
parent fd60acaced 31fff305bc
commit 45f75a0167
16 changed files with 47 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
revision.c
View File

@ -794,7 +794,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
local_flags = UNINTERESTING;
arg++;
}
if (get_sha1(arg, sha1) < 0) {
if (get_sha1(arg, sha1)) {
int j;
if (seen_dashdash || local_flags)
@ -820,7 +820,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
if (def && !revs->pending_objects) {
unsigned char sha1[20];
struct object *object;
if (get_sha1(def, sha1) < 0)
if (get_sha1(def, sha1))
die("bad default revision '%s'", def);
object = get_reference(revs, def, sha1, 0);
add_pending_object(revs, object, def);