diff_aligned_abbrev: use "struct oid"

Since we're modifying this function anyway, it's a good time
to update it to the more modern "struct oid". We can also
drop some of the magic numbers in favor of GIT_SHA1_HEXSZ,
along with some descriptive comments.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/combine-diff.c b/combine-diff.c
index b36c2d16bdbe8a3ddfaab177a94669cb216a181e..59501db99a74ab8f237766730045dda4ecd112b2 100644 (file)
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -1203,9 +1203,9 @@ static void show_raw_diff(struct combine_diff_path *p, int num_parent, struct re
 
                /* Show sha1's */
                for (i = 0; i < num_parent; i++)
 
                /* Show sha1's */
                for (i = 0; i < num_parent; i++)

-                       printf(" %s", diff_aligned_abbrev(p->parent[i].oid.hash,
+                       printf(" %s", diff_aligned_abbrev(&p->parent[i].oid,

                                                          opt->abbrev));
                                                          opt->abbrev));

-               printf(" %s ", diff_aligned_abbrev(p->oid.hash, opt->abbrev));
+               printf(" %s ", diff_aligned_abbrev(&p->oid, opt->abbrev));

        }
 
        if (opt->output_format & (DIFF_FORMAT_RAW | DIFF_FORMAT_NAME_STATUS)) {
        }
 
        if (opt->output_format & (DIFF_FORMAT_RAW | DIFF_FORMAT_NAME_STATUS)) {

diff --git a/diff.c b/diff.c
index 3cdf920672dc4f7f19eef5f4ff16a4ce66464756..b94e0e07110d1daa88306e6b78fd1d6dde057f51 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -4157,14 +4157,15 @@ void diff_free_filepair(struct diff_filepair *p)
        free(p);
 }
 
        free(p);
 }
 

-const char *diff_aligned_abbrev(const unsigned char *sha1, int len)
+const char *diff_aligned_abbrev(const struct object_id *oid, int len)

 {
        int abblen;
        const char *abbrev;
 {
        int abblen;
        const char *abbrev;

-       if (len == 40)
-               return sha1_to_hex(sha1);

 
 

-       abbrev = find_unique_abbrev(sha1, len);
+       if (len == GIT_SHA1_HEXSZ)
+               return oid_to_hex(oid);
+
+       abbrev = find_unique_abbrev(oid->hash, len);

        abblen = strlen(abbrev);
 
        /*
        abblen = strlen(abbrev);
 
        /*


@@ -4186,15 +4187,16 @@ const char *diff_aligned_abbrev(const unsigned char *sha1, int len)
         * the automatic sizing is supposed to give abblen that ensures
         * uniqueness across all objects (statistically speaking).
         */
         * the automatic sizing is supposed to give abblen that ensures
         * uniqueness across all objects (statistically speaking).
         */

-       if (abblen < 37) {
-               static char hex[41];
+       if (abblen < GIT_SHA1_HEXSZ - 3) {
+               static char hex[GIT_SHA1_HEXSZ + 1];

                if (len < abblen && abblen <= len + 2)
                        xsnprintf(hex, sizeof(hex), "%s%.*s", abbrev, len+3-abblen, "..");
                else
                        xsnprintf(hex, sizeof(hex), "%s...", abbrev);
                return hex;
        }
                if (len < abblen && abblen <= len + 2)
                        xsnprintf(hex, sizeof(hex), "%s%.*s", abbrev, len+3-abblen, "..");
                else
                        xsnprintf(hex, sizeof(hex), "%s...", abbrev);
                return hex;
        }

-       return sha1_to_hex(sha1);
+
+       return oid_to_hex(oid);

 }
 
 static void diff_flush_raw(struct diff_filepair *p, struct diff_options *opt)
 }
 
 static void diff_flush_raw(struct diff_filepair *p, struct diff_options *opt)


@@ -4205,9 +4207,9 @@ static void diff_flush_raw(struct diff_filepair *p, struct diff_options *opt)
        fprintf(opt->file, "%s", diff_line_prefix(opt));
        if (!(opt->output_format & DIFF_FORMAT_NAME_STATUS)) {
                fprintf(opt->file, ":%06o %06o %s ", p->one->mode, p->two->mode,
        fprintf(opt->file, "%s", diff_line_prefix(opt));
        if (!(opt->output_format & DIFF_FORMAT_NAME_STATUS)) {
                fprintf(opt->file, ":%06o %06o %s ", p->one->mode, p->two->mode,

-                       diff_aligned_abbrev(p->one->oid.hash, opt->abbrev));
+                       diff_aligned_abbrev(&p->one->oid, opt->abbrev));

                fprintf(opt->file, "%s ",
                fprintf(opt->file, "%s ",

-                       diff_aligned_abbrev(p->two->oid.hash, opt->abbrev));
+                       diff_aligned_abbrev(&p->two->oid, opt->abbrev));

        }
        if (p->score) {
                fprintf(opt->file, "%c%03d%c", p->status, similarity_index(p),
        }
        if (p->score) {
                fprintf(opt->file, "%c%03d%c", p->status, similarity_index(p),

diff --git a/diff.h b/diff.h
index f2b04b6d81319e895023311720d9673a0849e645..01afc70bd572448ed25cdc869b071994e948c546 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -344,7 +344,7 @@ extern void diff_warn_rename_limit(const char *varname, int needed, int degraded
  * This is different from find_unique_abbrev() in that
  * it stuffs the result with dots for alignment.
  */
  * This is different from find_unique_abbrev() in that
  * it stuffs the result with dots for alignment.
  */

-extern const char *diff_aligned_abbrev(const unsigned char *sha1, int);
+extern const char *diff_aligned_abbrev(const struct object_id *sha1, int);

 
 /* do not report anything on removed paths */
 #define DIFF_SILENT_ON_REMOVED 01
 
 /* do not report anything on removed paths */
 #define DIFF_SILENT_ON_REMOVED 01