[PATCH v2] git-branch: display sha1 on branch deletion
- From
Brandon Casey <casey@nrlssc.navy.mil>
- Date
- Dec 12, 2008, 23:20 UTC
- Message-ID
- <UfCPFu_boLV0ycLKLmOno8GTqmtC4RSZZ9O6aRLGYjmSZOdKv6ywhCjApnplTHLxUIzO8KJ5Mww@cipher.nrlssc.navy.mil>
- In-Reply-To
- <AeIdfC6dcUaLaDHDaAdSq8Mxz6QoUdeypSUI24erUEyAHVz4HeTSCw@cipher.nrlssc.navy.mil>
Make it easier to recover from a mistaken branch deletion by displaying the sha1 of the branch's tip commit.
Update t3200.
Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> --- builtin-branch.c | 3 ++- t/t3200-branch.sh | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/builtin-branch.c b/builtin-branch.c index 494cbac..02fa38f 100644 --- a/builtin-branch.c +++ b/builtin-branch.c @@ -165,7 +165,8 @@ static int delete_branches(int argc, const char **argv, int force, int kinds) ret = 1; } else { struct strbuf buf = STRBUF_INIT; - printf("Deleted %sbranch %s.\n", remote, argv[i]); + printf("Deleted %sbranch %s (%s).\n", remote, argv[i], + find_unique_abbrev(sha1, DEFAULT_ABBREV)); strbuf_addf(&buf, "branch.%s", argv[i]); if (git_config_rename_section(buf.buf, NULL) < 0) warning("Update of config-file failed"); diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index 25e9971..61a2010 100755 --- a/t/t3200-branch.sh +++ b/t/t3200-branch.sh @@ -194,7 +194,8 @@ test_expect_success 'test deleting branch deletes branch config' \ test_expect_success 'test deleting branch without config' \ 'git branch my7 s && - test "$(git branch -d my7 2>&1)" = "Deleted branch my7."' + sha1=$(git rev-parse my7 | cut -c 1-7) && + test "$(git branch -d my7 2>&1)" = "Deleted branch my7 ($sha1)."' test_expect_success 'test --track without .fetch entries' \ 'git branch --track my8 &&
-- 1.6.0.4.794.g35fad