From patchwork Sat Jan 11 17:57:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 11328969 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 20CCB1398 for ; Sat, 11 Jan 2020 17:58:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F3A3A2084D for ; Sat, 11 Jan 2020 17:58:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Xgw3/dcS" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730688AbgAKR6M (ORCPT ); Sat, 11 Jan 2020 12:58:12 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:22817 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729957AbgAKR6M (ORCPT ); Sat, 11 Jan 2020 12:58:12 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1578765491; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rBCk1AVvWRu/f+vsvveXW+U2NhmF/dlY9S6BZ+nSkzc=; b=Xgw3/dcS7iW85N7KMtbHU5lYNFtSBuqK44FLaOrj4d09pT2pPXhWVUU8XEoMNQG1HYFFT2 nH0Kt+OGMsNx9OYeXXuvwHX8b8zE9qKgBMwmxhaR9yfWB+JWzTAGxtxxUypMJRUydplVL1 MySU6/VJWTCQ8aw/XHIz+RUjeMeOBM4= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-228-1uunNmjUOT6mSLyZ6k176Q-1; Sat, 11 Jan 2020 12:58:07 -0500 X-MC-Unique: 1uunNmjUOT6mSLyZ6k176Q-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C01B6477; Sat, 11 Jan 2020 17:58:06 +0000 (UTC) Received: from localhost (unknown [10.36.112.11]) by smtp.corp.redhat.com (Postfix) with ESMTP id EABA05C1B5; Sat, 11 Jan 2020 17:58:02 +0000 (UTC) From: marcandre.lureau@redhat.com To: git@vger.kernel.org Cc: szeder.dev@gmail.com, sunshine@sunshineco.com, =?utf-8?q?Marc-Andr=C3=A9?= =?utf-8?q?_Lureau?= Subject: [PATCH v3] branch: let '--edit-description' default to rebased branch during rebase Date: Sat, 11 Jan 2020 21:57:57 +0400 Message-Id: <20200111175757.1970457-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Marc-André Lureau Defaulting to editing the description of the rebased branch without an explicit branchname argument would be useful. Even the git bash prompt shows the name of the rebased branch, and then ~/src/git (mybranch|REBASE-i 1/2)$ git branch --edit-description fatal: Cannot give description to detached HEAD looks quite unhelpful. Signed-off-by: Marc-André Lureau --- Changed in v3: - fix memory leaks on error paths - remove test_done left-over - style fixes builtin/branch.c | 40 +++++++++++++++++++++++++++++----------- t/t3200-branch.sh | 18 ++++++++++++++++++ 2 files changed, 47 insertions(+), 11 deletions(-) base-commit: 7a6a90c6ec48fc78c83d7090d6c1b95d8f3739c0 diff --git a/builtin/branch.c b/builtin/branch.c index d8297f80ff..033a045d40 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -745,33 +745,51 @@ int cmd_branch(int argc, const char **argv, const char *prefix) string_list_clear(&output, 0); return 0; } else if (edit_description) { - const char *branch_name; + char *branch_name = NULL; struct strbuf branch_ref = STRBUF_INIT; if (!argc) { - if (filter.detached) - die(_("Cannot give description to detached HEAD")); - branch_name = head; + if (!filter.detached) + branch_name = xstrdup(head); + else { + struct wt_status_state state; + + memset(&state, 0, sizeof(state)); + if (wt_status_check_rebase(NULL, &state)) + branch_name = state.branch; + if (!branch_name) + die(_("Cannot give description to detached HEAD")); + free(state.onto); + } } else if (argc == 1) - branch_name = argv[0]; + branch_name = xstrdup(argv[0]); else die(_("cannot edit description of more than one branch")); strbuf_addf(&branch_ref, "refs/heads/%s", branch_name); if (!ref_exists(branch_ref.buf)) { - strbuf_release(&branch_ref); + int ret; if (!argc) - return error(_("No commit on branch '%s' yet."), - branch_name); + ret = error(_("No commit on branch '%s' yet."), + branch_name); else - return error(_("No branch named '%s'."), - branch_name); + ret = error(_("No branch named '%s'."), + branch_name); + + strbuf_release(&branch_ref); + free(branch_name); + return ret; + } strbuf_release(&branch_ref); - if (edit_branch_description(branch_name)) + if (edit_branch_description(branch_name)) { + free(branch_name); return 1; + } + + free(branch_name); } else if (copy) { if (!argc) die(_("branch name required")); diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index 411a70b0ce..d2bdaf324d 100755 --- a/t/t3200-branch.sh +++ b/t/t3200-branch.sh @@ -1260,6 +1260,24 @@ test_expect_success 'use --edit-description' ' test_cmp expect EDITOR_OUTPUT ' +test_expect_success 'use --edit-description during rebase' ' + write_script editor <<-\EOF && + echo "Rebase contents" >"$1" + EOF + ( + set_fake_editor && + FAKE_LINES="break 1" git rebase -i HEAD^ && + EDITOR=./editor git branch --edit-description && + git rebase --continue + ) && + write_script editor <<-\EOF && + git stripspace -s <"$1" >"EDITOR_OUTPUT" + EOF + EDITOR=./editor git branch --edit-description && + echo "Rebase contents" >expect && + test_cmp expect EDITOR_OUTPUT +' + test_expect_success 'detect typo in branch name when using --edit-description' ' write_script editor <<-\EOF && echo "New contents" >"$1"