{"thread":{"id":"43281","subject":"Re: [PATCH] Add -v and --abbrev options to git-branch","startedAt":"2006-11-24T13:45:10Z","lastAt":"2006-11-24T15:22:01Z","messageCount":3,"participants":["Jakub Narebski","Lars Hjemli"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"298336","messageId":"1164375910450-git-send-email-hjemli@gmail.com","threadId":"43281","inReplyTo":null,"subject":"[PATCH] Add -v and --abbrev options to git-branch","fromName":"Lars Hjemli","fromEmail":"hjemli@gmail.com","sentAt":"2006-11-24T13:45:10Z","receivedAt":"2006-11-24T13:45:10Z","isPatch":true,"sender":{"key":"hjemli@gmail.com","avatar":null},"body":"The new -v option makes git-branch show the abbreviated sha1 + subjectline\nfor each branch.\n\nAdditionally, minimum abbreviation length can be specified with\n--abbrev=<length>\n\nSigned-off-by: Lars Hjemli <hjemli@gmail.com>\n---\n Documentation/git-branch.txt |    9 +++++++-\n builtin-branch.c             |   46 ++++++++++++++++++++++++++++++++++++-----\n 2 files changed, 48 insertions(+), 7 deletions(-)\n\ndiff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt\nindex 5376760..4f5b5d5 100644\n--- a/Documentation/git-branch.txt\n+++ b/Documentation/git-branch.txt\n@@ -8,7 +8,7 @@ git-branch - List, create, or delete bra\n SYNOPSIS\n --------\n [verse]\n-'git-branch' [-r] [-a]\n+'git-branch' [-r] [-a] [-v] [--abbrev=<length>]\n 'git-branch' [-l] [-f] <branchname> [<start-point>]\n 'git-branch' (-d | -D) <branchname>...\n \n@@ -52,6 +52,13 @@ OPTIONS\n -a::\n \tList both remote-tracking branches and local branches.\n \n+-v::\n+\tShow sha1 and subject message for each head.\n+\n+--abbrev=<length>::\n+\tAlter minimum display length for sha1 in output listing,\n+\tdefault value is 7.\n+\n <branchname>::\n \tThe name of the branch to create or delete.\n \tThe new branch name must pass all checks defined by\ndiff --git a/builtin-branch.c b/builtin-branch.c\nindex 22e3285..f14d814 100644\n--- a/builtin-branch.c\n+++ b/builtin-branch.c\n@@ -11,7 +11,7 @@\n #include \"builtin.h\"\n \n static const char builtin_branch_usage[] =\n-\"git-branch (-d | -D) <branchname> | [-l] [-f] <branchname> [<start-point>] | [-r] | [-a]\";\n+\"git-branch (-d | -D) <branchname> | [-l] [-f] <branchname> [<start-point>] | [-r | -a] [-v] [--abbrev=<length>] \";\n \n \n static const char *head;\n@@ -87,10 +87,11 @@ static void delete_branches(int argc, co\n struct ref_item {\n \tchar *name;\n \tunsigned int kind;\n+\tunsigned char sha1[20];\n };\n \n struct ref_list {\n-\tint index, alloc;\n+\tint index, alloc, maxwidth;\n \tstruct ref_item *list;\n \tint kinds;\n };\n@@ -100,6 +101,7 @@ static int append_ref(const char *refnam\n \tstruct ref_list *ref_list = (struct ref_list*)(cb_data);\n \tstruct ref_item *newitem;\n \tint kind = REF_UNKNOWN_TYPE;\n+\tint len;\n \n \t/* Detect kind */\n \tif (!strncmp(refname, \"refs/heads/\", 11)) {\n@@ -128,6 +130,10 @@ static int append_ref(const char *refnam\n \tnewitem = &(ref_list->list[ref_list->index++]);\n \tnewitem->name = xstrdup(refname);\n \tnewitem->kind = kind;\n+\tmemcpy(newitem->sha1, sha1, 20);\n+\tlen = strlen(newitem->name);\n+\tif (len > ref_list->maxwidth)\n+\t\tref_list->maxwidth = len;\n \n \treturn 0;\n }\n@@ -151,7 +157,24 @@ static int ref_cmp(const void *r1, const\n \treturn strcmp(c1->name, c2->name);\n }\n \n-static void print_ref_list(int kinds)\n+static void print_ref_info(const unsigned char *sha1, int abbrev)\n+{\n+\tstruct commit *commit;\n+\tchar subject[256];\n+\n+\n+\tcommit = lookup_commit(sha1);\n+\tif (commit && !parse_commit(commit))\n+\t\tpretty_print_commit(CMIT_FMT_ONELINE, commit, ~0, \n+\t\t\t\t    subject, sizeof(subject), 0, \n+\t\t\t\t    NULL, NULL, 0);\n+\telse\n+\t\tsprintf(subject, \" **** invalid ref ****\");\n+\n+\tprintf(\" %s %s\", find_unique_abbrev(sha1, abbrev), subject);\n+}\n+\n+static void print_ref_list(int kinds, int verbose, int abbrev)\n {\n \tint i;\n \tchar c;\n@@ -169,9 +192,11 @@ static void print_ref_list(int kinds)\n \t\t\t\t!strcmp(ref_list.list[i].name, head))\n \t\t\tc = '*';\n \n-\t\tprintf(\"%c %s\\n\", c, ref_list.list[i].name);\n+\t\tprintf(\"%c %-*s\", c, ref_list.maxwidth, ref_list.list[i].name);\n+\t\tif (verbose)\n+\t\t\tprint_ref_info(ref_list.list[i].sha1, abbrev);\n+\t\tprintf(\"\\n\");\t\n \t}\n-\n \tfree_ref_list(&ref_list);\n }\n \n@@ -215,6 +240,7 @@ static void create_branch(const char *na\n int cmd_branch(int argc, const char **argv, const char *prefix)\n {\n \tint delete = 0, force_delete = 0, force_create = 0;\n+\tint verbose = 0, abbrev = DEFAULT_ABBREV;\n \tint reflog = 0;\n \tint kinds = REF_LOCAL_BRANCH;\n \tint i;\n@@ -255,6 +281,14 @@ int cmd_branch(int argc, const char **ar\n \t\t\treflog = 1;\n \t\t\tcontinue;\n \t\t}\n+\t\tif (!strncmp(arg, \"--abbrev=\", 9)) {\n+\t\t\tabbrev = atoi(arg+9);\n+\t\t\tcontinue;\n+\t\t}\n+\t\tif (!strcmp(arg, \"-v\")) {\n+\t\t\tverbose = 1;\n+\t\t\tcontinue;\n+\t\t}\n \t\tusage(builtin_branch_usage);\n \t}\n \n@@ -268,7 +302,7 @@ int cmd_branch(int argc, const char **ar\n \tif (delete)\n \t\tdelete_branches(argc - i, argv + i, force_delete);\n \telse if (i == argc)\n-\t\tprint_ref_list(kinds);\n+\t\tprint_ref_list(kinds, verbose, abbrev);\n \telse if (i == argc - 1)\n \t\tcreate_branch(argv[i], head, force_create, reflog);\n \telse if (i == argc - 2)\n-- \n1.4.4\n"},{"id":"294209","messageId":"ek6u2s$at4$1@sea.gmane.org","threadId":"43281","inReplyTo":"1164375910450-git-send-email-hjemli@gmail.com","subject":"Re: [PATCH] Add -v and --abbrev options to git-branch","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2006-11-24T14:04:49Z","receivedAt":"2006-11-24T14:04:49Z","isPatch":true,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"Lars Hjemli wrote:\n\n> The new -v option makes git-branch show the abbreviated sha1 + subjectline\n> for each branch.\n\nIsn't what git-show-ref is about? Or git-for-each-ref?\n-- \nJakub Narebski\nWarsaw, Poland\nShadeHawk on #git\n\n"},{"id":"297245","messageId":"8c5c35580611240722n6590f21av8b58a4e595dcb52e@mail.gmail.com","threadId":"43281","inReplyTo":"ek6u2s$at4$1@sea.gmane.org","subject":"Re: [PATCH] Add -v and --abbrev options to git-branch","fromName":"Lars Hjemli","fromEmail":"hjemli@gmail.com","sentAt":"2006-11-24T15:22:01Z","receivedAt":"2006-11-24T15:22:01Z","isPatch":true,"sender":{"key":"hjemli@gmail.com","avatar":null},"body":"On 11/24/06, Jakub Narebski <jnareb@gmail.com> wrote:\n> Isn't what git-show-ref is about? Or git-for-each-ref?\n\nYes, there seem to be some overlap in functionality here :-)\n\nThe thing with git-branch is that it shows me which branch I'm\ncurrently on, someting neither git-show-ref nor git-for-each-ref does.\nAnd the \"starred\" branch, combined with hash and commit subject is\nvery useful for me (It reminds me where I am, and where I have been,\nand what i did there....)\n\nFinally, git-for-each-ref is more like plumbing, I wanted someting a\nlittle more userfriendly\n\n-- \n"}]}