[PATCH] checkout: obey -q option

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Signed-off-by: Gustaf Hendeby <hendeby@xxxxxxxxxx>
---

This makes the new tracking output introduced by
79a1e6b432d7d7ffaf2079d4cf895583502ca923 (checkout: notice when the
switched branch is behind or forked) obey the silence option.  FWIW, I
would really prefer only to get the one line informing me that I could
do a fast-forward or will need a merge unless I specifically ask for
more.  Is that something worth exploring?  Right now checkout is a bit
too talkative for my taste.

/Gustaf

 builtin-checkout.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/builtin-checkout.c b/builtin-checkout.c
index b1820a4..104ce4f 100644
--- a/builtin-checkout.c
+++ b/builtin-checkout.c
@@ -402,7 +402,7 @@ static void update_refs_for_switch(struct checkout_opts *opts,
 	}
 	remove_branch_state();
 	strbuf_release(&msg);
-	if (new->path || !strcmp(new->name, "HEAD"))
+	if (!opts->quiet && (new->path || !strcmp(new->name, "HEAD")))
 		adjust_to_tracking(new, opts);
 }
 
-- 
1.5.4.2.232.g08e5

-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux