From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.4 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,RCVD_IN_SORBS_SPAM, RP_MATCHES_RCVD shortcircuit=no autolearn=no autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 28B44201A9 for ; Fri, 17 Feb 2017 22:41:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964820AbdBQWlN (ORCPT ); Fri, 17 Feb 2017 17:41:13 -0500 Received: from mail-wm0-f66.google.com ([74.125.82.66]:35306 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964795AbdBQWlL (ORCPT ); Fri, 17 Feb 2017 17:41:11 -0500 Received: by mail-wm0-f66.google.com with SMTP id u63so4783474wmu.2 for ; Fri, 17 Feb 2017 14:41:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=6N/dQ1YR9MCUsT6cm5B1uTrW74bRChekmQsqgXxdplw=; b=sfK1STcv4j8Jk3JCLsnOA7a3Fi+bjWS71hzVzyvJtIzKUYaoO7T1wPb3+reY2OCNLz FqbvYixhS+kXgmT9GkqUDHr5vy3fGrCrDFKqjGXBmyKY+2jH0QvDyUwfDqjGVe+FTIkC +K7UutRxxQHW4KVxeouedCDcUpdvQaoUOKtCq7sfd2lVhXAiGI2LevYxVIZ7m8C5IWKY 00G8QPXm0YTHFTnXdEcBlWMkyd998Y5vBaclv0pWVYVgwxWmcmk45wQEZNBGi/YmRehH thtOSZP7cQgarcF/Tpx1hWShrjXLHjiBJMWwWZFcBBOeEL7mAekcwNUNdoaFYlQoUsfb h1iQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=6N/dQ1YR9MCUsT6cm5B1uTrW74bRChekmQsqgXxdplw=; b=HZr0g842mh/EXhmfBAzKqjx8dihksyYatsqSkSoG8gnuWXSNSiWNHOPiraw6GG066G RF2nR/ascP/ged4x3c8o/6+HYG1DftwqOxJ4UoPwAvKCK6aUa8hDOf6b4j3SrBvEpbVE +79kMip7eICCSdGm3fX5STFBH52S2E1YtAYONl+5VC3smYN+ejemHlIIJNAfQOXgSF6E SJ67LS253rBt1wdGFl4r6sDaLHx7v7Dc/rG1upT2kvIrZmwVelapv2RjMq0dvHD6YfW/ bjckwPfYpB1Q8CzKM7/vNb8oxNNiAR5MDf5vQTM9UBuNtT9iWx88Xmt24RGRZmCEbyUZ QM+g== X-Gm-Message-State: AMke39ms0mnZLBgm/N2ptvwkRofkWw6OVamjEBstZptBDRkoWN8JI3HwHQYQ4RPQ1XvOkA== X-Received: by 10.28.20.209 with SMTP id 200mr3567287wmu.64.1487371269296; Fri, 17 Feb 2017 14:41:09 -0800 (PST) Received: from localhost ([2a02:c7f:c42b:f900:5e51:4fff:fee9:57af]) by smtp.gmail.com with ESMTPSA id m83sm3269619wmc.33.2017.02.17.14.41.08 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 17 Feb 2017 14:41:08 -0800 (PST) From: Thomas Gummerer To: git@vger.kernel.org Cc: Junio C Hamano , Jeff King , Johannes Schindelin , =?UTF-8?q?=C3=98yvind=20A=20=2E=20Holm?= , =?UTF-8?q?Jakub=20Nar=C4=99bski?= , Matthieu Moy , Thomas Gummerer Subject: [PATCH v5 4/6] stash: teach 'push' (and 'create_stash') to honor pathspec Date: Fri, 17 Feb 2017 22:41:39 +0000 Message-Id: <20170217224141.19183-5-t.gummerer@gmail.com> X-Mailer: git-send-email 2.11.0.301.g27b9849079.dirty In-Reply-To: <20170217224141.19183-1-t.gummerer@gmail.com> References: <20170212215420.16701-1-t.gummerer@gmail.com> <20170217224141.19183-1-t.gummerer@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org While working on a repository, it's often helpful to stash the changes of a single or multiple files, and leave others alone. Unfortunately git currently offers no such option. git stash -p can be used to work around this, but it's often impractical when there are a lot of changes over multiple files. Allow 'git stash push' to take pathspec to specify which paths to stash. Helped-by: Junio C Hamano Signed-off-by: Thomas Gummerer --- Documentation/git-stash.txt | 11 ++++++ git-stash.sh | 48 +++++++++++++++++++------ t/t3903-stash.sh | 72 ++++++++++++++++++++++++++++++++++++++ t/t3905-stash-include-untracked.sh | 26 ++++++++++++++ 4 files changed, 146 insertions(+), 11 deletions(-) diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt index d93c47446a..086c229db0 100644 --- a/Documentation/git-stash.txt +++ b/Documentation/git-stash.txt @@ -15,9 +15,13 @@ SYNOPSIS 'git stash' branch [] 'git stash' [save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet] [-u|--include-untracked] [-a|--all] []] +'git stash' push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet] + [-u|--include-untracked] [-a|--all] [-m|--message ]] + [--] [...] 'git stash' clear 'git stash' create [] 'git stash' create [-m ] [-u|--include-untracked ] + [-- ...] 'git stash' store [-m|--message ] [-q|--quiet] DESCRIPTION @@ -47,6 +51,7 @@ OPTIONS ------- save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] []:: +push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [-m|--message ] [--] [...]:: Save your local modifications to a new 'stash', and run `git reset --hard` to revert them. The part is optional and gives @@ -55,6 +60,12 @@ save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q only does not trigger this action to prevent a misspelled subcommand from making an unwanted stash. + +When pathspec is given to 'git stash push', the new stash records the +modified states only for the files that match the pathspec. The index +entries and working tree files are then rolled back to the state in +HEAD only for these files, too, leaving files that do not match the +pathspec intact. ++ If the `--keep-index` option is used, all changes already added to the index are left intact. + diff --git a/git-stash.sh b/git-stash.sh index e76741d37d..6b56f84d81 100755 --- a/git-stash.sh +++ b/git-stash.sh @@ -11,6 +11,7 @@ USAGE="list [] [-u|--include-untracked] [-a|--all] []] or: $dashless push [--patch] [-k|--[no-]keep-index] [-q|--quiet] [-u|--include-untracked] [-a|--all] [-m ] + [-- ...] or: $dashless clear" SUBDIRECTORY_OK=Yes @@ -35,15 +36,15 @@ else fi no_changes () { - git diff-index --quiet --cached HEAD --ignore-submodules -- && - git diff-files --quiet --ignore-submodules && + git diff-index --quiet --cached HEAD --ignore-submodules -- "$@" && + git diff-files --quiet --ignore-submodules -- "$@" && (test -z "$untracked" || test -z "$(untracked_files)") } untracked_files () { excl_opt=--exclude-standard test "$untracked" = "all" && excl_opt= - git ls-files -o -z $excl_opt + git ls-files -o -z $excl_opt -- "$@" } clear_stash () { @@ -72,12 +73,16 @@ create_stash () { shift untracked=${1-"BUG: create_stash () -u requires an argument"} ;; + --) + shift + break + ;; esac shift done git update-index -q --refresh - if no_changes + if no_changes "$@" then exit 0 fi @@ -109,7 +114,7 @@ create_stash () { # Untracked files are stored by themselves in a parentless commit, for # ease of unpacking later. u_commit=$( - untracked_files | ( + untracked_files "$@" | ( GIT_INDEX_FILE="$TMPindex" && export GIT_INDEX_FILE && rm -f "$TMPindex" && @@ -132,7 +137,7 @@ create_stash () { git read-tree --index-output="$TMPindex" -m $i_tree && GIT_INDEX_FILE="$TMPindex" && export GIT_INDEX_FILE && - git diff-index --name-only -z HEAD -- >"$TMP-stagenames" && + git diff-index --name-only -z HEAD -- "$@" >"$TMP-stagenames" && git update-index -z --add --remove --stdin <"$TMP-stagenames" && git write-tree && rm -f "$TMPindex" @@ -146,7 +151,7 @@ create_stash () { # find out what the user wants GIT_INDEX_FILE="$TMP-index" \ - git add--interactive --patch=stash -- && + git add--interactive --patch=stash -- "$@" && # state of the working tree w_tree=$(GIT_INDEX_FILE="$TMP-index" git write-tree) || @@ -275,7 +280,7 @@ push_stash () { fi git update-index -q --refresh - if no_changes + if no_changes "$@" then say "$(gettext "No local changes to save")" exit 0 @@ -283,18 +288,39 @@ push_stash () { git reflog exists $ref_stash || clear_stash || die "$(gettext "Cannot initialize stash")" - create_stash -m "$stash_msg" -u "$untracked" + create_stash -m "$stash_msg" -u "$untracked" -- "$@" store_stash -m "$stash_msg" -q $w_commit || die "$(gettext "Cannot save the current status")" say "$(eval_gettext "Saved working directory and index state \$stash_msg")" if test -z "$patch_mode" then - git reset --hard ${GIT_QUIET:+-q} + if test $# != 0 + then + saved_untracked= + if test -n "$(git ls-files --others -- "$@")" + then + saved_untracked=$( + git ls-files -z --others -- "$@" | + xargs -0 git stash create -u all --) + fi + git ls-files -z -- "$@" | xargs -0 git reset ${GIT_QUIET:+-q} -- + git ls-files -z --modified -- "$@" | xargs -0 git checkout ${GIT_QUIET:+-q} HEAD -- + if test -n "$(git ls-files -z --others -- "$@")" + then + git ls-files -z --others -- "$@" | xargs -0 git clean --force -d ${GIT_QUIET:+-q} -- + fi + if test -n "$saved_untracked" + then + git stash pop -q $saved_untracked + fi + else + git reset --hard ${GIT_QUIET:+-q} + fi test "$untracked" = "all" && CLEAN_X_OPTION=-x || CLEAN_X_OPTION= if test -n "$untracked" then - git clean --force --quiet -d $CLEAN_X_OPTION + git clean --force --quiet -d $CLEAN_X_OPTION -- "$@" fi if test "$keep_index" = "t" && test -n "$i_tree" diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh index ffe3549ea5..4fb800eec8 100755 --- a/t/t3903-stash.sh +++ b/t/t3903-stash.sh @@ -802,4 +802,76 @@ test_expect_success 'create with multiple arguments for the message' ' test_cmp expect actual ' +test_expect_success 'stash -- stashes and restores the file' ' + >foo && + >bar && + git add foo bar && + git stash push -- foo && + test_path_is_file bar && + test_path_is_missing foo && + git stash pop && + test_path_is_file foo && + test_path_is_file bar +' + +test_expect_success 'stash with multiple filename arguments' ' + >foo && + >bar && + >extra && + git add foo bar extra && + git stash push -- foo bar && + test_path_is_missing bar && + test_path_is_missing foo && + test_path_is_file extra && + git stash pop && + test_path_is_file foo && + test_path_is_file bar && + test_path_is_file extra +' + +test_expect_success 'stash with file including $IFS character' ' + >"foo bar" && + >foo && + >bar && + git add foo* && + git stash push -- "foo b*" && + test_path_is_missing "foo bar" && + test_path_is_file foo && + test_path_is_file bar && + git stash pop && + test_path_is_file "foo bar" && + test_path_is_file foo && + test_path_is_file bar +' + +test_expect_success 'stash push -p with pathspec shows no changes only onece' ' + >file && + git add file && + git stash push -p not-file >actual && + echo "No local changes to save" >expect && + test_cmp expect actual +' + +test_expect_success 'stash push with pathspec shows no changes when there are none' ' + >file && + git add file && + git stash push not-file >actual && + echo "No local changes to save" >expect && + test_cmp expect actual +' + +test_expect_success 'untracked file is not removed when using pathspecs' ' + >untracked && + git stash push untracked && + test_path_is_file untracked +' + +test_expect_success 'untracked files are left in place when -u is not given' ' + >file && + git add file && + >untracked && + git stash push file && + test_path_is_file untracked +' + test_done diff --git a/t/t3905-stash-include-untracked.sh b/t/t3905-stash-include-untracked.sh index f372fc8ca8..193adc7b68 100755 --- a/t/t3905-stash-include-untracked.sh +++ b/t/t3905-stash-include-untracked.sh @@ -185,4 +185,30 @@ test_expect_success 'stash save --all is stash poppable' ' test -s .gitignore ' +test_expect_success 'stash push --include-untracked with pathspec' ' + >foo && + >bar && + git stash push --include-untracked -- foo && + test_path_is_file bar && + test_path_is_missing foo && + git stash pop && + test_path_is_file bar && + test_path_is_file foo +' + +test_expect_success 'stash push with $IFS character' ' + >"foo bar" && + >foo && + >bar && + git add foo* && + git stash push --include-untracked -- "foo b*" && + test_path_is_missing "foo bar" && + test_path_is_file foo && + test_path_is_file bar && + git stash pop && + test_path_is_file "foo bar" && + test_path_is_file foo && + test_path_is_file bar +' + test_done -- 2.11.0.301.g27b9849079.dirty