Commit Diff

Commit:
102ff934b46daf842c7e393a017ab35d9449c577
From:
Stefan Sperling <stsp@stsp.name>
Date:
Message:
don't report 'base bumped' status if base is up-to-date
Actions:
Patch | Tree
commit - a484d721b0152ab353a510e75b2aab3cd1aebee3
commit + 102ff934b46daf842c7e393a017ab35d9449c577
blob - d541a30b5fbfe09481bfcf827b523db052fb9afb
blob + 9c8e0f6aa7469f287229ba2c42433b98972f6c62
--- lib/worktree.c
+++ lib/worktree.c
@@ -1474,6 +1474,10 @@ bump_base_commit_id(void *arg, struct got_fileindex_en
 		if (strcmp(ie->path, a->path) != 0)
 			return NULL;
 	} else if (!got_path_is_child(ie->path, a->path, a->path_len))
+		return NULL;
+
+	if (memcmp(ie->commit_sha1, a->base_commit_id->sha1,
+	    SHA1_DIGEST_LENGTH) == 0)
 		return NULL;
 
 	(*a->progress_cb)(a->progress_arg, GOT_STATUS_BUMP_BASE, ie->path);