[PATCH] replace: List replacement along with the object
From: Michael J Gruber <hidden>
Date: 2016-06-15 22:51:55
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
The documentation could be misunderstood as if "git replace -l" lists the replacements of the specified objects. Currently, it lists the replaced objects. Change the output to the form "<object> <replacement>" so that there is an easy way to find the replacement, besides the more difficult to find git show-ref $(git replace -l). Signed-off-by: Michael J Gruber <redacted> --- Noted in passing while testing decorations. --- Documentation/git-replace.txt | 2 +- builtin/replace.c | 2 +- t/t6050-replace.sh | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Documentation/git-replace.txt b/Documentation/git-replace.txt
index 17df525..9bf3ff8 100644
--- a/Documentation/git-replace.txt
+++ b/Documentation/git-replace.txt@@ -58,7 +58,7 @@ OPTIONS -l <pattern>:: List replace refs for objects that match the given pattern (or - all if no pattern is given). + all if no pattern is given) in the form "<object> <replacement>". Typing "git replace" without arguments, also lists all replace refs.
diff --git a/builtin/replace.c b/builtin/replace.c
index fe3a647..f8c5a9f 100644
--- a/builtin/replace.c
+++ b/builtin/replace.c@@ -26,7 +26,7 @@ static int show_reference(const char *refname, const unsigned char *sha1, const char *pattern = cb_data; if (!fnmatch(pattern, refname, 0)) - printf("%s\n", refname); + printf("%s %s\n", refname, sha1_to_hex(sha1)); return 0; }
diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh
index 5c87f28..665b308 100755
--- a/t/t6050-replace.sh
+++ b/t/t6050-replace.sh@@ -119,10 +119,10 @@ test_expect_success 'repack, clone and fetch work' ' ' test_expect_success '"git replace" listing and deleting' ' - test "$HASH2" = "$(git replace -l)" && - test "$HASH2" = "$(git replace)" && + test "$HASH2 $R" = "$(git replace -l)" && + test "$HASH2 $R" = "$(git replace)" && aa=${HASH2%??????????????????????????????????????} && - test "$HASH2" = "$(git replace -l "$aa*")" && + test "$HASH2 $R" = "$(git replace -l "$aa*")" && test_must_fail git replace -d $R && test_must_fail git replace -d && test_must_fail git replace -l -d $HASH2 &&
@@ -137,7 +137,7 @@ test_expect_success '"git replace" replacing' ' test_must_fail git replace $HASH2 $R && git replace -f $HASH2 $R && test_must_fail git replace -f && - test "$HASH2" = "$(git replace)" + test "$HASH2 $R" = "$(git replace)" ' # This creates a side branch where the bug in H2
--
1.7.6.845.gc3c05