3
#include "commit.h"
4
#include "tree.h"
5
#include "blob.h"
6
+#include "diff.h"
7
8
static int find_short_object_filename(int len, const char *name, unsigned char *sha1)
9
{
450
return get_short_sha1(name, len, sha1, 0);
451
}
452
453
+static int get_tree_entry(const unsigned char *, const char *, unsigned char *);
454
+
455
+static int find_tree_entry(struct tree_desc *t, const char *name, unsigned char *result)
456
+{
457
+ int namelen = strlen(name);
458
+ while (t->size) {
459
+ const char *entry;
460
+ const unsigned char *sha1;
461
+ int entrylen, cmp;
462
+ unsigned mode;
463
+
464
+ sha1 = tree_entry_extract(t, &entry, &mode);
465
+ update_tree_entry(t);
466
+ entrylen = strlen(entry);
467
+ if (entrylen > namelen)
468
+ continue;
469
+ cmp = memcmp(name, entry, entrylen);
470
+ if (cmp > 0)
471
+ continue;
472
+ if (cmp < 0)
473
+ break;
474
+ if (entrylen == namelen) {
475
+ memcpy(result, sha1, 20);
476
+ return 0;
477
+ }
478
+ if (name[entrylen] != '/')
479
+ continue;
480
+ if (!S_ISDIR(mode))
481
+ break;
482
+ if (++entrylen == namelen) {
483
+ memcpy(result, sha1, 20);
484
+ return 0;
485
+ }
486
+ return get_tree_entry(sha1, name + entrylen, result);
487
+ }
488
+ return -1;
489
+}
490
+
491
+static int get_tree_entry(const unsigned char *tree_sha1, const char *name, unsigned char *sha1)
492
+{
493
+ int retval;
494
+ void *tree;
495
+ struct tree_desc t;
496
+
497
+ tree = read_object_with_reference(tree_sha1, tree_type, &t.size, NULL);
498
+ if (!tree)
499
+ return -1;
500
+ t.buf = tree;
501
+ retval = find_tree_entry(&t, name, sha1);
502
+ free(tree);
503
+ return retval;
504
+}
505
+
506
/*
507
* This is like "get_sha1_basic()", except it allows "sha1 expressions",
508
* notably "xyz^" for "parent of xyz"
509
*/
510
int get_sha1(const char *name, unsigned char *sha1)
511
{
512
+ int ret;
513
+
514
prepare_alt_odb();
459
- return get_sha1_1(name, strlen(name), sha1);
515
+ ret = get_sha1_1(name, strlen(name), sha1);
516
+ if (ret < 0) {
517
+ const char *cp = strchr(name, ':');
518
+ if (cp) {
519
+ unsigned char tree_sha1[20];
520
+ if (!get_sha1_1(name, cp-name, tree_sha1))
521
+ return get_tree_entry(tree_sha1, cp+1, sha1);
522
+ }
523
+ }
524
+ return ret;
525
}